- tor-commits - lists.torproject.org

[orbot/master] update changelog for v15.10 RC-5
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 2ae22ec3e4af73cd94bd7451d693a5d4c7fbf2e8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Jan 26 03:43:30 2016 -0500 update changelog for v15.10 RC-5 --- CHANGELOG | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index c43383c..f5a45a1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,12 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ + +/** 15.1.0-RC-5 / 26-January-2016 / 33fa19f9894c44879d81bc3fb578eb4e9b134b8f **/ + +* da7eb96 small fixes to VPN service port setup to ensure proper setup +* ec6083f add 'Mosaddegh','Azadi','MaBishomarim' & 'JonbesheSabz' to default bridges +* 8a00ab1 remove extra chars from bridge line. fixes #18148 + /** 15.1.0-RC-4 / 25-January-2016 / 80491ea95bd62346bf3f3a579d3302dbd84f4ca9 **/ Improve Bridge selection to support built-in default bridges

1 0

[orbot/master] remove extra chars from bridge line. fixes #18148
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 8a00ab1f029fd31c61ea19fae038d48c84344145 Author: Nima Fatemi <nima(a)torproject.org> Date: Tue Jan 26 04:19:44 2016 +0000 remove extra chars from bridge line. fixes #18148 --- assets/bridges.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/bridges.txt b/assets/bridges.txt index 693c3be..399caf9 100644 --- a/assets/bridges.txt +++ b/assets/bridges.txt @@ -4,11 +4,11 @@ obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 obfs3 109.105.109.163:38980 1E05F577A0EC0213F971D81BF4D86A9E4E8229ED obfs3 109.105.109.163:47779 4C331FA9B3D1D6D8FB0D8FBBF0C259C360D97E6A scramblesuit 83.212.101.3:443 A09D536DD1752D542E1FBB3C9CE4449D51298239 password=XTCXLG2JAMJKZW2POLBAOWOQETQSMASH -obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0"); +obfs4 198.245.60.50:443 752CF7825B3B9EA6A98C83AC41F7099D67007EA5 cert=xpmQtKUqQ/6v5X7ijgYE/f03+l2/EuQ1dexjyUhh16wQlu/cpXUGalmhDIlhuiQPNEKmKw iat-mode=0 obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/itxeL4TWKLP6N1MaQzSOC6tcRIBv6q57DYAZc3b2AzuM+/TfB7mqTFEfXILCjEwzVA iat-mode=0 obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0 obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0 obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0 meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com -meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com \ No newline at end of file +meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com

1 0

[orbot/master] add 'Mosaddegh', 'Azadi', 'MaBishomarim' & 'JonbesheSabz' to default bridges
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit ec6083fcd7d02a007bfdfa3c2df56e05d0002de4 Author: Nima Fatemi <nima(a)torproject.org> Date: Tue Jan 26 04:31:37 2016 +0000 add 'Mosaddegh','Azadi','MaBishomarim' & 'JonbesheSabz' to default bridges --- assets/bridges.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/bridges.txt b/assets/bridges.txt index 399caf9..86ebae2 100644 --- a/assets/bridges.txt +++ b/assets/bridges.txt @@ -9,6 +9,10 @@ obfs4 109.105.109.165:10527 8DFCD8FB3285E855F5A55EDDA35696C743ABFC4E cert=Bvg/it obfs4 83.212.101.3:41213 A09D536DD1752D542E1FBB3C9CE4449D51298239 cert=lPRQ/MXdD1t5SRZ9MquYQNT9m5DV757jtdXdlePmRCudUU9CFUOX1Tm7/meFSyPOsud7Cw iat-mode=0 obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfDQrKjUJP8Qq6wrwSICEPf3Vl/nJRsYxWbg3QRoSqhl2EB78MPS2lQxbXY4EW1wwXA iat-mode=0 obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0 +obfs4 154.35.22.10:41835 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0 +obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0 +obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0 +obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0 meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com

