[tor-commits] [orbot/master] fixed pt_br naming, adding in obfs bridge strings

n8fr8 at torproject.org n8fr8 at torproject.org
Mon Feb 27 04:24:19 UTC 2012 

commit befd79c4b94fb79ff1001e249543a1585e92ff6f
Author: Nathan Freitas <nathan at freitas.net>
Date:   Thu Feb 23 14:37:27 2012 -0500

    fixed pt_br naming, adding in obfs bridge strings
---
 res/values-pt-rBR/strings.xml |  198 ++++++++++++++++++
 res/values-pt_BR/strings.xml  |  198 ------------------
 res/values/strings.xml        |  449 +++++++++++++++++++++++-----------------
 3 files changed, 456 insertions(+), 389 deletions(-)

diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..42c6c8c
--- /dev/null
+++ b/res/values-pt-rBR/strings.xml
@@ -0,0 +1,198 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Orbot</string>
+  <string name="internal_web_url">http://orbot/</string>
+  <string name="default_web_url">http://check.torproject.org</string>
+  <string name="secure_default_web_url">https://check.torproject.org</string>
+  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+  <string name="control_permission_label">iniciar e parar o Tor</string>
+  <string name="tor_proxy_service_process">torproxyservice</string>
+  <string name="status_starting_up">Orbot está iniciando...</string>
+  <string name="status_activated">Conectado à rede Tor</string>
+  <string name="status_disabled">Orbot está Desativado</string>
+  <string name="status_shutting_down">Orbot está sendo desligado</string>
+  <string name="tor_process_starting">Iniciando cliente Tor...</string>
+  <string name="tor_process_complete">completo.</string>
+  <string name="tor_process_waiting">esperando.</string>
+  <string name="not_anonymous_yet">AVISO: Seu tráfego não é anônimo ainda! Por favor, configure suas aplicações para usar proxy HTTP 127.0.0.1:8118 ou SOCKS4A ou SOCKS5 proxy 127.0.0.1:9050</string>
+  <string name="menu_home">Início</string>
+  <string name="menu_browse">Procurar</string>
+  <string name="menu_settings">Configurações</string>
+  <string name="menu_log">Log</string>
+  <string name="menu_info">Ajuda</string>
+  <string name="menu_apps">Apps</string>
+  <string name="menu_start">Iniciar</string>
+  <string name="menu_stop">Parar</string>
+  <string name="menu_about">Sobre</string>
+  <string name="menu_wizard">Assistente</string>
+  <string name="button_help">Ajuda</string>
+  <string name="button_close">Fechar</string>
+  <string name="button_about">Sobre</string>
+  <string name="button_clear_log">Limpar Log</string>
+  <string name="menu_verify">Checar</string>
+  <string name="menu_exit">Sair</string>
+  <string name="powered_by">powered by the Tor Project</string>
+  <string name="press_to_start">- longo clique para iniciar -</string>
+  <string name="pref_trans_proxy_group">Proxying Transparente (Requer Root)</string>
+  <string name="pref_trans_proxy_title">Proxying Transparente</string>
+  <string name="pref_trans_proxy_summary">Automaticamente Torificar Apps</string>
+  <string name="pref_transparent_all_title">Tor Tudo</string>
+  <string name="pref_transparent_all_summary">Tráfego proxy para todos apps através do Tor</string>
+  <string name="pref_transparent_port_fallback_title">Porta do Proxy Reserva</string>
+  <string name="pref_transparent_port_fallback_summary">AVISO: evite as portas comuns (80,443, etc). *USE SOMENTE* se o modo \'Todos\' ou \'App\' não funcionou.</string>
+  <string name="pref_transparent_port_title">Lista de Portas</string>
+  <string name="pref_transparent_port_summary">Lista de portas para proxy. *USE SOMENTE* se o modo \'Todos\' ou \'App\' não funcionou</string>
+  <string name="pref_transparent_port_dialog">Insira as portas para proxy</string>
+  <string name="pref_has_root">Requer Acesso Root</string>
+  <string name="pref_has_root_summary">Requer acesso root para proxy transparente</string>
+  <string name="status_install_success">Binário do Tor instalados com sucesso!</string>
+  <string name="status_install_fail">Os arquivos binários do Tor estão inaptos à serem instalados. Por favor, cheque o log e notifique tor-assistants at torproject.org</string>
+  <string name="title_error">Erro de Aplicação</string>
+  <string name="wizard_title">Orbot</string>
+  <string name="wizard_btn_tell_me_more">Sobre Orbot</string>
+  <string name="btn_next">Próximo</string>
+  <string name="btn_back">Voltar</string>
+  <string name="btn_finish">Terminar</string>
+  <string name="btn_okay">Okay</string>
+  <string name="btn_cancel">Cancelar</string>
+  <string name="wizard_details">Alguns detalher do Orbot</string>
+  <string name="wizard_details_msg">Orbot é uma aplicação de código aberto que contém o Tor, LibEvent e Privoxy. Ela provê um proxy HTTP local (8118) e um proxy SOCKS (9050) dentro da rede Tor. Orbot também tem a habilidade, num dispositivo roteado, enviar todo o tráfego da Internet através do Tor</string>
+  <string name="wizard_permissions_root">Permissão Concedida</string>
+  <string name="wizard_permissions_stock">Permissões do Orbot</string>
+  <string name="wizard_premissions_msg_root">Excelent! Detectamos que você deu permissão root para Orbot. Nós usaremos este poder com sabedoria.</string>
+  <string name="wizard_permissions_msg_stock"> Enquanto não é requerido, o Orbot pode se tornar uma ferramenta mais poderosa se seu dispositivo tivesse acesso root. Use o botão abaixo para conceder superpoderes ao Orbot! </string>
+  <string name="wizard_permissions_no_root">Se você não tem acesso root ou não tem idéia sobre o que estamos falando, só tenha a certeza de usar apps feitas para trabalhar com o Orbot.</string>
+  <string name="wizard_permissions_consent">Eu entendo e gostaria de continuar sem o Superusuário</string>
+  <string name="wizard_permission_enable_root">Conceder acesso Root ao Orbot</string>
+  <string name="wizard_configure">Configurar Torificação</string>
+  <string name="wizard_configure_msg">Orbot dá a você a opção de rotear todo o tráfego de aplicação através do Tor OU para escolher suas aplicações individualmente.</string>
+  <string name="wizard_configure_all">Usar Proxy para Todas Apps Através do Tor</string>
+  <string name="wizard_configure_select_apps">Selecionar Apps Individuais para o Tor</string>
+  <string name="wizard_tips_tricks">Apps habilitadas para Orbot</string>
+  <string name="wizard_tips_msg">As apps abaixo foram desenvolvidas para trabalhar com Orbot. Clique em cada botão para instalar agora, ou você pode encontrá-las posteriormente no Android Market.</string>
+  <string name="wizard_tips_otrchat">Gibberbot - Cliente de mensagem instantânea seguro para Android</string>
+  <string name="wizard_tips_proxy">Configurações de Proxy - Aprenda como configurar apps para trabalhar com Orbot</string>
+  <string name="wizard_proxy_help_info">Configurações de Proxy</string>
+  <string name="wizard_proxy_help_msg">Se a app Android que você está usando puder suportar o uso de proxy HTTP ou SOCKS, então você pode configurar para conectar ao Orbot e usar o Tor.\n\n
+    As configurações de host são 127.0.0.1 ou \"localhost\". Para HTTP, a porta configurada é 8118. Para SOCKS, o proxy é 9050. Você deve usar SOCKS4A ou SOCKS5 se possível.
+    \n\n
+    Você pode aprender mais sobre proxy no Android através do FAQ em: http://tinyurl.com/proxyandroid
+    </string>
+  <string name="wizard_final">Orbot está pronto!</string>
+  <string name="wizard_final_msg">Centenas de milhares de pessoas ao redor do mundo usam o Tor por uma enorme variedade de razões.\n\nJornalistas e bloggers, defensores dos direitos humanos, oficiais da lei, soldados, corporações, cidadãos em regimes repressivos, e somente cidadãos comuns... e agora você está pronto para usar, também! </string>
+  <string name="connect_first_time">Você se conectou à rede Tor com sucesso - mas isto NÃO significa que seu dispositivo é seguro. Você pode usar a opção \'Checar\' no menu para testar seu navegador.\n\nVisite-nos em https://guardianproject.info/apps/orbot ou envie um e-mail para help at guardianproject.info para saber mais.</string>
+  <string name="tor_check">Isto irá abrir seu navegador web em https://check.torproject.org com o intuito de ver se o Orbot está provavelmente configurado e você está conectado ao Tor.</string>
+  <string name="pref_hs_group">Serviços Ocultos</string>
+  <string name="pref_general_group">Geral</string>
+  <string name="pref_start_boot_title">Iniciar Orbot no Boot</string>
+  <string name="pref_start_boot_summary">Automaticamente iniciar o Orbot e conectar o Tor quando seu Android bootar.</string>
+  <string name="wizard_title_msg">Orbot trouxe Tor para Android!!\n\nTor ajuda você a se defender contra filtro de conteúdo, análises de tráfego e vigilância de rede que ameaçam sua privacidade, informação confidencial e relacionamentos pessoais.\n\nEste assistente irá ajudá-lo a configurar o Orbot e Tor no seu dispositivo.</string>
+  <string name="wizard_warning_title">Aviso</string>
+  <string name="wizard_warning_msg">Simplesmente instalando o Orbot não irá automaticamente anonimizar seu tráfego móvel.\n\nVocê deve configurar apropriadamente o Orbot, seu dispositivo e outras apps para usar o Tor com sucesso.</string>
+  <string name="wizard_permissions_title">Permissões</string>
+  <string name="wizard_permissions_root_msg1">Você pode opcionalmente garantir ao Orbot acesso de \'Superusuário\' para habilitar recursos avançados, como um proxy transparente.</string>
+  <string name="wizard_permissions_root_msg2">Se você não quiser fazer isto, tenha certeza de usar apps feitas para trabalhar com o Orbot.</string>
+  <string name="wizard_permissions_no_root_msg">Seu dispositivo não parece ser roteado ou prover um acesso \'Superusuário\'.\n\nDe maneira a você se beneficiar do Tor, você precisará usar apps criadas para trabalhar com o Orbot, ou que suportem configurações de proxy HTTP ou SOCKS.
+
+</string>
+  <string name="wizard_tips_title">Apps Orbot Habilitadas</string>
+  <string name="wizard_tips_gibberbot">Gibberbot: App segura para chat com encriptação sem gravação </string>
+  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+  <string name="wizard_tips_orweb">Orweb: Navegador de reforço de privacidade que trabalha através do Tor</string>
+  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+  <string name="wizard_transproxy_title">Proxy Transparente</string>
+  <string name="wizard_transproxy_msg">Isto permite à suas apps automaticamente rodarem através da rede Tor sem nenhuma configuração.</string>
+  <string name="wizard_transproxy_hint">(Selecione esta caixa se você não souber do que estamos falando)</string>
+  <string name="wizard_transproxy_none">Nenhum</string>
+  <string name="pref_transparent_tethering_title">Tor Tethering</string>
+  <string name="pref_transparent_tethering_summary">Habilitar Proxy Transparente para Tor Dispositivos de Toque Wifi e Usb (requer reinicialização)</string>
+  <string name="button_grant_superuser">Acesso Superusuário Requerido</string>
+  <string name="pref_select_apps">Selecionar Apps</string>
+  <string name="pref_select_apps_summary">Escolha as Apps para Rotearem Através do Tor</string>
+  <string name="pref_node_configuration">Configuração de Nó</string>
+  <string name="pref_node_configuration_summary">Aqui estão as configurações avançadas que podem reduzir seu anonimato.</string>
+  <string name="pref_entrance_node">Nós de Entrada</string>
+  <string name="pref_entrance_node_summary">Impressões digitais, apelidos, países e endereços para a primeira etapa</string>
+  <string name="pref_entrance_node_dialog">Insira os Nós de Entrada</string>
+  <string name="pref_use_whispercore">Usar WhisperCore</string>
+  <string name="pref_use_whispercore_summary">Usar as NetFilter APIs proprietárias providas por WhisperSystems (requerido dispositivo com WhisperCore instalado)</string>
+  <string name="pref_proxy_type_title">Tipo de Proxy</string>
+  <string name="pref_proxy_type_summary">Protocolo para usar no servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
+  <string name="pref_proxy_type_dialog">Insira o Tipo de Proxy</string>
+  <string name="pref_proxy_host_title">Proxy Host</string>
+  <string name="pref_proxy_host_summary">Hostname do servidor Proxy</string>
+  <string name="pref_proxy_host_dialog">Insira o Host do Proxy</string>
+  <string name="pref_proxy_port_title">Porta do Proxy</string>
+  <string name="pref_proxy_port_summary">Porta do servidor Proxy</string>
+  <string name="pref_proxy_port_dialog">Insira a porta do Proxy</string>
+  <string name="status">Status</string>
+  <string name="setting_up_full_transparent_proxying_">Configurando proxy com total transparência...</string>
+  <string name="setting_up_app_based_transparent_proxying_">Configurando apps baseadas em transparência de proxy...</string>
+  <string name="transparent_proxying_enabled">Proxy Transparente HABILITADO</string>
+  <string name="transproxy_enabled_for_tethering_">TransProxy habilitado para Toque!</string>
+  <string name="warning_error_starting_transparent_proxying_">AVISO: erro ao iniciar o proxy transparente!</string>
+  <string name="transproxy_rules_cleared">Regras TransProxy limpas</string>
+  <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
+  <string name="privoxy_is_running_on_port_">Privoxy está rodando na porta: </string>
+  <string name="setting_up_port_based_transparent_proxying_">Configurando proxy transparente baseado em porta...</string>
+  <string name="bridge_error">Erro na Ponte</string>
+  <string name="bridge_requires_ip">Como condição para usar o recurso de ponte, você deve inserir pelo menos um endereço IP de ponte.</string>
+  <string name="send_email_for_bridges">Envie um email para bridges at torproject.org com a linha \"get bridges\" sozinha no corpo do e-mail, a partir de uma conta do gmail</string>
+  <string name="error">Erro</string>
+  <string name="your_reachableaddresses_settings_caused_an_exception_">Suas configurações de Endereços Acessíveis causou uma exceção!</string>
+  <string name="your_relay_settings_caused_an_exception_">Suas configurações de retransmissão causaram uma exceção!</string>
+  <string name="exit_nodes">Nós de Saída</string>
+  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Impressões digitais, apelidos, países e endereços para a última etapa.</string>
+  <string name="enter_exit_nodes">Insira os Nós de Saída</string>
+  <string name="exclude_nodes">Nós Excluídos</string>
+  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Impressões digitais, apelidos, países e endereços para excluir</string>
+  <string name="enter_exclude_nodes">Insira Nós Excluídos</string>
+  <string name="strict_nodes">Nós Estritos</string>
+  <string name="use_only_these_specified_nodes">Use *somente* estes nós específicos</string>
+  <string name="bridges">Pontes</string>
+  <string name="use_bridges">Usar pontes</string>
+  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar nós de entrada alternativos dentro da rede Tor</string>
+  <string name="ip_address_and_port_of_bridges">Endereço IP e porta das pontes</string>
+  <string name="enter_bridge_addresses">Insira os Endereços das Pontes</string>
+  <string name="relays">Retransmissores</string>
+  <string name="relaying">Retransmitindo</string>
+  <string name="enable_your_device_to_be_a_non_exit_relay">Habilitar seu dispositivo para não ser um retransmissor de saída</string>
+  <string name="relay_port">Porta Retransmissora</string>
+  <string name="listening_port_for_your_tor_relay">Ouvindo porta do seu retransmissor Tor</string>
+  <string name="enter_or_port">Insira porta OR</string>
+  <string name="relay_nickname">Apelido do Retransmissor</string>
+  <string name="the_nickname_for_your_tor_relay">O apelido para seu retransmissor Tor</string>
+  <string name="enter_a_custom_relay_nickname">Insira um apelido de retransmissor customizado</string>
+  <string name="reachable_addresses">Endereços Atingíveis</string>
+  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Rodar como um cliente atrás de um firewall com políticas restritivas.</string>
+  <string name="reachable_ports">Portas Atingíveis</string>
+  <string name="ports_reachable_behind_a_restrictive_firewall">Portas atingíveis atrás de um firewall restritivo</string>
+  <string name="enter_ports">Insira as portas</string>
+  <string name="enable_hidden_services">Habilitar Serviços Ocultos</string>
+  <string name="run_servers_accessible_via_the_tor_network">rodar servidores acessíveis via rede Tor</string>
+  <string name="enter_localhost_ports_for_hidden_services">insira as portas local para serviços ocultos</string>
+  <string name="hidden_service_ports">Portas de Serviço Oculto</string>
+  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">o nome enderessável para seu serviço oculto (gerado automaticamente)</string>
+  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">habilitar debug log para saída (deve usar adb ou aLogCat para ver)</string>
+  <string name="project_home">Home(s) do Projeto: </string>
+  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+  <string name="the_tor_license">A Licença Tor</string>
+  <string name="https_torproject_org">https://torproject.org</string>
+  <string name="third_party_software">Software de Terceiros</string>
+  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
+  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
+  <string name="hidden_service_request">Uma app quer abrir a porta %S oculta do servidor para a rede Tor. Isto é seguro se você confia na app.</string>
+  <string name="found_existing_tor_process">procurando processos Tor existentes...</string>
+  <string name="something_bad_happened">Algo ruim aconteceu. Cheque o lo</string>
+  <string name="hidden_service_on">serviço oculto em:</string>
+  <string name="unable_to_read_hidden_service_name">habilitar ler o nome do serviço oculto</string>
+  <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
+  <string name="pref_use_sys_iptables_title">Usar tabelas de IP padrão:</string>
+  <string name="pref_use_sys_iptables_summary">usar as tabelas ip binárias embutidas ao invés das tabelas do pacote Orbot</string>
+  <string name="error_installing_binares">Os binários Tor não estão disponíveis para serem instalados ou atualizados.</string>
+  <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string>
+  <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string>
+</resources>
diff --git a/res/values-pt_BR/strings.xml b/res/values-pt_BR/strings.xml
deleted file mode 100644
index 42c6c8c..0000000
--- a/res/values-pt_BR/strings.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
-  <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">iniciar e parar o Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está iniciando...</string>
-  <string name="status_activated">Conectado à rede Tor</string>
-  <string name="status_disabled">Orbot está Desativado</string>
-  <string name="status_shutting_down">Orbot está sendo desligado</string>
-  <string name="tor_process_starting">Iniciando cliente Tor...</string>
-  <string name="tor_process_complete">completo.</string>
-  <string name="tor_process_waiting">esperando.</string>
-  <string name="not_anonymous_yet">AVISO: Seu tráfego não é anônimo ainda! Por favor, configure suas aplicações para usar proxy HTTP 127.0.0.1:8118 ou SOCKS4A ou SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Início</string>
-  <string name="menu_browse">Procurar</string>
-  <string name="menu_settings">Configurações</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Ajuda</string>
-  <string name="menu_apps">Apps</string>
-  <string name="menu_start">Iniciar</string>
-  <string name="menu_stop">Parar</string>
-  <string name="menu_about">Sobre</string>
-  <string name="menu_wizard">Assistente</string>
-  <string name="button_help">Ajuda</string>
-  <string name="button_close">Fechar</string>
-  <string name="button_about">Sobre</string>
-  <string name="button_clear_log">Limpar Log</string>
-  <string name="menu_verify">Checar</string>
-  <string name="menu_exit">Sair</string>
-  <string name="powered_by">powered by the Tor Project</string>
-  <string name="press_to_start">- longo clique para iniciar -</string>
-  <string name="pref_trans_proxy_group">Proxying Transparente (Requer Root)</string>
-  <string name="pref_trans_proxy_title">Proxying Transparente</string>
-  <string name="pref_trans_proxy_summary">Automaticamente Torificar Apps</string>
-  <string name="pref_transparent_all_title">Tor Tudo</string>
-  <string name="pref_transparent_all_summary">Tráfego proxy para todos apps através do Tor</string>
-  <string name="pref_transparent_port_fallback_title">Porta do Proxy Reserva</string>
-  <string name="pref_transparent_port_fallback_summary">AVISO: evite as portas comuns (80,443, etc). *USE SOMENTE* se o modo \'Todos\' ou \'App\' não funcionou.</string>
-  <string name="pref_transparent_port_title">Lista de Portas</string>
-  <string name="pref_transparent_port_summary">Lista de portas para proxy. *USE SOMENTE* se o modo \'Todos\' ou \'App\' não funcionou</string>
-  <string name="pref_transparent_port_dialog">Insira as portas para proxy</string>
-  <string name="pref_has_root">Requer Acesso Root</string>
-  <string name="pref_has_root_summary">Requer acesso root para proxy transparente</string>
-  <string name="status_install_success">Binário do Tor instalados com sucesso!</string>
-  <string name="status_install_fail">Os arquivos binários do Tor estão inaptos à serem instalados. Por favor, cheque o log e notifique tor-assistants at torproject.org</string>
-  <string name="title_error">Erro de Aplicação</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Sobre Orbot</string>
-  <string name="btn_next">Próximo</string>
-  <string name="btn_back">Voltar</string>
-  <string name="btn_finish">Terminar</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Cancelar</string>
-  <string name="wizard_details">Alguns detalher do Orbot</string>
-  <string name="wizard_details_msg">Orbot é uma aplicação de código aberto que contém o Tor, LibEvent e Privoxy. Ela provê um proxy HTTP local (8118) e um proxy SOCKS (9050) dentro da rede Tor. Orbot também tem a habilidade, num dispositivo roteado, enviar todo o tráfego da Internet através do Tor</string>
-  <string name="wizard_permissions_root">Permissão Concedida</string>
-  <string name="wizard_permissions_stock">Permissões do Orbot</string>
-  <string name="wizard_premissions_msg_root">Excelent! Detectamos que você deu permissão root para Orbot. Nós usaremos este poder com sabedoria.</string>
-  <string name="wizard_permissions_msg_stock"> Enquanto não é requerido, o Orbot pode se tornar uma ferramenta mais poderosa se seu dispositivo tivesse acesso root. Use o botão abaixo para conceder superpoderes ao Orbot! </string>
-  <string name="wizard_permissions_no_root">Se você não tem acesso root ou não tem idéia sobre o que estamos falando, só tenha a certeza de usar apps feitas para trabalhar com o Orbot.</string>
-  <string name="wizard_permissions_consent">Eu entendo e gostaria de continuar sem o Superusuário</string>
-  <string name="wizard_permission_enable_root">Conceder acesso Root ao Orbot</string>
-  <string name="wizard_configure">Configurar Torificação</string>
-  <string name="wizard_configure_msg">Orbot dá a você a opção de rotear todo o tráfego de aplicação através do Tor OU para escolher suas aplicações individualmente.</string>
-  <string name="wizard_configure_all">Usar Proxy para Todas Apps Através do Tor</string>
-  <string name="wizard_configure_select_apps">Selecionar Apps Individuais para o Tor</string>
-  <string name="wizard_tips_tricks">Apps habilitadas para Orbot</string>
-  <string name="wizard_tips_msg">As apps abaixo foram desenvolvidas para trabalhar com Orbot. Clique em cada botão para instalar agora, ou você pode encontrá-las posteriormente no Android Market.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Cliente de mensagem instantânea seguro para Android</string>
-  <string name="wizard_tips_proxy">Configurações de Proxy - Aprenda como configurar apps para trabalhar com Orbot</string>
-  <string name="wizard_proxy_help_info">Configurações de Proxy</string>
-  <string name="wizard_proxy_help_msg">Se a app Android que você está usando puder suportar o uso de proxy HTTP ou SOCKS, então você pode configurar para conectar ao Orbot e usar o Tor.\n\n
-    As configurações de host são 127.0.0.1 ou \"localhost\". Para HTTP, a porta configurada é 8118. Para SOCKS, o proxy é 9050. Você deve usar SOCKS4A ou SOCKS5 se possível.
-    \n\n
-    Você pode aprender mais sobre proxy no Android através do FAQ em: http://tinyurl.com/proxyandroid
-    </string>
-  <string name="wizard_final">Orbot está pronto!</string>
-  <string name="wizard_final_msg">Centenas de milhares de pessoas ao redor do mundo usam o Tor por uma enorme variedade de razões.\n\nJornalistas e bloggers, defensores dos direitos humanos, oficiais da lei, soldados, corporações, cidadãos em regimes repressivos, e somente cidadãos comuns... e agora você está pronto para usar, também! </string>
-  <string name="connect_first_time">Você se conectou à rede Tor com sucesso - mas isto NÃO significa que seu dispositivo é seguro. Você pode usar a opção \'Checar\' no menu para testar seu navegador.\n\nVisite-nos em https://guardianproject.info/apps/orbot ou envie um e-mail para help at guardianproject.info para saber mais.</string>
-  <string name="tor_check">Isto irá abrir seu navegador web em https://check.torproject.org com o intuito de ver se o Orbot está provavelmente configurado e você está conectado ao Tor.</string>
-  <string name="pref_hs_group">Serviços Ocultos</string>
-  <string name="pref_general_group">Geral</string>
-  <string name="pref_start_boot_title">Iniciar Orbot no Boot</string>
-  <string name="pref_start_boot_summary">Automaticamente iniciar o Orbot e conectar o Tor quando seu Android bootar.</string>
-  <string name="wizard_title_msg">Orbot trouxe Tor para Android!!\n\nTor ajuda você a se defender contra filtro de conteúdo, análises de tráfego e vigilância de rede que ameaçam sua privacidade, informação confidencial e relacionamentos pessoais.\n\nEste assistente irá ajudá-lo a configurar o Orbot e Tor no seu dispositivo.</string>
-  <string name="wizard_warning_title">Aviso</string>
-  <string name="wizard_warning_msg">Simplesmente instalando o Orbot não irá automaticamente anonimizar seu tráfego móvel.\n\nVocê deve configurar apropriadamente o Orbot, seu dispositivo e outras apps para usar o Tor com sucesso.</string>
-  <string name="wizard_permissions_title">Permissões</string>
-  <string name="wizard_permissions_root_msg1">Você pode opcionalmente garantir ao Orbot acesso de \'Superusuário\' para habilitar recursos avançados, como um proxy transparente.</string>
-  <string name="wizard_permissions_root_msg2">Se você não quiser fazer isto, tenha certeza de usar apps feitas para trabalhar com o Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Seu dispositivo não parece ser roteado ou prover um acesso \'Superusuário\'.\n\nDe maneira a você se beneficiar do Tor, você precisará usar apps criadas para trabalhar com o Orbot, ou que suportem configurações de proxy HTTP ou SOCKS.
-
-</string>
-  <string name="wizard_tips_title">Apps Orbot Habilitadas</string>
-  <string name="wizard_tips_gibberbot">Gibberbot: App segura para chat com encriptação sem gravação </string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">Orweb: Navegador de reforço de privacidade que trabalha através do Tor</string>
-  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
-  <string name="wizard_transproxy_title">Proxy Transparente</string>
-  <string name="wizard_transproxy_msg">Isto permite à suas apps automaticamente rodarem através da rede Tor sem nenhuma configuração.</string>
-  <string name="wizard_transproxy_hint">(Selecione esta caixa se você não souber do que estamos falando)</string>
-  <string name="wizard_transproxy_none">Nenhum</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Habilitar Proxy Transparente para Tor Dispositivos de Toque Wifi e Usb (requer reinicialização)</string>
-  <string name="button_grant_superuser">Acesso Superusuário Requerido</string>
-  <string name="pref_select_apps">Selecionar Apps</string>
-  <string name="pref_select_apps_summary">Escolha as Apps para Rotearem Através do Tor</string>
-  <string name="pref_node_configuration">Configuração de Nó</string>
-  <string name="pref_node_configuration_summary">Aqui estão as configurações avançadas que podem reduzir seu anonimato.</string>
-  <string name="pref_entrance_node">Nós de Entrada</string>
-  <string name="pref_entrance_node_summary">Impressões digitais, apelidos, países e endereços para a primeira etapa</string>
-  <string name="pref_entrance_node_dialog">Insira os Nós de Entrada</string>
-  <string name="pref_use_whispercore">Usar WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Usar as NetFilter APIs proprietárias providas por WhisperSystems (requerido dispositivo com WhisperCore instalado)</string>
-  <string name="pref_proxy_type_title">Tipo de Proxy</string>
-  <string name="pref_proxy_type_summary">Protocolo para usar no servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Insira o Tipo de Proxy</string>
-  <string name="pref_proxy_host_title">Proxy Host</string>
-  <string name="pref_proxy_host_summary">Hostname do servidor Proxy</string>
-  <string name="pref_proxy_host_dialog">Insira o Host do Proxy</string>
-  <string name="pref_proxy_port_title">Porta do Proxy</string>
-  <string name="pref_proxy_port_summary">Porta do servidor Proxy</string>
-  <string name="pref_proxy_port_dialog">Insira a porta do Proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Configurando proxy com total transparência...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Configurando apps baseadas em transparência de proxy...</string>
-  <string name="transparent_proxying_enabled">Proxy Transparente HABILITADO</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy habilitado para Toque!</string>
-  <string name="warning_error_starting_transparent_proxying_">AVISO: erro ao iniciar o proxy transparente!</string>
-  <string name="transproxy_rules_cleared">Regras TransProxy limpas</string>
-  <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy está rodando na porta: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Configurando proxy transparente baseado em porta...</string>
-  <string name="bridge_error">Erro na Ponte</string>
-  <string name="bridge_requires_ip">Como condição para usar o recurso de ponte, você deve inserir pelo menos um endereço IP de ponte.</string>
-  <string name="send_email_for_bridges">Envie um email para bridges at torproject.org com a linha \"get bridges\" sozinha no corpo do e-mail, a partir de uma conta do gmail</string>
-  <string name="error">Erro</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Suas configurações de Endereços Acessíveis causou uma exceção!</string>
-  <string name="your_relay_settings_caused_an_exception_">Suas configurações de retransmissão causaram uma exceção!</string>
-  <string name="exit_nodes">Nós de Saída</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Impressões digitais, apelidos, países e endereços para a última etapa.</string>
-  <string name="enter_exit_nodes">Insira os Nós de Saída</string>
-  <string name="exclude_nodes">Nós Excluídos</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Impressões digitais, apelidos, países e endereços para excluir</string>
-  <string name="enter_exclude_nodes">Insira Nós Excluídos</string>
-  <string name="strict_nodes">Nós Estritos</string>
-  <string name="use_only_these_specified_nodes">Use *somente* estes nós específicos</string>
-  <string name="bridges">Pontes</string>
-  <string name="use_bridges">Usar pontes</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar nós de entrada alternativos dentro da rede Tor</string>
-  <string name="ip_address_and_port_of_bridges">Endereço IP e porta das pontes</string>
-  <string name="enter_bridge_addresses">Insira os Endereços das Pontes</string>
-  <string name="relays">Retransmissores</string>
-  <string name="relaying">Retransmitindo</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Habilitar seu dispositivo para não ser um retransmissor de saída</string>
-  <string name="relay_port">Porta Retransmissora</string>
-  <string name="listening_port_for_your_tor_relay">Ouvindo porta do seu retransmissor Tor</string>
-  <string name="enter_or_port">Insira porta OR</string>
-  <string name="relay_nickname">Apelido do Retransmissor</string>
-  <string name="the_nickname_for_your_tor_relay">O apelido para seu retransmissor Tor</string>
-  <string name="enter_a_custom_relay_nickname">Insira um apelido de retransmissor customizado</string>
-  <string name="reachable_addresses">Endereços Atingíveis</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Rodar como um cliente atrás de um firewall com políticas restritivas.</string>
-  <string name="reachable_ports">Portas Atingíveis</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Portas atingíveis atrás de um firewall restritivo</string>
-  <string name="enter_ports">Insira as portas</string>
-  <string name="enable_hidden_services">Habilitar Serviços Ocultos</string>
-  <string name="run_servers_accessible_via_the_tor_network">rodar servidores acessíveis via rede Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">insira as portas local para serviços ocultos</string>
-  <string name="hidden_service_ports">Portas de Serviço Oculto</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">o nome enderessável para seu serviço oculto (gerado automaticamente)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">habilitar debug log para saída (deve usar adb ou aLogCat para ver)</string>
-  <string name="project_home">Home(s) do Projeto: </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">A Licença Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software de Terceiros</string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
-  <string name="hidden_service_request">Uma app quer abrir a porta %S oculta do servidor para a rede Tor. Isto é seguro se você confia na app.</string>
-  <string name="found_existing_tor_process">procurando processos Tor existentes...</string>
-  <string name="something_bad_happened">Algo ruim aconteceu. Cheque o lo</string>
-  <string name="hidden_service_on">serviço oculto em:</string>
-  <string name="unable_to_read_hidden_service_name">habilitar ler o nome do serviço oculto</string>
-  <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
-  <string name="pref_use_sys_iptables_title">Usar tabelas de IP padrão:</string>
-  <string name="pref_use_sys_iptables_summary">usar as tabelas ip binárias embutidas ao invés das tabelas do pacote Orbot</string>
-  <string name="error_installing_binares">Os binários Tor não estão disponíveis para serem instalados ou atualizados.</string>
-  <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string>
-  <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string>
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 144db09..46ba1dc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,196 +1,263 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start and stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot is starting...</string>
-  <string name="status_activated">Connected to the Tor network</string>
-  <string name="status_disabled">\"Orbot is Deactivated</string>
-  <string name="status_shutting_down">Orbot is shutting down</string>
-  <string name="tor_process_starting">Starting Tor client...</string>
-  <string name="tor_process_complete">complete.</string>
-  <string name="tor_process_waiting">waiting.</string>
-  <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Home</string>
-  <string name="menu_browse">Browse</string>
-  <string name="menu_settings">Settings</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Help</string>
-  <string name="menu_apps">Apps</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stop</string>
-  <string name="menu_about">About</string>
-  <string name="menu_wizard">Wizard</string>
-  <string name="button_help">Help</string>
-  <string name="button_close">Close</string>
-  <string name="button_about">About</string>
-  <string name="button_clear_log">Clear Log</string>
-  <string name="menu_verify">Check</string>
-  <string name="menu_exit">Exit</string>
-  <string name="powered_by">powered by the Tor Project</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
-  <string name="pref_trans_proxy_title">Transparent Proxying</string>
-  <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
-  <string name="pref_transparent_all_title">Tor Everything</string>
-  <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">Tor binaries successfully installed!</string>
-  <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants at torproject.org</string>
-  <string name="title_error">Application Error</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">About Orbot</string>
-  <string name="btn_next">Next</string>
-  <string name="btn_back">Back</string>
-  <string name="btn_finish">Finish</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Cancel</string>
-  <string name="wizard_details">Some Orbot Details</string>
-  <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
-  <string name="wizard_permissions_root">Permission Granted</string>
-  <string name="wizard_permissions_stock">Orbot Permissions</string>
-  <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string>
-  <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string>
-  <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
-  <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string>
-  <string name="wizard_permission_enable_root">Grant Root for Orbot</string>
-  <string name="wizard_configure">Configure Torification</string>
-  <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string>
-  <string name="wizard_configure_all">Proxy All Apps Through Tor</string>
-  <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string>
-  <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
-  <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n
-    The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.
+    <string name="app_name">Orbot</string>
+     
+    <string name="internal_web_url">http://orbot/</string>
+    <string name="default_web_url">http://check.torproject.org</string>
+    <string name="secure_default_web_url">https://check.torproject.org</string>
+    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+    <string name="control_permission_label">start and stop Tor</string>
+    <string name="tor_proxy_service_process">torproxyservice</string>
+   
+<string name="status_starting_up">Orbot is starting...</string>
+<string name="status_activated">Connected to the Tor network</string>
+<string name="status_disabled">"Orbot is Deactivated</string>
+<string name="status_shutting_down">Orbot is shutting down</string>
+
+<string name="tor_process_starting">Starting Tor client...</string>
+<string name="tor_process_complete">complete.</string>
+<string name="tor_process_waiting">waiting.</string>
+
+<string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string>
+<string name="menu_home">Home</string>
+<string name="menu_browse">Browse</string>
+<string name="menu_settings">Settings</string>
+<string name="menu_log">Log</string>
+<string name="menu_info">Help</string>
+<string name="menu_apps">Apps</string>
+<string name="menu_start">Start</string>
+<string name="menu_stop">Stop</string>
+
+<string name="menu_about">About</string>
+<string name="menu_wizard">Wizard</string>
+
+
+
+<string name="button_help">Help</string>
+<string name="button_close">Close</string>
+<string name="button_about">About</string>
+
+<string name="button_clear_log">Clear Log</string>
+
+
+<string name="menu_verify">Check</string>
+<string name="menu_exit">Exit</string>
+<string name="powered_by">powered by the Tor Project</string>
+<string name="press_to_start">- long press to start -</string>
+
+<string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
+<string name="pref_trans_proxy_title">Transparent Proxying</string>
+<string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
+
+<string name="pref_transparent_all_title">Tor Everything</string>
+<string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
+
+<string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
+<string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
+
+<string name="pref_transparent_port_title">Port List</string>
+<string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
+<string name="pref_transparent_port_dialog">Enter ports to proxy</string>
+
+<string name="pref_has_root">Request Root Access</string>
+<string name="pref_has_root_summary">Request root access for transparent proxying</string>
+
+<string name="status_install_success">Tor binaries successfully installed!</string>
+<string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants at torproject.org</string>
+
+<string name="title_error">Application Error</string>
+
+<string name="wizard_title">Orbot</string>
+
+<string name="wizard_btn_tell_me_more">About Orbot</string>
+<string name="btn_next">Next</string>
+<string name="btn_back">Back</string>
+<string name="btn_finish">Finish</string>
+
+<string name="btn_okay">Okay</string>
+<string name="btn_cancel">Cancel</string>
+
+
+ <!-- Welcome Wizard strings (DJH) -->
+    <string name="wizard_details">Some Orbot Details</string>
+    <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Privoxy. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
+    <string name="wizard_permissions_root">Permission Granted</string>
+    <string name="wizard_permissions_stock">Orbot Permissions</string>
+    <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string>
+    <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string>
+   
+    <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
+    <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string>
+   
+    <string name="wizard_permission_enable_root">Grant Root for Orbot</string>
+    <string name="wizard_configure">Configure Torification</string>
+    <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> 
+    <string name="wizard_configure_all">Proxy All Apps Through Tor</string>
+    <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string>
+    
+    
+    <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
+    <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later in the Android Market.</string>
+    <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string>
+    <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
+    
+    <string name="wizard_proxy_help_info">Proxy Settings</string>
+    <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n
+    The host settings is 127.0.0.1 or "localhost". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.
     \n\n
     You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid
     </string>
