tbb-commits

tbb-commits@lists.torproject.org

1 participants
17624 discussions

[torbutton/master] Update translations.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit c9cfd540eaac8d75305d643dcf3113bcd7e3920c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 18 18:35:51 2015 -0800 Update translations. --- src/chrome/locale/es/brand.dtd | 2 +- src/chrome/locale/es/torbutton.properties | 2 +- src/chrome/locale/fa/aboutTor.dtd | 2 +- src/chrome/locale/fa/brand.dtd | 8 +++--- src/chrome/locale/fa/torbutton.dtd | 12 ++++----- src/chrome/locale/fa/torbutton.properties | 12 ++++----- src/chrome/locale/it/aboutTor.dtd | 2 +- src/chrome/locale/it/brand.dtd | 8 +++--- src/chrome/locale/ko/brand.dtd | 8 +++--- src/chrome/locale/pt/brand.dtd | 8 +++--- src/chrome/locale/pt/torbutton.properties | 42 ++++++++++++++--------------- src/chrome/locale/ru/brand.dtd | 8 +++--- src/chrome/locale/ru/torbutton.dtd | 12 ++++----- src/chrome/locale/ru/torbutton.properties | 12 ++++----- src/chrome/locale/sv/aboutTor.dtd | 2 +- src/chrome/locale/sv/brand.dtd | 8 +++--- src/chrome/locale/sv/torbutton.properties | 4 +-- 17 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/chrome/locale/es/brand.dtd b/src/chrome/locale/es/brand.dtd index c2c9e68..acfea78 100644 --- a/src/chrome/locale/es/brand.dtd +++ b/src/chrome/locale/es/brand.dtd @@ -11,4 +11,4 @@ <!ENTITY plugins.installed.find "Haga clic para cargar los complementos de sistema instalados"> <!ENTITY plugins.installed.enable "Habilitar complementos"> <!ENTITY plugins.installed.disable "Deshabilitar complementos"> -<!ENTITY plugins.installed.disable.tip "Haga clic para prevenir que se carguen complementos de sistema"> +<!ENTITY plugins.installed.disable.tip "Haga clic para evitar que se carguen complementos de sistema"> diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties index 8cd1ed5..957a8f9 100644 --- a/src/chrome/locale/es/torbutton.properties +++ b/src/chrome/locale/es/torbutton.properties @@ -3,7 +3,7 @@ torbutton.button.tooltip.enabled = Deshabilitar Tor torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP desconocida torbutton.circuit_display.this_browser = Este navegador -torbutton.circuit_display.tor_bridge = Repetior puente (bridge) +torbutton.circuit_display.tor_bridge = Repetidor puente (bridge) torbutton.circuit_display.unknown_country = País desconocido torbutton.panel.tooltip.disabled = Haga clic para habilitar Tor torbutton.panel.tooltip.enabled = Haga clic para deshabilitar Tor diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd index 8c94506..a7bd20f 100644 --- a/src/chrome/locale/fa/aboutTor.dtd +++ b/src/chrome/locale/fa/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "با این حال ٫ این مرورگر قدیمی می باشد."> <!ENTITY aboutTor.outOfDateTorOff.label "همچنین ٫ این مرورگر قدیمی می باشد ."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> +<!ENTITY aboutTor.outOfDate2.label "روی پیاز کلیک کنید و سپس انتخاب کنید Check را برای به روز رسانی Tor Browser"> <!ENTITY aboutTor.check.label "تنظیمات شبکه‌ی تور را بررسی کنید"> diff --git a/src/chrome/locale/fa/brand.dtd b/src/chrome/locale/fa/brand.dtd index 62d877c..1f84c62 100644 --- a/src/chrome/locale/fa/brand.dtd +++ b/src/chrome/locale/fa/brand.dtd @@ -8,7 +8,7 @@ <!ENTITY trademarkInfo.part1 "فایرفاکس و لوگو فایرفاکس نشان تجاری بنیاد موزیلا می باشند.">  -<!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> -<!ENTITY plugins.installed.disable "Disable plugins"> -<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins"> +<!ENTITY plugins.installed.find "کلیک کنید تا لود شود سیستم نصب پلاگین ها"> +<!ENTITY plugins.installed.enable "فعال کردن پلاگین ها"> +<!ENTITY plugins.installed.disable "غیر فعال کردن پلاگین ها"> +<!ENTITY plugins.installed.disable.tip "کلیک کنید تا جلوگیری شود از لود شدن سیستم نصب پلاگین ها"> diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd index 1c999fd..3c2e698 100644 --- a/src/chrome/locale/fa/torbutton.dtd +++ b/src/chrome/locale/fa/torbutton.dtd @@ -24,19 +24,19 @@ <!ENTITY torbutton.pref_connection_more_info.text "دکمه تُرهم اکنون فعال شده است.اگر می‌خواهيد تنظيمات پراکسی غيرمرتبط با تُر را تغيير دهيد، لطفا دکمه تُر را غيرفعال کنيد و دوباره به اينجا بازگرديد. اگر ميخواهيد تنظيمات تُر را تغيير دهيد، از پنجره تنظيمات دکمه تُر استفاده کنيد."> <!ENTITY torbutton.context_menu.new_identity "هویت جدید"> <!ENTITY torbutton.context_menu.new_identity_key "من"> -<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> +<!ENTITY torbutton.context_menu.new_circuit "مدار جدید Tor برای این سایت"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.toggle "ضامن فعال/غيرفعال کردن تُر"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…"> +<!ENTITY torbutton.context_menu.preferences "حفظ حریم خصوصی و تنظیمات امنیتی"> <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "درباره ي دکمه تُر..."> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…"> +<!ENTITY torbutton.context_menu.networksettings "تنظیمات شبکه تور"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> +<!ENTITY torbutton.context_menu.downloadUpdate "بررسی برای به روز رسانی Tor Browser ..."> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> +<!ENTITY torbutton.context_menu.cookieProtections "حفاظت کوکی ها..."> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "کپی به نشانی اينترنتی"> <!ENTITY torbutton.context_menu.copyTor.key "p"> @@ -157,4 +157,4 @@ <!ENTITY torbutton.prefs.sec_med_high "متوسط - بالا"> <!ENTITY torbutton.prefs.sec_high "زیاد"> <!ENTITY torbutton.prefs.sec_custom "تنظیم سفارشی"> -<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.circuit_display.title "مدار Tor برای این سایت"> diff --git a/src/chrome/locale/fa/torbutton.properties b/src/chrome/locale/fa/torbutton.properties index 8e02910..3c8fc1d 100644 --- a/src/chrome/locale/fa/torbutton.properties +++ b/src/chrome/locale/fa/torbutton.properties @@ -1,10 +1,10 @@ torbutton.button.tooltip.disabled = فعال کردن تُر torbutton.button.tooltip.enabled = غيرفعال کردن تُر -torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = IP unknown -torbutton.circuit_display.this_browser = This browser -torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country +torbutton.circuit_display.internet = اینترنت +torbutton.circuit_display.ip_unknown = IP ناشناخته +torbutton.circuit_display.this_browser = این مرورگر +torbutton.circuit_display.tor_bridge = پل +torbutton.circuit_display.unknown_country = کشور ناشناخته torbutton.panel.tooltip.disabled = برای فعال کردن تُرکليک کنيد torbutton.panel.tooltip.enabled = برای غيرفعال کردن تُر کليک کنيد torbutton.panel.plugins.disabled = برای فعال کردن پلاگين ها کليک کنيد @@ -51,7 +51,7 @@ torbutton.popup.short_torbrowser = اطلاعلت مهم Torbutton!\n\nTorbutton torbutton.popup.confirm_plugins = پلاگینها مانند فلش، میتوانند اختفا و ناشناس بودن شما را به خطر بیاندازند.\n\nآنها همچنین میتوانند "تر" را دور زده تا موقعیت کنونی و آدرس IP شما را برملا کنند.\n\nمطمئنید که میخواهید پلاگینها را فعال کنید؟\n\n torbutton.popup.never_ask_again = دیگر هیچگاه این را از من نپرس -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = مرورگر Tor همه پنجره ها و تب ها را می بندد. همه جلسات وب سایت شود از دست خواهد رفت\n\nآیا می خواهید راه اندازی مجدد مرورگر Tor الان انجام شود تا هویت خود را تنظیم مجدد کنید؟\n # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=این وب‌سایت (%S) سعی دارد اطلاعات بوم تصویر HTML5 را دریافت کند که ممکن است برای شناسایی منحصر به فرد کامپیوتر شما استفاده شود.\n\nآیا مرورگر تور میبایست اجازه دریافت این اطلاعات را بدهد؟ diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd index ae9aeae..cbeae7c 100644 --- a/src/chrome/locale/it/aboutTor.dtd +++ b/src/chrome/locale/it/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "TUTTAVIA, questo browser non è aggiornato."> <!ENTITY aboutTor.outOfDateTorOff.label "INOLTRE, questo browser non è aggiornato."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> +<!ENTITY aboutTor.outOfDate2.label "Clicca sulla cipolla e scegli "Scarica Aggiornamento Tor Browser Bundle"."> <!ENTITY aboutTor.check.label "Test Impostazioni della Rete Tor"> diff --git a/src/chrome/locale/it/brand.dtd b/src/chrome/locale/it/brand.dtd index 17fbe4b..225f9b7 100644 --- a/src/chrome/locale/it/brand.dtd +++ b/src/chrome/locale/it/brand.dtd @@ -8,7 +8,7 @@ <!ENTITY trademarkInfo.part1 "Firefox e i loghi Firefox sono marchi registrati della Mozilla Foundation.">  -<!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> -<!ENTITY plugins.installed.disable "Disable plugins"> -<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins"> +<!ENTITY plugins.installed.find "Clicca per caricare i plugin di sistema installati"> +<!ENTITY plugins.installed.enable "Permetti plugin"> +<!ENTITY plugins.installed.disable "Disabilita plugin"> +<!ENTITY plugins.installed.disable.tip "Clicca per evitare di caricare i plugin di sistema"> diff --git a/src/chrome/locale/ko/brand.dtd b/src/chrome/locale/ko/brand.dtd index c7bdff6..96182f5 100644 --- a/src/chrome/locale/ko/brand.dtd +++ b/src/chrome/locale/ko/brand.dtd @@ -8,7 +8,7 @@ <!ENTITY trademarkInfo.part1 "파이어폭스와 파이어폭스 로고들은 모질라 재단의 등록 상표입니다.">  -<!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> -<!ENTITY plugins.installed.disable "Disable plugins"> -<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins"> +<!ENTITY plugins.installed.find "클릭하여 플러그인 불러오기"> +<!ENTITY plugins.installed.enable "플러그인 활성"> +<!ENTITY plugins.installed.disable "플러그인 비활성"> +<!ENTITY plugins.installed.disable.tip "클릭하여 플러그인 열기 취소"> diff --git a/src/chrome/locale/pt/brand.dtd b/src/chrome/locale/pt/brand.dtd index 2969197..67232da 100644 --- a/src/chrome/locale/pt/brand.dtd +++ b/src/chrome/locale/pt/brand.dtd @@ -8,7 +8,7 @@ <!ENTITY trademarkInfo.part1 "O Firefox e os logos Firefox são marcas registadas da Fundação Mozilla.">  -<!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> -<!ENTITY plugins.installed.disable "Disable plugins"> -<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins"> +<!ENTITY plugins.installed.find "Clique para carregar os plug-ins do sistema instalados"> +<!ENTITY plugins.installed.enable "Ativar plug-ins"> +<!ENTITY plugins.installed.disable "Desativar plug-ins"> +<!ENTITY plugins.installed.disable.tip "Clique para evitar o carregamento dos plug-ins do sistema instalados"> diff --git a/src/chrome/locale/pt/torbutton.properties b/src/chrome/locale/pt/torbutton.properties index 3130115..761001f 100644 --- a/src/chrome/locale/pt/torbutton.properties +++ b/src/chrome/locale/pt/torbutton.properties @@ -1,23 +1,23 @@ torbutton.button.tooltip.disabled = Activar Tor -torbutton.button.tooltip.enabled = Desactivar Tor +torbutton.button.tooltip.enabled = Desativar Tor torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = IP unknown -torbutton.circuit_display.this_browser = This browser +torbutton.circuit_display.ip_unknown = IP desconhecido +torbutton.circuit_display.this_browser = Este navegador torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country -torbutton.panel.tooltip.disabled = Clique para activar Tor -torbutton.panel.tooltip.enabled = Clique para desactivar Tor -torbutton.panel.plugins.disabled = Clique para activar plugins -torbutton.panel.plugins.enabled = Clique para desactivar plugins -torbutton.panel.label.disabled = Tor desactivado -torbutton.panel.label.enabled = Tor activado +torbutton.circuit_display.unknown_country = País desconhecido +torbutton.panel.tooltip.disabled = Clique para ativar o Tor +torbutton.panel.tooltip.enabled = Clique para desativar o Tor +torbutton.panel.plugins.disabled = Clique para ativar os plug-ins +torbutton.panel.plugins.enabled = Clique para desativar os plug-ins +torbutton.panel.label.disabled = Tor desativado +torbutton.panel.label.enabled = Tor ativado extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. torbutton.popup.history.warning = O Torbutton bloqueou a actividade de um separador carregado num diferente estado do Tor.\n\nIsto é para contornar os erros Firefox 409737 e 417869.\n\nSe este aviso lhe parece ter aparecido sem qualquer razão aparente, um dos separadores está a tentar recarregar-se a si próprio em segundo plano e foi bloqueado.\n\nPara recarregar o separador neste estado do Tor, seleccione 'entrar' na caixa de localização da URL.\n\n torbutton.popup.plugin.warning = Torbutton bloqueou o carregamento do plugin de conteúdo do Tor.\n\nUtilize o Salvar Como.\n\n torbutton.popup.confirm_ca_certs = Torbutton: Você não possui nenhum Certificado de Autenticação. Verificar a lista de Certificados de Autenticação pode ser uma operação lenta para o Tor. Gostaria de desactivar o modo de isolamento de Certificados de Autenticação? (Se você não percebeu esta mensagem, o mais seguro é pressionar OK) torbutton.popup.ff3.warning = Aviso!\n\nO Torbutton no Firefox 3 é conhecido por dar a conhecer o seu fuso horário e os seus Live Marks, através da rede Tor.\n\nTem a certeza que deseja continuar? -torbutton.popup.toggle.warning = Tem que pressionar o ícone do Torbutton ou reiniciar o navegador para as alterações terem efeito. -torbutton.popup.test.success = Teste ao proxy Tor concluído com sucesso! +torbutton.popup.toggle.warning = Precisa de alternar o Tor ou reiniciar para aplicar as suas definições. +torbutton.popup.test.success = Teste do proxy do Tor concluído com sucesso torbutton.popup.test.failure = O teste ao proxy Tor FALHOU! Verifique as propriedades do proxy e do Polipo. torbutton.popup.test.confirm_toggle = O mais recente teste de utilização de Tor falhou.\n\nTem a certeza que deseja continuar mesmo assim?\n\nNota: Se já resolveu o problema, é recomendado voltar a testar a ligação nas Preferências do Torbutton para remover este aviso. torbutton.popup.test.ff3_notice = Pressione OK para testar as configurações do proxy Tor. Este teste é realizado em plano de fundo. Por favor seja paciente. @@ -32,26 +32,26 @@ torbutton.popup.external.note = Alguns tipos de ficheiro podem implicar uma liga torbutton.popup.external.suggest = Para sua segurança, deve apenas abrir ficheiros transferidos quando estiver offline, or usar um CD Tor Live como o Tails. torbutton.popup.launch = Transferir ficheiro torbutton.popup.cancel = Cancelar -torbutton.popup.dontask = Transferir automaticamente ficheiros a partir de agora -torbutton.popup.test.no_http_proxy = Teste ao proxy Tor: Erro na ligação ao proxy HTTP local. O Polipo está em execução? +torbutton.popup.dontask = A partir de agora, transferir automaticamente os ficheiros +torbutton.popup.test.no_http_proxy = Teste do proxy do Tor: Proxy HTTP local inacessível. O Polipo está devidamente em execução? torbutton.popup.captcha.title = Evitar Captchas do Google? torbutton.popup.captcha.ask = O Torbutton detectou uma Captcha do Google. Pretende ser redireccionado para um novo motor de busca usando esta consulta? -torbutton.popup.captcha.always = Siga sempre este procedimento de agora em diante -torbutton.popup.redirect = Redireccione -torbutton.popup.no_redirect = Não redireccione +torbutton.popup.captcha.always = A partir de agora, efetuar sempre esta ação +torbutton.popup.redirect = Redirecionar +torbutton.popup.no_redirect = Não Redirecionar torbutton.popup.prompted_language = Para lhe fornecer maior privacidade, o Torbutton pode requerer o uso da versão em inglês em páginas da Internet. Isto pode causar a visualização em inglês das páginas que prefere ler em português.\n\nPretende visualizar páginas em inglês, para melhor privacidade? torbutton.popup.no_newnym = O Torbutton não pode, em segurança, fornecer-lhe uma nova identidade. Não tem acesso à porta de controle Tor.\n\nEstá a usar o Tor Browser Bundle? torbutton.popup.use_tbb = Parece estar a usar Torbutton com Firefox, o que já não é recomendado como uma configuração segura.\n\nEm alternativa, sugerimos que obtenha o último Tor Browser Bundle através de envio de e-mail para: gettor(a)torproject.org ou carregando para o computador o ficheiro na seguinte URL: torbutton.popup.pref_error = O Torbutton não consegue actualizar as preferências na directoria do perfil do Explorador do Tor. torbutton.popup.permission_denied = Por favor restabeleça as permissões da directoria do Explorador do Tor ou copie para uma nova localização. torbutton.popup.device_full = O disco parece estar cheio. Por favor liberte espaço ou relocalize o Explorador do Tor para um novo dispositivo. -torbutton.title.prompt_torbrowser = Informação importante do Torbutton +torbutton.title.prompt_torbrowser = Informação Importante do Torbutton torbutton.popup.prompt_torbrowser = O Torbutton funciona agora de forma diferente: já não pode desligá-lo.\n\nProcedemos a esta alteração porque não é seguro usar o Torbutton num explorador também usado para buscas fora do Tor. Havia demasiados erros que não conseguimos corrigir de outra forma.\n\nSe pretende continuar a usar o Firefox normalmente, deve desinstalar o Torbutton e carregar o Tor Browser Bundle para o seu computador. As políticas de privacidade do Explorador do Tor também são superiores às normais no Firefox, mesmo quando este é usado com o Torbutton.\n\nPara remover o Torbutton abra Ferramentas->Acessórios->Extensões e clique no botão Remover junto ao Torbutton. torbutton.popup.short_torbrowser = Informação importante do Torbutton!\nO Torbutton não está sempre activo.\nClique no Torbutton para mais informação. torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n -torbutton.popup.never_ask_again = Never ask me again -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.never_ask_again = Não voltar a perguntar-me +torbutton.popup.confirm_newnym = O Navegador Tor irá fechar todas as janela e separadores. Estarão perdidas todas sessões do sítio da Web.\n\nReiniciar o Navegador Tor para repor a sua identidade?\n\n # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Este site (%S) tentou extrair informação HTML5, que pode ser usada para identificar claramente o seu computador.\n\nQuer que o navegador Tor permita que o site extraia a informação HTML5? @@ -59,5 +59,5 @@ canvas.notNow=Agora não canvas.notNowAccessKey=N canvas.allow=Permitir de futuro canvas.allowAccessKey=A -canvas.never=Nunca para este site (recomendado) +canvas.never=Nunca para este sítio (recomendado) canvas.neverAccessKey=e diff --git a/src/chrome/locale/ru/brand.dtd b/src/chrome/locale/ru/brand.dtd index dff02f0..bf81534 100644 --- a/src/chrome/locale/ru/brand.dtd +++ b/src/chrome/locale/ru/brand.dtd @@ -8,7 +8,7 @@ <!ENTITY trademarkInfo.part1 "Firefox и его логотипы это торговые знаки Mozilla Foundation.">  -<!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> -<!ENTITY plugins.installed.disable "Disable plugins"> -<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins"> +<!ENTITY plugins.installed.find "Нажмите для загрузки установленных системных плагинов"> +<!ENTITY plugins.installed.enable "Включить плагины"> +<!ENTITY plugins.installed.disable "Выключить плагины"> +<!ENTITY plugins.installed.disable.tip "Нажмите для предотвращения загрузки системых плагинов"> diff --git a/src/chrome/locale/ru/torbutton.dtd b/src/chrome/locale/ru/torbutton.dtd index 760ce93..b5b0f17 100644 --- a/src/chrome/locale/ru/torbutton.dtd +++ b/src/chrome/locale/ru/torbutton.dtd @@ -24,19 +24,19 @@ <!ENTITY torbutton.pref_connection_more_info.text "Torbutton включен. Если будут изменяться настройки прокси, не являющегося частью сети Tor, необходимо сначала отключить Torbutton и затем вернуться сюда. Если будут изменяться настройки Tor, необходимо использовать окно настроек Torbutton."> <!ENTITY torbutton.context_menu.new_identity "Новая личность"> <!ENTITY torbutton.context_menu.new_identity_key "Я"> -<!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> +<!ENTITY torbutton.context_menu.new_circuit "Новая цепочка Tor для этого Сайта"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> <!ENTITY torbutton.context_menu.toggle "Изменить состояние Tor"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…"> +<!ENTITY torbutton.context_menu.preferences "Настройки Секретности и Безопасности"> <!ENTITY torbutton.context_menu.preferences.key "Н"> <!ENTITY torbutton.context_menu.about "О Torbutton..."> <!ENTITY torbutton.context_menu.about.key "О"> -<!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…"> +<!ENTITY torbutton.context_menu.networksettings "Настройки сети Tor"> <!ENTITY torbutton.context_menu.networksettings.key "S"> -<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> +<!ENTITY torbutton.context_menu.downloadUpdate "Проверить обновления для Tor Browser"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> +<!ENTITY torbutton.context_menu.cookieProtections "Защита Cookie"> <!ENTITY torbutton.context_menu.cookieProtections.key "C"> <!ENTITY torbutton.context_menu.copyTor "Копировать URL Tor"> <!ENTITY torbutton.context_menu.copyTor.key "p"> @@ -157,4 +157,4 @@ <!ENTITY torbutton.prefs.sec_med_high "Средне-Высокий"> <!ENTITY torbutton.prefs.sec_high "Высокий"> <!ENTITY torbutton.prefs.sec_custom "Собственные Значения"> -<!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> +<!ENTITY torbutton.circuit_display.title "Цепочка Tor для этого сайта"> diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties index 33ced7f..5477be6 100644 --- a/src/chrome/locale/ru/torbutton.properties +++ b/src/chrome/locale/ru/torbutton.properties @@ -1,10 +1,10 @@ torbutton.button.tooltip.disabled = Включить Tor torbutton.button.tooltip.enabled = Отключить Tor -torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = IP unknown -torbutton.circuit_display.this_browser = This browser -torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country +torbutton.circuit_display.internet = Интернет +torbutton.circuit_display.ip_unknown = IP неизвестен +torbutton.circuit_display.this_browser = Этот браузер +torbutton.circuit_display.tor_bridge = Ретранслятор +torbutton.circuit_display.unknown_country = Неизвестная страна torbutton.panel.tooltip.disabled = Нажмите, чтобы включить Tor torbutton.panel.tooltip.enabled = Нажмите, чтобы отключить Tor torbutton.panel.plugins.disabled = Нажмите, чтобы включить плагины @@ -51,7 +51,7 @@ torbutton.popup.short_torbrowser = Важная информация Torbutton! torbutton.popup.confirm_plugins = Плагины вроде Flash могут нанести вред вашей конфиденциальности и анонимности.\nОни также могут обходить Tor, чтобы раскрыть ваше текущее местоположение и IP-адрес.\nВы уверены, что хотите включить плагины?\n torbutton.popup.never_ask_again = Больше не спрашивать -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n +torbutton.popup.confirm_newnym = Tor Browser закроет все окна и вкладки. Все сессии веб-сайта будут потеряны.\n\nПерезапустить сейчас Tor Browser, чтобы изменить Вашу личность?\n\n # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Этот веб-сайт (%S) пытается извлечь данные изображения HTML5 canvas, что может быть использовано для получения информации о вашем компьютере.\n\nДолжен ли Tor Browser разрешить этому сайту извлечь данные изображения HTML5 canvas? diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd index 5b454fb..d49c02b 100644 --- a/src/chrome/locale/sv/aboutTor.dtd +++ b/src/chrome/locale/sv/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "EMELLERTID, denna webbläsare är ej uppdaterad."> <!ENTITY aboutTor.outOfDateTorOff.label "DESSUTOM, denna webbläsare är ej uppdaterad."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> +<!ENTITY aboutTor.outOfDate2.label "Klicka på Tor-löken och välj sedan 'Sök efter uppdateringar för Tor webbläsare'."> <!ENTITY aboutTor.check.label "Testa nätverksinställningarna för Tor"> diff --git a/src/chrome/locale/sv/brand.dtd b/src/chrome/locale/sv/brand.dtd index 83a75a4..69c00f2 100644 --- a/src/chrome/locale/sv/brand.dtd +++ b/src/chrome/locale/sv/brand.dtd @@ -8,7 +8,7 @@ <!ENTITY trademarkInfo.part1 "Firefox och Firefox-logotypen är varumärken som tillhör Mozilla Foundation.">  -<!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> -<!ENTITY plugins.installed.disable "Disable plugins"> -<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins"> +<!ENTITY plugins.installed.find "Klicka här för att ladda installerade systemtillägg."> +<!ENTITY plugins.installed.enable "Tillåt tillägg"> +<!ENTITY plugins.installed.disable "Stäng av tillägg."> +<!ENTITY plugins.installed.disable.tip "Klicka för att förhindra laddningen av systemtillägg."> diff --git a/src/chrome/locale/sv/torbutton.properties b/src/chrome/locale/sv/torbutton.properties index 5289a40..1c8a351 100644 --- a/src/chrome/locale/sv/torbutton.properties +++ b/src/chrome/locale/sv/torbutton.properties @@ -1,10 +1,10 @@ torbutton.button.tooltip.disabled = Aktivera Tor torbutton.button.tooltip.enabled = Inaktivera Tor torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = IP unknown +torbutton.circuit_display.ip_unknown = Okänd IP-adress. torbutton.circuit_display.this_browser = This browser torbutton.circuit_display.tor_bridge = Bridge -torbutton.circuit_display.unknown_country = Unknown country +torbutton.circuit_display.unknown_country = Okänt land torbutton.panel.tooltip.disabled = Klicka för att aktivera Tor torbutton.panel.tooltip.enabled = Klicka för att inaktivera Tor torbutton.panel.plugins.disabled = Klicka för att aktivera plugins