1 0

[orbot/master] Merge branch 'bug-18148' of https://github.com/mrphs/orbot into mrphs-fixes
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 25150a329c05d70cba0c3acd33fbd00096ef40ac Merge: da7eb96 8a00ab1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 23:52:59 2016 -0500 Merge branch 'bug-18148' of https://github.com/mrphs/orbot into mrphs-fixes assets/bridges.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[orbot/master] small fixes to VPN service port setup to ensure proper setup
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit da7eb961f1ea62787006919ca0fb4de158ad6563 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 23:44:44 2016 -0500 small fixes to VPN service port setup to ensure proper setup --- src/org/torproject/android/service/TorService.java | 26 +++++--------------- .../android/service/TorServiceConstants.java | 9 ++++++- .../torproject/android/vpn/OrbotVpnService.java | 10 +++++--- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 47add0e..09c04ed 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -568,11 +568,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } }).start(); - - - if (OrbotVpnService.mSocksProxyPort == -1) - OrbotVpnService.mSocksProxyPort = (int)((Math.random()*1000)+10000); - + } catch (Exception e) { @@ -752,7 +748,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (Prefs.bridgesEnabled()) if (Prefs.useVpn() && !mIsLollipop) - customEnv.add("TOR_PT_PROXY=socks5://127.0.0.1:" + OrbotVpnService.mSocksProxyPort); + customEnv.add("TOR_PT_PROXY=socks5://127.0.0.1:" + OrbotVpnService.sSocksProxyServerPort); String baseDirectory = OrbotApp.fileTor.getParent(); Shell shellUser = Shell.startShell(customEnv, baseDirectory); @@ -1208,9 +1204,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon intent.putExtra("torSocks", mPortSOCKS); - if (!mIsLollipop) - intent.putExtra("proxyPort",OrbotVpnService.mSocksProxyPort); - startService(intent); } @@ -1899,7 +1892,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { String proxyType = "socks5"; String proxyHost = "127.0.0.1"; - extraLines.append(proxyType + "Proxy" + ' ' + proxyHost + ':' + OrbotVpnService.mSocksProxyPort).append('\n'); + extraLines.append(proxyType + "Proxy" + ' ' + proxyHost + ':' + OrbotVpnService.sSocksProxyServerPort).append('\n'); }; } @@ -1987,14 +1980,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon String bridgeConfig = "meek exec " + OrbotApp.fileMeekclient.getCanonicalPath(); extraLines.append("ClientTransportPlugin" + ' ' + bridgeConfig).append('\n'); - - String[] meekBridge = - { - "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com", - "meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com", - "meek 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com" - }; - + int meekIdx = 2; //let's use Azure by default if (bridgeList != null && bridgeList.length() == 1) @@ -2003,7 +1989,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon { meekIdx = Integer.parseInt(bridgeList); - if (meekIdx+1 > meekBridge.length) + if (meekIdx+1 > BRIDGES_MEEK.length) throw new Exception("not valid meek idx"); } catch (Exception e) @@ -2012,7 +1998,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } } - extraLines.append("Bridge " + meekBridge[meekIdx]).append('\n'); + extraLines.append("Bridge " + BRIDGES_MEEK[meekIdx]).append('\n'); } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index c21b227..54213d9 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -152,5 +152,12 @@ public interface TorServiceConstants { //EXIT COUNTRY CODES public final static String[] COUNTRY_CODES = {"DE","AT","SE","CH","IS","CA","US","ES","FR","BG","PL","AU","BR","CZ","DK","FI","GB","HU","NL","JP","RO","RU","SG","SK"}; - + //MEEK BRIDGEs + public final static String[] BRIDGES_MEEK = + { + "meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com", + "meek 0.0.2.0:2 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com", + "meek 0.0.2.0:3 url=https://az668014.vo.msecnd.net/ front=ajax.aspnetcdn.com" + }; + } diff --git a/src/org/torproject/android/vpn/OrbotVpnService.java b/src/org/torproject/android/vpn/OrbotVpnService.java index 0520f57..92d868c 100644 --- a/src/org/torproject/android/vpn/OrbotVpnService.java +++ b/src/org/torproject/android/vpn/OrbotVpnService.java @@ -67,7 +67,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { private int mTorSocks = TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT; - public static int mSocksProxyPort = -1; + public static int sSocksProxyServerPort = -1; private ProxyServer mSocksProxyServer; @@ -100,7 +100,6 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { Log.d(TAG,"starting OrbotVPNService service!"); mTorSocks = intent.getIntExtra("torSocks", TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT); - mSocksProxyPort = intent.getIntExtra("proxyPort", 0); // The handler is only used to show messages. if (mHandler == null) { @@ -109,6 +108,11 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { if (!mIsLollipop) { + + //generate the proxy port that the + if (sSocksProxyServerPort == -1) + sSocksProxyServerPort = (int)((Math.random()*1000)+10000); + startSocksBypass(); } @@ -156,7 +160,7 @@ public class OrbotVpnService extends VpnService implements Handler.Callback { { mSocksProxyServer = new ProxyServer(new ServerAuthenticatorNone(null, null)); ProxyServer.setVpnService(OrbotVpnService.this); - mSocksProxyServer.start(mSocksProxyPort, 5, InetAddress.getLocalHost()); + mSocksProxyServer.start(sSocksProxyServerPort, 5, InetAddress.getLocalHost()); } catch (Exception e)

