June 2014 - tor-commits - lists.torproject.org

[orbot/master] sometimes text can be null
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit f6750e135a480a08d61f06a50deef01ce888f708 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 4 23:24:21 2014 -0400 sometimes text can be null --- src/org/torproject/android/Orbot.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 32726d3..bc95961 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -196,7 +196,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic private void appendLogTextAndScroll(String text) { - if(mTxtOrbotLog != null){ + if(mTxtOrbotLog != null && text != null && text.length() > 0){ if (mTxtOrbotLog.getText().length() > MAX_LOG_LENGTH) mTxtOrbotLog.setText("");

1 0

[orbot/master] Merge branch 'amoghbl1-issue_3014_wizard_workflow'
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit f52c22aa0d695bdf5c545d99cfc89164723ab0bc Merge: f6750e1 63b4304 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 4 23:24:43 2014 -0400 Merge branch 'amoghbl1-issue_3014_wizard_workflow' res/values/strings.xml | 1 + .../android/wizard/ChooseLocaleWizardActivity.java | 19 ++++++++--- .../android/wizard/ConfigureTransProxy.java | 25 ++++++++++---- src/org/torproject/android/wizard/LotsaText.java | 21 +++++++----- src/org/torproject/android/wizard/Permissions.java | 22 ++++++++---- .../torproject/android/wizard/TipsAndTricks.java | 36 ++++++++++++-------- 6 files changed, 84 insertions(+), 40 deletions(-)

1 0

[orbot/master] fix bridge append value from qrcode scan
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit d3924396e3c89707309013fa4e33a50b777a4f1b Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 4 23:52:37 2014 -0400 fix bridge append value from qrcode scan --- src/org/torproject/android/Orbot.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index bc95961..17b80b3 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -621,9 +621,23 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic showAlert("Bridges Updated","Restart Orbot to use this bridge: " + newBridgeValue,false); SharedPreferences mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + + String bridges = mPrefs.getString(TorConstants.PREF_BRIDGES_LIST, null); + Editor pEdit = mPrefs.edit(); - pEdit.putString(TorConstants.PREF_BRIDGES_LIST,newBridgeValue); //set the string to a preference + if (bridges != null && bridges.trim().length() > 0) + { + if (bridges.indexOf('\n')!=-1) + bridges += '\n' + newBridgeValue; + else + bridges += ',' + newBridgeValue; + } + else + bridges = newBridgeValue; + + pEdit.putString(TorConstants.PREF_BRIDGES_LIST,bridges); //set the string to a preference + pEdit.putBoolean(TorConstants.PREF_BRIDGES_ENABLED,true); pEdit.commit(); }

1 0

[orbot/master] remove synchronized - not needed, and causing blocking
by n8fr8＠torproject.org 05 Jun '14

05 Jun '14

commit d6f5720f270778a9026f20b72da37bcc0362e3b1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 4 23:52:28 2014 -0400 remove synchronized - not needed, and causing blocking --- src/org/torproject/android/service/TorService.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index ff219f2..81453f1 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1002,17 +1002,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - public synchronized void setTorProfile(int profile) { + public void setTorProfile(int profile) { - if (profile == PROFILE_ON && currentStatus == STATUS_OFF) + if (currentStatus == STATUS_OFF) { - currentStatus = STATUS_CONNECTING; sendCallbackStatusMessage (getString(R.string.status_starting_up)); try { initTor(); + + currentStatus = STATUS_CONNECTING; } catch (Exception e) { @@ -1024,11 +1025,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst } else { - currentStatus = STATUS_OFF; sendCallbackStatusMessage (getString(R.string.status_shutting_down)); stopTor(); - + + currentStatus = STATUS_OFF; } }

1 0

[tor-browser/tor-browser-24.6.0esr-3.x-1] Bug 10895: Fix language pack usage (fix Firefox version).
by mikeperry＠torproject.org 05 Jun '14

05 Jun '14

commit 6b554ada57da71483628679974eb031f07d01975 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 5 07:39:04 2014 -0700 Bug 10895: Fix language pack usage (fix Firefox version). --- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 60f1860..b5e8f5c 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -24.6.0esrpre +24.6.0 diff --git a/config/milestone.txt b/config/milestone.txt index c9dc647..71e3ef9 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0esrpre +24.6.0 diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index c9dc647..71e3ef9 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0esrpre +24.6.0

1 0

[tor-browser/tor-browser-24.6.0esr-4.x-1] Bug 10895: Fix language pack usage (fix Firefox version).
by mikeperry＠torproject.org 05 Jun '14

05 Jun '14

commit ea96fd4557a6ff5fd9873833284537d1b57f2aa1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 5 07:39:04 2014 -0700 Bug 10895: Fix language pack usage (fix Firefox version). --- browser/config/version.txt | 2 +- config/milestone.txt | 2 +- js/src/config/milestone.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/config/version.txt b/browser/config/version.txt index 60f1860..b5e8f5c 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -24.6.0esrpre +24.6.0 diff --git a/config/milestone.txt b/config/milestone.txt index c9dc647..71e3ef9 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0esrpre +24.6.0 diff --git a/js/src/config/milestone.txt b/js/src/config/milestone.txt index c9dc647..71e3ef9 100644 --- a/js/src/config/milestone.txt +++ b/js/src/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -24.6.0esrpre +24.6.0

1 0

r26806: {website} add another mirror (website/trunk/include)
by Andrew Lewman 05 Jun '14

05 Jun '14

Author: phobos Date: 2014-06-05 14:17:31 +0000 (Thu, 05 Jun 2014) New Revision: 26806 Modified: website/trunk/include/tor-mirrors.csv Log: add another mirror Modified: website/trunk/include/tor-mirrors.csv =================================================================== --- website/trunk/include/tor-mirrors.csv 2014-06-05 07:50:32 UTC (rev 26805) +++ website/trunk/include/tor-mirrors.csv 2014-06-05 14:17:31 UTC (rev 26806) @@ -93,3 +93,4 @@ nick at calyx dot com, The Calyx Institute, US, United States, North America, TRUE, FALSE, No, http://tor.calyxinstitute.org, https://tor.calyxinstitute.org, , , http://tor.calyxinstitute.org/dist/, https://tor.calyxinstitute.org/dist/, , http://tmdrhl4e4anhsjc5.onion, Fri May 30 11:31:25 2014 tor-mirror AT rdns DOT cc, d0wn.biz, FR, France, Europe, TRUE, FALSE, No, http://tor.static.lu, https://tor.static.lu, , , http://tor.static.lu/dist/, https://tor.static.lu/dist/, , , Fri May 30 11:31:25 2014 calebcenter(a)live.com, alebcay.tk, US, United States, US, TRUE, FALSE, NO, http://tor.alebcay.tk, , rsync://alebcay.tk/tor, ftp://ftp.alebcay.tk, http://tor.alebcay.tk/dist, , , , +kevinmg(a)pressfreedomfoundation.org, Freedom of the Press Foundation, , US, US, True, False, No, http://tor.pressfreedomfoundation.org, https://tor.pressfreedomfoundation.org, , , http://tor.pressfreedomfoundation.org/dist/, https://tor.pressfreedomfoundation.org/dist/, , ,

1 0

[tor-launcher/master] Bump version to 0.2.6.0.
by mikeperry＠torproject.org 05 Jun '14

05 Jun '14

commit ebba4a05611f289c5f47727477c64a32009f0614 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 5 05:24:44 2014 -0700 Bump version to 0.2.6.0. --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 495b8ca..f5d64fa 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.5.4</em:version> + <em:version>0.2.6.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>https://127.0.0.1/</em:updateURL> <!--

1 0

[tor-launcher/master] Update translations.
by mikeperry＠torproject.org 05 Jun '14

05 Jun '14

commit 8f077a2e969b57c7eadbf44e08ad733cd15c1a42 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 5 05:24:36 2014 -0700 Update translations. --- src/chrome/locale/ca/network-settings.dtd | 16 ++++++------ src/chrome/locale/cs/network-settings.dtd | 34 ++++++++++++------------- src/chrome/locale/fi/network-settings.dtd | 18 +++++++------- src/chrome/locale/pa/network-settings.dtd | 36 +++++++++++++-------------- src/chrome/locale/pa/progress.dtd | 8 +++--- src/chrome/locale/pa/torlauncher.properties | 4 +-- src/chrome/locale/si/network-settings.dtd | 8 +++--- 7 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index 5cc6665..f98aba3 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -8,7 +8,7 @@ <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "Quina de les següuens descriula teva situació?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> +<!ENTITY torSettings.configurePrompt1 "La connexió a internet d'aquest ordinador està censurada, filtrada o usa Proxys"> <!ENTITY torSettings.configurePrompt2 "Necessito configurar un pont, el tallafocs o els paràmetres del proxy."> <!ENTITY torSettings.configure "Configura"> <!ENTITY torSettings.connectPrompt2 "M'agradaria conectar-me directament a la xarxa Tor."> @@ -24,7 +24,7 @@ <!ENTITY torSettings.enterFirewall "Escriviu una llista separada per comes dels ports que estan permesos pel proxy."> <!ENTITY torSettings.bridgeQuestion "El vostre proveïdor d'Internet (ISP) bloqueja o censura les connexions a la Xarxa Tor?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  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.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeSettingsPrompt "Hauries d'utilitzar el set de repetidors provist o customitzar el teu propi.">  @@ -47,9 +47,9 @@ <!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a través d'un proxy que només permet connexions a certs ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports permesos:"> <!ENTITY torsettings.useBridges.checkbox "El meu proveidor d'internet (ISP) bloqueja les conexions a la xarxa Tor"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.default "Connectar amb els repetidors porvistos."> <!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.custom "Entra als repetidors customitzats."> <!ENTITY torsettings.useBridges.label "Entra en un o més repetidors (un per linia)."> <!ENTITY torsettings.useBridges.placeholder "introdueix adreça:port"> @@ -57,9 +57,9 @@ <!ENTITY torsettings.bridgeHelpTitle "Ajuda Repetidors"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> +<!ENTITY torsettings.bridgeHelp2Heading "A través del web"> <!ENTITY torsettings.bridgeHelp2 "Utilitza un navegador web o vés a: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3Heading "A través del mail d'autorresposta."> <!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp4Heading "A través del Escriptori d'Ajuda"> +<!ENTITY torsettings.bridgeHelp4 "Com a última opció, pots demanar adreces de repetidors enviant un missatge a help(a)rt.torproject.org.  siusplau recorda que serà una persona qui et respondrà, siguis pacient i amable."> diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index d974db3..84ca9ee 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -2,17 +2,17 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Než se připojíte s síti TORu je potřeba poskytnout údaje o internetovém připojení tohoto počítače."> <!ENTITY torSettings.yes "Ano"> <!ENTITY torSettings.no "Ne"> <!ENTITY torSettings.firstQuestion "Která možnost nejlépe popisuje Vaši situaci?"> <!ENTITY torSettings.configurePrompt1 "Toto připojení počítače k internetu je cenzurováno, filtrováno, nebo zprostředkováno."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Potřebuji nastavit síťový most, firewall, nebo nastavní proxy."> <!ENTITY torSettings.configure "Konfigurovat"> <!ENTITY torSettings.connectPrompt2 "Chtěl bych se přímo připojit k Tor síti."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Toto bude fungovat ve většině případů."> <!ENTITY torSettings.connect "Připojit"> <!ENTITY torSettings.proxyQuestion "Potřebuje Váš počítač připojení k internetu přes proxy?"> @@ -22,9 +22,9 @@ <!ENTITY torSettings.firewallQuestion "Je počítač připojen k internetu přes firewall, který povoluje připojení pouze přes některé porty?"> <!ENTITY torSettings.firewallHelp "Jestli si nejste jisti, jak odpovědět na otázku, odpovězte NE. Jestliže narazíte na problémy s připojením k Tor síti, změňte toto nastavení."> <!ENTITY torSettings.enterFirewall "Zadejte čárkami oddělený seznam portů, které jsou povoleny firewallem."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  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.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeQuestion "Blokuje nebo jinak cenzuruje váš poskytovatel internetového připojení (ISP) spojení se sítí TORu?"> +<!ENTITY torSettings.bridgeHelp "Pokud si nejste jistí jak odpovědět na tuto otázku, zvolte No.  Pokud vyberete Ano, budete vyzváni k nastavení Mostů TORu, což jsou přenašeče neuvedené v seznamu, které dělají blokování spojení se sítí TORu složitější."> +<!ENTITY torSettings.bridgeSettingsPrompt "Můžete použít poskytnutou sadu síťových mostů nebo můžete získat a zadat vlastní sadu.">  @@ -46,19 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "Tento počítač používá firewall, který povoluje připojení pouze přes některé porty."> <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> <!ENTITY torsettings.useBridges.checkbox "Můj internetový poskytovatel (ISP) blokuje připojení k Tor síti"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.default "Připojit pomocí poskytnuté sady mostů"> +<!ENTITY torsettings.useBridges.type "Typ přenosu:"> +<!ENTITY torsettings.useBridges.custom "Zadejete vlastní mosty"> <!ENTITY torsettings.useBridges.label "Zadejte jedno nebo více mostních relé (jedno na řádek)."> <!ENTITY torsettings.useBridges.placeholder "zadej adresu:port"> <!ENTITY torsettings.copyLog "Zkopíruj logový soubor Toru do schránky"> <!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních relé"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Pokud nejste schopni se připojit k síti TORu, může to být způsobeno tím, že váš posktytovatel internetu (ISP) nebo nějaká jiná služba blokuje Tor.  Většinou můžete obejít tento problém použitím Mostů TORu, což jsou přenašeče neuvedené v seznamu, které je složitější zablokovat."> +<!ENTITY torsettings.bridgeHelp1B "Můžete použít přednastavenou, poskytnutou sadu síťových mostů, nebo můžete získat vlastní sadu adres použitím jedné z těchto tří metod:"> +<!ENTITY torsettings.bridgeHelp2Heading "Přes síť"> +<!ENTITY torsettings.bridgeHelp2 "Použijte internetový prohlížeč k návštěvě https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Přes automatický e-mailový odpovídač"> +<!ENTITY torsettings.bridgeHelp3 "Pošlete e-mail na bridges(a)torproject.org s větou 'get bridges' jako takovou v těle zprávy.  Nicméně abychom ztížili útočníkovi zjištění spousty adres, musíte tento požadavek poslat z e-mailové adresy gmail.com nebo yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "Přes zákaznickou linku"> +<!ENTITY torsettings.bridgeHelp4 "Jako poslední řešení si můžete vyžádat adresy síťových mostů tak, že zašlete slušný e-mail na help(a)rt.torproject.org.  Vezměte v úvahu si prosím, že na každý požadavek musí odpovědět člověk."> diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index 19cc04f..934ddf0 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -12,7 +12,7 @@ <!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Tämä toimii monissa tilanteissa."> <!ENTITY torSettings.connect "Yhdistä"> <!ENTITY torSettings.proxyQuestion "Tarvitseeko tämä tietokone proxya päästäkseen internettiin?"> @@ -22,19 +22,19 @@ <!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> <!ENTITY torSettings.firewallHelp "Ellet ole varma kuinka vastata tähän kysymykseen, valitse Ei. Muuta tätä asetusta jos yhteyden saamisessa Tor-verkkoon on ongelmia."> <!ENTITY torSettings.enterFirewall "Luettele pilkuin erotettuina ne portit, jotka palomuuri sallii. "> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeQuestion "Sensuroiko tai estääkö sinun operaattorisi (ISP) yhteydet Tor-verkkoon?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  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.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Käynnistä Vidalia uudelleen"> +<!ENTITY torsettings.startingTor "Odotetaan Torin käynnistymistä..."> +<!ENTITY torsettings.restart "Käynnistä uudelleen"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Vaihtoehtoinen"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.checkbox "Tämä tietokone tarvitsee käyttää proxya päästäkseen internettiin."> +<!ENTITY torsettings.useProxy.type "Proxy tyyppi:"> <!ENTITY torsettings.useProxy.address "Osoite:"> <!ENTITY torsettings.useProxy.address.placeholder "IP osoite tai isännän nimi"> <!ENTITY torsettings.useProxy.port "Portti:"> @@ -45,7 +45,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tämän tietokoneen palomuuri sallii yhteydet vain tiettyjen porttien kautta."> <!ENTITY torsettings.firewall.allowedPorts "Sallitut portit:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> +<!ENTITY torsettings.useBridges.checkbox "Minun internet-yhteyden tarjoaja (ISP) estää yhteydet Tor verkkoon."> <!ENTITY torsettings.useBridges.default "Connect with provided bridges"> <!ENTITY torsettings.useBridges.type "Siirtotyyppi:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> @@ -59,6 +59,6 @@ <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp3 "Lähetä sähköpostia: bridges(a)torproject.org tekstin kanssa 'get bridges' 160"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd index 0ac00e2..483c12a 100644 --- a/src/chrome/locale/pa/network-settings.dtd +++ b/src/chrome/locale/pa/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "ਟੋਰ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗ">  @@ -9,11 +9,11 @@ <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.configurePrompt2 "ਮੈਨੂੰ ਬਰਿਜ਼, ਫਾਇਰਵਾਲ ਜਾਂ ਪਰਾਕਸੀ ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"> +<!ENTITY torSettings.configure "ਸੰਰਚਨਾ"> +<!ENTITY torSettings.connectPrompt2 "ਮੈਂ ਟੋਰ ਨੈੱਟਵਰਕ ਨਾਲ ਸਿੱਧਾ ਕੁਨੈਕਟ ਹੋਣਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹਾਂ।"> +<!ENTITY torSettings.connectPrompt3 "ਇਹ ਬਹੁਤੇ ਹਾਲਤਾਂ ਵਿੱਚ ਕੰਮ ਕਰੇਗਾ।"> +<!ENTITY torSettings.connect "ਕੁਨੈਕਟ ਕਰੋ"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">  @@ -28,17 +28,17 @@  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.startingTor "...ਟੋਰ ਸ਼ੁਰੂ ਹੋਣ ਤੱਕ ਉਡੀਕੋ"> +<!ENTITY torsettings.restart "ਮੁੜ-ਚਾਲੂ"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "ਚੋਣਵਾਂ"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.checkbox "ਇਹ ਕੰਪਿਊਟਰ ਨੂੰ ਇੰਟਰਨੈੱਟ ਵਰਤਣ ਲਈ ਪਰਾਕਸੀ ਦੀ ਲੋੜ ਹੈ"> +<!ENTITY torsettings.useProxy.type "ਪਰਾਕਸੀ ਕਿਸਮ:"> <!ENTITY torsettings.useProxy.address "ਪਤਾ:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.address.placeholder "IP ਸਿਰਨਾਵਾਂ ਜਾਂ ਹੋਸਟ-ਨਾਂ"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "ਯੂਜ਼ਰ-ਨਾਂ:"> <!ENTITY torsettings.useProxy.password "ਪਾਸਵਰਡ:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> @@ -46,9 +46,9 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.default "ਦਿੱਤੇ ਬਰਿਜ਼ ਰਾਹੀਂ ਕੁਨੈਕਟ"> +<!ENTITY torsettings.useBridges.type "ਟਰਾਂਸਪੋਰਟ ਕਿਸਮ:"> +<!ENTITY torsettings.useBridges.custom "ਪਸੰਦੀਦਾ ਬਰਿੱਜ਼ ਦਿਓ"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> <!ENTITY torsettings.useBridges.placeholder "type address:port"> @@ -56,9 +56,9 @@ <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> +<!ENTITY torsettings.bridgeHelp2Heading "ਵੈੱਬ ਰਾਹੀਂ"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4Heading "ਮੱਦਦ ਡੈਸਕ ਰਾਹੀਂ"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/pa/progress.dtd b/src/chrome/locale/pa/progress.dtd index ebd9cef..0a1de0c 100644 --- a/src/chrome/locale/pa/progress.dtd +++ b/src/chrome/locale/pa/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.dialog.title "ਟੋਰ ਸਥਿਤੀ"> +<!ENTITY torprogress.openSettings "ਸੈਟਿੰਗ ਖੋਲ੍ਹੋ"> +<!ENTITY torprogress.heading "ਟੋਰ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"> +<!ENTITY torprogress.pleaseWait "ਸਾਡੇ ਵਲੋਂ ਟੋਰ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਤਿਆਰ ਕਰਨ ਤੱਕ ਉਡੀਕ ਕੋਰ ਜੀ।"> diff --git a/src/chrome/locale/pa/torlauncher.properties b/src/chrome/locale/pa/torlauncher.properties index 7019a69..f0056e4 100644 --- a/src/chrome/locale/pa/torlauncher.properties +++ b/src/chrome/locale/pa/torlauncher.properties @@ -29,7 +29,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) -torlauncher.connect=Connect +torlauncher.connect=ਕੁਨੈਕਟ ਕਰੋ torlauncher.quit=Quit torlauncher.quit_win=ਬੰਦ ਕਰੋ torlauncher.done=ਮੁਕੰਮਲ @@ -43,7 +43,7 @@ torlauncher.bootstrapStatus.loading_status=ਨੈੱਟਵਰਕ ਸਥਇਤੀ torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.conn_or=ਟੋਰ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! diff --git a/src/chrome/locale/si/network-settings.dtd b/src/chrome/locale/si/network-settings.dtd index a346274..4cedae6 100644 --- a/src/chrome/locale/si/network-settings.dtd +++ b/src/chrome/locale/si/network-settings.dtd @@ -23,7 +23,7 @@ <!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> <!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  @@ -54,11 +54,11 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request.">

1 0

[tor-launcher/maint-0.2.5] Update translations.
by mikeperry＠torproject.org 05 Jun '14

05 Jun '14

commit 810df987300f3c0479bba0af279a68eff30f646c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Jun 5 05:29:54 2014 -0700 Update translations. --- src/chrome/locale/ca/network-settings.dtd | 16 ++++++------ src/chrome/locale/cs/network-settings.dtd | 34 ++++++++++++------------- src/chrome/locale/fi/network-settings.dtd | 18 +++++++------- src/chrome/locale/pa/network-settings.dtd | 36 +++++++++++++-------------- src/chrome/locale/pa/progress.dtd | 8 +++--- src/chrome/locale/pa/torlauncher.properties | 4 +-- src/chrome/locale/si/network-settings.dtd | 8 +++--- 7 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index 5cc6665..f98aba3 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -8,7 +8,7 @@ <!ENTITY torSettings.no "No"> <!ENTITY torSettings.firstQuestion "Quina de les següuens descriula teva situació?"> -<!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> +<!ENTITY torSettings.configurePrompt1 "La connexió a internet d'aquest ordinador està censurada, filtrada o usa Proxys"> <!ENTITY torSettings.configurePrompt2 "Necessito configurar un pont, el tallafocs o els paràmetres del proxy."> <!ENTITY torSettings.configure "Configura"> <!ENTITY torSettings.connectPrompt2 "M'agradaria conectar-me directament a la xarxa Tor."> @@ -24,7 +24,7 @@ <!ENTITY torSettings.enterFirewall "Escriviu una llista separada per comes dels ports que estan permesos pel proxy."> <!ENTITY torSettings.bridgeQuestion "El vostre proveïdor d'Internet (ISP) bloqueja o censura les connexions a la Xarxa Tor?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  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.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeSettingsPrompt "Hauries d'utilitzar el set de repetidors provist o customitzar el teu propi.">  @@ -47,9 +47,9 @@ <!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a través d'un proxy que només permet connexions a certs ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports permesos:"> <!ENTITY torsettings.useBridges.checkbox "El meu proveidor d'internet (ISP) bloqueja les conexions a la xarxa Tor"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.default "Connectar amb els repetidors porvistos."> <!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.custom "Entra als repetidors customitzats."> <!ENTITY torsettings.useBridges.label "Entra en un o més repetidors (un per linia)."> <!ENTITY torsettings.useBridges.placeholder "introdueix adreça:port"> @@ -57,9 +57,9 @@ <!ENTITY torsettings.bridgeHelpTitle "Ajuda Repetidors"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> +<!ENTITY torsettings.bridgeHelp2Heading "A través del web"> <!ENTITY torsettings.bridgeHelp2 "Utilitza un navegador web o vés a: https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> +<!ENTITY torsettings.bridgeHelp3Heading "A través del mail d'autorresposta."> <!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp4Heading "A través del Escriptori d'Ajuda"> +<!ENTITY torsettings.bridgeHelp4 "Com a última opció, pots demanar adreces de repetidors enviant un missatge a help(a)rt.torproject.org.  siusplau recorda que serà una persona qui et respondrà, siguis pacient i amable."> diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index d974db3..84ca9ee 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -2,17 +2,17 @@  -<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Než se připojíte s síti TORu je potřeba poskytnout údaje o internetovém připojení tohoto počítače."> <!ENTITY torSettings.yes "Ano"> <!ENTITY torSettings.no "Ne"> <!ENTITY torSettings.firstQuestion "Která možnost nejlépe popisuje Vaši situaci?"> <!ENTITY torSettings.configurePrompt1 "Toto připojení počítače k internetu je cenzurováno, filtrováno, nebo zprostředkováno."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> +<!ENTITY torSettings.configurePrompt2 "Potřebuji nastavit síťový most, firewall, nebo nastavní proxy."> <!ENTITY torSettings.configure "Konfigurovat"> <!ENTITY torSettings.connectPrompt2 "Chtěl bych se přímo připojit k Tor síti."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Toto bude fungovat ve většině případů."> <!ENTITY torSettings.connect "Připojit"> <!ENTITY torSettings.proxyQuestion "Potřebuje Váš počítač připojení k internetu přes proxy?"> @@ -22,9 +22,9 @@ <!ENTITY torSettings.firewallQuestion "Je počítač připojen k internetu přes firewall, který povoluje připojení pouze přes některé porty?"> <!ENTITY torSettings.firewallHelp "Jestli si nejste jisti, jak odpovědět na otázku, odpovězte NE. Jestliže narazíte na problémy s připojením k Tor síti, změňte toto nastavení."> <!ENTITY torSettings.enterFirewall "Zadejte čárkami oddělený seznam portů, které jsou povoleny firewallem."> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  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.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeQuestion "Blokuje nebo jinak cenzuruje váš poskytovatel internetového připojení (ISP) spojení se sítí TORu?"> +<!ENTITY torSettings.bridgeHelp "Pokud si nejste jistí jak odpovědět na tuto otázku, zvolte No.  Pokud vyberete Ano, budete vyzváni k nastavení Mostů TORu, což jsou přenašeče neuvedené v seznamu, které dělají blokování spojení se sítí TORu složitější."> +<!ENTITY torSettings.bridgeSettingsPrompt "Můžete použít poskytnutou sadu síťových mostů nebo můžete získat a zadat vlastní sadu.">  @@ -46,19 +46,19 @@ <!ENTITY torsettings.firewall.checkbox "Tento počítač používá firewall, který povoluje připojení pouze přes některé porty."> <!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> <!ENTITY torsettings.useBridges.checkbox "Můj internetový poskytovatel (ISP) blokuje připojení k Tor síti"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.default "Připojit pomocí poskytnuté sady mostů"> +<!ENTITY torsettings.useBridges.type "Typ přenosu:"> +<!ENTITY torsettings.useBridges.custom "Zadejete vlastní mosty"> <!ENTITY torsettings.useBridges.label "Zadejte jedno nebo více mostních relé (jedno na řádek)."> <!ENTITY torsettings.useBridges.placeholder "zadej adresu:port"> <!ENTITY torsettings.copyLog "Zkopíruj logový soubor Toru do schránky"> <!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních relé"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> -<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp1 "Pokud nejste schopni se připojit k síti TORu, může to být způsobeno tím, že váš posktytovatel internetu (ISP) nebo nějaká jiná služba blokuje Tor.  Většinou můžete obejít tento problém použitím Mostů TORu, což jsou přenašeče neuvedené v seznamu, které je složitější zablokovat."> +<!ENTITY torsettings.bridgeHelp1B "Můžete použít přednastavenou, poskytnutou sadu síťových mostů, nebo můžete získat vlastní sadu adres použitím jedné z těchto tří metod:"> +<!ENTITY torsettings.bridgeHelp2Heading "Přes síť"> +<!ENTITY torsettings.bridgeHelp2 "Použijte internetový prohlížeč k návštěvě https://bridges.torproject.org"> +<!ENTITY torsettings.bridgeHelp3Heading "Přes automatický e-mailový odpovídač"> +<!ENTITY torsettings.bridgeHelp3 "Pošlete e-mail na bridges(a)torproject.org s větou 'get bridges' jako takovou v těle zprávy.  Nicméně abychom ztížili útočníkovi zjištění spousty adres, musíte tento požadavek poslat z e-mailové adresy gmail.com nebo yahoo.com."> +<!ENTITY torsettings.bridgeHelp4Heading "Přes zákaznickou linku"> +<!ENTITY torsettings.bridgeHelp4 "Jako poslední řešení si můžete vyžádat adresy síťových mostů tak, že zašlete slušný e-mail na help(a)rt.torproject.org.  Vezměte v úvahu si prosím, že na každý požadavek musí odpovědět člověk."> diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index 19cc04f..934ddf0 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -12,7 +12,7 @@ <!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> <!ENTITY torSettings.configure "Configure"> <!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> +<!ENTITY torSettings.connectPrompt3 "Tämä toimii monissa tilanteissa."> <!ENTITY torSettings.connect "Yhdistä"> <!ENTITY torSettings.proxyQuestion "Tarvitseeko tämä tietokone proxya päästäkseen internettiin?"> @@ -22,19 +22,19 @@ <!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?"> <!ENTITY torSettings.firewallHelp "Ellet ole varma kuinka vastata tähän kysymykseen, valitse Ei. Muuta tätä asetusta jos yhteyden saamisessa Tor-verkkoon on ongelmia."> <!ENTITY torSettings.enterFirewall "Luettele pilkuin erotettuina ne portit, jotka palomuuri sallii. "> -<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> +<!ENTITY torSettings.bridgeQuestion "Sensuroiko tai estääkö sinun operaattorisi (ISP) yhteydet Tor-verkkoon?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  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.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Käynnistä Vidalia uudelleen"> +<!ENTITY torsettings.startingTor "Odotetaan Torin käynnistymistä..."> +<!ENTITY torsettings.restart "Käynnistä uudelleen"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "Vaihtoehtoinen"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.checkbox "Tämä tietokone tarvitsee käyttää proxya päästäkseen internettiin."> +<!ENTITY torsettings.useProxy.type "Proxy tyyppi:"> <!ENTITY torsettings.useProxy.address "Osoite:"> <!ENTITY torsettings.useProxy.address.placeholder "IP osoite tai isännän nimi"> <!ENTITY torsettings.useProxy.port "Portti:"> @@ -45,7 +45,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tämän tietokoneen palomuuri sallii yhteydet vain tiettyjen porttien kautta."> <!ENTITY torsettings.firewall.allowedPorts "Sallitut portit:"> -<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> +<!ENTITY torsettings.useBridges.checkbox "Minun internet-yhteyden tarjoaja (ISP) estää yhteydet Tor verkkoon."> <!ENTITY torsettings.useBridges.default "Connect with provided bridges"> <!ENTITY torsettings.useBridges.type "Siirtotyyppi:"> <!ENTITY torsettings.useBridges.custom "Enter custom bridges"> @@ -59,6 +59,6 @@ <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp3 "Lähetä sähköpostia: bridges(a)torproject.org tekstin kanssa 'get bridges' 160"> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd index 0ac00e2..483c12a 100644 --- a/src/chrome/locale/pa/network-settings.dtd +++ b/src/chrome/locale/pa/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "ਟੋਰ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗ">  @@ -9,11 +9,11 @@ <!ENTITY torSettings.firstQuestion "Which of the following best describes your situation?"> <!ENTITY torSettings.configurePrompt1 "This computer's Internet connection is censored, filtered, or proxied."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge, firewall, or proxy settings."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connectPrompt2 "I would like to connect directly to the Tor network."> -<!ENTITY torSettings.connectPrompt3 "This will work in most situations."> -<!ENTITY torSettings.connect "Connect"> +<!ENTITY torSettings.configurePrompt2 "ਮੈਨੂੰ ਬਰਿਜ਼, ਫਾਇਰਵਾਲ ਜਾਂ ਪਰਾਕਸੀ ਸੈਟਿੰਗ ਦੀ ਸੰਰਚਨਾ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"> +<!ENTITY torSettings.configure "ਸੰਰਚਨਾ"> +<!ENTITY torSettings.connectPrompt2 "ਮੈਂ ਟੋਰ ਨੈੱਟਵਰਕ ਨਾਲ ਸਿੱਧਾ ਕੁਨੈਕਟ ਹੋਣਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹਾਂ।"> +<!ENTITY torSettings.connectPrompt3 "ਇਹ ਬਹੁਤੇ ਹਾਲਤਾਂ ਵਿੱਚ ਕੰਮ ਕਰੇਗਾ।"> +<!ENTITY torSettings.connect "ਕੁਨੈਕਟ ਕਰੋ"> <!ENTITY torSettings.proxyQuestion "Does this computer need to use a proxy to access the Internet?">  @@ -28,17 +28,17 @@  -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restart "Restart"> +<!ENTITY torsettings.startingTor "...ਟੋਰ ਸ਼ੁਰੂ ਹੋਣ ਤੱਕ ਉਡੀਕੋ"> +<!ENTITY torsettings.restart "ਮੁੜ-ਚਾਲੂ"> -<!ENTITY torsettings.optional "Optional"> +<!ENTITY torsettings.optional "ਚੋਣਵਾਂ"> -<!ENTITY torsettings.useProxy.checkbox "This computer needs to use a proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.checkbox "ਇਹ ਕੰਪਿਊਟਰ ਨੂੰ ਇੰਟਰਨੈੱਟ ਵਰਤਣ ਲਈ ਪਰਾਕਸੀ ਦੀ ਲੋੜ ਹੈ"> +<!ENTITY torsettings.useProxy.type "ਪਰਾਕਸੀ ਕਿਸਮ:"> <!ENTITY torsettings.useProxy.address "ਪਤਾ:"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> +<!ENTITY torsettings.useProxy.address.placeholder "IP ਸਿਰਨਾਵਾਂ ਜਾਂ ਹੋਸਟ-ਨਾਂ"> <!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "ਯੂਜ਼ਰ-ਨਾਂ:"> <!ENTITY torsettings.useProxy.password "ਪਾਸਵਰਡ:"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> @@ -46,9 +46,9 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> -<!ENTITY torsettings.useBridges.type "Transport type:"> -<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> +<!ENTITY torsettings.useBridges.default "ਦਿੱਤੇ ਬਰਿਜ਼ ਰਾਹੀਂ ਕੁਨੈਕਟ"> +<!ENTITY torsettings.useBridges.type "ਟਰਾਂਸਪੋਰਟ ਕਿਸਮ:"> +<!ENTITY torsettings.useBridges.custom "ਪਸੰਦੀਦਾ ਬਰਿੱਜ਼ ਦਿਓ"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> <!ENTITY torsettings.useBridges.placeholder "type address:port"> @@ -56,9 +56,9 @@ <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> -<!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> +<!ENTITY torsettings.bridgeHelp2Heading "ਵੈੱਬ ਰਾਹੀਂ"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> <!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> -<!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> +<!ENTITY torsettings.bridgeHelp4Heading "ਮੱਦਦ ਡੈਸਕ ਰਾਹੀਂ"> <!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> diff --git a/src/chrome/locale/pa/progress.dtd b/src/chrome/locale/pa/progress.dtd index ebd9cef..0a1de0c 100644 --- a/src/chrome/locale/pa/progress.dtd +++ b/src/chrome/locale/pa/progress.dtd @@ -1,4 +1,4 @@ -<!ENTITY torprogress.dialog.title "Tor Status"> -<!ENTITY torprogress.openSettings "Open Settings"> -<!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> +<!ENTITY torprogress.dialog.title "ਟੋਰ ਸਥਿਤੀ"> +<!ENTITY torprogress.openSettings "ਸੈਟਿੰਗ ਖੋਲ੍ਹੋ"> +<!ENTITY torprogress.heading "ਟੋਰ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"> +<!ENTITY torprogress.pleaseWait "ਸਾਡੇ ਵਲੋਂ ਟੋਰ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਤਿਆਰ ਕਰਨ ਤੱਕ ਉਡੀਕ ਕੋਰ ਜੀ।"> diff --git a/src/chrome/locale/pa/torlauncher.properties b/src/chrome/locale/pa/torlauncher.properties index 7019a69..f0056e4 100644 --- a/src/chrome/locale/pa/torlauncher.properties +++ b/src/chrome/locale/pa/torlauncher.properties @@ -29,7 +29,7 @@ torlauncher.error_bridge_bad_default_type=No provided bridges that have the tran torlauncher.recommended_bridge=(recommended) -torlauncher.connect=Connect +torlauncher.connect=ਕੁਨੈਕਟ ਕਰੋ torlauncher.quit=Quit torlauncher.quit_win=ਬੰਦ ਕਰੋ torlauncher.done=ਮੁਕੰਮਲ @@ -43,7 +43,7 @@ torlauncher.bootstrapStatus.loading_status=ਨੈੱਟਵਰਕ ਸਥਇਤੀ torlauncher.bootstrapStatus.loading_keys=Loading authority certificates torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information torlauncher.bootstrapStatus.loading_descriptors=Loading relay information -torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network +torlauncher.bootstrapStatus.conn_or=ਟੋਰ ਨੈੱਟਵਰਕ ਨਾਲ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit torlauncher.bootstrapStatus.done=Connected to the Tor network! diff --git a/src/chrome/locale/si/network-settings.dtd b/src/chrome/locale/si/network-settings.dtd index a346274..4cedae6 100644 --- a/src/chrome/locale/si/network-settings.dtd +++ b/src/chrome/locale/si/network-settings.dtd @@ -23,7 +23,7 @@ <!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting."> <!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> -<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  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.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; 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.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  @@ -54,11 +54,11 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> +<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> <!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> -<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.  However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> +<!ENTITY torsettings.bridgeHelp3 "Send email to bridges(a)torproject.org with the line 'get bridges' by itself in the body of the message.&#160; However, to make it harder for an attacker to learn a lot of bridge addresses, you must send this request from a gmail.com or yahoo.com email address."> <!ENTITY torsettings.bridgeHelp4Heading "Through the Help Desk"> -<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.  Please note that a person will need to respond to each request."> +<!ENTITY torsettings.bridgeHelp4 "As a last resort, you can request bridge addresses by sending a polite email message to help(a)rt.torproject.org.&#160; Please note that a person will need to respond to each request.">

1 0