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

[tor/maint-0.4.0] Even more diagnostic messages for bug 28223.
by asn＠torproject.org 18 Apr '19

18 Apr '19

commit 99b87d7ca48c5ed80aec5f24902843f72975bfea Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 3 13:53:06 2019 -0400 Even more diagnostic messages for bug 28223. Try to figure out _where exactly_ we are first encountering NULs in microdescriptors, and what we are doing when that happens. --- changes/diagnostic_28223_redux | 4 ++++ src/feature/dirparse/microdesc_parse.c | 17 ++++++++++++++++- src/feature/nodelist/microdesc.c | 21 +++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/changes/diagnostic_28223_redux b/changes/diagnostic_28223_redux new file mode 100644 index 000000000..0d7499832 --- /dev/null +++ b/changes/diagnostic_28223_redux @@ -0,0 +1,4 @@ + o Minor features (diagnostic): + - Add more diagnostic log messages in an attempt to solve + the issue of NUL bytes appearing in a microdescriptor cache. + Related to ticket 28223. diff --git a/src/feature/dirparse/microdesc_parse.c b/src/feature/dirparse/microdesc_parse.c index 5a75af399..1e26901ce 100644 --- a/src/feature/dirparse/microdesc_parse.c +++ b/src/feature/dirparse/microdesc_parse.c @@ -159,7 +159,22 @@ microdescs_parse_from_string(const char *s, const char *eos, if (tokenize_string(area, s, start_of_next_microdesc, tokens, microdesc_token_table, flags)) { - log_warn(LD_DIR, "Unparseable microdescriptor"); + const char *location; + switch (where) { + case SAVED_NOWHERE: + location = "download or generated string"; + break; + case SAVED_IN_CACHE: + location = "cache"; + break; + case SAVED_IN_JOURNAL: + location = "journal"; + break; + default: + location = "unknown location"; + break; + } + log_warn(LD_DIR, "Unparseable microdescriptor found in %s", location); goto next; } diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c index dafaabb5e..af4f608d2 100644 --- a/src/feature/nodelist/microdesc.c +++ b/src/feature/nodelist/microdesc.c @@ -221,6 +221,13 @@ dump_microdescriptor(int fd, microdesc_t *md, size_t *annotation_len_out) } md->off = tor_fd_getpos(fd); + const char *nulpos = memchr(md->body, 0, md->bodylen); + if (BUG(nulpos)) { + log_warn(LD_BUG, "About to dump a NUL into a microdescriptor file. " + "offset %"PRId64", bodylen %zu, nul position %zu", + (int64_t)md->off, md->bodylen, + (size_t)(nulpos - md->body)); + } written = write_all_to_fd(fd, md->body, md->bodylen); if (written != (ssize_t)md->bodylen) { written = written < 0 ? 0 : written; @@ -480,6 +487,17 @@ microdesc_cache_clear(microdesc_cache_t *cache) cache->bytes_dropped = 0; } +static void +warn_if_nul_found(const char *inp, size_t len, const char *description) +{ + const char *nul_found = memchr(inp, 0, len); + if (BUG(nul_found)) { + log_warn(LD_BUG, "Found unexpected NUL while reading %s, at " + "position %zu/%zu.", + description, (nul_found - inp), len); + } +} + /** Reload the contents of <b>cache</b> from disk. If it is empty, load it * for the first time. Return 0 on success, -1 on failure. */ int @@ -497,6 +515,7 @@ microdesc_cache_reload(microdesc_cache_t *cache) mm = cache->cache_content = tor_mmap_file(cache->cache_fname); if (mm) { + warn_if_nul_found(mm->data, mm->size, "microdesc cache"); added = microdescs_add_to_cache(cache, mm->data, mm->data+mm->size, SAVED_IN_CACHE, 0, -1, NULL); if (added) { @@ -509,6 +528,8 @@ microdesc_cache_reload(microdesc_cache_t *cache) RFTS_IGNORE_MISSING, &st); if (journal_content) { cache->journal_len = (size_t) st.st_size; + warn_if_nul_found(journal_content, cache->journal_len, + "microdesc journal"); added = microdescs_add_to_cache(cache, journal_content, journal_content+st.st_size, SAVED_IN_JOURNAL, 0, -1, NULL);

1 0

[tor/maint-0.4.0] fdio.c: add more includes.
by asn＠torproject.org 18 Apr '19

18 Apr '19

commit 821d29e42040789c59d271ba2f1d87a54d6d1435 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 3 13:53:36 2019 -0400 fdio.c: add more includes. This is just in case there is some rogue platform that uses a nonstandard value for SEEK_*, and does not define that macro in unistd.h. I think that's unlikely, but it's conceivable. --- src/lib/fdio/fdio.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/fdio/fdio.c b/src/lib/fdio/fdio.c index 6c87af791..078af6a9b 100644 --- a/src/lib/fdio/fdio.c +++ b/src/lib/fdio/fdio.c @@ -17,12 +17,16 @@ #ifdef _WIN32 #include <windows.h> #endif +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif #include "lib/fdio/fdio.h" #include "lib/cc/torint.h" #include "lib/err/torerr.h" #include <stdlib.h> +#include <stdio.h> /** @{ */ /** Some old versions of Unix didn't define constants for these values,

1 0

[tor/maint-0.4.0] fixup! Even more diagnostic messages for bug 28223.
by asn＠torproject.org 18 Apr '19

18 Apr '19

commit 0c42ddf28c330280f66feb7cc92b63f3998468e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 15 15:21:18 2019 -0400 fixup! Even more diagnostic messages for bug 28223. Use TOR_PRIuSZ in place of %zu. --- src/feature/nodelist/microdesc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c index af4f608d2..eaa7f0caf 100644 --- a/src/feature/nodelist/microdesc.c +++ b/src/feature/nodelist/microdesc.c @@ -224,7 +224,8 @@ dump_microdescriptor(int fd, microdesc_t *md, size_t *annotation_len_out) const char *nulpos = memchr(md->body, 0, md->bodylen); if (BUG(nulpos)) { log_warn(LD_BUG, "About to dump a NUL into a microdescriptor file. " - "offset %"PRId64", bodylen %zu, nul position %zu", + "offset %"PRId64", bodylen %"TOR_PRIuSZ", " + "nul position %"TOR_PRIuSZ".", (int64_t)md->off, md->bodylen, (size_t)(nulpos - md->body)); } @@ -493,7 +494,7 @@ warn_if_nul_found(const char *inp, size_t len, const char *description) const char *nul_found = memchr(inp, 0, len); if (BUG(nul_found)) { log_warn(LD_BUG, "Found unexpected NUL while reading %s, at " - "position %zu/%zu.", + "position %"TOR_PRIuSZ"/%"TOR_PRIuSZ".", description, (nul_found - inp), len); } }

1 0

[tor/maint-0.4.0] In warn_if_nul_found, log surrounding context.
by asn＠torproject.org 18 Apr '19

18 Apr '19

commit 950d890f77d8f060702b100e6075d5083d536577 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 15 15:33:09 2019 -0400 In warn_if_nul_found, log surrounding context. We need to encode here instead of doing escaped(), since fwict escaped() does not currently handle NUL bytes. Also, use warn_if_nul_found in more cases to avoid duplication. --- src/feature/nodelist/microdesc.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c index eaa7f0caf..f4fa8eeae 100644 --- a/src/feature/nodelist/microdesc.c +++ b/src/feature/nodelist/microdesc.c @@ -69,6 +69,8 @@ struct microdesc_cache_t { }; static microdesc_cache_t *get_microdesc_cache_noload(void); +static void warn_if_nul_found(const char *inp, size_t len, int64_t offset, + const char *activity); /** Helper: computes a hash of <b>md</b> to place it in a hash table. */ static inline unsigned int @@ -221,14 +223,8 @@ dump_microdescriptor(int fd, microdesc_t *md, size_t *annotation_len_out) } md->off = tor_fd_getpos(fd); - const char *nulpos = memchr(md->body, 0, md->bodylen); - if (BUG(nulpos)) { - log_warn(LD_BUG, "About to dump a NUL into a microdescriptor file. " - "offset %"PRId64", bodylen %"TOR_PRIuSZ", " - "nul position %"TOR_PRIuSZ".", - (int64_t)md->off, md->bodylen, - (size_t)(nulpos - md->body)); - } + warn_if_nul_found(md->body, md->bodylen, (int64_t) md->off, + "dumping a microdescriptor"); written = write_all_to_fd(fd, md->body, md->bodylen); if (written != (ssize_t)md->bodylen) { written = written < 0 ? 0 : written; @@ -489,13 +485,23 @@ microdesc_cache_clear(microdesc_cache_t *cache) } static void -warn_if_nul_found(const char *inp, size_t len, const char *description) +warn_if_nul_found(const char *inp, size_t len, int64_t offset, + const char *activity) { const char *nul_found = memchr(inp, 0, len); if (BUG(nul_found)) { - log_warn(LD_BUG, "Found unexpected NUL while reading %s, at " - "position %"TOR_PRIuSZ"/%"TOR_PRIuSZ".", - description, (nul_found - inp), len); + log_warn(LD_BUG, "Found unexpected NUL while %s, offset %"PRId64 + "at position %"TOR_PRIuSZ"/%"TOR_PRIuSZ".", + activity, offset, (nul_found - inp), len); + const char *start_excerpt_at, *eos = inp + len; + if ((nul_found - inp) >= 16) + start_excerpt_at = nul_found - 16; + else + start_excerpt_at = inp; + size_t excerpt_len = MIN(32, eos - start_excerpt_at); + char tmp[65]; + base16_encode(tmp, sizeof(tmp), start_excerpt_at, excerpt_len); + log_warn(LD_BUG, " surrounding string: %s", tmp); } } @@ -516,7 +522,7 @@ microdesc_cache_reload(microdesc_cache_t *cache) mm = cache->cache_content = tor_mmap_file(cache->cache_fname); if (mm) { - warn_if_nul_found(mm->data, mm->size, "microdesc cache"); + warn_if_nul_found(mm->data, mm->size, 0, "scanning microdesc cache"); added = microdescs_add_to_cache(cache, mm->data, mm->data+mm->size, SAVED_IN_CACHE, 0, -1, NULL); if (added) { @@ -529,8 +535,8 @@ microdesc_cache_reload(microdesc_cache_t *cache) RFTS_IGNORE_MISSING, &st); if (journal_content) { cache->journal_len = (size_t) st.st_size; - warn_if_nul_found(journal_content, cache->journal_len, - "microdesc journal"); + warn_if_nul_found(journal_content, cache->journal_len, 0, + "reading microdesc journal"); added = microdescs_add_to_cache(cache, journal_content, journal_content+st.st_size, SAVED_IN_JOURNAL, 0, -1, NULL);

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 18 Apr '19

18 Apr '19

commit 44748d49a04896c9267c742b929f21881c51817b Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 18 09:45:51 2019 +0000 Update translations for https_everywhere --- ur/https-everywhere.dtd | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ur/https-everywhere.dtd b/ur/https-everywhere.dtd index 9ffb554c3..741c6c7f3 100644 --- a/ur/https-everywhere.dtd +++ b/ur/https-everywhere.dtd @@ -22,29 +22,29 @@ <!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere Sites Disabled"> <!ENTITY https-everywhere.options.updateChannelsWarning "Warning: Adding update channels can cause attackers to hijack your browser. Only edit this section if you know what you're doing!"> <!ENTITY https-everywhere.options.addUpdateChannel "تجدید کا راستہ شامل کریں"> -<!ENTITY https-everywhere.options.enterUpdateChannelName "Enter update channel name"> +<!ENTITY https-everywhere.options.enterUpdateChannelName "تجدید کے راستے کا نام درج کریں"> <!ENTITY https-everywhere.options.delete "حذف"> -<!ENTITY https-everywhere.options.update "اپ ڈیٹ کریں"> +<!ENTITY https-everywhere.options.update "تجدید کریں"> <!ENTITY https-everywhere.options.storedRulesetsVersion "Stored rulesets version: "> -<!ENTITY https-everywhere.options.updatesLastChecked "Updates last checked: "> -<!ENTITY https-everywhere.options.updatesLastCheckedNever "never"> +<!ENTITY https-everywhere.options.updatesLastChecked "آخری بار تجدید کی جانچ ہوئی: "> +<!ENTITY https-everywhere.options.updatesLastCheckedNever "کبھی نہیں"> -<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> -<!ENTITY https-everywhere.prefs.reset_defaults "Reset to Defaults"> +<!ENTITY https-everywhere.prefs.export_settings "ترتیبات برآمد کریں"> +<!ENTITY https-everywhere.prefs.reset_defaults "ڈیفالٹس پر واپس جائیے"> <!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> <!ENTITY https-everywhere.cancel.he_blocking_explainer "HTTPS Everywhere noticed you were navigating to a non-HTTPS page, and tried to send you to the HTTPS version instead. The HTTPS version is unavailable. Most likely this site does not support HTTPS, but it is also possible that an attacker is blocking the HTTPS version. If you wish to view the unencrypted version of this page, you can still do so by disabling the 'Encrypt All Sites Eligible' (EASE) option in your HTTPS Everywhere extension. Be aware that disabling this option could make your browser vulnerable to network-based downgrade attacks on websites you visit."> <!ENTITY https-everywhere.cancel.he_blocking_network "network-based downgrade attacks"> -<!ENTITY https-everywhere.cancel.open_page "Open insecure page"> +<!ENTITY https-everywhere.cancel.open_page "غیر محفوظ صفحہ کھولیں"> <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> -<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> +<!ENTITY https-everywhere.chrome.experimental_rules "تجرباتی قوانین"> <!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> -<!ENTITY https-everywhere.chrome.disable_on_this_site "Disable HTTPS Everywhere on this site"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "Enable HTTPS Everywhere on this site"> -<!ENTITY https-everywhere.chrome.add_rule "Add a rule for this site"> -<!ENTITY https-everywhere.chrome.add_new_rule "Add a new rule for this site"> +<!ENTITY https-everywhere.chrome.disable_on_this_site "اس سائیٹ پر ہائپر ٹیکسٹ ٹرانسفر پروٹوکول سکیور ہر جگہ کو غیر فعال کریں"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "اس سائیٹ پر ہائپر ٹیکسٹ ٹرانسفر پروٹوکول سکیور ہر جگہ کو فعال کریں"> +<!ENTITY https-everywhere.chrome.add_rule "اس سائیٹ کیلئے قانون شامل کریں"> +<!ENTITY https-everywhere.chrome.add_new_rule "اس سائیٹ کیلئے ایک نیا قانون شامل کریں"> <!ENTITY https-everywhere.chrome.always_https_for_host "Always use https for this host"> <!ENTITY https-everywhere.chrome.host "Host:"> <!ENTITY https-everywhere.chrome.show_advanced "Show advanced">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 18 Apr '19

18 Apr '19

commit 6e7bc7599a4a4a5107fdb9e666a5ae3d785ca57d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 18 09:15:51 2019 +0000 Update translations for https_everywhere --- ur/https-everywhere.dtd | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ur/https-everywhere.dtd b/ur/https-everywhere.dtd index 1855b0f11..9ffb554c3 100644 --- a/ur/https-everywhere.dtd +++ b/ur/https-everywhere.dtd @@ -3,25 +3,25 @@ <!ENTITY https-everywhere.about.ext_description "Encrypt the Web! Automatically use HTTPS security on many sites."> <!ENTITY https-everywhere.about.version "ورژن"> <!ENTITY https-everywhere.about.rulesets_version "Rulesets version for"> -<!ENTITY https-everywhere.about.add_new_rule "Add New Rule"> +<!ENTITY https-everywhere.about.add_new_rule "نیا قانون شامل کریں"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "EEF کو عطیہ دیجیے"> <!ENTITY https-everywhere.menu.observatory "SSL Observatory Preferences"> -<!ENTITY https-everywhere.menu.globalEnable "شروع کرئیں"> +<!ENTITY https-everywhere.menu.globalEnable "ہائپر ٹیکسٹ ٹرانسفر پروٹوکول سکیور ہر جگہ کو فعال کریں"> <!ENTITY https-everywhere.menu.encryptAllSitesEligible "Encrypt All Sites Eligible (EASE)"> <!ENTITY https-everywhere.menu.showCounter "کاؤنٹر دکھائیں"> -<!ENTITY https-everywhere.menu.viewAllRules "تمام قانون دکھائیں"> +<!ENTITY https-everywhere.menu.viewAllRules "تمام قوانین دکھائیں"> -<!ENTITY https-everywhere.options.generalSettings "مجموعی/ عام سیٹینگز"> +<!ENTITY https-everywhere.options.generalSettings "مجموعی/ عام ترتیبات"> <!ENTITY https-everywhere.options.advancedSettings "اعلٰی ترتیبات"> -<!ENTITY https-everywhere.options.updateChannels "Update Channels"> +<!ENTITY https-everywhere.options.updateChannels "تجدید کے راستے"> <!ENTITY https-everywhere.options.enableMixedRulesets "Enable mixed content rulesets"> <!ENTITY https-everywhere.options.showDevtoolsTab "Show Devtools tab"> -<!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets"> -<!ENTITY https-everywhere.options.userRulesListed "HTTPS Everywhere User Rules"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "خودکار تجدید کے مجموعی قوانین"> +<!ENTITY https-everywhere.options.userRulesListed "ہائپر ٹیکسٹ ٹرانسفر پروٹوکول سکیور ہر جگہ کے صارفی قوانین"> <!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere Sites Disabled"> <!ENTITY https-everywhere.options.updateChannelsWarning "Warning: Adding update channels can cause attackers to hijack your browser. Only edit this section if you know what you're doing!"> -<!ENTITY https-everywhere.options.addUpdateChannel "Add Update Channel"> +<!ENTITY https-everywhere.options.addUpdateChannel "تجدید کا راستہ شامل کریں"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Enter update channel name"> <!ENTITY https-everywhere.options.delete "حذف"> <!ENTITY https-everywhere.options.update "اپ ڈیٹ کریں">

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 17 Apr '19

17 Apr '19

commit b5f9d5078fda96c259f2fd6cbcfc360d3f254655 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 17 21:20:01 2019 +0000 Update translations for tor-launcher-properties --- hr/torlauncher.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/hr/torlauncher.properties b/hr/torlauncher.properties index 4cccfc822..1748e084b 100644 --- a/hr/torlauncher.properties +++ b/hr/torlauncher.properties @@ -3,12 +3,12 @@ torlauncher.error_title=Tor Launcher -torlauncher.tor_exited_during_startup=Tor je prekinut tijekom pokretanja. Ovo može biti zbog pogreške u vašoj torrc datoteci, pogreške u Tor-u ili u drugom programu na vašem sistemu, ili zbog neispravnog hardvera. Dok ne riješite temeljni problem i ponovno pokrenete Tor, Tor preglednik se neće pokrenuti. -torlauncher.tor_exited=Tor je neočekivano prekinut. To može biti zbog greške u samom Tor-u, drugom programu na vašem sistemu ili zbog neispravnog hardvera. Dok ponovno ne pokrenete Tor, Tor preglednik neće moči pristupiti web stranicama. Ako se problem nastavi, pošaljite kopiju vašeg Tor zapisnika timu za podršku. -torlauncher.tor_exited2=Ponovno pokretanje Tor-a neće zatvoriti vaše kartice preglednika. -torlauncher.tor_controlconn_failed=Povezivanje na kontrolni port Tor-a nije uspjelo. -torlauncher.tor_failed_to_start=Pokretanje Tor-a nije uspjelo. -torlauncher.tor_control_failed=Uzimanje kontrole nad Tor-om nije uspjelo +torlauncher.tor_exited_during_startup=Tor je izašao usred pokretanja. Do toga može doći zbog greške u Vašoj torrc datoteci, greške u Toru ili drugom programu u Vašem sustavu ili zbog neispravnog hardwarea. Dok ne popravite inicijalni problem i ponovno pokrenete Tor, Tor Browser se neće pokrenuti. +torlauncher.tor_exited=Tor je neočekivano izašao. Ovo bi moglo biti zbog greške u samom Toru, drugog programa na Vašem sustavu ili neispravnog hardwarea. Dok ne pokrenete Tor ponovno, Tor Browser neće biti u mogućnosti pristupiti web stranicama. Ako problem ustraje, molimo Vas da pošaljete kopiju Vašeg Tor zapisa timu za podršku. +torlauncher.tor_exited2=Ponovno pokretanje Tora neće zatvoriti Vaše kartice u pregledniku. +torlauncher.tor_controlconn_failed=Nije se moguće spojiti na Torov upravljački port. +torlauncher.tor_failed_to_start=Tor se nije uspio pokrenuti. +torlauncher.tor_control_failed=Preuzimanje kontrole nad Torom nije uspjelo. torlauncher.tor_bootstrap_failed=Tor nije uspio uspostaviti Tor mrežnu vezu. torlauncher.tor_bootstrap_failed_details=%1$S neuspjelo (%2$S). @@ -41,9 +41,9 @@ torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. torlauncher.no_bridges_available=No bridges are available at this time. Sorry. -torlauncher.connect=Poveži se +torlauncher.connect=Spoji torlauncher.restart_tor=Ponovno pokreni Tor -torlauncher.quit=Izlaz +torlauncher.quit=Prekini torlauncher.quit_win=Izlaz torlauncher.done=Gotovo

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 17 Apr '19

17 Apr '19

commit 7f3ffdce1fb21f2f96e09fd2c2fbf927489bb2ac Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 17 21:19:50 2019 +0000 Update translations for torcheck --- hr/torcheck.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/hr/torcheck.po b/hr/torcheck.po index 5cc902c23..619c555c0 100644 --- a/hr/torcheck.po +++ b/hr/torcheck.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-09 01:51+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-04-17 21:05+0000\n" +"Last-Translator: erinm\n" "Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,16 +20,16 @@ msgstr "" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" msgid "Congratulations. This browser is configured to use Tor." -msgstr "Čestitam. ovaj internet preglednik je konfiguriran da upotrebljava Tor." +msgstr "Čestitamo. Ovaj preglednik je konfiguriran za uporabu Tora." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Molimo pogledajte <a href=\"https://www.torproject.org/\">web stranicu Tora</a> za više informacija o sigurnom korištenju Tora. Sada možete anonimno pretraživati Internet." +msgstr "Pogledajte <a href=\"https://www.torproject.org/\">Tor web stranicu </a> za daljnje informacije o tome kako sigurno koristiti Tor. Sad možete anonimno pregledavati internet." msgid "There is a security update available for Tor Browser." -msgstr "dostupno je sigurnosno ažuriranje za Tor internet preglednik." +msgstr "Dostupno je sigurnosno ažuriranje za Tor Browser." msgid "" "<a href=\"https://www.torproject.org/download/\">Click here to go to the " @@ -37,7 +37,7 @@ msgid "" msgstr "" msgid "Sorry. You are not using Tor." -msgstr "Nažalost ne koristite Tor." +msgstr "Nažalost, Vi ne koristite Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " @@ -47,13 +47,13 @@ msgid "" msgstr "" msgid "Sorry, your query failed or an unexpected response was received." -msgstr "Žao nam je, Vaš upit nije uspio ili je primljen neočekivani odgovor." +msgstr "Nažalost Vaš upit nije uspio ili je primljen neočekivan odgovor." msgid "Your IP address appears to be: " -msgstr "Vaša IP adresa je:" +msgstr "Čini se da je Vaša IP adresa:" msgid "This page is also available in the following languages:" -msgstr "Ova stranica dostupna je na sljedećim jezicima:" +msgstr "Ova stranica je također dostupna na sljedećim jezicima:" msgid "For more information about this exit relay, see:" msgstr "Za više informacija o ovom izlaznom releju pogledajte:" @@ -76,7 +76,7 @@ msgid "Tor Q&A Site" msgstr "Tor stranica s pitanjima i odgovorima" msgid "Volunteer" -msgstr "volonter" +msgstr "Volontirajte" msgid "JavaScript is enabled." msgstr "JavaScript je omogućen." @@ -91,7 +91,7 @@ msgid "Run a Relay" msgstr "Pokreni relej" msgid "Stay Anonymous" -msgstr "Ostanite anonimni" +msgstr "Ostani anoniman" msgid "Relay Search" msgstr ""

1 0

[translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed
by translation＠torproject.org 17 Apr '19

17 Apr '19

commit f97f8dfb98251900b6fada2035fd421b9740542c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 17 21:19:15 2019 +0000 Update translations for torbutton-aboutdialogdtd_completed --- hr/aboutdialog.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hr/aboutdialog.dtd b/hr/aboutdialog.dtd index 31f083534..9cd366dea 100644 --- a/hr/aboutdialog.dtd +++ b/hr/aboutdialog.dtd @@ -1,19 +1,19 @@ <!ENTITY project.start "&brandShortName; razvija">  <!ENTITY project.tpoLink "&vendorShortName;"> -<!ENTITY project.end ", neprofitna organizacija posvećena obrani Vaše privatnosti i slobode na mreži."> +<!ENTITY project.end ", neprofitna organizacija koja radi na obrani Vaše privatnosti i online slobode."> <!ENTITY help.start "Želite pomoći?">  <!ENTITY help.donateLink "Donirajte"> <!ENTITY help.or "ili">  -<!ENTITY help.getInvolvedLink "se uključite"> +<!ENTITY help.getInvolvedLink "umiješajte se"> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "Pitanja?">  -<!ENTITY bottomLinks.grow "Pomognite Tor mreži da raste!"> +<!ENTITY bottomLinks.grow "Pomozite rastu Tor mreže!">  <!ENTITY bottomLinks.license "Informacije o licenciranju"> -<!ENTITY tor.TrademarkStatement "'Tor' i 'Onion Logo' su registrirani zaštitni znakovi Tor Project, Inc."> +<!ENTITY tor.TrademarkStatement "'Tor' i 'Onion Logo' su registrirani zaštitni znaci Tor Project, Inc.">

1 0

[translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd
by translation＠torproject.org 17 Apr '19

17 Apr '19

commit 0a00019e29c8351b68a98c087544f753be2dfe95 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Apr 17 21:19:09 2019 +0000 Update translations for torbutton-aboutdialogdtd --- hr/aboutdialog.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hr/aboutdialog.dtd b/hr/aboutdialog.dtd index 31f083534..9cd366dea 100644 --- a/hr/aboutdialog.dtd +++ b/hr/aboutdialog.dtd @@ -1,19 +1,19 @@ <!ENTITY project.start "&brandShortName; razvija">  <!ENTITY project.tpoLink "&vendorShortName;"> -<!ENTITY project.end ", neprofitna organizacija posvećena obrani Vaše privatnosti i slobode na mreži."> +<!ENTITY project.end ", neprofitna organizacija koja radi na obrani Vaše privatnosti i online slobode."> <!ENTITY help.start "Želite pomoći?">  <!ENTITY help.donateLink "Donirajte"> <!ENTITY help.or "ili">  -<!ENTITY help.getInvolvedLink "se uključite"> +<!ENTITY help.getInvolvedLink "umiješajte se"> <!ENTITY help.end "!">  <!ENTITY bottomLinks.questions "Pitanja?">  -<!ENTITY bottomLinks.grow "Pomognite Tor mreži da raste!"> +<!ENTITY bottomLinks.grow "Pomozite rastu Tor mreže!">  <!ENTITY bottomLinks.license "Informacije o licenciranju"> -<!ENTITY tor.TrademarkStatement "'Tor' i 'Onion Logo' su registrirani zaštitni znakovi Tor Project, Inc."> +<!ENTITY tor.TrademarkStatement "'Tor' i 'Onion Logo' su registrirani zaštitni znaci Tor Project, Inc.">

1 0