1 0

[tor-browser-bundle/master] Update versions.nightly for new TBB branch + NoScript.
by mikeperry＠torproject.org 19 Feb '15

19 Feb '15

commit 96f7be3ca355cd4cf89fc709d24d383b7bf7240a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 18 15:52:02 2015 -0800 Update versions.nightly for new TBB branch + NoScript. --- gitian/versions.nightly | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index a619cad..2f078b2 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -7,7 +7,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=31.4.0esr +FIREFOX_VERSION=31.5.0esr TORBROWSER_UPDATE_CHANNEL=default @@ -61,7 +61,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.11-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.14-fn+fx+sm.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -90,7 +90,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=568122b4834baf2113648317baf294879700178df157780a9c89582280338ba8 +NOSCRIPT_HASH=67516200ef6ec7a3741a2b94d2257edd91f1862cec92c89251ea870839f8032f HTTPSE_HASH=a42812dbd4b0103600ac5dce0e5f1366e8a7a7267e18743f5cd1e152615964e3 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Minor ChangeLog historical cleanup.
by mikeperry＠torproject.org 18 Feb '15

18 Feb '15

commit bf56375978a63e0426fc080c18aa119969468254 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 18 13:54:23 2015 -0800 Minor ChangeLog historical cleanup. --- Bundle-Data/Docs/ChangeLog.txt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 3466bce..793404a 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -61,12 +61,12 @@ Tor Browser 4.5a3 -- Jan 19 2015 * Bug 9387: Incorporate user feedback * Bug 13671: Fixup for circuit display if bridges are used * Translation updates - * Update Tor Launcher to 0.2.7.1 - * Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set - * Translation updates - * Bug 13379: Sign our MAR files - * Bug 13788: Fix broken meek in 4.5-alpha series - * Bug 13439: No canvas prompt for content callers + * Update Tor Launcher to 0.2.7.1 + * Bug 14122: Hide logo if TOR_HIDE_BROWSER_LOGO set + * Translation updates + * Bug 13379: Sign our MAR files + * Bug 13788: Fix broken meek in 4.5-alpha series + * Bug 13439: No canvas prompt for content callers Tor Browser 4.0.3 -- Jan 13 2015 * All Platforms @@ -96,10 +96,8 @@ Tor Browser 4.0.2 -- Dec 2 2014 * Update Torbutton to 1.7.0.2 * Bug 13019: Synchronize locale spoofing pref with our Firefox patch * Bug 13746: Properly link Torbutton UI to thirdparty pref. - * Bug 13742: Fix domain isolation for content cache and disk-enabled -browsing mode - * Bug 5926: Prevent JS engine locale leaks (by setting the C library -locale) + * Bug 13742: Fix domain isolation for content cache and disk-enabled browsing mode + * Bug 5926: Prevent JS engine locale leaks (by setting the C library locale) * Bug 13504: Remove unreliable/unreachable non-public bridges * Bug 13435: Remove our custom POODLE fix * Windows

