March 2016 - tor-commits - lists.torproject.org

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 52e33c330c59e0eb451da5b9715b0886b4019747 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 22:45:34 2016 +0000 Update translations for tor-launcher-progress --- zh_CN/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN/progress.dtd b/zh_CN/progress.dtd index 838d88e..dc816a5 100644 --- a/zh_CN/progress.dtd +++ b/zh_CN/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor 状态"> <!ENTITY torprogress.openSettings "打开设置"> <!ENTITY torprogress.heading "正在连接 Tor 网络"> -<!ENTITY torprogress.pleaseWait "请等待我们建立到 Tor 网络的连接。这可能会需要几分钟。"> +<!ENTITY torprogress.pleaseWait "正在与 Tor 网络建立连接。这可能需要几分钟，请耐心等待。">

1 0

[translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 36a4a168da8417686a897bf8bd8ff4d70fae261a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 21:46:44 2016 +0000 Update translations for tor-messenger-ircproperties_completed --- fr/irc.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fr/irc.properties b/fr/irc.properties index 2f7ee49..6243f00 100644 --- a/fr/irc.properties +++ b/fr/irc.properties @@ -172,6 +172,9 @@ error.sendMessageFailed=Une erreur est survenue lors de l'envoi de votre dernier # %1$S is the channel the user tried to join, %2$S is the channel # he was forwarded to. error.channelForward=Vous ne pouvez pas rejoindre %1$S. Vous avez été automatiquement redirigé sur %2$S à la place. +# %S is the mode that the user tried to set but was not recognized +# by the server as a valid mode. +error.unknownMode='%S' n'est pas un mode utilisateur valide sur ce serveur. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit c839965f3c6aa5b0fa3b3a3ab5aaa8cbb430d036 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 21:46:39 2016 +0000 Update translations for tor-messenger-ircproperties --- fr/irc.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/irc.properties b/fr/irc.properties index b206592..6243f00 100644 --- a/fr/irc.properties +++ b/fr/irc.properties @@ -174,7 +174,7 @@ error.sendMessageFailed=Une erreur est survenue lors de l'envoi de votre dernier error.channelForward=Vous ne pouvez pas rejoindre %1$S. Vous avez été automatiquement redirigé sur %2$S à la place. # %S is the mode that the user tried to set but was not recognized # by the server as a valid mode. -error.unknownMode='%S' is not a valid user mode on this server. +error.unknownMode='%S' n'est pas un mode utilisateur valide sur ce serveur. # LOCALIZATION NOTE (tooltip.*): # These are the descriptions given in a tooltip with information received

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit b8c2667f884ec8d496cbb402315ccf3e76117f2d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 21:46:00 2016 +0000 Update translations for torbutton-torbuttonproperties --- fr/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torbutton.properties b/fr/torbutton.properties index 71d22c9..e5161e2 100644 --- a/fr/torbutton.properties +++ b/fr/torbutton.properties @@ -76,4 +76,4 @@ profileProblemTitle=Problème de profil %S profileReadOnly=Vous ne pouvez pas exécuter %S à partir d'un système de fichiers en lecture seul. Veuillez copier %S vers un autre emplacement avant d'essayer de l'utiliser. profileReadOnlyMac=Vous ne pouvez pas exécuter %S à partir d'un système de fichiers en lecture seul. Veuillez copier %S vers votre dossier Bureau ou Applications avant d'essayer de l'utiliser. profileAccessDenied=%S n'a pas la permission d'accéder au profil. Veuillez ajuster les permissions de votre système de fichiers et ressayer. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. +profileMigrationFailed=La migration de votre profil existant %S a échoué.\nDe nouveaux paramètres vont être utilisés.

1 0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 8e8bd396973ab815ea3d8b23de2dd97ed5991ea7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 21:45:42 2016 +0000 Update translations for tor-launcher-properties_completed --- fr/torlauncher.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index dcb50bc..a90027b 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -1,4 +1,4 @@ -### Copyright (c) 2014, The Tor Project, Inc. +### Copyright (c) 2016, The Tor Project, Inc. ### See LICENSE for licensing information. torlauncher.error_title=Lanceur Tor @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S torlauncher.tor_missing=L'exécutable Tor est introuvable. -torlauncher.torrc_missing=Le fichier torrc est manquant. -torlauncher.datadir_missing=Le répertoire de données de Tor n'existe pas. +torlauncher.torrc_missing=Le fichier torrc est manquant et n'a pas pu être créé. +torlauncher.datadir_missing=Le dossier de données de Tor n'existe pas et n'a pas pu être créé. torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe chiffré. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S

1 0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit ac42545a525f13503a66d96c8a6bb841d5cf30a3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 21:45:38 2016 +0000 Update translations for tor-launcher-properties --- fr/torlauncher.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties index aef5019..a90027b 100644 --- a/fr/torlauncher.properties +++ b/fr/torlauncher.properties @@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S échoué (%2$S). torlauncher.unable_to_start_tor=Impossible de démarrer Tor.\n\n%S torlauncher.tor_missing=L'exécutable Tor est introuvable. -torlauncher.torrc_missing=The torrc file is missing and could not be created. -torlauncher.datadir_missing=The Tor data directory does not exist and could not be created. +torlauncher.torrc_missing=Le fichier torrc est manquant et n'a pas pu être créé. +torlauncher.datadir_missing=Le dossier de données de Tor n'existe pas et n'a pas pu être créé. torlauncher.password_hash_missing=Impossible d'obtenir le mot de passe chiffré. torlauncher.failed_to_get_settings=Impossible de récupérer les paramètres de Tor.\n\n%S

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 980ec32660d91faf6512672136b63e90104a95f0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 21:45:21 2016 +0000 Update translations for https_everywhere_completed --- fr/https-everywhere.dtd | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index e32703a..3763672 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -14,6 +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 "Faites un don à EFF"> <!ENTITY https-everywhere.menu.about "À propos de HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "Préférences de l'Observatoire SSL "> <!ENTITY https-everywhere.menu.globalEnable "Activer HTTPS Everywhere"> @@ -41,3 +42,15 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Forcer le chiffrement des connexions pour les sites internet suivant:"> <!ENTITY https-everywhere.chrome.experimental_rules "Règles expérimentales"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Peut causer des alertes ou des ruptures. Désactivé par défaut."> +<!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 ce serveur"> +<!ENTITY https-everywhere.chrome.host "Serveur :"> +<!ENTITY https-everywhere.chrome.show_advanced "Montrer l'onglet avancé"> +<!ENTITY https-everywhere.chrome.hide_advanced "Cacher l'onglet avancé"> +<!ENTITY https-everywhere.chrome.rule_name "Nom de la règle"> +<!ENTITY https-everywhere.chrome.regex "Expression régulière concordante"> +<!ENTITY https-everywhere.chrome.redirect_to "Rediriger vers"> +<!ENTITY https-everywhere.chrome.status_cancel_button "Annuler"> + +

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 24 Mar '16

24 Mar '16

commit 090e58e70015e4a97aca975e502f2ba8ff5897da Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 24 21:45:15 2016 +0000 Update translations for https_everywhere --- fr/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd index c3a38b0..3763672 100644 --- a/fr/https-everywhere.dtd +++ b/fr/https-everywhere.dtd @@ -49,7 +49,7 @@ <!ENTITY https-everywhere.chrome.show_advanced "Montrer l'onglet avancé"> <!ENTITY https-everywhere.chrome.hide_advanced "Cacher l'onglet avancé"> <!ENTITY https-everywhere.chrome.rule_name "Nom de la règle"> -<!ENTITY https-everywhere.chrome.regex "Matching regex"> +<!ENTITY https-everywhere.chrome.regex "Expression régulière concordante"> <!ENTITY https-everywhere.chrome.redirect_to "Rediriger vers"> <!ENTITY https-everywhere.chrome.status_cancel_button "Annuler">

1 0

[tor-messenger-build/master] Add a patch for bug 1218193
by arlo＠torproject.org 24 Mar '16

24 Mar '16

commit fd8841e0779acb5dca89d110dc585cbe28381bb7 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Mar 24 12:58:32 2016 -0700 Add a patch for bug 1218193 --- projects/instantbird/bug-1218193.patch | 31 +++++++++++++++++++++++++++++++ projects/instantbird/config | 2 ++ 2 files changed, 33 insertions(+) diff --git a/projects/instantbird/bug-1218193.patch b/projects/instantbird/bug-1218193.patch new file mode 100644 index 0000000..c540301 --- /dev/null +++ b/projects/instantbird/bug-1218193.patch @@ -0,0 +1,31 @@ + +# HG changeset patch +# User Nihanth Subramanya <nhnt11(a)gmail.com> +# Date 1456270075 28800 +# Node ID 07b10276713c5f9cd891ea6e5b944d985c3f2fc2 +# Parent 599fd18da6c144abcc9b7feec4ee30b92e9d7bfc +Bug 1218193 - Fix tab strip background colour on OS X. r=aleth + +diff --git a/im/themes/tabbrowser-pinstripe/tabbrowser.css b/im/themes/tabbrowser-pinstripe/tabbrowser.css +--- a/im/themes/tabbrowser-pinstripe/tabbrowser.css ++++ b/im/themes/tabbrowser-pinstripe/tabbrowser.css +@@ -203,17 +203,17 @@ statusbarpanel#statusbar-display { + } + + .tabbrowser-tab:-moz-lwtheme { + color: inherit; + text-shadow: inherit; + } + + .tabbrowser-strip { +- -moz-appearance: -moz-mac-unified-toolbar; ++ -moz-appearance: toolbar; + height: 26px; + background-repeat: repeat-x; + } + + .tabbrowser-strip:not(:-moz-lwtheme) { + background-color: -moz-mac-chrome-active; + } + + diff --git a/projects/instantbird/config b/projects/instantbird/config index e320000..547cebd 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -97,6 +97,8 @@ input_files: - filename: branding/about.png - filename: branding/osx.patch enable: '[% c("var/osx") %]' + - filename: bug-1218193.patch + enable: '[% c("var/osx") %]' - filename: cert-installer.patch enable: '[% c("var/osx") %]' - filename: cert_override.txt

1 0

[tor/master] Fix broken directory request to the DirPort
by nickm＠torproject.org 24 Mar '16

24 Mar '16

commit ba6509e9e1f9bfd052ea8bdfef104c87ee8ca6b9 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Thu Mar 24 13:57:53 2016 -0400 Fix broken directory request to the DirPort Commit e72cbf7a4 introduced a change to directory_initiate_command_rend() that made tor use the ORPort when making a directory request to the DirPort. The primary consequence was that a relay couldn't selftest its DirPort thus failing to work and join the network properly. The main issue was we were always considering an anonymized connection to be an OR connection which is not true. Fixes #18623 Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/directory.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 21a879d..d057dac 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1065,8 +1065,16 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, const int use_begindir = directory_command_should_use_begindir(options, &or_addr_port->addr, or_addr_port->port, router_purpose, indirection); + /* Is it an anonymous connection? Be careful, it could be either an OR or + * directory connection. */ const int anonymized_connection = dirind_is_anon(indirection); - const int or_connection = use_begindir || anonymized_connection; + /* Is it a connection to our DirPort? */ + const int dir_connection = (indirection == DIRIND_ANON_DIRPORT || + indirection == DIRIND_DIRECT_CONN); + /* It's an OR connection if we should use BEGIN_DIR or if it's an + * anonymized connection but obviously not a directory connection. */ + const int or_connection = (use_begindir || + (anonymized_connection && !dir_connection)); tor_addr_t addr; tor_addr_copy(&addr, &(or_connection ? or_addr_port : dir_addr_port)->addr); @@ -1096,7 +1104,7 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, /* ensure that we don't make direct connections when a SOCKS server is * configured. */ - if (!or_connection && !options->HTTPProxy && + if (dir_connection && !options->HTTPProxy && (options->Socks4Proxy || options->Socks5Proxy)) { log_warn(LD_DIR, "Cannot connect to a directory server through a " "SOCKS proxy!"); @@ -1113,7 +1121,7 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, logged_backtrace = 1; } return; - } else if (!or_connection && (!dir_addr_port->port + } else if (dir_connection && (!dir_addr_port->port || tor_addr_is_null(&dir_addr_port->addr))) { static int logged_backtrace = 0; log_warn(LD_DIR, "Cannot make an outgoing Dir connection without a Dir " @@ -1153,7 +1161,7 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, if (rend_query) conn->rend_data = rend_data_dup(rend_query); - if (!or_connection) { + if (dir_connection && !anonymized_connection) { /* then we want to connect to dirport directly */ if (options->HTTPProxy) {

1 0