1 0

[orbot/master] Merge branch 'new-bridges' of https://github.com/mrphs/orbot into mrphs-fixes
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 9b9bab3a7562f185221039df22074924b2ece29c Merge: 25150a3 ec6083f Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 23:53:14 2016 -0500 Merge branch 'new-bridges' of https://github.com/mrphs/orbot into mrphs-fixes assets/bridges.txt | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[tor-browser-bundle/hardened-builds] Version bump and changelog update
by gk＠torproject.org 26 Jan '16

26 Jan '16

commit f2d76bc061d14c15b81b40e744b9bf1826df95d6 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 26 05:23:29 2016 +0000 Version bump and changelog update --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions.alpha | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 47897d0..4210100 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -8,7 +8,7 @@ Tor Browser 6.0a1-hardened -- January 27 2016 * Bug 18004: Remove Tor fundraising donation banner * Code cleanup * Translation updates - * Update Tor Launcher to 0.2.8.2 + * Update Tor Launcher to 0.2.8.3 * Bug 18113: Randomly permutate available default bridges of chosen type * Bug 11773: Setup wizard UI flow improvements * Translation updates diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6b35ce3..f1ef483 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -17,7 +17,7 @@ TORBROWSER_UPDATE_CHANNEL=hardened TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1 TOR_TAG=tor-0.2.7.6 -TORLAUNCHER_TAG=0.2.8.2 +TORLAUNCHER_TAG=0.2.8.3 TORBUTTON_TAG=1.9.5 HTTPSE_TAG=5.1.2 NSIS_TAG=v0.3

1 0

[tor-launcher/master] Version bump
by gk＠torproject.org 26 Jan '16

26 Jan '16