1 0

[tor-browser-bundle/master] Add changelog for 4.5a4.
by mikeperry＠torproject.org 18 Feb '15

18 Feb '15

commit af64860488d8a473560e45d5cb4753bec888c0cf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 18 13:53:14 2015 -0800 Add changelog for 4.5a4. --- Bundle-Data/Docs/ChangeLog.txt | 46 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 2dd58e7..3466bce 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,49 @@ +Tor Browser 4.5a4 -- Feb 24 2015 + * All Platforms + * Update Firefox to 31.5.0esr + * Update OpenSSL to 1.0.1l + * Update obfs4proxy to 0.0.4 + * Use obfs4proxy for ScrambleSuit bridges + * Update Torbutton to 1.9.0.0 + * Bug 13882: Fix display of bridges after bridge settings have been changed + * Bug 5698: Use "Tor Browser" branding in "About Tor Browser" dialog + * Bug 10280: Strings and pref for preventing plugin initialization. + * Bug 14866: Show correct circuit when more than one exists for a given domain + * Bug 9442: Add New Circuit button to Torbutton menu + * Bug 9906: Warn users before closing all windows and performing new identity. + * Bug 8400: Prompt for restart if disk records are enabled/disabled. + * Bug 14630: Hide Torbutton's proxy settings tab. + * Bug 14632: Disable Cookie Manager until we get it working. + * Bug 11175: Remove "About Torbutton" from onion menu. + * Bug 13900: Remove remaining SafeCache code in favor of C++ patch + * Bug 14490: Use Disconnect search in about:tor search box + * Bug 14392: Don't steal input focus in about:tor search box + * Bug 11236: Don't set omnibox order in Torbutton (to prevent translation) + * Bug 13406: Stop directing users to download-easy.html.en on update + * Bug 9387: Handle "custom" mode better in Security Slider + * Bug 12430: Bind jar: pref to Security Slider + * Bug 14448: Restore Torbutton menu operation on non-English localizations + * Translation updates + * Update Tor Launcher to 0.2.7.2 + * Bug 13271: Display Bridge Configuration wizard pane before Proxy pane + * Bug 14336: Fix navigation button display issues on some wizard panes + * Translation updates + * Bug 14203: Prevent meek from displaying an extra update notification + * Bug 14849: Remove new NoScript menu option to make permissions permanent + * Bug 14851: Set NoScript pref to disable permanent permissions + * Bug 14490: Make Disconnect the default omnibox search engine + * Bug 11236: Fix omnibox order for non-English builds + * Also remove Amazon, eBay and bing; add Youtube and Twitter + * Bug 10280: Don't load any plugins into the address space. + * Bug 14392: Make about:tor hide itself from the URL bar + * Bug 12430: Provide a preference to disable remote jar: urls + * Bug 13900: Remove 3rd party HTTP auth tokens via Firefox patch + * Bug 5698: Fix branding in "About Torbrowser" window + * Windows: + * Bug 13169: Don't use /dev/random on Windows for SSP + * Linux: + * Bug 13717: Make sure we use the bash shell on Linux + Tor Browser 4.5a3 -- Jan 19 2015 * All Platforms * Update Firefox to 31.4.0esr

