- tor-commits - lists.torproject.org

[tor/master] Fix an erroneous renaming
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit e202f3a1ca2d2ef87820d0ff618a37d76b4e702a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 07:22:53 2016 -0500 Fix an erroneous renaming Did you know that crypto_digest_all is a substring of crypto_digest_alloc_bytes()? Hence the mysterious emergence of "crypto_common_digestsoc_bytes". Next time I should use the \b assertion in my regexen. Spotted by Mike. --- src/common/crypto.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 6c40c6e..9e66ded 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1742,7 +1742,7 @@ struct crypto_digest_t { * when we free one. */ static size_t -crypto_common_digestsoc_bytes(digest_algorithm_t alg) +crypto_digest_alloc_bytes(digest_algorithm_t alg) { /* Helper: returns the number of bytes in the 'f' field of 'st' */ #define STRUCT_FIELD_SIZE(st, f) (sizeof( ((st*)0)->f )) @@ -1773,7 +1773,7 @@ crypto_digest_t * crypto_digest_new(void) { crypto_digest_t *r; - r = tor_malloc(crypto_common_digestsoc_bytes(DIGEST_SHA1)); + r = tor_malloc(crypto_digest_alloc_bytes(DIGEST_SHA1)); SHA1_Init(&r->d.sha1); r->algorithm = DIGEST_SHA1; return r; @@ -1786,7 +1786,7 @@ crypto_digest256_new(digest_algorithm_t algorithm) { crypto_digest_t *r; tor_assert(algorithm == DIGEST_SHA256 || algorithm == DIGEST_SHA3_256); - r = tor_malloc(crypto_common_digestsoc_bytes(algorithm)); + r = tor_malloc(crypto_digest_alloc_bytes(algorithm)); if (algorithm == DIGEST_SHA256) SHA256_Init(&r->d.sha2); else @@ -1802,7 +1802,7 @@ crypto_digest512_new(digest_algorithm_t algorithm) { crypto_digest_t *r; tor_assert(algorithm == DIGEST_SHA512 || algorithm == DIGEST_SHA3_512); - r = tor_malloc(crypto_common_digestsoc_bytes(algorithm)); + r = tor_malloc(crypto_digest_alloc_bytes(algorithm)); if (algorithm == DIGEST_SHA512) SHA512_Init(&r->d.sha512); else @@ -1818,7 +1818,7 @@ crypto_digest_free(crypto_digest_t *digest) { if (!digest) return; - size_t bytes = crypto_common_digestsoc_bytes(digest->algorithm); + size_t bytes = crypto_digest_alloc_bytes(digest->algorithm); memwipe(digest, 0, bytes); tor_free(digest); } @@ -1878,7 +1878,7 @@ crypto_digest_get_digest(crypto_digest_t *digest, return; } - const size_t alloc_bytes = crypto_common_digestsoc_bytes(digest->algorithm); + const size_t alloc_bytes = crypto_digest_alloc_bytes(digest->algorithm); /* memcpy into a temporary ctx, since SHA*_Final clears the context */ memcpy(&tmpenv, digest, alloc_bytes); switch (digest->algorithm) { @@ -1910,7 +1910,7 @@ crypto_digest_t * crypto_digest_dup(const crypto_digest_t *digest) { tor_assert(digest); - const size_t alloc_bytes = crypto_common_digestsoc_bytes(digest->algorithm); + const size_t alloc_bytes = crypto_digest_alloc_bytes(digest->algorithm); return tor_memdup(digest, alloc_bytes); } @@ -1925,7 +1925,7 @@ crypto_digest_assign(crypto_digest_t *into, tor_assert(into); tor_assert(from); tor_assert(into->algorithm == from->algorithm); - const size_t alloc_bytes = crypto_common_digestsoc_bytes(from->algorithm); + const size_t alloc_bytes = crypto_digest_alloc_bytes(from->algorithm); memcpy(into,from,alloc_bytes); }

1 0

[tor/master] Whitespace fixes
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit a8d69895897056fcc313914e9d611d3c9008e17c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 15:35:46 2016 -0500 Whitespace fixes --- src/common/crypto.h | 4 ++-- src/common/tortls.h | 6 ++++-- src/or/channeltls.c | 3 ++- src/or/dirserv.h | 6 +++--- src/or/routerparse.c | 3 ++- src/or/routerparse.h | 3 ++- src/test/test_dir.c | 6 ++++-- 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/common/crypto.h b/src/common/crypto.h index f1e4981..9535c4e 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -102,7 +102,6 @@ typedef enum { #define N_DIGEST_ALGORITHMS (DIGEST_SHA3_512+1) #define N_COMMON_DIGEST_ALGORITHMS (DIGEST_SHA256+1) - /** A set of all the digests we commonly compute, taken on a single * string. Any digests that are shorter than 512 bits are right-padded * with 0 bits. @@ -193,7 +192,8 @@ int crypto_pk_private_hybrid_decrypt(crypto_pk_t *env, char *to, int crypto_pk_asn1_encode(crypto_pk_t *pk, char *dest, size_t dest_len); crypto_pk_t *crypto_pk_asn1_decode(const char *str, size_t len); int crypto_pk_get_digest(const crypto_pk_t *pk, char *digest_out); -int crypto_pk_get_common_digests(crypto_pk_t *pk, common_digests_t *digests_out); +int crypto_pk_get_common_digests(crypto_pk_t *pk, + common_digests_t *digests_out); int crypto_pk_get_fingerprint(crypto_pk_t *pk, char *fp_out,int add_space); int crypto_pk_get_hashed_fingerprint(crypto_pk_t *pk, char *fp_out); diff --git a/src/common/tortls.h b/src/common/tortls.h index 97ca8fd..d235ca5 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -237,8 +237,10 @@ tor_x509_cert_t *tor_x509_cert_decode(const uint8_t *certificate, size_t certificate_len); void tor_x509_cert_get_der(const tor_x509_cert_t *cert, const uint8_t **encoded_out, size_t *size_out); -const common_digests_t *tor_x509_cert_get_id_digests(const tor_x509_cert_t *cert); -const common_digests_t *tor_x509_cert_get_cert_digests(const tor_x509_cert_t *cert); +const common_digests_t *tor_x509_cert_get_id_digests( + const tor_x509_cert_t *cert); +const common_digests_t *tor_x509_cert_get_cert_digests( + const tor_x509_cert_t *cert); int tor_tls_get_my_certs(int server, const tor_x509_cert_t **link_cert_out, const tor_x509_cert_t **id_cert_out); diff --git a/src/or/channeltls.c b/src/or/channeltls.c index a4c5708..016ef75 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1819,7 +1819,8 @@ channel_tls_process_certs_cell(var_cell_t *cell, channel_tls_t *chan) chan->conn->handshake_state->authenticated = 1; { - const common_digests_t *id_digests = tor_x509_cert_get_id_digests(id_cert); + const common_digests_t *id_digests = + tor_x509_cert_get_id_digests(id_cert); crypto_pk_t *identity_rcvd; if (!id_digests) ERR("Couldn't compute digests for key in ID cert"); diff --git a/src/or/dirserv.h b/src/or/dirserv.h index 25a2a91..df23450 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -63,9 +63,9 @@ int directory_too_idle_to_fetch_descriptors(const or_options_t *options, cached_dir_t *dirserv_get_consensus(const char *flavor_name); void dirserv_set_cached_consensus_networkstatus(const char *consensus, - const char *flavor_name, - const common_digests_t *digests, - time_t published); + const char *flavor_name, + const common_digests_t *digests, + time_t published); void dirserv_clear_old_networkstatuses(time_t cutoff); int dirserv_get_routerdesc_fingerprints(smartlist_t *fps_out, const char *key, const char **msg, diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 7323f80..2173213 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3445,7 +3445,8 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out, /** Return the common_digests_t that holds the digests of the * flavor_name-flavored networkstatus according to the detached - * signatures document sigs, allocating a new common_digests_t as neeeded. */ + * signatures document sigs, allocating a new common_digests_t as + * neeeded. */ static common_digests_t * detached_get_digests(ns_detached_signatures_t *sigs, const char *flavor_name) { diff --git a/src/or/routerparse.h b/src/or/routerparse.h index 4745740..723d5d8 100644 --- a/src/or/routerparse.h +++ b/src/or/routerparse.h @@ -14,7 +14,8 @@ int router_get_router_hash(const char *s, size_t s_len, char *digest); int router_get_dir_hash(const char *s, char *digest); -int router_get_networkstatus_v3_hashes(const char *s, common_digests_t *digests); +int router_get_networkstatus_v3_hashes(const char *s, + common_digests_t *digests); int router_get_extrainfo_hash(const char *s, size_t s_len, char *digest); #define DIROBJ_MAX_SIG_LEN 256 char *router_get_dirobj_signature(const char *digest, diff --git a/src/test/test_dir.c b/src/test/test_dir.c index b770047..ef36303 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -2002,8 +2002,10 @@ test_a_networkstatus( tt_mem_op(&con->digests,OP_EQ, &con2->digests, sizeof(common_digests_t)); tt_mem_op(&con->digests,OP_EQ, &con3->digests, sizeof(common_digests_t)); - tt_mem_op(&con_md->digests,OP_EQ, &con_md2->digests, sizeof(common_digests_t)); - tt_mem_op(&con_md->digests,OP_EQ, &con_md3->digests, sizeof(common_digests_t)); + tt_mem_op(&con_md->digests,OP_EQ, &con_md2->digests, + sizeof(common_digests_t)); + tt_mem_op(&con_md->digests,OP_EQ, &con_md3->digests, + sizeof(common_digests_t)); /* Extract a detached signature from con3. */ detached_text1 = get_detached_sigs(con3, con_md3);

1 0

[tor/master] Another automated rename.
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit 9746aed2baffeb3788552f8cdedc5611ab2f91b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 10 15:31:43 2016 -0500 Another automated rename. Also simplify crypto_common_digests() to have no loop. --- src/common/crypto.c | 23 ++++------------------- src/common/crypto.h | 2 +- src/common/tortls.c | 2 +- src/test/test_crypto.c | 2 +- 4 files changed, 7 insertions(+), 22 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 2ebf203..6c40c6e 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1323,7 +1323,7 @@ crypto_pk_get_digest(const crypto_pk_t *pk, char *digest_out) /** Compute all digests of the DER encoding of pk, and store them * in digests_out. Return 0 on success, -1 on failure. */ int -crypto_pk_get_all_digests(crypto_pk_t *pk, common_digests_t *digests_out) +crypto_pk_get_common_digests(crypto_pk_t *pk, common_digests_t *digests_out) { unsigned char *buf = NULL; int len; @@ -1650,28 +1650,13 @@ crypto_digest512(char *digest, const char *m, size_t len, int crypto_common_digests(common_digests_t *ds_out, const char *m, size_t len) { - int i; tor_assert(ds_out); memset(ds_out, 0, sizeof(*ds_out)); if (crypto_digest(ds_out->d[DIGEST_SHA1], m, len) < 0) return -1; - for (i = DIGEST_SHA256; i < N_COMMON_DIGEST_ALGORITHMS; ++i) { - switch (i) { - case DIGEST_SHA256: /* FALLSTHROUGH */ - case DIGEST_SHA3_256: - if (crypto_digest256(ds_out->d[i], m, len, i) < 0) - return -1; - break; - case DIGEST_SHA512: - case DIGEST_SHA3_512: /* FALLSTHROUGH */ - tor_assert(0); /* These won't fit. */ - if (crypto_digest512(ds_out->d[i], m, len, i) < 0) - return -1; - break; - default: - return -1; - } - } + if (crypto_digest256(ds_out->d[DIGEST_SHA256], m, len, DIGEST_SHA256) < 0) + return -1; + return 0; } diff --git a/src/common/crypto.h b/src/common/crypto.h index 2aa49d3..f1e4981 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -193,7 +193,7 @@ int crypto_pk_private_hybrid_decrypt(crypto_pk_t *env, char *to, int crypto_pk_asn1_encode(crypto_pk_t *pk, char *dest, size_t dest_len); crypto_pk_t *crypto_pk_asn1_decode(const char *str, size_t len); int crypto_pk_get_digest(const crypto_pk_t *pk, char *digest_out); -int crypto_pk_get_all_digests(crypto_pk_t *pk, common_digests_t *digests_out); +int crypto_pk_get_common_digests(crypto_pk_t *pk, common_digests_t *digests_out); int crypto_pk_get_fingerprint(crypto_pk_t *pk, char *fp_out,int add_space); int crypto_pk_get_hashed_fingerprint(crypto_pk_t *pk, char *fp_out); diff --git a/src/common/tortls.c b/src/common/tortls.c index 688a755..3077943 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -691,7 +691,7 @@ MOCK_IMPL(STATIC tor_x509_cert_t *, if ((pkey = X509_get_pubkey(x509_cert)) && (rsa = EVP_PKEY_get1_RSA(pkey))) { crypto_pk_t *pk = crypto_new_pk_from_rsa_(rsa); - crypto_pk_get_all_digests(pk, &cert->pkey_digests); + crypto_pk_get_common_digests(pk, &cert->pkey_digests); cert->pkey_digests_set = 1; crypto_pk_free(pk); EVP_PKEY_free(pkey); diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 5ac20b9..14f1ecc 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -1098,7 +1098,7 @@ test_crypto_digests(void *arg) tt_mem_op(hex_str(digest, DIGEST_LEN),OP_EQ, AUTHORITY_SIGNKEY_A_DIGEST, HEX_DIGEST_LEN); - r = crypto_pk_get_all_digests(k, &pkey_digests); + r = crypto_pk_get_common_digests(k, &pkey_digests); tt_mem_op(hex_str(pkey_digests.d[DIGEST_SHA1], DIGEST_LEN),OP_EQ, AUTHORITY_SIGNKEY_A_DIGEST, HEX_DIGEST_LEN);

1 0

[tor/master] Merge branch 'bug17795'
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit 882e0fbd76b9b56b943680a310d16fc94ab07438 Merge: b3534df e202f3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 07:25:12 2016 -0500 Merge branch 'bug17795' src/common/crypto.c | 28 +++++++--------------------- src/common/crypto.h | 12 +++++++----- src/common/tortls.c | 8 ++++---- src/common/tortls.h | 10 ++++++---- src/or/channeltls.c | 5 +++-- src/or/connection_or.c | 2 +- src/or/dirserv.c | 4 ++-- src/or/dirserv.h | 6 +++--- src/or/dirvote.c | 2 +- src/or/networkstatus.c | 2 +- src/or/or.h | 4 ++-- src/or/routerkeys.c | 4 ++-- src/or/routerparse.c | 25 +++++++++++++------------ src/or/routerparse.h | 3 ++- src/test/test_crypto.c | 4 ++-- src/test/test_dir.c | 12 +++++++----- src/test/test_dir_handle_get.c | 2 +- src/test/test_tortls.c | 6 +++--- 18 files changed, 67 insertions(+), 72 deletions(-)

1 0

[tor/master] Add missing check to test_address_get_if_addrs_ifaddrs. Bug 18378
by nickm＠torproject.org 23 Feb '16

23 Feb '16

commit b3534dfc5e85c82e915c1576a8a58500fdd7c878 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 23 07:16:51 2016 -0500 Add missing check to test_address_get_if_addrs_ifaddrs. Bug 18378 --- src/test/test_address.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/test/test_address.c b/src/test/test_address.c index 3b17b23..748dfc5 100644 --- a/src/test/test_address.c +++ b/src/test/test_address.c @@ -297,7 +297,9 @@ test_address_get_if_addrs_ifaddrs(void *arg) } done: - SMARTLIST_FOREACH(results, tor_addr_t *, t, tor_free(t)); + if (results) { + SMARTLIST_FOREACH(results, tor_addr_t *, t, tor_free(t)); + } smartlist_free(results); return; }

1 0

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

23 Feb '16

commit be1508dc0ae86a50c7b57ee969f89ea6a0ffdb7f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 12:15:50 2016 +0000 Update translations for tails-misc_completed --- fr_CA.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index a3625f7..22e52df 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-11 21:00+0100\n" -"PO-Revision-Date: 2016-01-12 18:13+0000\n" +"POT-Creation-Date: 2016-02-12 13:52+0100\n" +"PO-Revision-Date: 2016-02-23 12:12+0000\n" "Last-Translator: Trans-fr\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -389,19 +389,19 @@ msgstr "Le système d'exploitation hôte et le logiciel de virtualisation peuven msgid "Learn more" msgstr "En apprendre davantage" -#: config/chroot_local-includes/usr/local/bin/tor-browser:29 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready" msgstr "Tor n'est pas prêt" -#: config/chroot_local-includes/usr/local/bin/tor-browser:30 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor n'est pas prêt. Démarrer le navigateur Tor quand même?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:31 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Start Tor Browser" msgstr "Démarrer le navigateur Tor" -#: config/chroot_local-includes/usr/local/bin/tor-browser:32 +#: config/chroot_local-includes/usr/local/bin/tor-browser:44 msgid "Cancel" msgstr "Annuler"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 23 Feb '16

23 Feb '16

commit 9e5a0f1aca6696f0c3ef2165f05df7d1b062dd73 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 12:15:46 2016 +0000 Update translations for tails-misc --- fr_CA.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index a3625f7..22e52df 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-11 21:00+0100\n" -"PO-Revision-Date: 2016-01-12 18:13+0000\n" +"POT-Creation-Date: 2016-02-12 13:52+0100\n" +"PO-Revision-Date: 2016-02-23 12:12+0000\n" "Last-Translator: Trans-fr\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -389,19 +389,19 @@ msgstr "Le système d'exploitation hôte et le logiciel de virtualisation peuven msgid "Learn more" msgstr "En apprendre davantage" -#: config/chroot_local-includes/usr/local/bin/tor-browser:29 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready" msgstr "Tor n'est pas prêt" -#: config/chroot_local-includes/usr/local/bin/tor-browser:30 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor n'est pas prêt. Démarrer le navigateur Tor quand même?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:31 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Start Tor Browser" msgstr "Démarrer le navigateur Tor" -#: config/chroot_local-includes/usr/local/bin/tor-browser:32 +#: config/chroot_local-includes/usr/local/bin/tor-browser:44 msgid "Cancel" msgstr "Annuler"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 23 Feb '16

23 Feb '16

commit 90d13fc19e6e8c9780a6717ab40ca622b362cb6f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 12:15:16 2016 +0000 Update translations for https_everywhere --- fr_CA/https-everywhere.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/fr_CA/https-everywhere.dtd b/fr_CA/https-everywhere.dtd index 3693a85..dd12b16 100644 --- a/fr_CA/https-everywhere.dtd +++ b/fr_CA/https-everywhere.dtd @@ -14,7 +14,7 @@ <!ENTITY https-everywhere.about.or "ou"> <!ENTITY https-everywhere.about.donate_eff "Faire un don à EFF"> -<!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> +<!ENTITY https-everywhere.menu.donate_eff_imperative "Faire un don à EFF"> <!ENTITY https-everywhere.menu.about "À propos de HTTPS partout"> <!ENTITY https-everywhere.menu.observatory "Préférences de l'observatoire SSL "> <!ENTITY https-everywhere.menu.globalEnable "Activer HTTPS partout"> @@ -42,15 +42,15 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Forcer des connexions chiffrées vers ces sites Web :"> <!ENTITY https-everywhere.chrome.experimental_rules "Règles expérimentales :"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Pourrait causer des avertissements ou des défaillances. Désactivé par défaut."> -<!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.always_https_for_host "Always use https for this host"> -<!ENTITY https-everywhere.chrome.host "Host:"> -<!ENTITY https-everywhere.chrome.show_advanced "Show advanced"> -<!ENTITY https-everywhere.chrome.hide_advanced "Hide advanced"> -<!ENTITY https-everywhere.chrome.rule_name "Rule name"> +<!ENTITY https-everywhere.chrome.add_rule "Ajouter une règle pour ce site"> +<!ENTITY https-everywhere.chrome.add_new_rule "Ajouter une nouvelle règle pour ce site"> +<!ENTITY https-everywhere.chrome.always_https_for_host "Toujours utiliser HTTPS pour cet hôte"> +<!ENTITY https-everywhere.chrome.host "Hôte :"> +<!ENTITY https-everywhere.chrome.show_advanced "Afficher les options avancées"> +<!ENTITY https-everywhere.chrome.hide_advanced "Cacher les options avancées"> +<!ENTITY https-everywhere.chrome.rule_name "Nom de la règle"> <!ENTITY https-everywhere.chrome.regex "Matching regex"> -<!ENTITY https-everywhere.chrome.redirect_to "Redirect to"> -<!ENTITY https-everywhere.chrome.status_cancel_button "Cancel"> +<!ENTITY https-everywhere.chrome.redirect_to "Rediriger vers"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Annuler">

1 0

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

23 Feb '16

commit 2e99a67bb17941ad82a192f4e16c99355efcc69c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 11:45:51 2016 +0000 Update translations for tails-misc_completed --- nb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nb.po b/nb.po index 905a028..0f63685 100644 --- a/nb.po +++ b/nb.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-11 21:00+0100\n" -"PO-Revision-Date: 2016-01-12 22:45+0000\n" +"POT-Creation-Date: 2016-02-12 13:52+0100\n" +"PO-Revision-Date: 2016-02-23 11:22+0000\n" "Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -393,19 +393,19 @@ msgstr "Både vertssystemet og virtualiseringsprogramvaren er i stand til å ove msgid "Learn more" msgstr "Lær mer" -#: config/chroot_local-includes/usr/local/bin/tor-browser:29 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready" msgstr "Tor er ikke klar" -#: config/chroot_local-includes/usr/local/bin/tor-browser:30 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor er ikke klar. Starte Tor Browser uansett?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:31 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Start Tor Browser" msgstr "Start Tor Browser" -#: config/chroot_local-includes/usr/local/bin/tor-browser:32 +#: config/chroot_local-includes/usr/local/bin/tor-browser:44 msgid "Cancel" msgstr "Avbryt"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 23 Feb '16

23 Feb '16

commit e02c5e79c8d04544aa2a7cefd43d7efecb4fca59 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 23 11:45:47 2016 +0000 Update translations for tails-misc --- nb.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nb.po b/nb.po index 905a028..0f63685 100644 --- a/nb.po +++ b/nb.po @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-11 21:00+0100\n" -"PO-Revision-Date: 2016-01-12 22:45+0000\n" +"POT-Creation-Date: 2016-02-12 13:52+0100\n" +"PO-Revision-Date: 2016-02-23 11:22+0000\n" "Last-Translator: Allan Nordhøy <epost(a)anotheragency.no>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -393,19 +393,19 @@ msgstr "Både vertssystemet og virtualiseringsprogramvaren er i stand til å ove msgid "Learn more" msgstr "Lær mer" -#: config/chroot_local-includes/usr/local/bin/tor-browser:29 +#: config/chroot_local-includes/usr/local/bin/tor-browser:41 msgid "Tor is not ready" msgstr "Tor er ikke klar" -#: config/chroot_local-includes/usr/local/bin/tor-browser:30 +#: config/chroot_local-includes/usr/local/bin/tor-browser:42 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor er ikke klar. Starte Tor Browser uansett?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:31 +#: config/chroot_local-includes/usr/local/bin/tor-browser:43 msgid "Start Tor Browser" msgstr "Start Tor Browser" -#: config/chroot_local-includes/usr/local/bin/tor-browser:32 +#: config/chroot_local-includes/usr/local/bin/tor-browser:44 msgid "Cancel" msgstr "Avbryt"

1 0