commit 85091369814453ce5976581c4fac47094b74d350 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 26 05:21:26 2016 +0000 Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 4a9944b..5c81e17 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.8.1</em:version> + <em:version>0.2.8.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit ab76d3c12b8c85907f3ccf8d15f4d463ed18fda9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 04:45:49 2016 +0000 Update translations for tor-launcher-network-settings_completed --- pt_BR/network-settings.dtd | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd index cefaf9a..4049a4f 100644 --- a/pt_BR/network-settings.dtd +++ b/pt_BR/network-settings.dtd @@ -13,26 +13,32 @@ <!ENTITY torSettings.firstQuestion "Quais opções descrevem melhor a sua situação?"> <!ENTITY torSettings.configurePrompt1 "A conexão à Internet deste computador foi censurada, filtrada ou limitada por um proxy."> -<!ENTITY torSettings.configurePrompt2 "Eu preciso configurar as configurações de ponte ou de proxy local."> +<!ENTITY torSettings.configurePrompt2 "Eu preciso configurar as definições de conexão de ponte ou proxy local antes de conectar à rede Tor."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "Eu gostaria de me conectar diretamente à rede Tor."> +<!ENTITY torSettings.connectPrompt2 "Eu gostaria de fazer uma conexão direta com a rede Tor."> <!ENTITY torSettings.connectPrompt3 "Isso funcionará na maioria dos casos."> <!ENTITY torSettings.connect "Conectar"> <!ENTITY torSettings.proxyPageTitle "Configuração de Proxy Local"> <!ENTITY torSettings.proxyQuestion "Este computador necessita de um proxy local para acessar a Internet?">  -<!ENTITY torSettings.proxyHelp "Se você não tiver certeza de como responder a esta pergunta, dê uma olhada nas configurações de Internet de um outro navegador para ver se ele está configurado para usar um proxy local."> +<!ENTITY torSettings.proxyExplanation1 "Na maioria dos casos, um proxy local não é necessário, mas é requerido quando estiver conectando através de uma rede de empresa, escola ou universidade."> +<!ENTITY torSettings.proxyExplanation2 "Se você não tem certeza de como responder essa questão, procure nas configurações de Internet de outro navegador ou verifique as configurações de rede do seu sistema para ver se um proxy local é necessário."> <!ENTITY torSettings.enterProxy "Insira as configurações de proxy."> <!ENTITY torSettings.bridgePageTitle "Configuração de Pontes Tor"> <!ENTITY torSettings.bridgeQuestion "Seu provedor de serviços de internet (ISP) bloqueia ou censura conexões à rede Tor?"> -<!ENTITY torSettings.bridgeHelp "Se você não tiver certeza sobre como responder a essa questão, escolha Não . Se você escolher Sim, será preciso configurar pontes Tor, que são relés não-listados que dificultam possíveis bloqueios à rede Tor."> +<!ENTITY torSettings.bridgeExplanation1 "Se você não tem certeza de como responder essa questão, escolha Não (se você não conseguir conectar à rede Tor sem uma conexão de ponte, você pode adicionar uma mais tarde)."> +<!ENTITY torSettings.bridgeExplanation2 "Se você escolher Sim, será solicitado que você configure Conexões de Ponte Tor, que são transmissores não-listados que dificultam mais o bloqueio de conexões à Rede Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Você pode usar o conjunto de pontes fornecidas ou obter e adicionar um conjunto de pontes personalizadas. ">  <!ENTITY torsettings.startingTor "Esperando que Tor inicie..."> <!ENTITY torsettings.restartTor "Reiniciar o Tor"> +<!ENTITY torsettings.reconfigTor "Reconfigurar"> + +<!ENTITY torsettings.discardSettings.prompt "Você configurou as definições de conexões de ponte Tor ou inseriu um proxy local.  Para fazer uma conexão direta à rede Tor, essas definições devem ser removidas."> +<!ENTITY torsettings.discardSettings.proceed "Remover Definições e Conectar"> <!ENTITY torsettings.optional "Opcional"> @@ -50,6 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:"> <!ENTITY torsettings.useBridges.checkbox "Meu Provedor de Serviços Internet (ISP) bloqueia as conexões à rede Tor"> <!ENTITY torsettings.useBridges.default "Conectar com as pontes fornecidas"> +<!ENTITY torsettings.useBridges.note "Cada tipo de conexão de ponte usa um método diferente para evitar censura.  Se uma não funcionar, tente novamente usando uma diferente."> <!ENTITY torsettings.useBridges.type "Tipo de transporte:"> <!ENTITY torsettings.useBridges.custom "Adicionar pontes personalizadas"> <!ENTITY torsettings.useBridges.label "Insira um ou mais relés de pontes (um por linha).">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit 55915d9362ec473a5bb0078a186f7b615c17ab40 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 26 04:45:44 2016 +0000 Update translations for tor-launcher-network-settings --- pt_BR/network-settings.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd index 08cc34c..4049a4f 100644 --- a/pt_BR/network-settings.dtd +++ b/pt_BR/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Quais opções descrevem melhor a sua situação?"> <!ENTITY torSettings.configurePrompt1 "A conexão à Internet deste computador foi censurada, filtrada ou limitada por um proxy."> -<!ENTITY torSettings.configurePrompt2 "Eu preciso configurar as definições de ponte ou proxy local antes de conectar à rede Tor."> +<!ENTITY torSettings.configurePrompt2 "Eu preciso configurar as definições de conexão de ponte ou proxy local antes de conectar à rede Tor."> <!ENTITY torSettings.configure "Configurar"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Eu gostaria de fazer uma conexão direta com a rede Tor."> <!ENTITY torSettings.connectPrompt3 "Isso funcionará na maioria dos casos."> <!ENTITY torSettings.connect "Conectar"> <!ENTITY torSettings.proxyPageTitle "Configuração de Proxy Local"> <!ENTITY torSettings.proxyQuestion "Este computador necessita de um proxy local para acessar a Internet?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "Na maioria dos casos, um proxy local não é necessário, mas é requerido quando estiver conectando através de uma rede de empresa, escola ou universidade."> +<!ENTITY torSettings.proxyExplanation2 "Se você não tem certeza de como responder essa questão, procure nas configurações de Internet de outro navegador ou verifique as configurações de rede do seu sistema para ver se um proxy local é necessário."> <!ENTITY torSettings.enterProxy "Insira as configurações de proxy."> <!ENTITY torSettings.bridgePageTitle "Configuração de Pontes Tor"> <!ENTITY torSettings.bridgeQuestion "Seu provedor de serviços de internet (ISP) bloqueia ou censura conexões à rede Tor?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Se você não tem certeza de como responder essa questão, escolha Não (se você não conseguir conectar à rede Tor sem uma conexão de ponte, você pode adicionar uma mais tarde)."> +<!ENTITY torSettings.bridgeExplanation2 "Se você escolher Sim, será solicitado que você configure Conexões de Ponte Tor, que são transmissores não-listados que dificultam mais o bloqueio de conexões à Rede Tor."> <!ENTITY torSettings.bridgeSettingsPrompt "Você pode usar o conjunto de pontes fornecidas ou obter e adicionar um conjunto de pontes personalizadas. ">  <!ENTITY torsettings.startingTor "Esperando que Tor inicie..."> <!ENTITY torsettings.restartTor "Reiniciar o Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Reconfigurar"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Você configurou as definições de conexões de ponte Tor ou inseriu um proxy local.  Para fazer uma conexão direta à rede Tor, essas definições devem ser removidas."> +<!ENTITY torsettings.discardSettings.proceed "Remover Definições e Conectar"> <!ENTITY torsettings.optional "Opcional"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:"> <!ENTITY torsettings.useBridges.checkbox "Meu Provedor de Serviços Internet (ISP) bloqueia as conexões à rede Tor"> <!ENTITY torsettings.useBridges.default "Conectar com as pontes fornecidas"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Cada tipo de conexão de ponte usa um método diferente para evitar censura.  Se uma não funcionar, tente novamente usando uma diferente."> <!ENTITY torsettings.useBridges.type "Tipo de transporte:"> <!ENTITY torsettings.useBridges.custom "Adicionar pontes personalizadas"> <!ENTITY torsettings.useBridges.label "Insira um ou mais relés de pontes (um por linha).">

1 0