1 0

[torbutton/master] Mention bug 14448 in changelog.
by mikeperry＠torproject.org 18 Feb '15

18 Feb '15

commit 3dad5b190785b34ecfbb293a8bbc56f5cb2f6665 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 18 12:48:44 2015 -0800 Mention bug 14448 in changelog. --- src/CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 11fa776..97db954 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -16,6 +16,7 @@ * Bug 13406: Stop directing users to download-easy.html.en on update * Bug 9387: Handle "custom" mode better in Security Slider * Bug 12430: Bind jar: pref to Security Slider + * Bug 14448: Restore Torbutton menu operation on non-English localizations 1.8.1.3 * Bug 13998: Handle changes in NoScript 2.6.9.8+

1 0

[torbutton/master] Add changelog for 1.9.0.0 + bump version.
by mikeperry＠torproject.org 18 Feb '15

18 Feb '15

commit a50335676cb8d62eb255f0ce206b82cb553e0fc5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 18 12:36:27 2015 -0800 Add changelog for 1.9.0.0 + bump version. --- src/CHANGELOG | 19 +++++++++++++++++++ src/install.rdf | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index a3e859e..11fa776 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,22 @@ +1.9.0.0 + * Bug 13882: Fix display of bridges after bridge settings have been changed + * Bug 5698: Use "Tor Browser" branding in "About Tor Browser" dialog + * Bug 10280: Strings and pref for preventing plugin initialization. + * Bug 14866: Show correct circuit when more than one exists for a given domain + * Bug 9442: Add New Circuit button to Torbutton menu + * Bug 9906: Warn users before closing all windows and performing new identity. + * Bug 8400: Prompt for restart if disk records are enabled/disabled. + * Bug 14630: Hide Torbutton's proxy settings tab. + * Bug 14632: Disable Cookie Manager until we get it working. + * Bug 11175: Remove "About Torbutton" from onion menu. + * Bug 13900: Remove SafeCache code. + * Bug 14490: Use Disconnect search in about:tor search box + * Bug 14392: Don't steal input focus in about:tor search box + * Bug 11236: Don't set omnibox order in Torbutton (to prevent translation) + * Bug 13406: Stop directing users to download-easy.html.en on update + * Bug 9387: Handle "custom" mode better in Security Slider + * Bug 12430: Bind jar: pref to Security Slider + 1.8.1.3 * Bug 13998: Handle changes in NoScript 2.6.9.8+ * Bug 14100: Option to hide NetworkSettings menuitem diff --git a/src/install.rdf b/src/install.rdf index e4045ad..b5a8e88 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.8.1.3</em:version> + <em:version>1.9.0.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Bug #13882: Fix display of bridges after bridge settings have been changed
by mikeperry＠torproject.org 18 Feb '15