-  <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
-  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
-  <string name="pref_hs_group">Hidden Services</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>
-  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
-  <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
-  <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
-  <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
-  <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
-  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
-  <string name="wizard_transproxy_none">None</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
-  <string name="button_grant_superuser">Request Superuser Access</string>
-  <string name="pref_select_apps">Select Apps</string>
-  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
-  <string name="pref_node_configuration">Node Configuration</string>
-  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
-  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
-  <string name="pref_use_whispercore">Use WhisperCore</string>
-  <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
-  <string name="pref_proxy_type_title">Proxy Type</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
-  <string name="pref_proxy_host_title">Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  <string name="pref_proxy_port_title">Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges at torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
-  <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
-  <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
-  <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>
-  <string name="relay_port">Relay Port</string>
-  <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string>
-  <string name="enter_or_port">Enter OR port</string>
-  <string name="relay_nickname">Relay nickname</string>
-  <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string>
-  <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string>
-  <string name="reachable_addresses">Reachable Addresses</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string>
-  <string name="reachable_ports">Reachable ports</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
-  <string name="enter_ports">Enter ports</string>
-  <string name="enable_hidden_services">Enable Hidden Services</string>
-  <string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string>
-  <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
-  <string name="hidden_service_ports">Hidden Service Ports</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string>
-  <string name="project_home">Project Home(s): </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">The Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
-  <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
-  <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
-  <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
-  <string name="found_existing_tor_process">found existing Tor process...</string>
-  <string name="something_bad_happened">Something bad happened. Check the log</string>
-  <string name="hidden_service_on">hidden service on:</string>
-  <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string>
-  <string name="unable_to_start_tor">Unable to start Tor:</string>
-  <string name="pref_use_sys_iptables_title">Use Default Iptables</string>
-  <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string>
-  <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
-  <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
-  <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
+    
+    <string name="wizard_final">Orbot is ready!</string>
+    <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string>
+    
+ <!-- END Welcome Wizard strings (DJH) -->
+
+	<string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help at guardianproject.info to learn more.</string>
+
+	<string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
+
+	
+    <string name="pref_hs_group">Hidden Services</string>
+    
+    <string name="pref_general_group">General</string>
+    <string name="pref_start_boot_title">Start Orbot on Boot</string>
+    <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
+ <!--  New Wizard Strings -->
+	<!-- Title Screen -->
+	<string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
+	<!-- Warning screen -->
+	<string name="wizard_warning_title">Warning</string>
+	<string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
+	<!-- Permissions screen -->
+	<string name="wizard_permissions_title">Permissions</string>
+	<string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
+	<string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
+	<string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>
+	<!-- TipsAndTricks screen -->
+	<string name="wizard_tips_title">Orbot-Enabled Apps</string>
+	<string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string>
+	<string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string>
+	<string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string>
+	<string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string>
+
+<!-- 
+	<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
+	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
+    <string name="firefox_apk_url">https://market.android.com/details?id=org.mozilla.firefox</string>
+    <string name="proxymob_url">https://addons.mozilla.org/mobile/downloads/latest/251558/type:attachment/addon-251558-latest.xpi?src=addon-detail</string>
+  -->
+    <!-- Transparent Proxy screen -->
+    <string name="wizard_transproxy_title">Transparent Proxying</string>
+    <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
+    <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
+    <string name="wizard_transproxy_none">None</string>
+
+ <string name="pref_transparent_tethering_title">Tor Tethering</string>
+	<string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string>
+   
+<string name="button_grant_superuser">Request Superuser Access</string>
+<string name="pref_select_apps">Select Apps</string>
+<string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
+
+<string name="pref_node_configuration">Node Configuration</string>
+<string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
+
+<string name="pref_entrance_node">Entrance Nodes</string>
+<string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
+<string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
+
+<string name="pref_use_whispercore">Use WhisperCore</string>
+<string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>
+
+
+<string name="pref_proxy_type_title">Proxy Type</string>
+<string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
+<string name="pref_proxy_type_dialog">Enter Proxy Type</string>
+
+<string name="pref_proxy_host_title">Proxy Host</string>
+<string name="pref_proxy_host_summary">Proxy server hostname</string>
+<string name="pref_proxy_host_dialog">Enter Proxy Host</string>
+
+<string name="pref_proxy_port_title">Proxy Port</string>
+<string name="pref_proxy_port_summary">Proxy server port</string>
+<string name="pref_proxy_port_dialog">Enter Proxy port</string>
+<string name="status">Status</string>
+<string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying...</string>
+<string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying...</string>
+<string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
+<string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
+<string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
+<string name="transproxy_rules_cleared">TransProxy rules cleared</string>
+<string name="couldn_t_start_tor_process_">"Couldn't start Tor process: "</string>
+<string name="privoxy_is_running_on_port_">Privoxy is running on port: </string>
+<string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying...</string>
+<string name="bridge_error">Bridge Error</string>
+<string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
+<string name="send_email_for_bridges">Send an email to bridges at torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
+<string name="error">Error</string>
+<string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
+<string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
+<string name="exit_nodes">Exit Nodes</string>
+<string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
+<string name="enter_exit_nodes">Enter Exit Nodes</string>
+<string name="exclude_nodes">Exclude Nodes</string>
+<string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
+<string name="enter_exclude_nodes">Enter Exclude Nodes</string>
+<string name="strict_nodes">Strict Nodes</string>
+<string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
+<string name="bridges">Bridges</string>
+<string name="use_bridges">Use Bridges</string>
+<string name="bridges_obfuscated">Obfuscated Bridges</string>
+<string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
+<string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
+<string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
+<string name="enter_bridge_addresses">Enter Bridge Addresses</string>
+<string name="relays">Relays</string>
+<string name="relaying">Relaying</string>
+<string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>
+<string name="relay_port">Relay Port</string>
+<string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string>
+<string name="enter_or_port">Enter OR port</string>
+<string name="relay_nickname">Relay nickname</string>
+<string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string>
+<string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string>
+<string name="reachable_addresses">Reachable Addresses</string>
+<string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string>
+<string name="reachable_ports">Reachable ports</string>
+<string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
+<string name="enter_ports">Enter ports</string>
+<string name="enable_hidden_services">Enable Hidden Services</string>
+<string name="run_servers_accessible_via_the_tor_network">run servers accessible via the Tor network</string>
+<string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
+<string name="hidden_service_ports">Hidden Service Ports</string>
+<string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
+<string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string>
+<string name="project_home">Project Home(s): </string>
+<string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+<string name="the_tor_license">The Tor License</string>
+<string name="https_torproject_org">https://torproject.org</string>
+<string name="third_party_software">3rd-Party-Software: </string>
+<string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string>
+<string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string>
+<string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string>
+<string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>
+<string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string>
+<string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
+<string name="found_existing_tor_process">found existing Tor process...</string>
+<string name="something_bad_happened">Something bad happened. Check the log</string>
+<string name="hidden_service_on">hidden service on:</string>
+<string name="unable_to_read_hidden_service_name">unable to read hidden service name</string>
+<string name="unable_to_start_tor">Unable to start Tor:</string>
+
+<string name="pref_use_sys_iptables_title">Use Default Iptables</string>
+<string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string>
+    
+<string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
+
+<string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
+<string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
+
+<string name="notification_using_bridges">Bridges enabled!</string>
+<string name="default_bridges"></string>
 </resources>

More information about the tor-commits mailing list