18 Feb '15

commit de8cb7a32e0d2a70812322ce1d6a1f4627ef33f0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Feb 16 17:47:13 2015 -0800 Bug #13882: Fix display of bridges after bridge settings have been changed --- src/chrome/content/tor-circuit-display.js | 71 ++++++++++------------- src/modules/tor-control-port.js | 88 ++++++++++++++++++++++------- 2 files changed, 99 insertions(+), 60 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 35a7dfc..e2628b4 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -43,41 +43,23 @@ let logger = Cc["@torproject.org/torbutton-logger;1"] let credentialsToNodeDataMap = {}, // A mutable map that reports `true` for IDs of "mature" circuits // (those that have conveyed a stream). - knownCircuitIDs = {}, - // A map from bridge fingerprint to its IP address. - bridgeIDtoIPmap = new Map(); + knownCircuitIDs = {}; // __trimQuotes(s)__. // Removes quotation marks around a quoted string. let trimQuotes = s => s ? s.match(/^\"(.*)\"$/)[1] : undefined; -// __readBridgeIPs(controller)__. -// Gets a map from bridge ID to bridge IP, and stores it -// in `bridgeIDtoIPmap`. -let readBridgeIPs = function (controller) { - Task.spawn(function* () { - let configText = yield controller.getInfo("config-text"), - bridgeEntries = configText.Bridge; - if (bridgeEntries) { - bridgeEntries.map(entry => { - let IPplusPort, ID, - tokens = entry.split(/\s+/); - // First check if we have a "vanilla" bridge: - if (tokens[0].match(/^\d+\.\d+\.\d+\.\d+/)) { - [IPplusPort, ID] = tokens; - // Several bridge types have a similar format: - } else if (["fte", "obfs3", "obfs4", "scramblesuit"] - .indexOf(tokens[0]) >= 0) { - [IPplusPort, ID] = tokens.slice(1); - } - // (For now, we aren't dealing with meek bridges and flashproxy.) - if (IPplusPort && ID) { - let IP = IPplusPort.split(":")[0]; - bridgeIDtoIPmap.set(ID.toUpperCase(), IP); - } - }); +// __getBridge(id)__. +// Gets the bridge parameters for a given node ID. If the node +// is not currently used as a bridge, returns null. +let getBridge = function* (controller, id) { + let bridges = yield controller.getConf("bridge"); + for (let bridge of bridges) { + if (bridge.ID.toUpperCase() === id.toUpperCase()) { + return bridge; } - }).then(null, Cu.reportError); + } + return null; }; // nodeDataForID(controller, id)__. @@ -85,17 +67,22 @@ let readBridgeIPs = function (controller) { // Example: `nodeDataForID(controller, "20BC91DC525C3DC9974B29FBEAB51230DE024C44")` // => `{ type : "default", ip : "12.23.34.45", countryCode : "fr" }` let nodeDataForID = function* (controller, id) { - let result = {}; // type, ip, countryCode; - if (bridgeIDtoIPmap.has(id.toUpperCase())) { - result.ip = bridgeIDtoIPmap.get(id.toUpperCase()); + let result = {}, + bridge = yield getBridge(controller, id); // type, ip, countryCode; + if (bridge) { result.type = "bridge"; - } else { - // Get the IP address for the given node ID. + result.bridgeType = bridge.type; + // Attempt to get an IP address from bridge address string. try { - let statusMap = yield controller.getInfo("ns/id/" + id); - result.ip = statusMap.IP; + result.ip = bridge.address.split(":")[0]; } catch (e) { } + } else { result.type = "default"; + // Get the IP address for the given node ID. + try { + let statusMap = yield controller.getInfo("ns/id/" + id); + result.ip = statusMap.IP; + } catch (e) { } } if (result.ip) { // Get the country code for the node's IP address. @@ -141,8 +128,10 @@ let collectIsolationData = function (aController) { logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); knownCircuitIDs[streamEvent.CircuitID] = true; let circuitStatus = yield getCircuitStatusByID(aController, streamEvent.CircuitID), - credentials = trimQuotes(circuitStatus.SOCKS_USERNAME) + ":" + - trimQuotes(circuitStatus.SOCKS_PASSWORD); + credentials = circuitStatus ? + (trimQuotes(circuitStatus.SOCKS_USERNAME) + ":" + + trimQuotes(circuitStatus.SOCKS_PASSWORD)) : + null; if (credentials) { let nodeData = yield nodeDataForCircuit(aController, circuitStatus); credentialsToNodeDataMap[credentials] = nodeData; @@ -195,11 +184,12 @@ let showCircuitDisplay = function (show) { // `"France (12.34.56.78)"`. let nodeLines = function (nodeData) { let result = [uiString("this_browser")]; - for (let {ip, countryCode, type} of nodeData) { + for (let {ip, countryCode, type, bridgeType} of nodeData) { let bridge = type === "bridge"; result.push((countryCode ? localizedCountryNameFromCode(countryCode) : uiString("unknown_country")) + - " (" + (bridge ? uiString("tor_bridge") + " (" + (bridge ? (uiString("tor_bridge") + + ((bridgeType !== "vanilla") ? (": " + bridgeType) : "")) : (ip || uiString("ip_unknown"))) + ")"); } result[4] = uiString("internet"); @@ -340,7 +330,6 @@ let setupDisplay = function (host, port, password, enablePrefName) { logger.eclog(5, "Disabling tor display circuit because of an error."); stop(); }); - readBridgeIPs(myController); syncDisplayWithSelectedTab(true); collectIsolationData(myController); } diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 3fa7756..a55a0d8 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -372,22 +372,22 @@ utils.listMapData = function (parameterString, listNames) { }; // ## info -// A namespace for functions related to tor's GETINFO command. +// A namespace for functions related to tor's GETINFO and GETCONF command. let info = info || {}; // __info.keyValueStringsFromMessage(messageText)__. -// Takes a message (text) response to GETINFO and provides a series of key-value -// strings, which are either multiline (with a `250+` prefix): +// Takes a message (text) response to GETINFO or GETCONF and provides +// a series of key-value strings, which are either multiline (with a `250+` prefix): // // 250+config/defaults= // AccountingMax "0 bytes" // AllowDotExit "0" // . // -// or single-line (with a `250-` prefix): +// or single-line (with a `250-` or `250 ` prefix): // // 250-version=0.2.6.0-alpha-dev (git-b408125288ad6943) -info.keyValueStringsFromMessage = utils.extractor(/^(250\+[\s\S]+?^\.|250-.+?)$/gmi); +info.keyValueStringsFromMessage = utils.extractor(/^(250\+[\s\S]+?^\.|250[-\ ].+?)$/gmi); // __info.applyPerLine(transformFunction)__. // Returns a function that splits text into lines, @@ -462,9 +462,33 @@ info.configTextParser = function(text) { return result; }; + +// __info.bridgeParser(bridgeLine)__. +// Takes a single line from a `getconf bridge` result and returns +// a map containing the bridge's type, address, and ID. +info.bridgeParser = function(bridgeLine) { + let result = {}, + tokens = bridgeLine.split(/\s+/); + // First check if we have a "vanilla" bridge: + if (tokens[0].match(/^\d+\.\d+\.\d+\.\d+/)) { + result.type = "vanilla"; + [result.address, result.ID] = tokens; + // Several bridge types have a similar format: + } else { + result.type = tokens[0]; + if (["fte", "obfs3", "obfs4", "scramblesuit"] + .indexOf(result.type) >= 0) { + [result.address, result.ID] = tokens.slice(1); + } else if (result.type === "meek") { + // do nothing for now + } + } + return result.type ? result : null; +}; + // __info.parsers__. -// A map of GETINFO keys to parsing function, which convert result strings to JavaScript -// data. +// A map of GETINFO and GETCONF keys to parsing function, which convert +// result strings to JavaScript data. info.parsers = { "version" : utils.identity, "config-file" : utils.identity, @@ -474,7 +498,8 @@ info.parsers = { "ns/name/" : info.routerStatusParser, "ip-to-country/" : utils.identity, "circuit-status" : info.applyPerLine(info.circuitStatusParser), - "stream-status" : info.applyPerLine(info.streamStatusParser) + "stream-status" : info.applyPerLine(info.streamStatusParser), + "bridge" : info.bridgeParser }; // __info.getParser(key)__. @@ -482,22 +507,37 @@ info.parsers = { // convert its corresponding valueString to JavaScript data. info.getParser = function(key) { return info.parsers[key] || - info.parsers[key.substring(0, key.lastIndexOf("/") + 1)] || - "unknown"; + info.parsers[key.substring(0, key.lastIndexOf("/") + 1)]; }; // __info.stringToValue(string)__. -// Converts a key-value string as from GETINFO to a value. +// Converts a key-value string as from GETINFO or GETCONF to a value. info.stringToValue = function (string) { // key should look something like `250+circuit-status=` or `250-circuit-status=...` - let key = string.match(/^250[\+-](.+?)=/mi)[1], - // matchResult finds a single-line result for `250-` or a multi-line one for `250+`. - matchResult = string.match(/250\-.+?=(.*?)$/mi) || + // or `250 circuit-status...` + let matchForKey = string.match(/^250[ +-](.+?)=/mi), + key = matchForKey ? matchForKey[1] : null; + if (key === null) return null; + // matchResult finds a single-line result for `250-` or a multi-line one for `250+`. + let matchResult = string.match(/250[ -].+?=(.*?)$/mi) || string.match(/250\+.+?=([\s\S]*?)^\.$/mi), // Retrieve the captured group (the text of the value in the key-value pair) - valueString = matchResult ? matchResult[1] : null; - // Return value where the latter has been parsed according to the key requested. - return info.getParser(key)(valueString); + valueString = matchResult ? matchResult[1] : null, + // Get the parser functino for the key found. + parse = info.getParser(key.toLowerCase()); + if (parse === undefined) { + throw new Error("No parser found for '" + key + "'"); + } + // Return value produced by the parser. + return parse(valueString); +}; + +// __info.getMultipleResponseValues(message)__. +// Process multiple responses to a GETINFO or GETCONF request. +info.getMultipleResponseValues = function (message) { + return info.keyValueStringsFromMessage(message) + .map(info.stringToValue) + .filter(utils.identity); }; // __info.getInfoMultiple(aControlSocket, keys)__. @@ -519,8 +559,7 @@ info.getInfoMultiple = function (aControlSocket, keys) { } */ return aControlSocket.sendCommand("getinfo " + keys.join(" ")) - .then(message => info.keyValueStringsFromMessage(message) - .map(info.stringToValue)); + .then(info.getMultipleResponseValues); }; // __info.getInfo(controlSocket, key)__. @@ -537,6 +576,16 @@ info.getInfo = function (aControlSocket, key) { return info.getInfoMultiple(aControlSocket, [key]).then(data => data[0]); }; +// __info.getConf(aControlSocket, key)__. +// Sends GETCONF for a single key. Returns a promise with the result. +info.getConf = function (aControlSocket, key) { + // GETCONF with a single argument returns results that look like + // results from GETINFO with multiple arguments. + // So we can use the same kind of parsing for + return aControlSocket.sendCommand("getconf " + key) + .then(info.getMultipleResponseValues); +}; + // ## event // Handlers for events @@ -587,6 +636,7 @@ tor.controller = function (host, port, password, onError) { isOpen = true; return { getInfo : key => info.getInfo(socket, key), getInfoMultiple : keys => info.getInfoMultiple(socket, keys), + getConf : key => info.getConf(socket, key), watchEvent : function (type, filter, onData) { event.watchEvent(socket, type, filter, onData); },

1 0

[torbutton/master] Merge remote-tracking branch 'arthur/13882+'
by mikeperry＠torproject.org 18 Feb '15

18 Feb '15

commit 3692388e5262cd6a5b9ffcd1a950b04e56933e18 Merge: 7fd169e de8cb7a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Feb 18 11:41:32 2015 -0800 Merge remote-tracking branch 'arthur/13882+' src/chrome/content/tor-circuit-display.js | 71 ++++++++++------------- src/modules/tor-control-port.js | 88 ++++++++++++++++++++++------- 2 files changed, 99 insertions(+), 60 deletions(-)

1 0

[tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 18 Feb '15

18 Feb '15

commit 9a5a1cec6b3449c1f5f3706823ec5b1ff31e40d0 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 18 14:21:49 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. It turns out that the fix for #11236 still contains too much randomnees for our taste if more than two search engines are specified to be on the top. Fall back to just two. --- browser/app/profile/000-tor-browser.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index cb59517..ceb9394 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -153,11 +153,11 @@ pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\" pref("browser.search.defaultenginename", "Search"); // Search engine order (order displayed in the search bar dropdown) -// Somewhat surprisingly we get Disconnect - YouTube - Twitter as the order -// only if we set them as below. -pref("browser.search.order.extra.1", "YouTube"); -pref("browser.search.order.extra.2", "Twitter"); -pref("browser.search.order.extra.3", "Search"); +// Somewhat surprisingly we get some random behavior if we specify more than +// two search engines as below. See +// https://bugzilla.mozilla.org/show_bug.cgi?id=1126722 for details. +pref("browser.search.order.extra.1", "Search"); +pref("browser.search.order.extra.2", "YouTube"); // Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW? // Nvida cards also experience crashes without the second pref set to disabled

1 0

[tor-browser-bundle/master] Bug 13717: Make sure we use the bash on Linux
by gk＠torproject.org 18 Feb '15

18 Feb '15

commit d02cbafea85464044e2117913310ddd77c81efc7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Feb 18 16:53:08 2015 +0000 Bug 13717: Make sure we use the bash on Linux This is basically a patch by a cypherpunk. Additionally, this commit contains a small clean-up of the shell script. --- RelativeLink/RelativeLink.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index e75482a..8c51f47 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -5,20 +5,28 @@ # # To run in debug mode simply pass --debug # -# Copyright 2014 The Tor Project. See LICENSE for licensing information. +# Copyright 2015 The Tor Project. See LICENSE for licensing information. -complain_dialog_title="Tor Browser Bundle" +complain_dialog_title="Tor Browser" # First, make sure DISPLAY is set. If it isn't, we're hosed; scream # at stderr and die. if [ "x$DISPLAY" = "x" ]; then - echo "$complain_dialog_title must be run within the X Window System." >&2 - echo "Exiting." >&2 - exit 1 + echo "$complain_dialog_title must be run within the X Window System." >&2 + echo "Exiting." >&2 + exit 1 +fi + +# Second, make sure this script wasn't started as 'sh start-tor-browser' or +# similar. +if [ "x$BASH" = "x" ]; then + echo "$complain_dialog_title should be started as './start-tor-browser'" + echo "Exiting." >&2 + exit 1; fi -# Do not (try to) connect to the session manager -unset SESSION_MANAGER +# Do not (try to) connect to the session manager +unset SESSION_MANAGER # Determine whether we are running in a terminal. If we are, we # should send our error messages to stderr...

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits