tbb-commits October 2019

tbb-commits@lists.torproject.org

3 participants
154 discussions

[tor-browser/tor-browser-68.1.0esr-9.0-3] fixup! Bug 13543: Spoof smooth and powerEfficient for Media Capabilities
by gk＠torproject.org 16 Oct '19

16 Oct '19

commit 084aa467fafc8aee4c2fbb57e872096386aca775 Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Oct 15 23:02:49 2019 +0200 fixup! Bug 13543: Spoof smooth and powerEfficient for Media Capabilities --- dom/media/mediacapabilities/MediaCapabilities.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dom/media/mediacapabilities/MediaCapabilities.cpp b/dom/media/mediacapabilities/MediaCapabilities.cpp index 148e2136ed2a..cdd9dbf0d86f 100644 --- a/dom/media/mediacapabilities/MediaCapabilities.cpp +++ b/dom/media/mediacapabilities/MediaCapabilities.cpp @@ -285,7 +285,7 @@ already_AddRefed<Promise> MediaCapabilities::DecodingInfo( } else if (nsContentUtils:: ShouldResistFingerprinting()) { p = CapabilitiesPromise::CreateAndResolve( - MediaCapabilitiesInfo(true, true, true), + MediaCapabilitiesInfo(true, true, false), __func__); } else { MOZ_ASSERT(config->IsVideo());

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-3] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 16 Oct '19

16 Oct '19

commit 70b7aa5c1ccaac72c063b135d53e413fc64ca6c1 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Oct 16 11:29:24 2019 +0200 fixup! TB4: Tor Browser's Firefox preference overrides. Fixes #30681. --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 78b252846689..4c244b49d181 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -322,6 +322,9 @@ pref("security.cert_pinning.enforcement_level", 2); // Don't allow MitM via Microsoft Family Safety, see bug 21686 pref("security.family_safety.mode", 0); +// Don't allow MitM via enterprise roots, see bug 30681 +pref("security.enterprise_roots.enabled", false); + // Enforce SHA1 deprecation, see: bug 18042. pref("security.pki.sha1_enforcement_level", 2);

1 0

[tor-android-service/master] Bug 32043: Add mavenLocal to repo list
by gk＠torproject.org 16 Oct '19

16 Oct '19

commit e9bbdc6fb25af47ccaf3bace0162125d94812072 Author: sisbell <shane.isbell(a)gmail.com> Date: Wed Jul 17 01:01:42 2019 -0700 Bug 32043: Add mavenLocal to repo list --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 671edab..001bdb1 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,7 @@ apply plugin: 'maven' buildscript { repositories { + mavenLocal() google() mavenCentral() } @@ -16,6 +17,7 @@ buildscript { allprojects { repositories { + mavenLocal() google() mavenCentral() maven { url "https://repo.spring.io/plugins-release" }

1 0

[tor-browser-build/master] Bug 32061: Bump snowflake version to b4f4b29a03
by gk＠torproject.org 16 Oct '19

16 Oct '19

commit 2b8726a176e3f01c44e714f4b56024a912fb6ab2 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Oct 14 18:37:45 2019 +0000 Bug 32061: Bump snowflake version to b4f4b29a03 --- projects/snowflake/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/snowflake/config b/projects/snowflake/config index 1f74d48..d800ee8 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://github.com/cohosh/snowflake -git_hash: 49a899be452a58db27ecc94223b0c527bf8d4927 +git_url: https://git.torproject.org/pluggable-transports/snowflake.git +git_hash: b4f4b29a037fd2444423835da5999f39525f3d24 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0

[tor-browser-build/master] Revert "Bug 32061: Bump snowflake version to b4f4b29a03"
by gk＠torproject.org 16 Oct '19

16 Oct '19

commit 15fcfa794b35134919d6687e4e5275fea83debba Author: Georg Koppen <gk(a)torproject.org> Date: Wed Oct 16 06:25:58 2019 +0000 Revert "Bug 32061: Bump snowflake version to b4f4b29a03" This reverts commit 268f36f0db6d317b554928106ad07b51eeffd118. --- projects/snowflake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/snowflake/config b/projects/snowflake/config index dd05d3c..1f74d48 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/cohosh/snowflake -git_hash: b4f4b29a037fd2444423835da5999f39525f3d24 +git_hash: 49a899be452a58db27ecc94223b0c527bf8d4927 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0

[tor-browser-build/master] Bug 32061: Bump snowflake version to b4f4b29a03
by gk＠torproject.org 16 Oct '19

16 Oct '19

commit 268f36f0db6d317b554928106ad07b51eeffd118 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Oct 14 18:37:45 2019 +0000 Bug 32061: Bump snowflake version to b4f4b29a03 --- projects/snowflake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/snowflake/config b/projects/snowflake/config index 1f74d48..dd05d3c 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/cohosh/snowflake -git_hash: 49a899be452a58db27ecc94223b0c527bf8d4927 +git_hash: b4f4b29a037fd2444423835da5999f39525f3d24 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0

[tor-launcher/master] Bug 31286: Update to tor settings related strings
by gk＠torproject.org 15 Oct '19

15 Oct '19

commit 5f40953122f759fe6a4992f7a61e4cb3d5888d53 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Oct 14 14:10:21 2019 -0700 Bug 31286: Update to tor settings related strings For each locale, programmatically migrated what we can from torlauncher.properties and removed colon [:：] characters from field label strings. --- src/chrome/locale/ady/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/af-ZA/network-settings.dtd | 2 ++ src/chrome/locale/af/network-settings.dtd | 16 +++++++++++----- src/chrome/locale/ak/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/am-ET/network-settings.dtd | 14 ++++++++------ src/chrome/locale/am/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ar/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/arn/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/az/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/be/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/bg-BG/network-settings.dtd | 2 ++ src/chrome/locale/bg/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/bn-BD/network-settings.dtd | 16 +++++++++++----- src/chrome/locale/bn-IN/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/bn/network-settings.dtd | 16 +++++++++++----- src/chrome/locale/bo/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/br/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/bs/network-settings.dtd | 16 +++++++++++----- src/chrome/locale/ca/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ca(a)valencia/network-settings.dtd | 2 ++ src/chrome/locale/cs-CZ/network-settings.dtd | 14 ++++++++------ src/chrome/locale/cs/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/csb/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/cv/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/cy/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/da/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/de/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/dz/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/el-GR/network-settings.dtd | 2 ++ src/chrome/locale/el/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/en-US/network-settings.dtd | 22 ++++++---------------- src/chrome/locale/eo/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/es-AR/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/es-CL/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/es-CO/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/es-MX/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/es-NI/network-settings.dtd | 2 ++ src/chrome/locale/es/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/et/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/eu/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/fa/network-settings.dtd | 16 +++++++++++----- src/chrome/locale/fi/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/fil/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/fo/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/fr-CA/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/fr/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/fur/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/fy/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ga/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/gl/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/gu-IN/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/gu/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/gun/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ha/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/he/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/hi/network-settings.dtd | 12 +++++++++--- src/chrome/locale/hr-HR/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/hr/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ht/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/hu/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/hy-AM/network-settings.dtd | 14 ++++++++------ src/chrome/locale/hy/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ia/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/id/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/is/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/it/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ja/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/jv/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ka/network-settings.dtd | 14 ++++++++++---- src/chrome/locale/kk/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/km/network-settings.dtd | 6 ++++++ src/chrome/locale/kn/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ko-KR/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ko/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ku/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/kw/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ky/network-settings.dtd | 16 +++++++++++----- src/chrome/locale/lb/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/lg/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ln/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/lo/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/lt/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/lv/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/mg/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/mi/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/mk/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ml/network-settings.dtd | 14 ++++++++++---- src/chrome/locale/mn/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/mr/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ms-MY/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ms/network-settings.dtd | 4 +++- src/chrome/locale/mt/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/my/network-settings.dtd | 10 ++++++++-- src/chrome/locale/nah/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/nap/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/nb/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/nds/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ne/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/nl-BE/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/nl/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/nn/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/nso/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/pa/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/pap/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/pl-PL/network-settings.dtd | 2 ++ src/chrome/locale/pl/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/pms/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ps/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/pt-BR/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/pt-PT/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/pt/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ro/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ru/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ru(a)petr1708/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/sco/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/si-LK/network-settings.dtd | 12 +++++++++--- src/chrome/locale/sk-SK/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/sk/network-settings.dtd | 16 +++++++++++----- src/chrome/locale/sl-SI/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/sl/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/sn/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/so/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/sq-AL/network-settings.dtd | 14 ++++++++------ src/chrome/locale/sq/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/sr/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/sr(a)latin/network-settings.dtd | 16 +++++++++++----- src/chrome/locale/st/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/su/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/sv/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/sw/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/szl/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ta/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/te-IN/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/te/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/tg/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/th/network-settings.dtd | 6 ++++++ src/chrome/locale/ti/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/tk/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/tr/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/uk/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ur-PK/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ur/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/uz/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/ve/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/vi/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/wa/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/wo/network-settings.dtd | 18 ++++++++++++------ .../locale/zh-CN.GB2312/network-settings.dtd | 2 ++ src/chrome/locale/zh-CN/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/zh-HK/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/zh-TW/network-settings.dtd | 18 ++++++++++++------ src/chrome/locale/zh/network-settings.dtd | 2 ++ src/chrome/locale/zu/network-settings.dtd | 18 ++++++++++++------ 153 files changed, 1691 insertions(+), 841 deletions(-) diff --git a/src/chrome/locale/ady/network-settings.dtd b/src/chrome/locale/ady/network-settings.dtd index 4615146..247385b 100644 --- a/src/chrome/locale/ady/network-settings.dtd +++ b/src/chrome/locale/ady/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/af-ZA/network-settings.dtd b/src/chrome/locale/af-ZA/network-settings.dtd index 3cab152..24db3c8 100644 --- a/src/chrome/locale/af-ZA/network-settings.dtd +++ b/src/chrome/locale/af-ZA/network-settings.dtd @@ -1,3 +1,5 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> + + diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd index ca04ccf..2fcaa2d 100644 --- a/src/chrome/locale/af/network-settings.dtd +++ b/src/chrome/locale/af/network-settings.dtd @@ -27,15 +27,15 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Poort:"> +<!ENTITY torsettings.useProxy.port "Poort">  -<!ENTITY torsettings.useProxy.username "Gebruikersnaam:"> +<!ENTITY torsettings.useProxy.username "Gebruikersnaam">  <!ENTITY torsettings.useProxy.password "Wagwoord"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> @@ -43,7 +43,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Hierdie rekenaar gaan deur 'n firewall wat slegs konneksies na sekere poorte toelaat">  -<!ENTITY torsettings.firewall.allowedPorts "Toegelate Poorte:"> +<!ENTITY torsettings.firewall.allowedPorts "Toegelate Poorte"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ak/network-settings.dtd b/src/chrome/locale/ak/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/ak/network-settings.dtd +++ b/src/chrome/locale/ak/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/am-ET/network-settings.dtd b/src/chrome/locale/am-ET/network-settings.dtd index 23aae0a..666d19a 100644 --- a/src/chrome/locale/am-ET/network-settings.dtd +++ b/src/chrome/locale/am-ET/network-settings.dtd @@ -43,17 +43,17 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.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.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> @@ -73,3 +73,5 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!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/am/network-settings.dtd b/src/chrome/locale/am/network-settings.dtd index d23064d..4d89bce 100644 --- a/src/chrome/locale/am/network-settings.dtd +++ b/src/chrome/locale/am/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd index 5e1673a..b6fc1de 100644 --- a/src/chrome/locale/ar/network-settings.dtd +++ b/src/chrome/locale/ar/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "أستخدم وسيطا للاتصال بالإنترنت">  -<!ENTITY torsettings.useProxy.type "نوع البروكسي:"> +<!ENTITY torsettings.useProxy.type "نوع البروكسي"> <!ENTITY torsettings.useProxy.type.placeholder "اختر نوع الوسيط">  -<!ENTITY torsettings.useProxy.address "العنوان:"> +<!ENTITY torsettings.useProxy.address "العنوان"> <!ENTITY torsettings.useProxy.address.placeholder "عنوان الإنترنت IP أو اسم المضيف">  -<!ENTITY torsettings.useProxy.port "المنفذ:"> +<!ENTITY torsettings.useProxy.port "المنفذ">  -<!ENTITY torsettings.useProxy.username "اسم المستخدم:"> +<!ENTITY torsettings.useProxy.username "اسم المستخدم">  -<!ENTITY torsettings.useProxy.password "كلمة السر:"> +<!ENTITY torsettings.useProxy.password "كلمة السر"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة">  -<!ENTITY torsettings.firewall.allowedPorts "المنافذ المسموح بها:"> +<!ENTITY torsettings.firewall.allowedPorts "المنافذ المسموح بها"> <!ENTITY torsettings.useBridges.checkbox "تور محجوب في بلدي"> <!ENTITY torsettings.useBridges.default "اختر جسرا مُدمَجا في البرنامج"> <!ENTITY torsettings.useBridges.default.placeholder "اختر جسرا"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "اطلب جسرا جديدا…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "يتصل بقاعدة بيانات الجسور BridgeDB. يُرجى الانتظار."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "حل كاباتشا لطلب جسر."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "الحل ليس سليمًا. يُرجى إعادة المحاولة."> diff --git a/src/chrome/locale/arn/network-settings.dtd b/src/chrome/locale/arn/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/arn/network-settings.dtd +++ b/src/chrome/locale/arn/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd index b3aeaae..4b9f8af 100644 --- a/src/chrome/locale/az/network-settings.dtd +++ b/src/chrome/locale/az/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Tipi:"> +<!ENTITY torsettings.useProxy.type "Proxy Tipi"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Ünvan:"> +<!ENTITY torsettings.useProxy.address "Ünvan"> <!ENTITY torsettings.useProxy.address.placeholder "İP ünvanı və ya anakompüterin adı">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "İstifadəçi adı:"> +<!ENTITY torsettings.useProxy.username "İstifadəçi adı">  -<!ENTITY torsettings.useProxy.password "Şifrə:"> +<!ENTITY torsettings.useProxy.password "Şifrə"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Bu kompüter yalnız müəyyən portlarla əlaqəyə icazə verən təhlükəsizlik divarindan keçir">  -<!ENTITY torsettings.firewall.allowedPorts "İczaə verilən portlar:"> +<!ENTITY torsettings.firewall.allowedPorts "İczaə verilən portlar"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd index 38e2752..17953ff 100644 --- a/src/chrome/locale/be/network-settings.dtd +++ b/src/chrome/locale/be/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Username">  -<!ENTITY torsettings.useProxy.password "Пароль:"> +<!ENTITY torsettings.useProxy.password "Пароль"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/bg-BG/network-settings.dtd b/src/chrome/locale/bg-BG/network-settings.dtd index 3cab152..24db3c8 100644 --- a/src/chrome/locale/bg-BG/network-settings.dtd +++ b/src/chrome/locale/bg-BG/network-settings.dtd @@ -1,3 +1,5 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> + + diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd index 01223d7..0ae6e2b 100644 --- a/src/chrome/locale/bg/network-settings.dtd +++ b/src/chrome/locale/bg/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Аз използвам прокси за достъп до интернет">  -<!ENTITY torsettings.useProxy.type "Прокси Тип:"> +<!ENTITY torsettings.useProxy.type "Прокси Тип"> <!ENTITY torsettings.useProxy.type.placeholder "Изберете вида на проксито">  -<!ENTITY torsettings.useProxy.address "Адрес:"> +<!ENTITY torsettings.useProxy.address "Адрес"> <!ENTITY torsettings.useProxy.address.placeholder "IP адрес или хост">  -<!ENTITY torsettings.useProxy.port "Порт:"> +<!ENTITY torsettings.useProxy.port "Порт">  -<!ENTITY torsettings.useProxy.username "Потребителско име:"> +<!ENTITY torsettings.useProxy.username "Потребителско име">  -<!ENTITY torsettings.useProxy.password "Парола:"> +<!ENTITY torsettings.useProxy.password "Парола"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Този компютър се свързва през firewall,който позволява връзки само към определени портове.">  -<!ENTITY torsettings.firewall.allowedPorts "Позволени портове:"> +<!ENTITY torsettings.firewall.allowedPorts "Позволени портове"> <!ENTITY torsettings.useBridges.checkbox "Tor е цензуриран в моята страна"> <!ENTITY torsettings.useBridges.default "Избор на вграден бридж"> <!ENTITY torsettings.useBridges.default.placeholder "изберете бридж"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Заявка за нов bridge..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Свързване с BridgeDB. Моля изчакайте."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Решете CAPTCHA за заявка на bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Решението не е правилно. Моля, опитайте пак."> diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd index 74cfe00..d18fc76 100644 --- a/src/chrome/locale/bn-BD/network-settings.dtd +++ b/src/chrome/locale/bn-BD/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "ঐচ্ছিক"> <!ENTITY torsettings.useProxy.checkbox "আমি ইন্টারনেটে সংযোগ স্থাপন করতে প্রক্সি ব্যবহার করি"> -<!ENTITY torsettings.useProxy.type "প্রক্সি প্রকার:"> +<!ENTITY torsettings.useProxy.type "প্রক্সি প্রকার"> <!ENTITY torsettings.useProxy.type.placeholder "একটি প্রক্সি টাইপ নির্বাচন করুন"> -<!ENTITY torsettings.useProxy.address "ঠিকানা:"> +<!ENTITY torsettings.useProxy.address "ঠিকানা"> <!ENTITY torsettings.useProxy.address.placeholder "আইপি ঠিকানা বা হোস্টনাম"> <!ENTITY torsettings.useProxy.port "পোর্টঃ"> -<!ENTITY torsettings.useProxy.username "ব্যবহারকারীর নাম:"> -<!ENTITY torsettings.useProxy.password "পাসওয়ার্ড:"> +<!ENTITY torsettings.useProxy.username "ব্যবহারকারীর নাম"> +<!ENTITY torsettings.useProxy.password "পাসওয়ার্ড"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "এই কম্পিউটারটি একটি ফায়ারওয়ালের মাধ্যমে যায় যা কেবলমাত্র কিছু পোর্টের সংযোগের অনুমতি দেয়"> -<!ENTITY torsettings.firewall.allowedPorts "অনুমোদিত পোর্টসমূহ:"> +<!ENTITY torsettings.firewall.allowedPorts "অনুমোদিত পোর্টসমূহ"> <!ENTITY torsettings.useBridges.checkbox "টর আমার দেশে সেন্সর করা হয়"> <!ENTITY torsettings.useBridges.default "একটি অন্তর্নির্মিত ব্রিজ নির্বাচন করুন"> <!ENTITY torsettings.useBridges.default.placeholder "একটি ব্রিজ নির্বাচন করুন"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "আমরা টর নেটওয়ার্কে একটি সংযোগ স্থাপন করার সময় অনুগ্রহ করে অপেক্ষা করুন। এই কয়েক মিনিট সময় নিতে পারে."> + + +<!ENTITY torPreferences.requestNewBridge "একটি নতুন ব্রিজ অনুরোধ করুন"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "ব্রিজডিবি এ যোগাযোগ করা হচ্ছে। অনুগ্রহপূর্বক অপেক্ষা করুন."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "একটি ব্রিজ অনুরোধ করার জন্য ক্যাপচা সমাধান করুন।..."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "সমাধান সঠিক নয়। অনুগ্রহপূর্বক আবার চেষ্টা করুন."> diff --git a/src/chrome/locale/bn-IN/network-settings.dtd b/src/chrome/locale/bn-IN/network-settings.dtd index 4615146..247385b 100644 --- a/src/chrome/locale/bn-IN/network-settings.dtd +++ b/src/chrome/locale/bn-IN/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/bn/network-settings.dtd b/src/chrome/locale/bn/network-settings.dtd index 67680f7..8518247 100644 --- a/src/chrome/locale/bn/network-settings.dtd +++ b/src/chrome/locale/bn/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "আমি ইন্টারনেটে সংযোগ স্থাপন করতে প্রক্সি ব্যবহার করি">  -<!ENTITY torsettings.useProxy.type "প্রক্সি প্রকার:"> +<!ENTITY torsettings.useProxy.type "প্রক্সি প্রকার"> <!ENTITY torsettings.useProxy.type.placeholder "একটি প্রক্সি টাইপ নির্বাচন করুন">  -<!ENTITY torsettings.useProxy.address "ঠিকানা:"> +<!ENTITY torsettings.useProxy.address "ঠিকানা"> <!ENTITY torsettings.useProxy.address.placeholder "আইপি ঠিকানা বা হোস্টনাম">  <!ENTITY torsettings.useProxy.port "পোর্টঃ">  -<!ENTITY torsettings.useProxy.username "ব্যবহারকারী নাম:"> +<!ENTITY torsettings.useProxy.username "ব্যবহারকারী নাম">  -<!ENTITY torsettings.useProxy.password "পাসওয়ার্ড:"> +<!ENTITY torsettings.useProxy.password "পাসওয়ার্ড"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "এই কম্পিউটারটি একটি ফায়ারওয়ালের মাধ্যমে যায় যা কেবলমাত্র কিছু পোর্টের সংযোগের অনুমতি দেয়">  -<!ENTITY torsettings.firewall.allowedPorts "অনুমোদিত পোর্টসমূহ:"> +<!ENTITY torsettings.firewall.allowedPorts "অনুমোদিত পোর্টসমূহ"> <!ENTITY torsettings.useBridges.checkbox "টর আমার দেশে সেন্সর করা হয়"> <!ENTITY torsettings.useBridges.default "একটি অন্তর্নির্মিত ব্রিজ নির্বাচন করুন"> <!ENTITY torsettings.useBridges.default.placeholder "একটি ব্রিজ নির্বাচন করুন"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "একটি নতুন ব্রিজ অনুরোধ করুন"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "ব্রিজডিবি এ যোগাযোগ করা হচ্ছে। অনুগ্রহপূর্বক অপেক্ষা করুন."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "একটি ব্রিজ অনুরোধ করার জন্য ক্যাপচা সমাধান করুন।..."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "সমাধান সঠিক নয়। অনুগ্রহপূর্বক আবার চেষ্টা করুন."> diff --git a/src/chrome/locale/bo/network-settings.dtd b/src/chrome/locale/bo/network-settings.dtd index c281daf..fa1e143 100644 --- a/src/chrome/locale/bo/network-settings.dtd +++ b/src/chrome/locale/bo/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd index 86eb33d..c9d0c9b 100644 --- a/src/chrome/locale/br/network-settings.dtd +++ b/src/chrome/locale/br/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Username">  -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd index ba458c3..499a2df 100644 --- a/src/chrome/locale/bs/network-settings.dtd +++ b/src/chrome/locale/bs/network-settings.dtd @@ -27,15 +27,15 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Korisničko ime:"> +<!ENTITY torsettings.useProxy.username "Korisničko ime">  <!ENTITY torsettings.useProxy.password "Šifra"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> @@ -43,7 +43,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd index 65d4f16..fc0db0d 100644 --- a/src/chrome/locale/ca/network-settings.dtd +++ b/src/chrome/locale/ca/network-settings.dtd @@ -28,23 +28,23 @@ <!ENTITY torsettings.useProxy.checkbox "Utilitzo un servidor intermediari per a accedir a Internet">  -<!ENTITY torsettings.useProxy.type "Tipus de servidor intermediari local:"> +<!ENTITY torsettings.useProxy.type "Tipus de servidor intermediari local"> <!ENTITY torsettings.useProxy.type.placeholder "seleccioneu un tipus de servidor intermediari">  -<!ENTITY torsettings.useProxy.address "Adreça:"> +<!ENTITY torsettings.useProxy.address "Adreça"> <!ENTITY torsettings.useProxy.address.placeholder "Adreça IP o nom del host">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Nom d'usuari:"> +<!ENTITY torsettings.useProxy.username "Nom d'usuari">  -<!ENTITY torsettings.useProxy.password "Contrasenya:"> +<!ENTITY torsettings.useProxy.password "Contrasenya"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Aquest ordinador va a través d'un tallafoc que només permet connexions a certs ports">  -<!ENTITY torsettings.firewall.allowedPorts "Ports permesos:"> +<!ENTITY torsettings.firewall.allowedPorts "Ports permesos"> <!ENTITY torsettings.useBridges.checkbox "Tor està censurat al meu país"> <!ENTITY torsettings.useBridges.default "Seleccioneu un pont predefinit"> <!ENTITY torsettings.useBridges.default.placeholder "seleccioneu un pont"> @@ -92,3 +92,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Sol·licita un pont nou..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "S'està contactant amb el BridgeDB. Espereu."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolgueu el CAPTCHA per a sol·licitar un pont."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solució no és correcta. Torneu a provar-ho."> diff --git a/src/chrome/locale/ca(a)valencia/network-settings.dtd b/src/chrome/locale/ca(a)valencia/network-settings.dtd index 0458e75..3cfb839 100644 --- a/src/chrome/locale/ca(a)valencia/network-settings.dtd +++ b/src/chrome/locale/ca(a)valencia/network-settings.dtd @@ -52,3 +52,5 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> + + diff --git a/src/chrome/locale/cs-CZ/network-settings.dtd b/src/chrome/locale/cs-CZ/network-settings.dtd index 75ece3b..3c445d0 100644 --- a/src/chrome/locale/cs-CZ/network-settings.dtd +++ b/src/chrome/locale/cs-CZ/network-settings.dtd @@ -43,17 +43,17 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.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.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> @@ -73,3 +73,5 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!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/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd index 61c193f..59dc1c8 100644 --- a/src/chrome/locale/cs/network-settings.dtd +++ b/src/chrome/locale/cs/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Používám proxy pro připojení k Internetu">  -<!ENTITY torsettings.useProxy.type "Typ proxy:"> +<!ENTITY torsettings.useProxy.type "Typ proxy"> <!ENTITY torsettings.useProxy.type.placeholder "vyberte typ proxy">  -<!ENTITY torsettings.useProxy.address "Adresa:"> +<!ENTITY torsettings.useProxy.address "Adresa"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa nebo název serveru">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Uživatel:"> +<!ENTITY torsettings.useProxy.username "Uživatel">  -<!ENTITY torsettings.useProxy.password "Heslo:"> +<!ENTITY torsettings.useProxy.password "Heslo"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Povolené porty"> <!ENTITY torsettings.useBridges.checkbox "Tor je v mé zemi cenzurován"> <!ENTITY torsettings.useBridges.default "Vyberte vestavěný most"> <!ENTITY torsettings.useBridges.default.placeholder "vyberte most"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Požádat o nový most…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktování BridgeDB. Čekejte prosím."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Pro vyžádání mostu prosím opište kód CAPTCHA."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Neopsali jste kód správně. Zkuste to prosím znovu."> diff --git a/src/chrome/locale/csb/network-settings.dtd b/src/chrome/locale/csb/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/csb/network-settings.dtd +++ b/src/chrome/locale/csb/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/cv/network-settings.dtd b/src/chrome/locale/cv/network-settings.dtd index c4d154c..818a3a0 100644 --- a/src/chrome/locale/cv/network-settings.dtd +++ b/src/chrome/locale/cv/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Прокси:"> +<!ENTITY torsettings.useProxy.type "Прокси"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Адрĕс:"> +<!ENTITY torsettings.useProxy.address "Адрĕс"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Порчĕ:"> -<!ENTITY torsettings.useProxy.username "Ячĕ:"> -<!ENTITY torsettings.useProxy.password "Кĕме сăмах:"> +<!ENTITY torsettings.useProxy.port "Порчĕ"> +<!ENTITY torsettings.useProxy.username "Ячĕ"> +<!ENTITY torsettings.useProxy.password "Кĕме сăмах"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd index 55cb7db..e998b8d 100644 --- a/src/chrome/locale/cy/network-settings.dtd +++ b/src/chrome/locale/cy/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Math Dirprwy:"> +<!ENTITY torsettings.useProxy.type "Math Dirprwy"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Cyfeiriad:"> +<!ENTITY torsettings.useProxy.address "Cyfeiriad"> <!ENTITY torsettings.useProxy.address.placeholder "Cyfeiriad IP neu enw gwesteiwr">  -<!ENTITY torsettings.useProxy.port "Porth:"> +<!ENTITY torsettings.useProxy.port "Porth">  -<!ENTITY torsettings.useProxy.username "Enw defnyddiwr:"> +<!ENTITY torsettings.useProxy.username "Enw defnyddiwr">  -<!ENTITY torsettings.useProxy.password "Cyfrinair:"> +<!ENTITY torsettings.useProxy.password "Cyfrinair"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">  -<!ENTITY torsettings.firewall.allowedPorts "Pyrth a ganiateir:"> +<!ENTITY torsettings.firewall.allowedPorts "Pyrth a ganiateir"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd index 9cde33f..552561c 100644 --- a/src/chrome/locale/da/network-settings.dtd +++ b/src/chrome/locale/da/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Jeg bruger en proxy til at oprette forbindelse til internettet">  -<!ENTITY torsettings.useProxy.type "Proxytype:"> +<!ENTITY torsettings.useProxy.type "Proxytype"> <!ENTITY torsettings.useProxy.type.placeholder "vælg en proxytype">  -<!ENTITY torsettings.useProxy.address "Adresse:"> +<!ENTITY torsettings.useProxy.address "Adresse"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse eller værtsnavn">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Brugernavn:"> +<!ENTITY torsettings.useProxy.username "Brugernavn">  -<!ENTITY torsettings.useProxy.password "Adgangskode:"> +<!ENTITY torsettings.useProxy.password "Adgangskode"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> <!ENTITY torsettings.firewall.checkbox "Computeren går gennem en firewall som kun tillader forbindelse til bestemte porte">  -<!ENTITY torsettings.firewall.allowedPorts "Tilladte porte:"> +<!ENTITY torsettings.firewall.allowedPorts "Tilladte porte"> <!ENTITY torsettings.useBridges.checkbox "Tor er censureret i mit land"> <!ENTITY torsettings.useBridges.default "Vælg en indbygget bro"> <!ENTITY torsettings.useBridges.default.placeholder "vælg en bro"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Anmod om en ny bro…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontakter BridgeDB. Vent venligst."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Løs CAPTCHA'en for at anmode om en bro."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Løsningen er ikke korrekt. Prøv venligst igen."> diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd index 33e1bf4..e4ae6af 100644 --- a/src/chrome/locale/de/network-settings.dtd +++ b/src/chrome/locale/de/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Ich benutze einen Proxy, um mich mit dem Internet zu verbinden">  -<!ENTITY torsettings.useProxy.type "Proxy-Typ:"> +<!ENTITY torsettings.useProxy.type "Proxy-Typ"> <!ENTITY torsettings.useProxy.type.placeholder "Proxy-Typ auswählen">  -<!ENTITY torsettings.useProxy.address "Adresse:"> +<!ENTITY torsettings.useProxy.address "Adresse"> <!ENTITY torsettings.useProxy.address.placeholder "IP-Adresse oder Rechnername">  -<!ENTITY torsettings.useProxy.port "Anschluss:"> +<!ENTITY torsettings.useProxy.port "Anschluss">  -<!ENTITY torsettings.useProxy.username "Nutzername:"> +<!ENTITY torsettings.useProxy.username "Nutzername">  -<!ENTITY torsettings.useProxy.password "Passwort:"> +<!ENTITY torsettings.useProxy.password "Passwort"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Die Verbindung dieses Rechner geht durch eine Firewall, die nur bestimmte Anschlüsse zulässt">  -<!ENTITY torsettings.firewall.allowedPorts "Erlaubte Anschlüsse:"> +<!ENTITY torsettings.firewall.allowedPorts "Erlaubte Anschlüsse"> <!ENTITY torsettings.useBridges.checkbox "Tor wird in meinem Land blockiert."> <!ENTITY torsettings.useBridges.default "Bereitgestellte Brücke auswählen"> <!ENTITY torsettings.useBridges.default.placeholder "Brücke auswählen"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Neue Brücke anfordern..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktiere BridgeDB. Bitte warten."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Löse das CAPTCHA, um eine Brücke anzufordern."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Die Lösung ist nicht korrekt. Bitte versuchen Sie es erneut."> diff --git a/src/chrome/locale/dz/network-settings.dtd b/src/chrome/locale/dz/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/dz/network-settings.dtd +++ b/src/chrome/locale/dz/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/el-GR/network-settings.dtd b/src/chrome/locale/el-GR/network-settings.dtd index 3cab152..24db3c8 100644 --- a/src/chrome/locale/el-GR/network-settings.dtd +++ b/src/chrome/locale/el-GR/network-settings.dtd @@ -1,3 +1,5 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> + + diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd index 740406b..11fdcbe 100644 --- a/src/chrome/locale/el/network-settings.dtd +++ b/src/chrome/locale/el/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Χρησιμοποιώ διακομιστή μεσολάβησης για να συνδεθώ στο ίντερνετ.">  -<!ENTITY torsettings.useProxy.type "Τύπος διακομιστή μεσολάβησης:"> +<!ENTITY torsettings.useProxy.type "Τύπος διακομιστή μεσολάβησης"> <!ENTITY torsettings.useProxy.type.placeholder "Επιλέξτε τύπο διακομιστή μεσολάβησης.">  -<!ENTITY torsettings.useProxy.address "Διεύθυνση:"> +<!ENTITY torsettings.useProxy.address "Διεύθυνση"> <!ENTITY torsettings.useProxy.address.placeholder "Διεύθυνση ΙΡ η όνομα υπολογιστή ">  -<!ENTITY torsettings.useProxy.port "Θύρα συστήματος:"> +<!ENTITY torsettings.useProxy.port "Θύρα συστήματος">  -<!ENTITY torsettings.useProxy.username "Όνομα Χρήστη:"> +<!ENTITY torsettings.useProxy.username "Όνομα Χρήστη">  -<!ENTITY torsettings.useProxy.password "Κωδικός:"> +<!ENTITY torsettings.useProxy.password "Κωδικός"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος">  -<!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες:"> +<!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες"> <!ENTITY torsettings.useBridges.checkbox "Ο Tor είναι αποκλεισμένος στη χώρα μου"> <!ENTITY torsettings.useBridges.default "Επιλέξτε ένα ενταγμένο bridge"> <!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε ένα bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Ζητήστε μία καινούρια γέφυρα..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Επικοινωνούμε με την BridgeDB. Παρακαλώ, περιμένετε."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Λύστε το CAPTCHA για να ζητήσετε γέφυρα."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Η λύση δεν είναι σωστή. Παρακαλώ προσπαθήστε ξανά."> diff --git a/src/chrome/locale/en-US/network-settings.dtd b/src/chrome/locale/en-US/network-settings.dtd index 2c6e5a5..e0b5454 100644 --- a/src/chrome/locale/en-US/network-settings.dtd +++ b/src/chrome/locale/en-US/network-settings.dtd @@ -26,24 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> - -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> - -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> - -<!ENTITY torsettings.useProxy.port "Port:"> - -<!ENTITY torsettings.useProxy.username "Username:"> - -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -75,18 +69,14 @@ <!ENTITY torPreferences.bridges "Bridges"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> <!ENTITY torPreferences.useBridge "Use a bridge"> - <!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> <!ENTITY torPreferences.provideBridge "Provide a bridge"> <!ENTITY torPreferences.advanced "Advanced"> <!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet."> <!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values"> <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> - <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> - <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> - <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs…"> diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd index 123b293..8057d0a 100644 --- a/src/chrome/locale/eo/network-settings.dtd +++ b/src/chrome/locale/eo/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Adreso:"> +<!ENTITY torsettings.useProxy.address "Adreso"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Pordo:"> +<!ENTITY torsettings.useProxy.port "Pordo">  -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Username">  -<!ENTITY torsettings.useProxy.password "Pasvorto:"> +<!ENTITY torsettings.useProxy.password "Pasvorto"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd index b5c9a4d..2e9a850 100644 --- a/src/chrome/locale/es-AR/network-settings.dtd +++ b/src/chrome/locale/es-AR/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Uso un proxy para conectar a Internet">  -<!ENTITY torsettings.useProxy.type "Tipo de proxy:"> +<!ENTITY torsettings.useProxy.type "Tipo de proxy"> <!ENTITY torsettings.useProxy.type.placeholder "seleccioná un tipo de proxy">  -<!ENTITY torsettings.useProxy.address "Dirección:"> +<!ENTITY torsettings.useProxy.address "Dirección"> <!ENTITY torsettings.useProxy.address.placeholder "Dirección IP o nombre de equipo">  -<!ENTITY torsettings.useProxy.port "Puerto:"> +<!ENTITY torsettings.useProxy.port "Puerto">  -<!ENTITY torsettings.useProxy.username "Usuario:"> +<!ENTITY torsettings.useProxy.username "Usuario">  -<!ENTITY torsettings.useProxy.password "Contraseña:"> +<!ENTITY torsettings.useProxy.password "Contraseña"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Esta computadora pasa a través de un cortafuegos que sólo permite conexiones a ciertos puertos">  -<!ENTITY torsettings.firewall.allowedPorts "Puerto permitidos:"> +<!ENTITY torsettings.firewall.allowedPorts "Puerto permitidos"> <!ENTITY torsettings.useBridges.checkbox "Tor está censurado en mi país"> <!ENTITY torsettings.useBridges.default "Seleccioná un puente incorporado"> <!ENTITY torsettings.useBridges.default.placeholder "seleccioná un puente"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Solicitá un nuevo puente..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactando BridgeDB. Por favor esperá."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solucioná el CAPTCHA para solicitar un puente."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solución no es correcta. Por favor intentá de nuevo."> diff --git a/src/chrome/locale/es-CL/network-settings.dtd b/src/chrome/locale/es-CL/network-settings.dtd index 39875fc..ed60823 100644 --- a/src/chrome/locale/es-CL/network-settings.dtd +++ b/src/chrome/locale/es-CL/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/es-CO/network-settings.dtd b/src/chrome/locale/es-CO/network-settings.dtd index 773e655..f30313a 100644 --- a/src/chrome/locale/es-CO/network-settings.dtd +++ b/src/chrome/locale/es-CO/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd index 02fef62..b47d4c2 100644 --- a/src/chrome/locale/es-MX/network-settings.dtd +++ b/src/chrome/locale/es-MX/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Puerto:"> +<!ENTITY torsettings.useProxy.port "Puerto">  -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Username">  -<!ENTITY torsettings.useProxy.password "Contraseña:"> +<!ENTITY torsettings.useProxy.password "Contraseña"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/es-NI/network-settings.dtd b/src/chrome/locale/es-NI/network-settings.dtd index 3cab152..24db3c8 100644 --- a/src/chrome/locale/es-NI/network-settings.dtd +++ b/src/chrome/locale/es-NI/network-settings.dtd @@ -1,3 +1,5 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network."> + + diff --git a/src/chrome/locale/es/network-settings.dtd b/src/chrome/locale/es/network-settings.dtd index e8c1793..deb32af 100644 --- a/src/chrome/locale/es/network-settings.dtd +++ b/src/chrome/locale/es/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Utilizo un proxy para conectar a Internet.">  -<!ENTITY torsettings.useProxy.type "Tipo de proxy:"> +<!ENTITY torsettings.useProxy.type "Tipo de proxy"> <!ENTITY torsettings.useProxy.type.placeholder "seleccionar un tipo de proxy">  -<!ENTITY torsettings.useProxy.address "Dirección:"> +<!ENTITY torsettings.useProxy.address "Dirección"> <!ENTITY torsettings.useProxy.address.placeholder "Dirección IP o nombre de máquina (host)">  -<!ENTITY torsettings.useProxy.port "Puerto:"> +<!ENTITY torsettings.useProxy.port "Puerto">  -<!ENTITY torsettings.useProxy.username "Nombre de usuario:"> +<!ENTITY torsettings.useProxy.username "Nombre de usuario">  -<!ENTITY torsettings.useProxy.password "Contraseña:"> +<!ENTITY torsettings.useProxy.password "Contraseña"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Esta computadora va a través de un cortafuegos(firewall) que sólo permite conexiones a ciertos puertos">  -<!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos:"> +<!ENTITY torsettings.firewall.allowedPorts "Puertos permitidos"> <!ENTITY torsettings.useBridges.checkbox "En mi país se censura a Tor"> <!ENTITY torsettings.useBridges.default "Seleccionar un puente construido"> <!ENTITY torsettings.useBridges.default.placeholder "seleccionar un puente"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "Ver los registros de Tor."> <!ENTITY torPreferences.viewLogs "Ver registros&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Registros de Tor"> + + +<!ENTITY torPreferences.requestNewBridge "Solicitar un nuevo puente..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactando con BridgeDB. Espera por favor."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resuelve el CAPTCHA para solicitar un puente."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solución no es correcta. Por favor, inténtalo de nuevo."> diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd index e4f9b2e..fb1420e 100644 --- a/src/chrome/locale/et/network-settings.dtd +++ b/src/chrome/locale/et/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Ma kasutan proksit et ühenduda internetti">  -<!ENTITY torsettings.useProxy.type "Proksi tüüp:"> +<!ENTITY torsettings.useProxy.type "Proksi tüüp"> <!ENTITY torsettings.useProxy.type.placeholder "valige proksi tüüp">  -<!ENTITY torsettings.useProxy.address "Aadress:"> +<!ENTITY torsettings.useProxy.address "Aadress"> <!ENTITY torsettings.useProxy.address.placeholder "IP aadress või haldaja nimi">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Kasutajanimi:"> +<!ENTITY torsettings.useProxy.username "Kasutajanimi">  -<!ENTITY torsettings.useProxy.password "Parool:"> +<!ENTITY torsettings.useProxy.password "Parool"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "See arvuti läheb läbi tulemüüri mis lubab ainult ühendusi kindlatesse portidesse.">  -<!ENTITY torsettings.firewall.allowedPorts "Lubatud pordid:"> +<!ENTITY torsettings.firewall.allowedPorts "Lubatud pordid"> <!ENTITY torsettings.useBridges.checkbox "Tor on minu riigis tsensoreeritud"> <!ENTITY torsettings.useBridges.default "Valige sisseehitatud sild"> <!ENTITY torsettings.useBridges.default.placeholder "valige sild"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Taotle uut Silda…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Lahenda CAPTCHA, et taotleda silda."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd index e04cc7e..03999ad 100644 --- a/src/chrome/locale/eu/network-settings.dtd +++ b/src/chrome/locale/eu/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Proxy bat erabiltzen dut Internetera sartzeko">  -<!ENTITY torsettings.useProxy.type "Proxy mota:"> +<!ENTITY torsettings.useProxy.type "Proxy mota"> <!ENTITY torsettings.useProxy.type.placeholder "proxy mota aukeratu">  -<!ENTITY torsettings.useProxy.address "Helbidea:"> +<!ENTITY torsettings.useProxy.address "Helbidea"> <!ENTITY torsettings.useProxy.address.placeholder "IP helbide edo ostalari izena">  -<!ENTITY torsettings.useProxy.port "Ataka:"> +<!ENTITY torsettings.useProxy.port "Ataka">  -<!ENTITY torsettings.useProxy.username "Erabiltzaile izena:"> +<!ENTITY torsettings.useProxy.username "Erabiltzaile izena">  -<!ENTITY torsettings.useProxy.password "Pasahitza:"> +<!ENTITY torsettings.useProxy.password "Pasahitza"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ordenagailu honek ataka zehatz batzuetara bakarrik konektatzea baimentzen duen sueten baten zehar doa">  -<!ENTITY torsettings.firewall.allowedPorts "Baimendutako atakak:"> +<!ENTITY torsettings.firewall.allowedPorts "Baimendutako atakak"> <!ENTITY torsettings.useBridges.checkbox "Tor zentsuratuta dago nire herrialdean"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "aukeratu zubia"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Zubi berri bat eskatu…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDBrekin kontaktatzen. Itxaron mesedez."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "CAPTCHAa ebatzi ezazu zubi bat eskatzeko."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ebazpena ez da zuzena. Mesedez saiatu berriro."> diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd index 89dd4d4..ec8c078 100644 --- a/src/chrome/locale/fa/network-settings.dtd +++ b/src/chrome/locale/fa/network-settings.dtd @@ -27,15 +27,15 @@ <!ENTITY torsettings.useProxy.checkbox "من برای دسترسی به اینترنت از پروکسی استفاده می‌کنم.">  -<!ENTITY torsettings.useProxy.type "نوع پراکسی:"> +<!ENTITY torsettings.useProxy.type "نوع پراکسی"> <!ENTITY torsettings.useProxy.type.placeholder "یک نوع پروکسی را انتخاب کنید">  -<!ENTITY torsettings.useProxy.address "آدرس:"> +<!ENTITY torsettings.useProxy.address "آدرس"> <!ENTITY torsettings.useProxy.address.placeholder "آدرس آی‌پی یا نام میزبان">  -<!ENTITY torsettings.useProxy.port "پورت:"> +<!ENTITY torsettings.useProxy.port "پورت">  -<!ENTITY torsettings.useProxy.username "نام کاربری:"> +<!ENTITY torsettings.useProxy.username "نام کاربری">  <!ENTITY torsettings.useProxy.password "رمز عبور"> <!ENTITY torsettings.useProxy.type.socks4 "ساکس ۴"> @@ -43,7 +43,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "به نظر می رسد شبکه ارتباطی شما به اینترنت، از یک فایروال استفاده می کند. یعنی فقط اجازه اتصال از یک سری درگاه های به خصوص را می دهد.">  -<!ENTITY torsettings.firewall.allowedPorts "پورت های مجاز:"> +<!ENTITY torsettings.firewall.allowedPorts "پورت های مجاز"> <!ENTITY torsettings.useBridges.checkbox "تور در کشور من فیلتر یا سانسور شده است"> <!ENTITY torsettings.useBridges.default "پل ساخته شده را انتخاب کنید"> <!ENTITY torsettings.useBridges.default.placeholder "یک پل انتخاب کنید"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "درخواست یک پل جدید..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "تماس با BridgeDB. لطفا صبر کنید."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "برای درخواست یک پل کپچا را حل کنید."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "راه حل درست نیست. لطفا دوباره تلاش کنید."> diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd index 75c4ad3..7d82f78 100644 --- a/src/chrome/locale/fi/network-settings.dtd +++ b/src/chrome/locale/fi/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Käytän välityspalvelinta yhdistääkseni internetiin">  -<!ENTITY torsettings.useProxy.type "Välityspalvelintyyppi:"> +<!ENTITY torsettings.useProxy.type "Välityspalvelintyyppi"> <!ENTITY torsettings.useProxy.type.placeholder "valitse välityspalvelintyyppi">  -<!ENTITY torsettings.useProxy.address "Osoite:"> +<!ENTITY torsettings.useProxy.address "Osoite"> <!ENTITY torsettings.useProxy.address.placeholder "IP-osoite tai palvelinnimi">  -<!ENTITY torsettings.useProxy.port "Portti:"> +<!ENTITY torsettings.useProxy.port "Portti">  -<!ENTITY torsettings.useProxy.username "Käyttäjätunnus:"> +<!ENTITY torsettings.useProxy.username "Käyttäjätunnus">  -<!ENTITY torsettings.useProxy.password "Salasana:"> +<!ENTITY torsettings.useProxy.password "Salasana"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!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.firewall.allowedPorts "Sallitut portit"> <!ENTITY torsettings.useBridges.checkbox "Maani sensuroi Tor'ia"> <!ENTITY torsettings.useBridges.default "Valitse sisäänrakennettu silta"> <!ENTITY torsettings.useBridges.default.placeholder "valitse silta"> @@ -92,3 +92,9 @@ Tässä saattaa kestää muutama minuutti."> <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Pyydä uusi silta..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Yhdistetään BridgeDB:hen. Odota hetki."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ratkaise CAPTCHA jotta voit pyytää sillan."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Ratkaisu ei ollut oikein. Yritä uudelleen."> diff --git a/src/chrome/locale/fil/network-settings.dtd b/src/chrome/locale/fil/network-settings.dtd index 8a9ba3c..c82efd4 100644 --- a/src/chrome/locale/fil/network-settings.dtd +++ b/src/chrome/locale/fil/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Mag-hintay habang ginagawa ang pag-establish ng connection sa Tor network.  Maari itong tumagal ng ilang minuto."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/fo/network-settings.dtd b/src/chrome/locale/fo/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/fo/network-settings.dtd +++ b/src/chrome/locale/fo/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/fr-CA/network-settings.dtd b/src/chrome/locale/fr-CA/network-settings.dtd index 2510f40..687e4e2 100644 --- a/src/chrome/locale/fr-CA/network-settings.dtd +++ b/src/chrome/locale/fr-CA/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Facultatif"> <!ENTITY torsettings.useProxy.checkbox "J’utilise un mandataire pour accéder à Internet"> -<!ENTITY torsettings.useProxy.type "Type de mandataire :"> +<!ENTITY torsettings.useProxy.type "Type de mandataire "> <!ENTITY torsettings.useProxy.type.placeholder "sélectionner un type de mandataire"> -<!ENTITY torsettings.useProxy.address "Adresse :"> +<!ENTITY torsettings.useProxy.address "Adresse "> <!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d’hôte"> -<!ENTITY torsettings.useProxy.port "Port :"> -<!ENTITY torsettings.useProxy.username "Nom d’utilisateur :"> -<!ENTITY torsettings.useProxy.password "Mot de passe :"> +<!ENTITY torsettings.useProxy.port "Port "> +<!ENTITY torsettings.useProxy.username "Nom d’utilisateur "> +<!ENTITY torsettings.useProxy.password "Mot de passe "> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n’autorise que les connexions à certains ports"> -<!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> +<!ENTITY torsettings.firewall.allowedPorts "Ports autorisés "> <!ENTITY torsettings.useBridges.checkbox "Tor est censuré dans mon pays"> <!ENTITY torsettings.useBridges.default "Sélectionner un pont intégré"> <!ENTITY torsettings.useBridges.default.placeholder "sélectionner un pont"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor.  Cela pourrait prendre plusieurs minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd index 82a9353..0508450 100644 --- a/src/chrome/locale/fr/network-settings.dtd +++ b/src/chrome/locale/fr/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "J’utilise un mandataire pour accéder à Internet">  -<!ENTITY torsettings.useProxy.type "Type de mandataire :"> +<!ENTITY torsettings.useProxy.type "Type de mandataire "> <!ENTITY torsettings.useProxy.type.placeholder "sélectionner un type de mandataire">  -<!ENTITY torsettings.useProxy.address "Adresse :"> +<!ENTITY torsettings.useProxy.address "Adresse "> <!ENTITY torsettings.useProxy.address.placeholder "adresse IP ou nom d’hôte">  -<!ENTITY torsettings.useProxy.port "Port :"> +<!ENTITY torsettings.useProxy.port "Port ">  -<!ENTITY torsettings.useProxy.username "Nom d’utilisateur :"> +<!ENTITY torsettings.useProxy.username "Nom d’utilisateur ">  -<!ENTITY torsettings.useProxy.password "Mot de passe :"> +<!ENTITY torsettings.useProxy.password "Mot de passe "> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui n’autorise que les connexions à certains ports">  -<!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> +<!ENTITY torsettings.firewall.allowedPorts "Ports autorisés "> <!ENTITY torsettings.useBridges.checkbox "Tor est censuré dans mon pays"> <!ENTITY torsettings.useBridges.default "Sélectionner un pont intégré"> <!ENTITY torsettings.useBridges.default.placeholder "Sélectionner un pont"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Demander un nouveau pont…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Connexion à BridgeDB. Veuillez patienter."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Résoudre le captcha pour demander un pont."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "La solution est erronée. Veuillez ressayer."> diff --git a/src/chrome/locale/fur/network-settings.dtd b/src/chrome/locale/fur/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/fur/network-settings.dtd +++ b/src/chrome/locale/fur/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/fy/network-settings.dtd b/src/chrome/locale/fy/network-settings.dtd index 74c947e..4fc6f5b 100644 --- a/src/chrome/locale/fy/network-settings.dtd +++ b/src/chrome/locale/fy/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Username">  -<!ENTITY torsettings.useProxy.password "Wachtwurd:"> +<!ENTITY torsettings.useProxy.password "Wachtwurd"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ga/network-settings.dtd b/src/chrome/locale/ga/network-settings.dtd index e83332e..43ed8e4 100644 --- a/src/chrome/locale/ga/network-settings.dtd +++ b/src/chrome/locale/ga/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Úsáidim seachfhreastalaí chun ceangal leis an Idirlíon">  -<!ENTITY torsettings.useProxy.type "Cineál an tSeachfhreastalaí:"> +<!ENTITY torsettings.useProxy.type "Cineál an tSeachfhreastalaí"> <!ENTITY torsettings.useProxy.type.placeholder "roghnaigh cineál an tseachfhreastalaí">  -<!ENTITY torsettings.useProxy.address "Seoladh:"> +<!ENTITY torsettings.useProxy.address "Seoladh"> <!ENTITY torsettings.useProxy.address.placeholder "Seoladh IP nó óstainm">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Ainm úsáideora:"> +<!ENTITY torsettings.useProxy.username "Ainm úsáideora">  -<!ENTITY torsettings.useProxy.password "Focal faire:"> +<!ENTITY torsettings.useProxy.password "Focal faire"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Téann an ríomhaire seo trí bhalla dóiteáin nach gceadaíonn ceangail ach le poirt áirithe">  -<!ENTITY torsettings.firewall.allowedPorts "Poirt Cheadaithe:"> +<!ENTITY torsettings.firewall.allowedPorts "Poirt Cheadaithe"> <!ENTITY torsettings.useBridges.checkbox "Déantar cinsireacht ar Tor sa tír seo"> <!ENTITY torsettings.useBridges.default "Roghnaigh droichead ionsuite"> <!ENTITY torsettings.useBridges.default.placeholder "roghnaigh droichead"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Iarr Droichead Nua..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Ag dul i dteagmháil le BridgeDB. Fan nóiméad."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Réitigh an CAPTCHA le droichead a iarraidh."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Níl an freagra sin ceart. Bain triail eile as."> diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd index 88b0780..22dbe5b 100644 --- a/src/chrome/locale/gl/network-settings.dtd +++ b/src/chrome/locale/gl/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Tipo de Proxy:"> +<!ENTITY torsettings.useProxy.type "Tipo de Proxy"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Enderezo:"> +<!ENTITY torsettings.useProxy.address "Enderezo"> <!ENTITY torsettings.useProxy.address.placeholder "Enderezo IP ou nome da máquina">  -<!ENTITY torsettings.useProxy.port "Porto:"> +<!ENTITY torsettings.useProxy.port "Porto">  -<!ENTITY torsettings.useProxy.username "Nome de usuario:"> +<!ENTITY torsettings.useProxy.username "Nome de usuario">  -<!ENTITY torsettings.useProxy.password "Contrasinal:"> +<!ENTITY torsettings.useProxy.password "Contrasinal"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Este computador pasa por un firewall que só permite conexións a certos portos">  -<!ENTITY torsettings.firewall.allowedPorts "Portos permitidos:"> +<!ENTITY torsettings.firewall.allowedPorts "Portos permitidos"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/gu-IN/network-settings.dtd +++ b/src/chrome/locale/gu-IN/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/gu/network-settings.dtd b/src/chrome/locale/gu/network-settings.dtd index 9a46a2a..d495ad9 100644 --- a/src/chrome/locale/gu/network-settings.dtd +++ b/src/chrome/locale/gu/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "પોર્ટ:"> +<!ENTITY torsettings.useProxy.port "પોર્ટ">  -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Username">  -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/gun/network-settings.dtd b/src/chrome/locale/gun/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/gun/network-settings.dtd +++ b/src/chrome/locale/gun/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ha/network-settings.dtd b/src/chrome/locale/ha/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/ha/network-settings.dtd +++ b/src/chrome/locale/ha/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd index 99f0f30..f70e6cf 100644 --- a/src/chrome/locale/he/network-settings.dtd +++ b/src/chrome/locale/he/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "אני משתמש בייפוי־כוח כדי להתחבר לאינטרנט">  -<!ENTITY torsettings.useProxy.type "סוג ייפוי־כוח:"> +<!ENTITY torsettings.useProxy.type "סוג ייפוי־כוח"> <!ENTITY torsettings.useProxy.type.placeholder "בחר סוג ייפוי־כוח">  -<!ENTITY torsettings.useProxy.address "כתובת:"> +<!ENTITY torsettings.useProxy.address "כתובת"> <!ENTITY torsettings.useProxy.address.placeholder "כתובת IP או שם מארח">  -<!ENTITY torsettings.useProxy.port "פתחה:"> +<!ENTITY torsettings.useProxy.port "פתחה">  -<!ENTITY torsettings.useProxy.username "שם משתמש:"> +<!ENTITY torsettings.useProxy.username "שם משתמש">  -<!ENTITY torsettings.useProxy.password "סיסמה:"> +<!ENTITY torsettings.useProxy.password "סיסמה"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "מחשב זה עובר דרך חומת אש המתירה חיבורים רק אל פתחות מסוימות">  -<!ENTITY torsettings.firewall.allowedPorts "פתחות מותרות:"> +<!ENTITY torsettings.firewall.allowedPorts "פתחות מותרות"> <!ENTITY torsettings.useBridges.checkbox "Tor מצונזר במדינה שלי"> <!ENTITY torsettings.useBridges.default "בחר גשר מובנה"> <!ENTITY torsettings.useBridges.default.placeholder "בחר גשר"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "בקש גשר חדש..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "יוצר קשר עם BridgeDB. אנא המתן."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "פתור את ה־CAPTCHA כדי לבקש גשר."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "הפתרון אינו נכון. אנא נסה שוב."> diff --git a/src/chrome/locale/hi/network-settings.dtd b/src/chrome/locale/hi/network-settings.dtd index 6ef9422..92ac9aa 100644 --- a/src/chrome/locale/hi/network-settings.dtd +++ b/src/chrome/locale/hi/network-settings.dtd @@ -27,13 +27,13 @@ <!ENTITY torsettings.useProxy.checkbox "मैं इंटरनेट से कनेक्ट करने के लिए प्रॉक्सी का उपयोग करता हूं">  -<!ENTITY torsettings.useProxy.type "प्रॉक्सी प्रकार:"> +<!ENTITY torsettings.useProxy.type "प्रॉक्सी प्रकार"> <!ENTITY torsettings.useProxy.type.placeholder "प्रॉक्सी प्रकार का चयन करें">  -<!ENTITY torsettings.useProxy.address "पता :"> +<!ENTITY torsettings.useProxy.address "पता "> <!ENTITY torsettings.useProxy.address.placeholder "IP पता या मेजबाननाम">  -<!ENTITY torsettings.useProxy.port "पोर्ट/द्वार :"> +<!ENTITY torsettings.useProxy.port "पोर्ट/द्वार ">  <!ENTITY torsettings.useProxy.username "उपयोगकर्ता नाम">  @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "एक नए पुल का अनुरोध करें ..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDB से संपर्क किया जा रहा है।कृपया प्रतीक्षा करें।"> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "पुल का अनुरोध करने के लिए कैप्चा को हल करें।"> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "समाधान सही नहीं है। कृपया पुन: प्रयास करें।"> diff --git a/src/chrome/locale/hr-HR/network-settings.dtd b/src/chrome/locale/hr-HR/network-settings.dtd index e4dc474..fc0825a 100644 --- a/src/chrome/locale/hr-HR/network-settings.dtd +++ b/src/chrome/locale/hr-HR/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Opcionalno"> <!ENTITY torsettings.useProxy.checkbox "Koristim proxy za spajanje na Internet"> -<!ENTITY torsettings.useProxy.type "Tip proxya:"> +<!ENTITY torsettings.useProxy.type "Tip proxya"> <!ENTITY torsettings.useProxy.type.placeholder "odaberite tip proxya"> -<!ENTITY torsettings.useProxy.address "Adresa:"> +<!ENTITY torsettings.useProxy.address "Adresa"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Korisničko ime:"> -<!ENTITY torsettings.useProxy.password "Lozinka:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Korisničko ime"> +<!ENTITY torsettings.useProxy.password "Lozinka"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ovo računalo je iza vatrozida koji dopušta spajanje samo na određene portove"> -<!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi:"> +<!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi"> <!ENTITY torsettings.useBridges.checkbox "Tor je cenzuriran u mojoj državi"> <!ENTITY torsettings.useBridges.default "Odaberite ugrađeni most"> <!ENTITY torsettings.useBridges.default.placeholder "odaberite most"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Molimo pričekajte dok ne uspostavimo vezu s Tor mrežom.  To bi moglo potrajati nekoliko minuta."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd index 5a5dcf9..a59fcf4 100644 --- a/src/chrome/locale/hr/network-settings.dtd +++ b/src/chrome/locale/hr/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Koristim proxy za spajanje na internet">  -<!ENTITY torsettings.useProxy.type "Tip proxy-a:"> +<!ENTITY torsettings.useProxy.type "Tip proxy-a"> <!ENTITY torsettings.useProxy.type.placeholder "odaberite tip proxy-a">  -<!ENTITY torsettings.useProxy.address "Adresa:"> +<!ENTITY torsettings.useProxy.address "Adresa"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa ili poslužitelj">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Korisničko ime:"> +<!ENTITY torsettings.useProxy.username "Korisničko ime">  -<!ENTITY torsettings.useProxy.password "Lozinka:"> +<!ENTITY torsettings.useProxy.password "Lozinka"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ovo raučunalo ide kroz vatrozid koji dozvoljava veze samo preko pojedinih portova.">  -<!ENTITY torsettings.firewall.allowedPorts "Dopušteni portovi:"> +<!ENTITY torsettings.firewall.allowedPorts "Dopušteni portovi"> <!ENTITY torsettings.useBridges.checkbox "Tor je cenzuriran u mojoj zemlji"> <!ENTITY torsettings.useBridges.default "Odaberite ugrađeni most"> <!ENTITY torsettings.useBridges.default.placeholder "odaberite most"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ht/network-settings.dtd b/src/chrome/locale/ht/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/ht/network-settings.dtd +++ b/src/chrome/locale/ht/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd index 487fd65..0e350cf 100644 --- a/src/chrome/locale/hu/network-settings.dtd +++ b/src/chrome/locale/hu/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Proxy-t használok az Internetre való kapcsolódáshoz">  -<!ENTITY torsettings.useProxy.type "Proxy Típus:"> +<!ENTITY torsettings.useProxy.type "Proxy Típus"> <!ENTITY torsettings.useProxy.type.placeholder " válaszon ki egy proxy típust">  -<!ENTITY torsettings.useProxy.address "Cím:"> +<!ENTITY torsettings.useProxy.address "Cím"> <!ENTITY torsettings.useProxy.address.placeholder "IP cím vagy gépnév">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Felhasználónév:"> +<!ENTITY torsettings.useProxy.username "Felhasználónév">  -<!ENTITY torsettings.useProxy.password "Jelszó:"> +<!ENTITY torsettings.useProxy.password "Jelszó"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "A számítógép egy tűzfalon keresztül kommunikál, ami csak adott portokon keresztül engedélyezi a kapcsolatotokat.">  -<!ENTITY torsettings.firewall.allowedPorts "Engedélyezett portok:"> +<!ENTITY torsettings.firewall.allowedPorts "Engedélyezett portok"> <!ENTITY torsettings.useBridges.checkbox "A Tor cenzúrázva van az országomban"> <!ENTITY torsettings.useBridges.default "Válasszon ki egy beépített hidat"> <!ENTITY torsettings.useBridges.default.placeholder "Válasszon ki egy hidat"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Új híd kérése..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kapcsolódás a hídadatbázishoz. Kérjük várjon."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Oldjon meg egy CAPTCHA-t a híd kéréséhez."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "A megoldás nem helyes. Kérjük próbálja újra."> diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd index f6b89c5..dc977d2 100644 --- a/src/chrome/locale/hy-AM/network-settings.dtd +++ b/src/chrome/locale/hy-AM/network-settings.dtd @@ -43,17 +43,17 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.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.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> @@ -73,3 +73,5 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!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/hy/network-settings.dtd b/src/chrome/locale/hy/network-settings.dtd index 958b4c4..1d76c58 100644 --- a/src/chrome/locale/hy/network-settings.dtd +++ b/src/chrome/locale/hy/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Username">  -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ia/network-settings.dtd b/src/chrome/locale/ia/network-settings.dtd index eed18d7..1b7be98 100644 --- a/src/chrome/locale/ia/network-settings.dtd +++ b/src/chrome/locale/ia/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Adresse:"> +<!ENTITY torsettings.useProxy.address "Adresse"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Porto:"> -<!ENTITY torsettings.useProxy.username "Nomine de usator:"> -<!ENTITY torsettings.useProxy.password "Contrasigno:"> +<!ENTITY torsettings.useProxy.port "Porto"> +<!ENTITY torsettings.useProxy.username "Nomine de usator"> +<!ENTITY torsettings.useProxy.password "Contrasigno"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd index 5fefae6..0fc6b74 100644 --- a/src/chrome/locale/id/network-settings.dtd +++ b/src/chrome/locale/id/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Saya menggunakan proxy untuk terhubung ke Internet">  -<!ENTITY torsettings.useProxy.type "Tipe Proksi:"> +<!ENTITY torsettings.useProxy.type "Tipe Proksi"> <!ENTITY torsettings.useProxy.type.placeholder "pilih jenis proxy">  -<!ENTITY torsettings.useProxy.address "Alamat:"> +<!ENTITY torsettings.useProxy.address "Alamat"> <!ENTITY torsettings.useProxy.address.placeholder "alamat IP atau nama host">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Nama User:"> +<!ENTITY torsettings.useProxy.username "Nama User">  -<!ENTITY torsettings.useProxy.password "Kata sandi:"> +<!ENTITY torsettings.useProxy.password "Kata sandi"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Komputer ini pergi melalui firewall yang hanya mengizinkan koneksi untuk beberapa port">  -<!ENTITY torsettings.firewall.allowedPorts "Port yang diizinkan:"> +<!ENTITY torsettings.firewall.allowedPorts "Port yang diizinkan"> <!ENTITY torsettings.useBridges.checkbox "Tor disensor di negara saya"> <!ENTITY torsettings.useBridges.default "Pilih satu built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "pilih satu bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Meminta bridge baru..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Menghubungi BridgeDB. Mohon tunggu."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Selesaikan CAPTCHA untuk meminta sebuah bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Solusinya tidak tepat. Silakan coba lagi."> diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd index 5556d16..aaa055c 100644 --- a/src/chrome/locale/is/network-settings.dtd +++ b/src/chrome/locale/is/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Ég nota milliþjón (proxy) til að tengjast við internetið">  -<!ENTITY torsettings.useProxy.type "Gerð milliþjóns:"> +<!ENTITY torsettings.useProxy.type "Gerð milliþjóns"> <!ENTITY torsettings.useProxy.type.placeholder "veldu tegund milliþjóns">  -<!ENTITY torsettings.useProxy.address "Vistfang:"> +<!ENTITY torsettings.useProxy.address "Vistfang"> <!ENTITY torsettings.useProxy.address.placeholder "IP-vistfang eða vélarheiti">  -<!ENTITY torsettings.useProxy.port "Gátt:"> +<!ENTITY torsettings.useProxy.port "Gátt">  -<!ENTITY torsettings.useProxy.username "Notandanafn:"> +<!ENTITY torsettings.useProxy.username "Notandanafn">  -<!ENTITY torsettings.useProxy.password "Lykilorð:"> +<!ENTITY torsettings.useProxy.password "Lykilorð"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Þessi tölva tengist í gegnum eldvegg sem leyfir einungis tengingar í gegnum tilteknar gáttir">  -<!ENTITY torsettings.firewall.allowedPorts "Leyfðar gáttir:"> +<!ENTITY torsettings.firewall.allowedPorts "Leyfðar gáttir"> <!ENTITY torsettings.useBridges.checkbox "Tor er ritskoðað í landinu mínu"> <!ENTITY torsettings.useBridges.default "Veldu innbyggða brú"> <!ENTITY torsettings.useBridges.default.placeholder "veldu brú"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Biðja um nýja brú…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Tengist BridgeDB. Bíddu aðeins."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Leystu CAPTCHA-þrautina til að biðja um brú."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Þessi lausn er ekki rétt. Reyndu aftur."> diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd index eccf9b2..f8c20c9 100644 --- a/src/chrome/locale/it/network-settings.dtd +++ b/src/chrome/locale/it/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Uso un proxy per connettermi a internet">  -<!ENTITY torsettings.useProxy.type "Tipo di proxy:"> +<!ENTITY torsettings.useProxy.type "Tipo di proxy"> <!ENTITY torsettings.useProxy.type.placeholder "Seleziona un tipo di proxy">  -<!ENTITY torsettings.useProxy.address "Indirizzo:"> +<!ENTITY torsettings.useProxy.address "Indirizzo"> <!ENTITY torsettings.useProxy.address.placeholder "Indirizzo IP oppure hostname">  -<!ENTITY torsettings.useProxy.port "Porta:"> +<!ENTITY torsettings.useProxy.port "Porta">  -<!ENTITY torsettings.useProxy.username "Nome utente:"> +<!ENTITY torsettings.useProxy.username "Nome utente">  -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte">  -<!ENTITY torsettings.firewall.allowedPorts "Porte consentite:"> +<!ENTITY torsettings.firewall.allowedPorts "Porte consentite"> <!ENTITY torsettings.useBridges.checkbox "Tor viene censurato nel mio Paese"> <!ENTITY torsettings.useBridges.default "Seleziona un bridge integrato"> <!ENTITY torsettings.useBridges.default.placeholder "seleziona un bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Richiedi un nuovo bridge..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contatto BridgeDB. Attendere, prego."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Risolvi il CAPTCHA per richiedere un bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluzione è sbagliata. Riprova."> diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd index 3eb98a7..cd678f1 100644 --- a/src/chrome/locale/ja/network-settings.dtd +++ b/src/chrome/locale/ja/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "インターネットに接続するのにプロキシを使用します">  -<!ENTITY torsettings.useProxy.type "プロキシの種類:"> +<!ENTITY torsettings.useProxy.type "プロキシの種類"> <!ENTITY torsettings.useProxy.type.placeholder "プロキシの種類を選択">  -<!ENTITY torsettings.useProxy.address "アドレス:"> +<!ENTITY torsettings.useProxy.address "アドレス"> <!ENTITY torsettings.useProxy.address.placeholder "IP アドレスまたはホスト名">  -<!ENTITY torsettings.useProxy.port "ポート:"> +<!ENTITY torsettings.useProxy.port "ポート">  -<!ENTITY torsettings.useProxy.username "ユーザー名:"> +<!ENTITY torsettings.useProxy.username "ユーザー名">  -<!ENTITY torsettings.useProxy.password "パスワード:"> +<!ENTITY torsettings.useProxy.password "パスワード"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "このコンピューターは特定のポートへの接続のみ許可するファイアーウォールを通します。">  -<!ENTITY torsettings.firewall.allowedPorts "許可されたポート:"> +<!ENTITY torsettings.firewall.allowedPorts "許可されたポート"> <!ENTITY torsettings.useBridges.checkbox "Tor は私の国では検閲されています"> <!ENTITY torsettings.useBridges.default "内蔵ブリッジを選択する"> <!ENTITY torsettings.useBridges.default.placeholder "ブリッジを選択"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "新たなブリッジをリクエスト。"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDBとの接続を確立しています。しばらく待って下さい。"> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt " ブリッジをリクエストするにはCAPTCHAを解いて下さい。"> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "その解答は正しくありません。再度実行してください。"> diff --git a/src/chrome/locale/jv/network-settings.dtd b/src/chrome/locale/jv/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/jv/network-settings.dtd +++ b/src/chrome/locale/jv/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd index b0612a4..aa01eca 100644 --- a/src/chrome/locale/ka/network-settings.dtd +++ b/src/chrome/locale/ka/network-settings.dtd @@ -27,15 +27,15 @@ <!ENTITY torsettings.useProxy.checkbox "ინტერნეტთან დასაკავშირებლად პროქსის ვიყენებ">  -<!ENTITY torsettings.useProxy.type "პროქსის სახეობა:"> +<!ENTITY torsettings.useProxy.type "პროქსის სახეობა"> <!ENTITY torsettings.useProxy.type.placeholder "მიუთითეთ პროქსის სახეობა">  <!ENTITY torsettings.useProxy.address "მისამართი"> <!ENTITY torsettings.useProxy.address.placeholder "IP-მისამართი ან დასახელება">  -<!ENTITY torsettings.useProxy.port "პორტი:"> +<!ENTITY torsettings.useProxy.port "პორტი">  -<!ENTITY torsettings.useProxy.username "მომხმარებლის სახელი:"> +<!ENTITY torsettings.useProxy.username "მომხმარებლის სახელი">  <!ENTITY torsettings.useProxy.password "პაროლი"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> @@ -43,7 +43,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "კომპიუტერი ინტერნეტს უკავშირდება ქსელის ფარის გავლით, რომელშიც მხოლოდ ცალკეული პორტებია დაშვებული">  -<!ENTITY torsettings.firewall.allowedPorts "დაშვებული პორტები:"> +<!ENTITY torsettings.firewall.allowedPorts "დაშვებული პორტები"> <!ENTITY torsettings.useBridges.checkbox "Tor შეზღუდულია ჩემს ქვეყანაში"> <!ENTITY torsettings.useBridges.default "ჩაშენებული გადამცემი ხიდის მითითება"> <!ENTITY torsettings.useBridges.default.placeholder "ხიდის მითითება"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "ახალი გადამცემი ხიდის მოთხოვნა..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "დაკავშირება BridgeDB-სთან. გთხოვთ, მოითმინოთ."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "გაიარეთ CAPTCHA, გადამცემი ხიდის მოთხოვნისთვის."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "გადაწყვეტა არასწორია. გთხოვთ სცადოთ ხელახლა."> diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd index 8323269..2573377 100644 --- a/src/chrome/locale/kk/network-settings.dtd +++ b/src/chrome/locale/kk/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Username">  -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Жаңа көпірді сұраңыз..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDB-ке хабарласудамыз. Өтінемін күте тұрыңыз."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Көпірді сұрату үшін CAPTCHA-ны дұрыс жазыңыз"> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Шешім дұрыс емес. Әрекетті қайталап көріңіз."> diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd index ff36028..bbd29b2 100644 --- a/src/chrome/locale/km/network-settings.dtd +++ b/src/chrome/locale/km/network-settings.dtd @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/kn/network-settings.dtd b/src/chrome/locale/kn/network-settings.dtd index d31b5c1..6aa4864 100644 --- a/src/chrome/locale/kn/network-settings.dtd +++ b/src/chrome/locale/kn/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Username">  -<!ENTITY torsettings.useProxy.password "ಗುಪ್ತಪದ:"> +<!ENTITY torsettings.useProxy.password "ಗುಪ್ತಪದ"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ko-KR/network-settings.dtd b/src/chrome/locale/ko-KR/network-settings.dtd index e177235..4a93912 100644 --- a/src/chrome/locale/ko-KR/network-settings.dtd +++ b/src/chrome/locale/ko-KR/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "주소:"> +<!ENTITY torsettings.useProxy.address "주소"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "포트:"> -<!ENTITY torsettings.useProxy.username "사용자 이름:"> -<!ENTITY torsettings.useProxy.password "비밀번호:"> +<!ENTITY torsettings.useProxy.port "포트"> +<!ENTITY torsettings.useProxy.username "사용자 이름"> +<!ENTITY torsettings.useProxy.password "비밀번호"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "허용된 포트:"> +<!ENTITY torsettings.firewall.allowedPorts "허용된 포트"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd index fbb93cf..2bbe605 100644 --- a/src/chrome/locale/ko/network-settings.dtd +++ b/src/chrome/locale/ko/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "인터넷에 연결할 때 프록시를 사용합니다">  -<!ENTITY torsettings.useProxy.type "프록시 종류:"> +<!ENTITY torsettings.useProxy.type "프록시 종류"> <!ENTITY torsettings.useProxy.type.placeholder "프록시 유형을 선택해 주세요.">  -<!ENTITY torsettings.useProxy.address "주소:"> +<!ENTITY torsettings.useProxy.address "주소"> <!ENTITY torsettings.useProxy.address.placeholder "IP 주소 또는 호스트 네임">  -<!ENTITY torsettings.useProxy.port "포트:"> +<!ENTITY torsettings.useProxy.port "포트">  -<!ENTITY torsettings.useProxy.username "사용자명:"> +<!ENTITY torsettings.useProxy.username "사용자명">  -<!ENTITY torsettings.useProxy.password "비밀번호:"> +<!ENTITY torsettings.useProxy.password "비밀번호"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "이 컴퓨터는 특정 포트만 허용하는 방화벽을 통해서 연결됩니다.">  -<!ENTITY torsettings.firewall.allowedPorts "허용된 포트:"> +<!ENTITY torsettings.firewall.allowedPorts "허용된 포트"> <!ENTITY torsettings.useBridges.checkbox "우리나라에서는 Tor를 검열합니다."> <!ENTITY torsettings.useBridges.default "제공된 브릿지를 선택하세요."> <!ENTITY torsettings.useBridges.default.placeholder "브릿지를 선택하세요."> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "새로운 브릿지 요청하기"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "브릿지DB에 연결하고 있으니, 잠시 기다려주세요."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "브릿지를 요청하기 위해 CAPCHA를 풀어주세요."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "풀이가 맞지 않습니다. 다시 시도해주세요."> diff --git a/src/chrome/locale/ku/network-settings.dtd b/src/chrome/locale/ku/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/ku/network-settings.dtd +++ b/src/chrome/locale/ku/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/kw/network-settings.dtd b/src/chrome/locale/kw/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/kw/network-settings.dtd +++ b/src/chrome/locale/kw/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ky/network-settings.dtd b/src/chrome/locale/ky/network-settings.dtd index cccc8ab..ece5873 100644 --- a/src/chrome/locale/ky/network-settings.dtd +++ b/src/chrome/locale/ky/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Дарек:"> +<!ENTITY torsettings.useProxy.address "Дарек"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port"> <!ENTITY torsettings.useProxy.username "Колдонуучунун аты"> -<!ENTITY torsettings.useProxy.password "Сыр сөз:"> +<!ENTITY torsettings.useProxy.password "Сыр сөз"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/lb/network-settings.dtd b/src/chrome/locale/lb/network-settings.dtd index a7dbaca..d33b082 100644 --- a/src/chrome/locale/lb/network-settings.dtd +++ b/src/chrome/locale/lb/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Passwuert:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Passwuert"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/lg/network-settings.dtd b/src/chrome/locale/lg/network-settings.dtd index 263e747..3526afa 100644 --- a/src/chrome/locale/lg/network-settings.dtd +++ b/src/chrome/locale/lg/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ln/network-settings.dtd b/src/chrome/locale/ln/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/ln/network-settings.dtd +++ b/src/chrome/locale/ln/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/lo/network-settings.dtd b/src/chrome/locale/lo/network-settings.dtd index ec2106f..f4b4974 100644 --- a/src/chrome/locale/lo/network-settings.dtd +++ b/src/chrome/locale/lo/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "ພັອດ:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "ພັອດ"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "ກະລຸນາລໍຖ້າໃນຂະນະທີ່ພວກເຮົາຈັດແຈງການເຊື່ອມຕໍ່ເຂົ້າເຄືອຂ່າຍ Tor.  ອາດຈະໃຊ້ເວລາຫລາຍນາທີ."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd index 6aa3b5d..d974e0e 100644 --- a/src/chrome/locale/lt/network-settings.dtd +++ b/src/chrome/locale/lt/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Prisijungimui prie interneto aš naudoju įgaliotąjį serverį">  -<!ENTITY torsettings.useProxy.type "Įgaliotojo serverio tipas:"> +<!ENTITY torsettings.useProxy.type "Įgaliotojo serverio tipas"> <!ENTITY torsettings.useProxy.type.placeholder "pasirinkite įgaliotojo serverio tipą">  -<!ENTITY torsettings.useProxy.address "Adresas:"> +<!ENTITY torsettings.useProxy.address "Adresas"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresas arba serverio vardas">  -<!ENTITY torsettings.useProxy.port "Prievadas:"> +<!ENTITY torsettings.useProxy.port "Prievadas">  -<!ENTITY torsettings.useProxy.username "Naudotojo vardas:"> +<!ENTITY torsettings.useProxy.username "Naudotojo vardas">  -<!ENTITY torsettings.useProxy.password "Slaptažodis:"> +<!ENTITY torsettings.useProxy.password "Slaptažodis"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Šis kompiuteris jungiasi per užkardą, kuri leidžia jungtis tik prie tam tikrų prievadų">  -<!ENTITY torsettings.firewall.allowedPorts "Leidžiami prievadai:"> +<!ENTITY torsettings.firewall.allowedPorts "Leidžiami prievadai"> <!ENTITY torsettings.useBridges.checkbox "Mano šalyje Tor yra cenzūruojamas"> <!ENTITY torsettings.useBridges.default "Pasirinkite įtaisytąjį tinklų tiltą"> <!ENTITY torsettings.useBridges.default.placeholder "pasirinkite tinklų tiltą"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Užklausti naują tinklų tiltą…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Susisiekiama su BridgeDB. Palaukite."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Norėdami užklausti tinklų tiltą, išspręskite saugos kodą."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Sprendimas neteisingas. Bandykite dar kartą."> diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd index c7feeb9..2d8055a 100644 --- a/src/chrome/locale/lv/network-settings.dtd +++ b/src/chrome/locale/lv/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Lai izveidotu savienojumu ar internetu, es lietoju starpniekseveri">  -<!ENTITY torsettings.useProxy.type "Starpnieka tips:"> +<!ENTITY torsettings.useProxy.type "Starpnieka tips"> <!ENTITY torsettings.useProxy.type.placeholder "izvēlieties starpniekservera veidu">  -<!ENTITY torsettings.useProxy.address "Adrese:"> +<!ENTITY torsettings.useProxy.address "Adrese"> <!ENTITY torsettings.useProxy.address.placeholder "IP adrese vai resursdatora nosaukums">  -<!ENTITY torsettings.useProxy.port "Ports:"> +<!ENTITY torsettings.useProxy.port "Ports">  -<!ENTITY torsettings.useProxy.username "Lietotājvārds:"> +<!ENTITY torsettings.useProxy.username "Lietotājvārds">  -<!ENTITY torsettings.useProxy.password "Parole:"> +<!ENTITY torsettings.useProxy.password "Parole"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Šis dators iet caur ugunsmūri, kurš atļauj tikai savienojumus ar noteiktiem portiem.">  -<!ENTITY torsettings.firewall.allowedPorts "Atļautie porti:"> +<!ENTITY torsettings.firewall.allowedPorts "Atļautie porti"> <!ENTITY torsettings.useBridges.checkbox "Manā valstī Tor tiek cenzēts"> <!ENTITY torsettings.useBridges.default "Izvēlieties iebūvētu tiltu"> <!ENTITY torsettings.useBridges.default.placeholder "izvēlieties tiltu"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/mg/network-settings.dtd b/src/chrome/locale/mg/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/mg/network-settings.dtd +++ b/src/chrome/locale/mg/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/mi/network-settings.dtd b/src/chrome/locale/mi/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/mi/network-settings.dtd +++ b/src/chrome/locale/mi/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd index a6ab9ec..3830d1d 100644 --- a/src/chrome/locale/mk/network-settings.dtd +++ b/src/chrome/locale/mk/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Користам прокси за поврзување на Интернет">  -<!ENTITY torsettings.useProxy.type "Тип на прокси:"> +<!ENTITY torsettings.useProxy.type "Тип на прокси"> <!ENTITY torsettings.useProxy.type.placeholder "одбери тип на прокси">  -<!ENTITY torsettings.useProxy.address "Адреси:"> +<!ENTITY torsettings.useProxy.address "Адреси"> <!ENTITY torsettings.useProxy.address.placeholder "IP адреси или име на хост">  -<!ENTITY torsettings.useProxy.port "Порта:"> +<!ENTITY torsettings.useProxy.port "Порта">  -<!ENTITY torsettings.useProxy.username "Корисничко име:"> +<!ENTITY torsettings.useProxy.username "Корисничко име">  -<!ENTITY torsettings.useProxy.password "Лозинка:"> +<!ENTITY torsettings.useProxy.password "Лозинка"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Овој компјутер оди преку заштитен ѕид кој дозволува поврзувања до одредени порти">  -<!ENTITY torsettings.firewall.allowedPorts "Дозволени порти:"> +<!ENTITY torsettings.firewall.allowedPorts "Дозволени порти"> <!ENTITY torsettings.useBridges.checkbox "Tor е цензуриран во мојата држава"> <!ENTITY torsettings.useBridges.default "Одбери вграден мост"> <!ENTITY torsettings.useBridges.default.placeholder "одбери мост"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Барање за нов мост..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Контактирање со BridgeDB. Ве молиме почекајте."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Решете ја ЗАДАЧАТА за да побарате мост."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Решението е погрешно. Ве молиме обидете се повторно."> diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd index 3c6b28a..bbab031 100644 --- a/src/chrome/locale/ml/network-settings.dtd +++ b/src/chrome/locale/ml/network-settings.dtd @@ -27,15 +27,15 @@ <!ENTITY torsettings.useProxy.checkbox "ഞാൻ ഇന്റർനൈറ്റിലെക് ബന്ധപ്പെടാൻ ഒരു പ്രോക്സി ഉപയോഗിക്കുന്നു ">  -<!ENTITY torsettings.useProxy.type "പ്രോക്സി ഇനം :"> +<!ENTITY torsettings.useProxy.type "പ്രോക്സി ഇനം "> <!ENTITY torsettings.useProxy.type.placeholder "ഒരു പ്രോക്സി ഇനം തിരഞ്ഞെടുക്കുക :">  -<!ENTITY torsettings.useProxy.address "മേൽവിലാസം :"> +<!ENTITY torsettings.useProxy.address "മേൽവിലാസം "> <!ENTITY torsettings.useProxy.address.placeholder "ഐ പി മേൽവിലാസം അല്ലെങ്കിൽ ഹോസ്റ്റ് നെയിം ">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "യൂസർ നെയിം :"> +<!ENTITY torsettings.useProxy.username "യൂസർ നെയിം ">  <!ENTITY torsettings.useProxy.password "പാസ്സ്‌വേർഡ്‌ "> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "ഒരു പുതിയ ബ്രിഡ്ജിനെ ചോദിക്കുക ..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "ബ്രിഡ്ജ് ഡി ബിയെ ബന്ധപ്പെടുന്നു , ദയവായി കാത്തിരിക്കുക "> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "ബ്രിഡ്ജിനെ കിട്ടാൻ തന്നിരിക്കുന്ന കാപ്ച പരിഹരിക്കുക "> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "പരിഹാരം ശെരിയല്ല . ദയവായി ഒന്നുകൂടെ ശ്രെമിക്കുക "> diff --git a/src/chrome/locale/mn/network-settings.dtd b/src/chrome/locale/mn/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/mn/network-settings.dtd +++ b/src/chrome/locale/mn/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd index e372640..2e88e08 100644 --- a/src/chrome/locale/mr/network-settings.dtd +++ b/src/chrome/locale/mr/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Username">  -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "नवीन ब्रिजची विनंती करा ..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "ब्रिजडिबशी संपर्क साधणे कृपया थांबा."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "पुलाची विनंती करण्यासाठी कॅप्चाचे निरसन करा."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "उपाय बरोबर नाही. कृपया पुन्हा प्रयत्न करा."> diff --git a/src/chrome/locale/ms-MY/network-settings.dtd b/src/chrome/locale/ms-MY/network-settings.dtd index 9c6299e..c0a22a9 100644 --- a/src/chrome/locale/ms-MY/network-settings.dtd +++ b/src/chrome/locale/ms-MY/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Saya guna proksi untuk bersambung dengan Internet">  -<!ENTITY torsettings.useProxy.type "Jenis Proksi:"> +<!ENTITY torsettings.useProxy.type "Jenis Proksi"> <!ENTITY torsettings.useProxy.type.placeholder "pilih sejenis proksi">  -<!ENTITY torsettings.useProxy.address "Alamat:"> +<!ENTITY torsettings.useProxy.address "Alamat"> <!ENTITY torsettings.useProxy.address.placeholder "Alamat IP atau nama hos">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Nama Pengguna:"> +<!ENTITY torsettings.useProxy.username "Nama Pengguna">  -<!ENTITY torsettings.useProxy.password "Kata Laluan:"> +<!ENTITY torsettings.useProxy.password "Kata Laluan"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Komputer ini melalui tembok api yang hanya membolehkan sambungan ke port tertentu">  -<!ENTITY torsettings.firewall.allowedPorts "Port Dibenarkan:"> +<!ENTITY torsettings.firewall.allowedPorts "Port Dibenarkan"> <!ENTITY torsettings.useBridges.checkbox "Tor dilarang penggunaannya di negara saya"> <!ENTITY torsettings.useBridges.default "Pilih satu titi terbina-dalam"> <!ENTITY torsettings.useBridges.default.placeholder "pilih satu titi"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Pinta satu Titi Baharu..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Menghubungi BridgeDB. Tunggu sebentar."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Selesaikan CAPTCHA untuk meminta satu titi."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Jawapan salah. Cuba sekali lagi."> diff --git a/src/chrome/locale/ms/network-settings.dtd b/src/chrome/locale/ms/network-settings.dtd index 723a055..26740be 100644 --- a/src/chrome/locale/ms/network-settings.dtd +++ b/src/chrome/locale/ms/network-settings.dtd @@ -35,7 +35,7 @@ <!ENTITY torsettings.useProxy.type ""> <!ENTITY torsettings.useProxy.address ""> <!ENTITY torsettings.useProxy.address.placeholder ""> -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port"> <!ENTITY torsettings.useProxy.username ""> <!ENTITY torsettings.useProxy.password ""> <!ENTITY torsettings.useProxy.type.socks4 ""> @@ -53,3 +53,5 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> + + diff --git a/src/chrome/locale/mt/network-settings.dtd b/src/chrome/locale/mt/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/mt/network-settings.dtd +++ b/src/chrome/locale/mt/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd index e461e30..33c2410 100644 --- a/src/chrome/locale/my/network-settings.dtd +++ b/src/chrome/locale/my/network-settings.dtd @@ -27,13 +27,13 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  <!ENTITY torsettings.useProxy.address "နေရပ်လိပ်စာ -"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  <!ENTITY torsettings.useProxy.username "သုံးစွဲသူအမည် -">  @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/nah/network-settings.dtd b/src/chrome/locale/nah/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/nah/network-settings.dtd +++ b/src/chrome/locale/nah/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/nap/network-settings.dtd b/src/chrome/locale/nap/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/nap/network-settings.dtd +++ b/src/chrome/locale/nap/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/nb/network-settings.dtd b/src/chrome/locale/nb/network-settings.dtd index f4da5b7..3680510 100644 --- a/src/chrome/locale/nb/network-settings.dtd +++ b/src/chrome/locale/nb/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Jeg bruker en mellomtjener for å koble til Internett">  -<!ENTITY torsettings.useProxy.type "Mellomtjeningstype:"> +<!ENTITY torsettings.useProxy.type "Mellomtjeningstype"> <!ENTITY torsettings.useProxy.type.placeholder "velg en mellomtjenertype">  -<!ENTITY torsettings.useProxy.address "Adresse:"> +<!ENTITY torsettings.useProxy.address "Adresse"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse, eller vertsnavn">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Brukernavn:"> +<!ENTITY torsettings.useProxy.username "Brukernavn">  -<!ENTITY torsettings.useProxy.password "Passord:"> +<!ENTITY torsettings.useProxy.password "Passord"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denne datamaskinen går gjennom en brannmur som kun tillater tilkoblinger til visse porter">  -<!ENTITY torsettings.firewall.allowedPorts "Tillatte porter:"> +<!ENTITY torsettings.firewall.allowedPorts "Tillatte porter"> <!ENTITY torsettings.useBridges.checkbox "Tor er sensurert i mitt land"> <!ENTITY torsettings.useBridges.default "Velg en bro med flere innfartsårer"> <!ENTITY torsettings.useBridges.default.placeholder "velg en bro"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Forespør ny bro…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontakter BridgeDB. Vennligst vent."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Løs CAPTCHA-en for å forespørre en bro."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Løsningen er ikke riktig. Vær så snill, prøv på nytt."> diff --git a/src/chrome/locale/nds/network-settings.dtd b/src/chrome/locale/nds/network-settings.dtd index 4615146..247385b 100644 --- a/src/chrome/locale/nds/network-settings.dtd +++ b/src/chrome/locale/nds/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd index 5704206..fc44a69 100644 --- a/src/chrome/locale/ne/network-settings.dtd +++ b/src/chrome/locale/ne/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Username">  -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd index d6ec3f7..d52710a 100644 --- a/src/chrome/locale/nl-BE/network-settings.dtd +++ b/src/chrome/locale/nl-BE/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Adres:"> +<!ENTITY torsettings.useProxy.address "Adres"> <!ENTITY torsettings.useProxy.address.placeholder "IP adres of hostnaam">  -<!ENTITY torsettings.useProxy.port "Poort:"> +<!ENTITY torsettings.useProxy.port "Poort">  -<!ENTITY torsettings.useProxy.username "Gebruikersnaam:"> +<!ENTITY torsettings.useProxy.username "Gebruikersnaam">  -<!ENTITY torsettings.useProxy.password "Wachtwoord:"> +<!ENTITY torsettings.useProxy.password "Wachtwoord"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -92,3 +92,9 @@ Dit kan enkele minuten duren."> <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd index 7cbe12a..e735f4e 100644 --- a/src/chrome/locale/nl/network-settings.dtd +++ b/src/chrome/locale/nl/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I gebruik een proxy om met het internet te verbinden.">  -<!ENTITY torsettings.useProxy.type "Proxytype:"> +<!ENTITY torsettings.useProxy.type "Proxytype"> <!ENTITY torsettings.useProxy.type.placeholder "selecteer een proxytype">  -<!ENTITY torsettings.useProxy.address "Adres:"> +<!ENTITY torsettings.useProxy.address "Adres"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adres of hostnaam">  -<!ENTITY torsettings.useProxy.port "Poort:"> +<!ENTITY torsettings.useProxy.port "Poort">  -<!ENTITY torsettings.useProxy.username "Gebruikersnaam:"> +<!ENTITY torsettings.useProxy.username "Gebruikersnaam">  -<!ENTITY torsettings.useProxy.password "Wachtwoord:"> +<!ENTITY torsettings.useProxy.password "Wachtwoord"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Deze computer gebruikt een firewall die alleen verbindingen naar bepaalde poorten toestaat">  -<!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten:"> +<!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten"> <!ENTITY torsettings.useBridges.checkbox "Tor is in mijn land gecensureerd."> <!ENTITY torsettings.useBridges.default "Een ingebouwde bridge selecteren"> <!ENTITY torsettings.useBridges.default.placeholder "selecteer een bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Een nieuwe bridge aanvragen…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contact maken met BridgeDB. Een ogenblik."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Los de CAPTCHA op om een bridge aan te vragen."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "De oplossing is niet juist. Probeer het opnieuw."> diff --git a/src/chrome/locale/nn/network-settings.dtd b/src/chrome/locale/nn/network-settings.dtd index d94e449..9513dcd 100644 --- a/src/chrome/locale/nn/network-settings.dtd +++ b/src/chrome/locale/nn/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Mellomtenartype:"> +<!ENTITY torsettings.useProxy.type "Mellomtenartype"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Addresse:"> +<!ENTITY torsettings.useProxy.address "Addresse"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adresse eller vertsnamn">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Brukarnamn:"> +<!ENTITY torsettings.useProxy.username "Brukarnamn">  -<!ENTITY torsettings.useProxy.password "Passord:"> +<!ENTITY torsettings.useProxy.password "Passord"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS"> <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">  -<!ENTITY torsettings.firewall.allowedPorts "Tillatne portar:"> +<!ENTITY torsettings.firewall.allowedPorts "Tillatne portar"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/nso/network-settings.dtd b/src/chrome/locale/nso/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/nso/network-settings.dtd +++ b/src/chrome/locale/nso/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/pa/network-settings.dtd b/src/chrome/locale/pa/network-settings.dtd index 17f12d8..57ceea2 100644 --- a/src/chrome/locale/pa/network-settings.dtd +++ b/src/chrome/locale/pa/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "ਪਰਾਕਸੀ ਕਿਸਮ:"> +<!ENTITY torsettings.useProxy.type "ਪਰਾਕਸੀ ਕਿਸਮ"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "ਪਤਾ:"> +<!ENTITY torsettings.useProxy.address "ਪਤਾ"> <!ENTITY torsettings.useProxy.address.placeholder "IP ਸਿਰਨਾਵਾਂ ਜਾਂ ਹੋਸਟ-ਨਾਂ">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "ਯੂਜ਼ਰ-ਨਾਂ:"> +<!ENTITY torsettings.useProxy.username "ਯੂਜ਼ਰ-ਨਾਂ">  -<!ENTITY torsettings.useProxy.password "ਪਾਸਵਰਡ:"> +<!ENTITY torsettings.useProxy.password "ਪਾਸਵਰਡ"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/pap/network-settings.dtd b/src/chrome/locale/pap/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/pap/network-settings.dtd +++ b/src/chrome/locale/pap/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/pl-PL/network-settings.dtd b/src/chrome/locale/pl-PL/network-settings.dtd index 9a2f3f6..49683d0 100644 --- a/src/chrome/locale/pl-PL/network-settings.dtd +++ b/src/chrome/locale/pl-PL/network-settings.dtd @@ -53,3 +53,5 @@ <!ENTITY torsettings.bridgeHelp2 ""> <!ENTITY torsettings.bridgeHelp3 ""> <!ENTITY torsettings.bridgeHelp4 ""> + + diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd index e8c508d..f39f5a0 100644 --- a/src/chrome/locale/pl/network-settings.dtd +++ b/src/chrome/locale/pl/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Używam proxy do łączenia się z Internetem">  -<!ENTITY torsettings.useProxy.type "Typ Proxy:"> +<!ENTITY torsettings.useProxy.type "Typ Proxy"> <!ENTITY torsettings.useProxy.type.placeholder "wybierz typ proxy">  -<!ENTITY torsettings.useProxy.address "Adres:"> +<!ENTITY torsettings.useProxy.address "Adres"> <!ENTITY torsettings.useProxy.address.placeholder "Nazwa hosta lub adres IP">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Użytkownik:"> +<!ENTITY torsettings.useProxy.username "Użytkownik">  -<!ENTITY torsettings.useProxy.password "Hasło:"> +<!ENTITY torsettings.useProxy.password "Hasło"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami">  -<!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:"> +<!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty"> <!ENTITY torsettings.useBridges.checkbox "Tor jest ocenzurowany w moim kraju"> <!ENTITY torsettings.useBridges.default "Wybierz wbudowany most"> <!ENTITY torsettings.useBridges.default.placeholder "wybierz most"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Poproś o nowy most..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontakt z BridgeDB. Proszę czekać."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Rozwiąż CAPTCHA, aby poprosić o most."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Rozwiązanie nie jest poprawne. Proszę spróbuj ponownie."> diff --git a/src/chrome/locale/pms/network-settings.dtd b/src/chrome/locale/pms/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/pms/network-settings.dtd +++ b/src/chrome/locale/pms/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ps/network-settings.dtd b/src/chrome/locale/ps/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/ps/network-settings.dtd +++ b/src/chrome/locale/ps/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd index 6fbdd57..6106de4 100644 --- a/src/chrome/locale/pt-BR/network-settings.dtd +++ b/src/chrome/locale/pt-BR/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Eu uso proxy para me conectar à Internet">  -<!ENTITY torsettings.useProxy.type "Tipo de Proxy:"> +<!ENTITY torsettings.useProxy.type "Tipo de Proxy"> <!ENTITY torsettings.useProxy.type.placeholder "Selecione um tipo de proxy">  -<!ENTITY torsettings.useProxy.address "Endereço:"> +<!ENTITY torsettings.useProxy.address "Endereço"> <!ENTITY torsettings.useProxy.address.placeholder "Endereço IP ou Servidor">  -<!ENTITY torsettings.useProxy.port "Porta:"> +<!ENTITY torsettings.useProxy.port "Porta">  -<!ENTITY torsettings.useProxy.username "Usuário:"> +<!ENTITY torsettings.useProxy.username "Usuário">  -<!ENTITY torsettings.useProxy.password "Senha:"> +<!ENTITY torsettings.useProxy.password "Senha"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "A conexão Internet deste computador é filtrada por uma firewall que autoriza conexões somente a determinadas portas.">  -<!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:"> +<!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas"> <!ENTITY torsettings.useBridges.checkbox "Tor é censurado no país onde estou"> <!ENTITY torsettings.useBridges.default "Selecione uma ponte embutida"> <!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Solicitar uma nova ponte"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Entrando em contato com BridgeDB. Por favor, aguarde."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "A solução não está correta. Por favor, tente novamente."> diff --git a/src/chrome/locale/pt-PT/network-settings.dtd b/src/chrome/locale/pt-PT/network-settings.dtd index 0c40404..f2ea9bf 100644 --- a/src/chrome/locale/pt-PT/network-settings.dtd +++ b/src/chrome/locale/pt-PT/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Eu utilizo um proxy para ligar à Internet">  -<!ENTITY torsettings.useProxy.type "Tipo de proxy:"> +<!ENTITY torsettings.useProxy.type "Tipo de proxy"> <!ENTITY torsettings.useProxy.type.placeholder "selecionar um tipo de proxy">  -<!ENTITY torsettings.useProxy.address "Endereço:"> +<!ENTITY torsettings.useProxy.address "Endereço"> <!ENTITY torsettings.useProxy.address.placeholder "Endereço de IP ou nome do hospedeiro">  -<!ENTITY torsettings.useProxy.port "Porta:"> +<!ENTITY torsettings.useProxy.port "Porta">  -<!ENTITY torsettings.useProxy.username "Nome do utilizador:"> +<!ENTITY torsettings.useProxy.username "Nome do utilizador">  -<!ENTITY torsettings.useProxy.password "Palavra-passe:"> +<!ENTITY torsettings.useProxy.password "Palavra-passe"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Este computador liga através de uma firewall que só permite ligações para determinadas portas">  -<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> +<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas"> <!ENTITY torsettings.useBridges.checkbox "O Tor é censurado no meu país"> <!ENTITY torsettings.useBridges.default "Selecionar uma ponte integrada"> <!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Solicitar uma Nova Ponte..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "A contactar a BridgeDB. Por favor, aguarde."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "A solução não está correta. Por favor, tente novamente."> diff --git a/src/chrome/locale/pt/network-settings.dtd b/src/chrome/locale/pt/network-settings.dtd index 8876712..aa57861 100644 --- a/src/chrome/locale/pt/network-settings.dtd +++ b/src/chrome/locale/pt/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Opcional"> <!ENTITY torsettings.useProxy.checkbox "Eu utilizo um proxy para ligar à Internet"> -<!ENTITY torsettings.useProxy.type "Tipo de proxy:"> +<!ENTITY torsettings.useProxy.type "Tipo de proxy"> <!ENTITY torsettings.useProxy.type.placeholder "selecionar um tipo de proxy"> -<!ENTITY torsettings.useProxy.address "Endereço:"> +<!ENTITY torsettings.useProxy.address "Endereço"> <!ENTITY torsettings.useProxy.address.placeholder "Endereço de IP ou nome do hospedeiro"> -<!ENTITY torsettings.useProxy.port "Porta:"> -<!ENTITY torsettings.useProxy.username "Nome do utilizador:"> -<!ENTITY torsettings.useProxy.password "Senha:"> +<!ENTITY torsettings.useProxy.port "Porta"> +<!ENTITY torsettings.useProxy.username "Nome do utilizador"> +<!ENTITY torsettings.useProxy.password "Senha"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Este computador liga através de uma firewall que só permite ligações para determinadas portas."> -<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:"> +<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas"> <!ENTITY torsettings.useBridges.checkbox "Tor é censurado no meu país"> <!ENTITY torsettings.useBridges.default "Selecionar um ponte integrada"> <!ENTITY torsettings.useBridges.default.placeholder "selecionar uma ponte"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos."> + + +<!ENTITY torPreferences.requestNewBridge "Solicite uma Nova Ponte..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "A contactar BridgeDB. Por favor, aguarde."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "A solução não está correta. Por favor, tente novamente."> diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd index 602aa09..1bdef23 100644 --- a/src/chrome/locale/ro/network-settings.dtd +++ b/src/chrome/locale/ro/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Folosesc un proxy pentru a mă conecta la Internet">  -<!ENTITY torsettings.useProxy.type "Tip proxy:"> +<!ENTITY torsettings.useProxy.type "Tip proxy"> <!ENTITY torsettings.useProxy.type.placeholder "alege un tip de proxy">  -<!ENTITY torsettings.useProxy.address "Adresă:"> +<!ENTITY torsettings.useProxy.address "Adresă"> <!ENTITY torsettings.useProxy.address.placeholder "Adresă IP sau hostname">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Nume utilizator:"> +<!ENTITY torsettings.useProxy.username "Nume utilizator">  -<!ENTITY torsettings.useProxy.password "Parola:"> +<!ENTITY torsettings.useProxy.password "Parola"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Acest computer trece printr-un firewall care permite doar conexiuni către anumite porturi">  -<!ENTITY torsettings.firewall.allowedPorts "Porturi permise:"> +<!ENTITY torsettings.firewall.allowedPorts "Porturi permise"> <!ENTITY torsettings.useBridges.checkbox "Tor este cenzurat în țara mea"> <!ENTITY torsettings.useBridges.default "Selectează o punte integrată"> <!ENTITY torsettings.useBridges.default.placeholder "selectează o punte"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Cerere Punte Nouă"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Se contactează BridgeDB. Așteptați."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Rezolvă acest CAPTCHA pentru a cere o punte."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Soluția nu este corectă. Încearcă din nou."> diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd index f4b0918..de75219 100644 --- a/src/chrome/locale/ru/network-settings.dtd +++ b/src/chrome/locale/ru/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Я использую прокси для подключения к интернету">  -<!ENTITY torsettings.useProxy.type "Тип прокси:"> +<!ENTITY torsettings.useProxy.type "Тип прокси"> <!ENTITY torsettings.useProxy.type.placeholder "выбор типа прокси">  -<!ENTITY torsettings.useProxy.address "Адрес:"> +<!ENTITY torsettings.useProxy.address "Адрес"> <!ENTITY torsettings.useProxy.address.placeholder "IP-адрес или имя узла">  -<!ENTITY torsettings.useProxy.port "Порт:"> +<!ENTITY torsettings.useProxy.port "Порт">  -<!ENTITY torsettings.useProxy.username "Имя пользователя:"> +<!ENTITY torsettings.useProxy.username "Имя пользователя">  -<!ENTITY torsettings.useProxy.password "Пароль:"> +<!ENTITY torsettings.useProxy.password "Пароль"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Мой сетевой экран позволяет мне подключиться только к определенным портам">  -<!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты:"> +<!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты"> <!ENTITY torsettings.useBridges.checkbox "Tor запрещен в моей стране"> <!ENTITY torsettings.useBridges.default "Выбрать встроенный мост"> <!ENTITY torsettings.useBridges.default.placeholder "выбор моста"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Запрос нового моста…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Обращение к BridgeDB. Пожалуйста, подождите."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Решите CAPTCHA для запроса моста."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Решение не является правильным. Попробуйте еще раз."> diff --git a/src/chrome/locale/ru(a)petr1708/network-settings.dtd b/src/chrome/locale/ru(a)petr1708/network-settings.dtd index 137d417..203d8e3 100644 --- a/src/chrome/locale/ru(a)petr1708/network-settings.dtd +++ b/src/chrome/locale/ru(a)petr1708/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Адрес:"> +<!ENTITY torsettings.useProxy.address "Адрес"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Порт:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Пароль:"> +<!ENTITY torsettings.useProxy.port "Порт"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Пароль"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/sco/network-settings.dtd b/src/chrome/locale/sco/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/sco/network-settings.dtd +++ b/src/chrome/locale/sco/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/si-LK/network-settings.dtd b/src/chrome/locale/si-LK/network-settings.dtd index bbc6322..c3c2e4f 100644 --- a/src/chrome/locale/si-LK/network-settings.dtd +++ b/src/chrome/locale/si-LK/network-settings.dtd @@ -27,13 +27,13 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "නියුතු සේවාදායක වර්ගය:"> +<!ENTITY torsettings.useProxy.type "නියුතු සේවාදායක වර්ගය"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "ලිපිනය:"> +<!ENTITY torsettings.useProxy.address "ලිපිනය"> <!ENTITY torsettings.useProxy.address.placeholder "IP ලිපිනය හෝ සත්කාරක නාමය">  -<!ENTITY torsettings.useProxy.port "පොර්ටය:"> +<!ENTITY torsettings.useProxy.port "පොර්ටය">  <!ENTITY torsettings.useProxy.username "පරිශීලක නාමය">  @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/sk-SK/network-settings.dtd b/src/chrome/locale/sk-SK/network-settings.dtd index 5f77c81..b3882a7 100644 --- a/src/chrome/locale/sk-SK/network-settings.dtd +++ b/src/chrome/locale/sk-SK/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Voliteľné"> <!ENTITY torsettings.useProxy.checkbox "Na pripojenie k internetu používam proxy"> -<!ENTITY torsettings.useProxy.type "Typ proxy:"> +<!ENTITY torsettings.useProxy.type "Typ proxy"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Adresa:"> +<!ENTITY torsettings.useProxy.address "Adresa"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo názov hostiteľa"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Užívateľské meno:"> -<!ENTITY torsettings.useProxy.password "Heslo:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Užívateľské meno"> +<!ENTITY torsettings.useProxy.password "Heslo"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tento počítač prechádza cez firewall, ktorý povoľuje spojenie len k určitým portom."> -<!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> +<!ENTITY torsettings.firewall.allowedPorts "Povolené porty"> <!ENTITY torsettings.useBridges.checkbox "Tor je v mojej krajine cenzurovaný"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Prosím počkajte na vytvorenie pripojenia do siete Tor.  Môže to trvať niekoľko minút. "> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd index f73bc29..c9c4000 100644 --- a/src/chrome/locale/sk/network-settings.dtd +++ b/src/chrome/locale/sk/network-settings.dtd @@ -27,15 +27,15 @@ <!ENTITY torsettings.useProxy.checkbox "Na pripojenie k internetu používam proxy">  -<!ENTITY torsettings.useProxy.type "Typ Proxy:"> +<!ENTITY torsettings.useProxy.type "Typ Proxy"> <!ENTITY torsettings.useProxy.type.placeholder "vybrať typ proxy">  -<!ENTITY torsettings.useProxy.address "Adresa:"> +<!ENTITY torsettings.useProxy.address "Adresa"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresa alebo názov hostiteľa">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Už.názov:"> +<!ENTITY torsettings.useProxy.username "Už.názov">  <!ENTITY torsettings.useProxy.password "Heslo?"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> @@ -43,7 +43,7 @@ <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Tento počítač ide cez firewall, ktorý povoľuje iba niektoré porty">  -<!ENTITY torsettings.firewall.allowedPorts "Povolené porty:"> +<!ENTITY torsettings.firewall.allowedPorts "Povolené porty"> <!ENTITY torsettings.useBridges.checkbox "Tor je v mojej krajine cenzurovaný"> <!ENTITY torsettings.useBridges.default "Zvoľte zabudované premostenie"> <!ENTITY torsettings.useBridges.default.placeholder "zvoľte premostenie"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Požiadať o nové premostenie."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Spájam sa s databázou premostení. Prosím čakajte."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Vyrieš CAPTCHA na vyžiadanie premostenia."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Riešenie nie je správne. Prosím skúste znova."> diff --git a/src/chrome/locale/sl-SI/network-settings.dtd b/src/chrome/locale/sl-SI/network-settings.dtd index 1fd99f6..22c9ec6 100644 --- a/src/chrome/locale/sl-SI/network-settings.dtd +++ b/src/chrome/locale/sl-SI/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Po izbiri"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy tip:"> +<!ENTITY torsettings.useProxy.type "Proxy tip"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Naslov:"> +<!ENTITY torsettings.useProxy.address "Naslov"> <!ENTITY torsettings.useProxy.address.placeholder "IP naslov ali ime domene"> -<!ENTITY torsettings.useProxy.port "Vhod:"> -<!ENTITY torsettings.useProxy.username "Uporabniško ime:"> -<!ENTITY torsettings.useProxy.password "Geslo:"> +<!ENTITY torsettings.useProxy.port "Vhod"> +<!ENTITY torsettings.useProxy.username "Uporabniško ime"> +<!ENTITY torsettings.useProxy.password "Geslo"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Računalnik uporablja požarni zid, ki dovoljuje povezavo le na določena vrata"> -<!ENTITY torsettings.firewall.allowedPorts "Dovoljena vrata:"> +<!ENTITY torsettings.firewall.allowedPorts "Dovoljena vrata"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd index d3119fd..3b8b975 100644 --- a/src/chrome/locale/sl/network-settings.dtd +++ b/src/chrome/locale/sl/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy tip:"> +<!ENTITY torsettings.useProxy.type "Proxy tip"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Naslov:"> +<!ENTITY torsettings.useProxy.address "Naslov"> <!ENTITY torsettings.useProxy.address.placeholder "IP naslov ali ime domene">  -<!ENTITY torsettings.useProxy.port "vrata:"> +<!ENTITY torsettings.useProxy.port "vrata">  -<!ENTITY torsettings.useProxy.username "Uporabniško ime:"> +<!ENTITY torsettings.useProxy.username "Uporabniško ime">  -<!ENTITY torsettings.useProxy.password "Geslo:"> +<!ENTITY torsettings.useProxy.password "Geslo"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Računalnik uporablja požarni zid, ki dovoljuje povezavo le na določena vrata">  -<!ENTITY torsettings.firewall.allowedPorts "Dovoljena vrata:"> +<!ENTITY torsettings.firewall.allowedPorts "Dovoljena vrata"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/sn/network-settings.dtd b/src/chrome/locale/sn/network-settings.dtd index e126b2a..c73d96a 100644 --- a/src/chrome/locale/sn/network-settings.dtd +++ b/src/chrome/locale/sn/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/so/network-settings.dtd b/src/chrome/locale/so/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/so/network-settings.dtd +++ b/src/chrome/locale/so/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/sq-AL/network-settings.dtd b/src/chrome/locale/sq-AL/network-settings.dtd index 75ece3b..3c445d0 100644 --- a/src/chrome/locale/sq-AL/network-settings.dtd +++ b/src/chrome/locale/sq-AL/network-settings.dtd @@ -43,17 +43,17 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "This computer needs to use a local proxy to access the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.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.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> @@ -73,3 +73,5 @@ <!ENTITY torsettings.bridgeHelp3.emailList "https://www.riseup.net, https://mail.google.com, or https://mail.yahoo.com"> <!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/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd index e5ca0fc..54593dc 100644 --- a/src/chrome/locale/sq/network-settings.dtd +++ b/src/chrome/locale/sq/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Unë përdor një proxy për tu lidhur në Internet">  -<!ENTITY torsettings.useProxy.type "Lloji i Proxy-t:"> +<!ENTITY torsettings.useProxy.type "Lloji i Proxy-t"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Adresa:"> +<!ENTITY torsettings.useProxy.address "Adresa"> <!ENTITY torsettings.useProxy.address.placeholder "Adresa IP ose emri i pritësit">  -<!ENTITY torsettings.useProxy.port "Porta:"> +<!ENTITY torsettings.useProxy.port "Porta">  -<!ENTITY torsettings.useProxy.username "Emri i përdoruesit:"> +<!ENTITY torsettings.useProxy.username "Emri i përdoruesit">  -<!ENTITY torsettings.useProxy.password "Fjalëkalimi:"> +<!ENTITY torsettings.useProxy.password "Fjalëkalimi"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Ky kompjuter kalon përmes një muri mbrojtës, që i lejon lidhje vetëm me disa porta.">  -<!ENTITY torsettings.firewall.allowedPorts "Portat e Lejuara:"> +<!ENTITY torsettings.firewall.allowedPorts "Portat e Lejuara"> <!ENTITY torsettings.useBridges.checkbox "TOR është i çensuruar në vëndin tim"> <!ENTITY torsettings.useBridges.default "Zgjidh një urë të paracaktuar"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd index 8c46da8..7141eb0 100644 --- a/src/chrome/locale/sr/network-settings.dtd +++ b/src/chrome/locale/sr/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Koristim proxy za povezivanje na internet">  -<!ENTITY torsettings.useProxy.type "Врста proxyja:"> +<!ENTITY torsettings.useProxy.type "Врста proxyja"> <!ENTITY torsettings.useProxy.type.placeholder "изаберите тип проксија">  -<!ENTITY torsettings.useProxy.address "Adresa:"> +<!ENTITY torsettings.useProxy.address "Adresa"> <!ENTITY torsettings.useProxy.address.placeholder "IP адреса или hostname">  -<!ENTITY torsettings.useProxy.port "Порт:"> +<!ENTITY torsettings.useProxy.port "Порт">  -<!ENTITY torsettings.useProxy.username "Корисничко име:"> +<!ENTITY torsettings.useProxy.username "Корисничко име">  -<!ENTITY torsettings.useProxy.password "Lozinka:"> +<!ENTITY torsettings.useProxy.password "Lozinka"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Овај рачунар пролази кроз firewall који дозвољава само конекције на одређене портове.">  -<!ENTITY torsettings.firewall.allowedPorts "Дозвољени Портови:"> +<!ENTITY torsettings.firewall.allowedPorts "Дозвољени Портови"> <!ENTITY torsettings.useBridges.checkbox "Тор је цензурисан у мојој земљи"> <!ENTITY torsettings.useBridges.default "Odaberi ugrađeni most"> <!ENTITY torsettings.useBridges.default.placeholder "Odaberi most"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Zahtevanje novog mosta..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktiranje BridgeDB. Molimo sačekajte."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Rešite CAPTCHA da biste zahtevali most."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Rešenje nije ispravno. Molimo pokušajte ponovo."> diff --git a/src/chrome/locale/sr(a)latin/network-settings.dtd b/src/chrome/locale/sr(a)latin/network-settings.dtd index 22408b5..23af3e2 100644 --- a/src/chrome/locale/sr(a)latin/network-settings.dtd +++ b/src/chrome/locale/sr(a)latin/network-settings.dtd @@ -26,13 +26,13 @@ <!ENTITY torsettings.optional "Opciono"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Adresa:"> +<!ENTITY torsettings.useProxy.address "Adresa"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Korisničko ime:"> -<!ENTITY torsettings.useProxy.password "Lozinka:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Korisničko ime"> +<!ENTITY torsettings.useProxy.password "Lozinka"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4 "> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5 "> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS "> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/st/network-settings.dtd b/src/chrome/locale/st/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/st/network-settings.dtd +++ b/src/chrome/locale/st/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/su/network-settings.dtd b/src/chrome/locale/su/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/su/network-settings.dtd +++ b/src/chrome/locale/su/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/sv/network-settings.dtd b/src/chrome/locale/sv/network-settings.dtd index 09616d1..2ae558d 100644 --- a/src/chrome/locale/sv/network-settings.dtd +++ b/src/chrome/locale/sv/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Jag använder en proxy för att ansluta till internet">  -<!ENTITY torsettings.useProxy.type "Proxytyp:"> +<!ENTITY torsettings.useProxy.type "Proxytyp"> <!ENTITY torsettings.useProxy.type.placeholder "Välj en proxytyp">  -<!ENTITY torsettings.useProxy.address "Adress:"> +<!ENTITY torsettings.useProxy.address "Adress"> <!ENTITY torsettings.useProxy.address.placeholder "IP-adress eller värdnamn">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Användarnamn:"> +<!ENTITY torsettings.useProxy.username "Användarnamn">  -<!ENTITY torsettings.useProxy.password "Lösenord:"> +<!ENTITY torsettings.useProxy.password "Lösenord"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Denna dator går genom en brandvägg som bara tillåter anslutningar på vissa specifika portar.">  -<!ENTITY torsettings.firewall.allowedPorts "Tillåtna portar:"> +<!ENTITY torsettings.firewall.allowedPorts "Tillåtna portar"> <!ENTITY torsettings.useBridges.checkbox "Tor är censurerat i mitt land"> <!ENTITY torsettings.useBridges.default "Välj en inbyggd bro"> <!ENTITY torsettings.useBridges.default.placeholder "Välj en bro"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Begär en ny bro..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktar BridgeDB. Vänligen vänta."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Lös CAPTCHA:n för att begära en bro."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Lösningen är inte korrekt. Vänligen försök igen."> diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd index 879715c..f920ae4 100644 --- a/src/chrome/locale/sw/network-settings.dtd +++ b/src/chrome/locale/sw/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Kituo:"> +<!ENTITY torsettings.useProxy.port "Kituo">  -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Username">  -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/szl/network-settings.dtd b/src/chrome/locale/szl/network-settings.dtd index 4615146..247385b 100644 --- a/src/chrome/locale/szl/network-settings.dtd +++ b/src/chrome/locale/szl/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd index 544797f..33ebde2 100644 --- a/src/chrome/locale/ta/network-settings.dtd +++ b/src/chrome/locale/ta/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "நான் இணையத்துடன் இணைய ஒரு பதிலாளைப் பயன்படுத்துகிறேன்">  -<!ENTITY torsettings.useProxy.type "பதிலாள் வகை:"> +<!ENTITY torsettings.useProxy.type "பதிலாள் வகை"> <!ENTITY torsettings.useProxy.type.placeholder "ஒரு பதிலாள் வகையைத் தேர்ந்தெடுங்கள்">  -<!ENTITY torsettings.useProxy.address "முகவரி:"> +<!ENTITY torsettings.useProxy.address "முகவரி"> <!ENTITY torsettings.useProxy.address.placeholder "IP முகவரி அல்லது ஹோஸ்ட்பெயர்">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "பயனர்பெயர்:"> +<!ENTITY torsettings.useProxy.username "பயனர்பெயர்">  -<!ENTITY torsettings.useProxy.password "கடவுச்சொல்:"> +<!ENTITY torsettings.useProxy.password "கடவுச்சொல்"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "இந்த கணினி ஒரு தீயரண் வழியே செல்கிறது அது குறிப்பிட்ட முனைகளுக்கான இணைப்புகளை மட்டுமே அனுமதிக்கிறது">  -<!ENTITY torsettings.firewall.allowedPorts "அனுமதிக்கப்பட்ட முனைகள்:"> +<!ENTITY torsettings.firewall.allowedPorts "அனுமதிக்கப்பட்ட முனைகள்"> <!ENTITY torsettings.useBridges.checkbox "Tor எனது நாட்டின் தணிக்கையிடப்படுகிறது"> <!ENTITY torsettings.useBridges.default "ஒரு உள்ளமை bridge தேர்ந்தெடுங்கள்"> <!ENTITY torsettings.useBridges.default.placeholder "ஒரு bridge தேர்ந்தெடுங்கள்"> @@ -92,3 +92,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/te-IN/network-settings.dtd b/src/chrome/locale/te-IN/network-settings.dtd index 4615146..247385b 100644 --- a/src/chrome/locale/te-IN/network-settings.dtd +++ b/src/chrome/locale/te-IN/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd index da2e5c8..de2f245 100644 --- a/src/chrome/locale/te/network-settings.dtd +++ b/src/chrome/locale/te/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Username:"> +<!ENTITY torsettings.useProxy.username "Username">  -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/tg/network-settings.dtd b/src/chrome/locale/tg/network-settings.dtd index 0cec284..fa41990 100644 --- a/src/chrome/locale/tg/network-settings.dtd +++ b/src/chrome/locale/tg/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd index e4fa0b1..85c2b5a 100644 --- a/src/chrome/locale/th/network-settings.dtd +++ b/src/chrome/locale/th/network-settings.dtd @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "ขอสะพานใหม่…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "กำลังติดต่อ BridgeDB. กรุณารอ"> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "แก้ปัญหา CAPTCHA เพื่อขอสะพาน"> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "วิธีแก้ไขไม่ถูกต้อง กรุณาลองอีกครั้ง"> diff --git a/src/chrome/locale/ti/network-settings.dtd b/src/chrome/locale/ti/network-settings.dtd index a1a326b..782ff95 100644 --- a/src/chrome/locale/ti/network-settings.dtd +++ b/src/chrome/locale/ti/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/tk/network-settings.dtd b/src/chrome/locale/tk/network-settings.dtd index daf47ca..b01b8db 100644 --- a/src/chrome/locale/tk/network-settings.dtd +++ b/src/chrome/locale/tk/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd index a0179c4..bd94ba7 100644 --- a/src/chrome/locale/tr/network-settings.dtd +++ b/src/chrome/locale/tr/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Internete erişmek için vekil sunucu kullanıyorum">  -<!ENTITY torsettings.useProxy.type "Vekil Sunucu Türü:"> +<!ENTITY torsettings.useProxy.type "Vekil Sunucu Türü"> <!ENTITY torsettings.useProxy.type.placeholder "vekil sunucu türünü seçin">  -<!ENTITY torsettings.useProxy.address "Adres:"> +<!ENTITY torsettings.useProxy.address "Adres"> <!ENTITY torsettings.useProxy.address.placeholder "IP adresi ya da sunucu adı">  -<!ENTITY torsettings.useProxy.port "Kapı Numarası:"> +<!ENTITY torsettings.useProxy.port "Kapı Numarası">  -<!ENTITY torsettings.useProxy.username "Kullanıcı Adı:"> +<!ENTITY torsettings.useProxy.username "Kullanıcı Adı">  -<!ENTITY torsettings.useProxy.password "Parola:"> +<!ENTITY torsettings.useProxy.password "Parola"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Bu bilgisayarda yalnız belirli kapı numaralarından bağlanılmasına izin veren bir güvenlik duvarı kullanılıyor">  -<!ENTITY torsettings.firewall.allowedPorts "Kullanılabilecek Kapı Numaraları:"> +<!ENTITY torsettings.firewall.allowedPorts "Kullanılabilecek Kapı Numaraları"> <!ENTITY torsettings.useBridges.checkbox "Bulunduğum ülkede Tor ağı engelleniyor"> <!ENTITY torsettings.useBridges.default "Hazır Köprülerden Seçin"> <!ENTITY torsettings.useBridges.default.placeholder "bir köprü seçin"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "Tor günlük kayıtlarına bakın."> <!ENTITY torPreferences.viewLogs "Günlüğü Görüntüle&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Günlük Kayıtları"> + + +<!ENTITY torPreferences.requestNewBridge "Yeni Bir Köprü İsteği Yap..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Köprü veritabanına bağlanılıyor. Lütfen bekleyin."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Köprü isteği yapmak için güvenlik kodunu çözün."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Çözüm doğru değil. Lütfen yeniden deneyin."> diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd index e7a9862..7fc8fe7 100644 --- a/src/chrome/locale/uk/network-settings.dtd +++ b/src/chrome/locale/uk/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Я використовую проксі для з'єднання з Інтернетом">  -<!ENTITY torsettings.useProxy.type "Тип проксі:"> +<!ENTITY torsettings.useProxy.type "Тип проксі"> <!ENTITY torsettings.useProxy.type.placeholder "оберіть тип проксі">  -<!ENTITY torsettings.useProxy.address "Адреса:"> +<!ENTITY torsettings.useProxy.address "Адреса"> <!ENTITY torsettings.useProxy.address.placeholder "ІР адреса або ім'я хосту">  -<!ENTITY torsettings.useProxy.port "Порт:"> +<!ENTITY torsettings.useProxy.port "Порт">  -<!ENTITY torsettings.useProxy.username "Ім'я користувача:"> +<!ENTITY torsettings.useProxy.username "Ім'я користувача">  -<!ENTITY torsettings.useProxy.password "Пароль:"> +<!ENTITY torsettings.useProxy.password "Пароль"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Мій брандмауер дозволяє підключення тільки до певних портів">  -<!ENTITY torsettings.firewall.allowedPorts "Дозволенні порти:"> +<!ENTITY torsettings.firewall.allowedPorts "Дозволенні порти"> <!ENTITY torsettings.useBridges.checkbox "Тор цензується в моїй країні"> <!ENTITY torsettings.useBridges.default "Виберіть вбудований міст"> <!ENTITY torsettings.useBridges.default.placeholder "Виберіть міст"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Надіслати запит на отримання нового мосту..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "З'єднання з базою даних мостів. Зачекайте."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Розв'яжіть CAPTCHA, щоб надіслати запит на отримання мосту."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "Розв'язання невірне. Спробуйте знову."> diff --git a/src/chrome/locale/ur-PK/network-settings.dtd b/src/chrome/locale/ur-PK/network-settings.dtd index 2e8cfaf..7cdf82a 100644 --- a/src/chrome/locale/ur-PK/network-settings.dtd +++ b/src/chrome/locale/ur-PK/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "اختیاری"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "پورٹ:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "پورٹ"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd index 7b76324..a92aba6 100644 --- a/src/chrome/locale/ur/network-settings.dtd +++ b/src/chrome/locale/ur/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "صارف کا نام:"> +<!ENTITY torsettings.useProxy.username "صارف کا نام">  -<!ENTITY torsettings.useProxy.password "پاس ورڈ :"> +<!ENTITY torsettings.useProxy.password "پاس ورڈ "> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "ایک نئے پل کی گزارش کریں۔۔۔"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "برج ڈی بی سے رابطہ کیا جا رہا ہے۔ برائے مہربانی انتظار کریں،"> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "پل کی گزارش کرنے کیلئے کیپچا کو حل کریں۔"> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd index aaae5c1..858fe82 100644 --- a/src/chrome/locale/uz/network-settings.dtd +++ b/src/chrome/locale/uz/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "Proksi turi:"> +<!ENTITY torsettings.useProxy.type "Proksi turi"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "Manzil:"> +<!ENTITY torsettings.useProxy.address "Manzil"> <!ENTITY torsettings.useProxy.address.placeholder "IP manzil yoki host nomi">  -<!ENTITY torsettings.useProxy.port "Port:"> +<!ENTITY torsettings.useProxy.port "Port">  -<!ENTITY torsettings.useProxy.username "Foydalanuvchi nomi:"> +<!ENTITY torsettings.useProxy.username "Foydalanuvchi nomi">  -<!ENTITY torsettings.useProxy.password "Maxfiy so'z:"> +<!ENTITY torsettings.useProxy.password "Maxfiy so'z"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/ve/network-settings.dtd b/src/chrome/locale/ve/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/ve/network-settings.dtd +++ b/src/chrome/locale/ve/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd index 1910e2a..e3281db 100644 --- a/src/chrome/locale/vi/network-settings.dtd +++ b/src/chrome/locale/vi/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "Tôi sử dụng proxy để kết nối tới Internet">  -<!ENTITY torsettings.useProxy.type "Dạng proxy:"> +<!ENTITY torsettings.useProxy.type "Dạng proxy"> <!ENTITY torsettings.useProxy.type.placeholder "chọn loại proxy">  -<!ENTITY torsettings.useProxy.address "Địa chỉ:"> +<!ENTITY torsettings.useProxy.address "Địa chỉ"> <!ENTITY torsettings.useProxy.address.placeholder "Địa chỉ IP hoặc hostname">  -<!ENTITY torsettings.useProxy.port "Cổng:"> +<!ENTITY torsettings.useProxy.port "Cổng">  -<!ENTITY torsettings.useProxy.username "Tên đăng nhập:"> +<!ENTITY torsettings.useProxy.username "Tên đăng nhập">  -<!ENTITY torsettings.useProxy.password "Mật khẩu:"> +<!ENTITY torsettings.useProxy.password "Mật khẩu"> <!ENTITY torsettings.useProxy.type.socks4 "SOCK 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCK 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "Máy tính này đi qua một tường lửa mà chỉ cho phép tới một vài cổng">  -<!ENTITY torsettings.firewall.allowedPorts "Những Cổng Được phép:"> +<!ENTITY torsettings.firewall.allowedPorts "Những Cổng Được phép"> <!ENTITY torsettings.useBridges.checkbox "Tor đã bị kiểm duyệt ở quốc gia của tôi"> <!ENTITY torsettings.useBridges.default "Sử dụng cầu nối có sẵn"> <!ENTITY torsettings.useBridges.default.placeholder "chọn loại cầu nối"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/wa/network-settings.dtd b/src/chrome/locale/wa/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/wa/network-settings.dtd +++ b/src/chrome/locale/wa/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/wo/network-settings.dtd b/src/chrome/locale/wo/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/wo/network-settings.dtd +++ b/src/chrome/locale/wo/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/zh-CN.GB2312/network-settings.dtd b/src/chrome/locale/zh-CN.GB2312/network-settings.dtd index 13c9d3a..76c4c53 100644 --- a/src/chrome/locale/zh-CN.GB2312/network-settings.dtd +++ b/src/chrome/locale/zh-CN.GB2312/network-settings.dtd @@ -1,3 +1,5 @@  <!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established."> + + diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd index 1baec73..4ca136b 100644 --- a/src/chrome/locale/zh-CN/network-settings.dtd +++ b/src/chrome/locale/zh-CN/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "使用代理访问互联网">  -<!ENTITY torsettings.useProxy.type "代理类型："> +<!ENTITY torsettings.useProxy.type "代理类型"> <!ENTITY torsettings.useProxy.type.placeholder "选择代理类型">  -<!ENTITY torsettings.useProxy.address "地址："> +<!ENTITY torsettings.useProxy.address "地址"> <!ENTITY torsettings.useProxy.address.placeholder "IP 地址或主机名">  -<!ENTITY torsettings.useProxy.port "端口："> +<!ENTITY torsettings.useProxy.port "端口">  -<!ENTITY torsettings.useProxy.username "用户名："> +<!ENTITY torsettings.useProxy.username "用户名">  -<!ENTITY torsettings.useProxy.password "密码："> +<!ENTITY torsettings.useProxy.password "密码"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接">  -<!ENTITY torsettings.firewall.allowedPorts "允许的端口："> +<!ENTITY torsettings.firewall.allowedPorts "允许的端口"> <!ENTITY torsettings.useBridges.checkbox "我所在的国家对 Tor 进行了审查"> <!ENTITY torsettings.useBridges.default "选择内置网桥"> <!ENTITY torsettings.useBridges.default.placeholder "选择网桥"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "查看日志&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "正在请求新网桥……"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "正在连接到BridgeDB,请等待。"> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "请输入验证码以获取网桥。"> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "结果并不正确，请重试。"> diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd index 4e4e359..9c958cf 100644 --- a/src/chrome/locale/zh-HK/network-settings.dtd +++ b/src/chrome/locale/zh-HK/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet">  -<!ENTITY torsettings.useProxy.type "代理伺服器類型："> +<!ENTITY torsettings.useProxy.type "代理伺服器類型"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type">  -<!ENTITY torsettings.useProxy.address "位址："> +<!ENTITY torsettings.useProxy.address "位址"> <!ENTITY torsettings.useProxy.address.placeholder "IP位址或主機名稱">  -<!ENTITY torsettings.useProxy.port "連接埠："> +<!ENTITY torsettings.useProxy.port "連接埠">  -<!ENTITY torsettings.useProxy.username "用戶名："> +<!ENTITY torsettings.useProxy.username "用戶名">  -<!ENTITY torsettings.useProxy.password "密碼："> +<!ENTITY torsettings.useProxy.password "密碼"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "http╱https"> <!ENTITY torsettings.firewall.checkbox "呢部電腦通過某個只容許連接至特定連線埠嘅防火牆">  -<!ENTITY torsettings.firewall.allowedPorts "容許嘅連接埠："> +<!ENTITY torsettings.firewall.allowedPorts "容許嘅連接埠"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd index 01f2e29..815cab1 100644 --- a/src/chrome/locale/zh-TW/network-settings.dtd +++ b/src/chrome/locale/zh-TW/network-settings.dtd @@ -27,23 +27,23 @@ <!ENTITY torsettings.useProxy.checkbox "使用代理服務連線到網際網路">  -<!ENTITY torsettings.useProxy.type "代理伺服器類型："> +<!ENTITY torsettings.useProxy.type "代理伺服器類型"> <!ENTITY torsettings.useProxy.type.placeholder "選擇代理伺服器類型">  -<!ENTITY torsettings.useProxy.address "位址："> +<!ENTITY torsettings.useProxy.address "位址"> <!ENTITY torsettings.useProxy.address.placeholder "IP 位址或主機名稱">  -<!ENTITY torsettings.useProxy.port "連接埠："> +<!ENTITY torsettings.useProxy.port "連接埠">  -<!ENTITY torsettings.useProxy.username "使用者名稱："> +<!ENTITY torsettings.useProxy.username "使用者名稱">  -<!ENTITY torsettings.useProxy.password "密碼："> +<!ENTITY torsettings.useProxy.password "密碼"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!ENTITY torsettings.firewall.checkbox "這台電腦通過某個只允許連接至特定連接埠的防火牆">  -<!ENTITY torsettings.firewall.allowedPorts "允許的連接埠："> +<!ENTITY torsettings.firewall.allowedPorts "允許的連接埠"> <!ENTITY torsettings.useBridges.checkbox "我的國家中 Tor 受到審查"> <!ENTITY torsettings.useBridges.default "選擇內建的橋接"> <!ENTITY torsettings.useBridges.default.placeholder "選擇橋接"> @@ -91,3 +91,9 @@ <!ENTITY torPreferences.viewTorLogs "View the Tor logs."> <!ENTITY torPreferences.viewLogs "View Logs&#x2026;"> <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> + + +<!ENTITY torPreferences.requestNewBridge "請求一個新的橋接..."> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "正在連接到 BridgeDB，請稍等。"> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "解決驗證碼來請求橋接"> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "解答不正確。請再試一次。"> diff --git a/src/chrome/locale/zh/network-settings.dtd b/src/chrome/locale/zh/network-settings.dtd index 0db3c9c..965652e 100644 --- a/src/chrome/locale/zh/network-settings.dtd +++ b/src/chrome/locale/zh/network-settings.dtd @@ -4,3 +4,5 @@  <!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established."> + + diff --git a/src/chrome/locale/zu/network-settings.dtd b/src/chrome/locale/zu/network-settings.dtd index c6c5687..f22f1c8 100644 --- a/src/chrome/locale/zu/network-settings.dtd +++ b/src/chrome/locale/zu/network-settings.dtd @@ -26,18 +26,18 @@ <!ENTITY torsettings.optional "Optional"> <!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type:"> +<!ENTITY torsettings.useProxy.type "Proxy Type"> <!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address:"> +<!ENTITY torsettings.useProxy.address "Address"> <!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port:"> -<!ENTITY torsettings.useProxy.username "Username:"> -<!ENTITY torsettings.useProxy.password "Password:"> +<!ENTITY torsettings.useProxy.port "Port"> +<!ENTITY torsettings.useProxy.username "Username"> +<!ENTITY torsettings.useProxy.password "Password"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> <!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.firewall.allowedPorts "Allowed Ports"> <!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> <!ENTITY torsettings.useBridges.default "Select a built-in bridge"> <!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> @@ -60,3 +60,9 @@  <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> + + +<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…"> +<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please wait."> +<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> +<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">

1 0

[tor-browser-build/master] Bug 32068: Remove Python license
by gk＠torproject.org 15 Oct '19

15 Oct '19

commit d0bba237d2ddf1d14516e8e3a37172f5a6f0576b Author: David Fifield <david(a)bamsoftware.com> Date: Mon Oct 14 13:46:25 2019 -0600 Bug 32068: Remove Python license --- .../Docs/Licenses/PluggableTransports/LICENSE | 13 +- .../Licenses/PluggableTransports/LICENSE.PYTHON | 773 --------------------- 2 files changed, 2 insertions(+), 784 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE index 25d930e..d216374 100644 --- a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE +++ b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE @@ -1,15 +1,6 @@ This file contains the copyrights and licenses of third-party -dependencies of pluggable transports that are distributed in the -pluggable transports bundle. - -=============================================================================== - -Python - -Some pluggable transports are written in Python and the binary packages -include a Python interpreter. A copy of the Python license (which itself -includes the licenses of some of Python's components) is included in the -file LICENSE.PYTHON. +dependencies of pluggable transports that are distributed in +Tor Browser. =============================================================================== diff --git a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.PYTHON b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.PYTHON deleted file mode 100644 index d4dbdeb..0000000 --- a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.PYTHON +++ /dev/null @@ -1,773 +0,0 @@ -A. HISTORY OF THE SOFTWARE -========================== - -Python was created in the early 1990s by Guido van Rossum at Stichting -Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands -as a successor of a language called ABC. Guido remains Python's -principal author, although it includes many contributions from others. - -In 1995, Guido continued his work on Python at the Corporation for -National Research Initiatives (CNRI, see http://www.cnri.reston.va.us) -in Reston, Virginia where he released several versions of the -software. - -In May 2000, Guido and the Python core development team moved to -BeOpen.com to form the BeOpen PythonLabs team. In October of the same -year, the PythonLabs team moved to Digital Creations (now Zope -Corporation, see http://www.zope.com). In 2001, the Python Software -Foundation (PSF, see http://www.python.org/psf/) was formed, a -non-profit organization created specifically to own Python-related -Intellectual Property. Zope Corporation is a sponsoring member of -the PSF. - -All Python releases are Open Source (see http://www.opensource.org for -the Open Source Definition). Historically, most, but not all, Python -releases have also been GPL-compatible; the table below summarizes -the various releases. - - Release Derived Year Owner GPL- - from compatible? (1) - - 0.9.0 thru 1.2 1991-1995 CWI yes - 1.3 thru 1.5.2 1.2 1995-1999 CNRI yes - 1.6 1.5.2 2000 CNRI no - 2.0 1.6 2000 BeOpen.com no - 1.6.1 1.6 2001 CNRI yes (2) - 2.1 2.0+1.6.1 2001 PSF no - 2.0.1 2.0+1.6.1 2001 PSF yes - 2.1.1 2.1+2.0.1 2001 PSF yes - 2.2 2.1.1 2001 PSF yes - 2.1.2 2.1.1 2002 PSF yes - 2.1.3 2.1.2 2002 PSF yes - 2.2.1 2.2 2002 PSF yes - 2.2.2 2.2.1 2002 PSF yes - 2.2.3 2.2.2 2003 PSF yes - 2.3 2.2.2 2002-2003 PSF yes - 2.3.1 2.3 2002-2003 PSF yes - 2.3.2 2.3.1 2002-2003 PSF yes - 2.3.3 2.3.2 2002-2003 PSF yes - 2.3.4 2.3.3 2004 PSF yes - 2.3.5 2.3.4 2005 PSF yes - 2.4 2.3 2004 PSF yes - 2.4.1 2.4 2005 PSF yes - 2.4.2 2.4.1 2005 PSF yes - 2.4.3 2.4.2 2006 PSF yes - 2.4.4 2.4.3 2006 PSF yes - 2.5 2.4 2006 PSF yes - 2.5.1 2.5 2007 PSF yes - 2.5.2 2.5.1 2008 PSF yes - 2.5.3 2.5.2 2008 PSF yes - 2.6 2.5 2008 PSF yes - 2.6.1 2.6 2008 PSF yes - 2.6.2 2.6.1 2009 PSF yes - 2.6.3 2.6.2 2009 PSF yes - 2.6.4 2.6.3 2009 PSF yes - 2.6.5 2.6.4 2010 PSF yes - 2.7 2.6 2010 PSF yes - -Footnotes: - -(1) GPL-compatible doesn't mean that we're distributing Python under - the GPL. All Python licenses, unlike the GPL, let you distribute - a modified version without making your changes open source. The - GPL-compatible licenses make it possible to combine Python with - other software that is released under the GPL; the others don't. - -(2) According to Richard Stallman, 1.6.1 is not GPL-compatible, - because its license has a choice of law clause. According to - CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1 - is "not incompatible" with the GPL. - -Thanks to the many outside volunteers who have worked under Guido's -direction to make these releases possible. - - -B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON -=============================================================== - -PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 --------------------------------------------- - -1. This LICENSE AGREEMENT is between the Python Software Foundation -("PSF"), and the Individual or Organization ("Licensee") accessing and -otherwise using this software ("Python") in source or binary form and -its associated documentation. - -2. Subject to the terms and conditions of this License Agreement, PSF hereby -grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, -analyze, test, perform and/or display publicly, prepare derivative works, -distribute, and otherwise use Python alone or in any derivative version, -provided, however, that PSF's License Agreement and PSF's notice of copyright, -i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -2011, 2012 Python Software Foundation; All Rights Reserved" are retained in Python -alone or in any derivative version prepared by Licensee. - -3. In the event Licensee prepares a derivative work that is based on -or incorporates Python or any part thereof, and wants to make -the derivative work available to others as provided herein, then -Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python. - -4. PSF is making Python available to Licensee on an "AS IS" -basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -7. Nothing in this License Agreement shall be deemed to create any -relationship of agency, partnership, or joint venture between PSF and -Licensee. This License Agreement does not grant permission to use PSF -trademarks or trade name in a trademark sense to endorse or promote -products or services of Licensee, or any third party. - -8. By copying, installing or otherwise using Python, Licensee -agrees to be bound by the terms and conditions of this License -Agreement. - - -BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0 -------------------------------------------- - -BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1 - -1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an -office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the -Individual or Organization ("Licensee") accessing and otherwise using -this software in source or binary form and its associated -documentation ("the Software"). - -2. Subject to the terms and conditions of this BeOpen Python License -Agreement, BeOpen hereby grants Licensee a non-exclusive, -royalty-free, world-wide license to reproduce, analyze, test, perform -and/or display publicly, prepare derivative works, distribute, and -otherwise use the Software alone or in any derivative version, -provided, however, that the BeOpen Python License is retained in the -Software, alone or in any derivative version prepared by Licensee. - -3. BeOpen is making the Software available to Licensee on an "AS IS" -basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE -SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS -AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY -DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -5. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -6. This License Agreement shall be governed by and interpreted in all -respects by the law of the State of California, excluding conflict of -law provisions. Nothing in this License Agreement shall be deemed to -create any relationship of agency, partnership, or joint venture -between BeOpen and Licensee. This License Agreement does not grant -permission to use BeOpen trademarks or trade names in a trademark -sense to endorse or promote products or services of Licensee, or any -third party. As an exception, the "BeOpen Python" logos available at -http://www.pythonlabs.com/logos.html may be used according to the -permissions granted on that web page. - -7. By copying, installing or otherwise using the software, Licensee -agrees to be bound by the terms and conditions of this License -Agreement. - - -CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1 ---------------------------------------- - -1. This LICENSE AGREEMENT is between the Corporation for National -Research Initiatives, having an office at 1895 Preston White Drive, -Reston, VA 20191 ("CNRI"), and the Individual or Organization -("Licensee") accessing and otherwise using Python 1.6.1 software in -source or binary form and its associated documentation. - -2. Subject to the terms and conditions of this License Agreement, CNRI -hereby grants Licensee a nonexclusive, royalty-free, world-wide -license to reproduce, analyze, test, perform and/or display publicly, -prepare derivative works, distribute, and otherwise use Python 1.6.1 -alone or in any derivative version, provided, however, that CNRI's -License Agreement and CNRI's notice of copyright, i.e., "Copyright (c) -1995-2001 Corporation for National Research Initiatives; All Rights -Reserved" are retained in Python 1.6.1 alone or in any derivative -version prepared by Licensee. Alternately, in lieu of CNRI's License -Agreement, Licensee may substitute the following text (omitting the -quotes): "Python 1.6.1 is made available subject to the terms and -conditions in CNRI's License Agreement. This Agreement together with -Python 1.6.1 may be located on the Internet using the following -unique, persistent identifier (known as a handle): 1895.22/1013. This -Agreement may also be obtained from a proxy server on the Internet -using the following URL: http://hdl.handle.net/1895.22/1013". - -3. In the event Licensee prepares a derivative work that is based on -or incorporates Python 1.6.1 or any part thereof, and wants to make -the derivative work available to others as provided herein, then -Licensee hereby agrees to include in any such work a brief summary of -the changes made to Python 1.6.1. - -4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS" -basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR -IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND -DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS -FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT -INFRINGE ANY THIRD PARTY RIGHTS. - -5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON -1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS -A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1, -OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -7. This License Agreement shall be governed by the federal -intellectual property law of the United States, including without -limitation the federal copyright law, and, to the extent such -U.S. federal law does not apply, by the law of the Commonwealth of -Virginia, excluding Virginia's conflict of law provisions. -Notwithstanding the foregoing, with regard to derivative works based -on Python 1.6.1 that incorporate non-separable material that was -previously distributed under the GNU General Public License (GPL), the -law of the Commonwealth of Virginia shall govern this License -Agreement only as to issues arising under or with respect to -Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this -License Agreement shall be deemed to create any relationship of -agency, partnership, or joint venture between CNRI and Licensee. This -License Agreement does not grant permission to use CNRI trademarks or -trade name in a trademark sense to endorse or promote products or -services of Licensee, or any third party. - -8. By clicking on the "ACCEPT" button where indicated, or by copying, -installing or otherwise using Python 1.6.1, Licensee agrees to be -bound by the terms and conditions of this License Agreement. - - ACCEPT - - -CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2 --------------------------------------------------- - -Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam, -The Netherlands. All rights reserved. - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose and without fee is hereby granted, -provided that the above copyright notice appear in all copies and that -both that copyright notice and this permission notice appear in -supporting documentation, and that the name of Stichting Mathematisch -Centrum or CWI not be used in advertising or publicity pertaining to -distribution of the software without specific, written prior -permission. - -STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO -THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE -FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - - -Additional Conditions for this Windows binary build ---------------------------------------------------- - -This program is linked with and uses Microsoft Distributable Code, -copyrighted by Microsoft Corporation. The Microsoft Distributable Code -includes the following files: - -msvcr90.dll -msvcp90.dll -msvcm90.dll - -If you further distribute programs that include the Microsoft -Distributable Code, you must comply with the restrictions on -distribution specified by Microsoft. In particular, you must require -distributors and external end users to agree to terms that protect the -Microsoft Distributable Code at least as much as Microsoft's own -requirements for the Distributable Code. See Microsoft's documentation -(included in its developer tools and on its website at microsoft.com) -for specific details. - -Redistribution of the Windows binary build of the Python interpreter -complies with this agreement, provided that you do not: - -- alter any copyright, trademark or patent notice in Microsoft's -Distributable Code; - -- use Microsoft's trademarks in your programs' names or in a way that -suggests your programs come from or are endorsed by Microsoft; - -- distribute Microsoft's Distributable Code to run on a platform other -than Microsoft operating systems, run-time technologies or application -platforms; or - -- include Microsoft Distributable Code in malicious, deceptive or -unlawful programs. - -These restrictions apply only to the Microsoft Distributable Code as -defined above, not to Python itself or any programs running on the -Python interpreter. The redistribution of the Python interpreter and -libraries is governed by the Python Software License included with this -file, or by other licenses as marked. - - -This copy of Python includes a copy of bzip2, which is licensed under the following terms: - - --------------------------------------------------------------------------- - -This program, "bzip2", the associated library "libbzip2", and all -documentation, are copyright (C) 1996-2007 Julian R Seward. All -rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. The origin of this software must not be misrepresented; you must - not claim that you wrote the original software. If you use this - software in a product, an acknowledgment in the product - documentation would be appreciated but is not required. - -3. Altered source versions must be plainly marked as such, and must - not be misrepresented as being the original software. - -4. The name of the author may not be used to endorse or promote - products derived from this software without specific prior written - permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS -OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE -GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -Julian Seward, jseward(a)bzip.org -bzip2/libbzip2 version 1.0.5 of 10 December 2007 - --------------------------------------------------------------------------- - -This copy of Python includes a copy of Berkeley DB, which is licensed under the following terms: - -/*- - * $Id: LICENSE,v 12.9 2008/02/07 17:12:17 mark Exp $ - */ - -The following is the license that applies to this copy of the Berkeley DB -software. For a license to use the Berkeley DB software under conditions -other than those described here, or to purchase support for this software, -please contact Oracle at berkeleydb-info_us(a)oracle.com. - -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -/* - * Copyright (c) 1990,2008 Oracle. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Redistributions in any form must be accompanied by information on - * how to obtain complete source code for the DB software and any - * accompanying software that uses the DB software. The source code - * must either be included in the distribution or be available for no - * more than the cost of distribution plus a nominal fee, and must be - * freely redistributable under reasonable conditions. For an - * executable file, complete source code means the source code for all - * modules it contains. It does not include source code for modules or - * files that typically accompany the major components of the operating - * system on which the executable file runs. - * - * THIS SOFTWARE IS PROVIDED BY ORACLE ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR - * NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL ORACLE BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR - * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN - * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -/* - * Copyright (c) 1990, 1993, 1994, 1995 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -/* - * Copyright (c) 1995, 1996 - * The President and Fellows of Harvard University. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY HARVARD AND ITS CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL HARVARD OR ITS CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -/*** - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2005 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -This copy of Python includes a copy of openssl, which is licensed under the following terms: - - - LICENSE ISSUES - ============== - - The OpenSSL toolkit stays under a dual license, i.e. both the conditions of - the OpenSSL License and the original SSLeay license apply to the toolkit. - See below for the actual license texts. Actually both licenses are BSD-style - Open Source licenses. In case of any license issues related to OpenSSL - please contact openssl-core(a)openssl.org. - - OpenSSL License - --------------- - -/* ==================================================================== - * Copyright (c) 1998-2008 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core(a)openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay(a)cryptsoft.com). This product includes software written by Tim - * Hudson (tjh(a)cryptsoft.com). - * - */ - - Original SSLeay License - ----------------------- - -/* Copyright (C) 1995-1998 Eric Young (eay(a)cryptsoft.com) - * All rights reserved. - * - * This package is an SSL implementation written - * by Eric Young (eay(a)cryptsoft.com). - * The implementation was written so as to conform with Netscapes SSL. - * - * This library is free for commercial and non-commercial use as long as - * the following conditions are aheared to. The following conditions - * apply to all code found in this distribution, be it the RC4, RSA, - * lhash, DES, etc., code; not just the SSL code. The SSL documentation - * included with this distribution is covered by the same copyright terms - * except that the holder is Tim Hudson (tjh(a)cryptsoft.com). - * - * Copyright remains Eric Young's, and as such any Copyright notices in - * the code are not to be removed. - * If this package is used in a product, Eric Young should be given attribution - * as the author of the parts of the library used. - * This can be in the form of a textual message at program startup or - * in documentation (online or textual) provided with the package. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * "This product includes cryptographic software written by - * Eric Young (eay(a)cryptsoft.com)" - * The word 'cryptographic' can be left out if the rouines from the library - * being used are not cryptographic related :-). - * 4. If you include any Windows specific code (or a derivative thereof) from - * the apps directory (application code) you must include an acknowledgement: - * "This product includes software written by Tim Hudson (tjh(a)cryptsoft.com)" - * - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * The licence and distribution terms for any publically available version or - * derivative of this code cannot be changed. i.e. this code cannot simply be - * copied and put under another distribution licence - * [including the GNU Public Licence.] - */ - - -This copy of Python includes a copy of Tcl, which is licensed under the following terms: - -This software is copyrighted by the Regents of the University of -California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState -Corporation and other parties. The following terms apply to all files -associated with the software unless explicitly disclaimed in -individual files. - -The authors hereby grant permission to use, copy, modify, distribute, -and license this software and its documentation for any purpose, provided -that existing copyright notices are retained in all copies and that this -notice is included verbatim in any distributions. No written agreement, -license, or royalty fee is required for any of the authorized uses. -Modifications to this software may be copyrighted by their authors -and need not follow the licensing terms described here, provided that -the new terms are clearly indicated on the first page of each file where -they apply. - -IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY -FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES -ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY -DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE -IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE -NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR -MODIFICATIONS. - -GOVERNMENT USE: If you are acquiring this software on behalf of the -U.S. government, the Government shall have only "Restricted Rights" -in the software and related documentation as defined in the Federal -Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you -are acquiring the software on behalf of the Department of Defense, the -software shall be classified as "Commercial Computer Software" and the -Government shall have only "Restricted Rights" as defined in Clause -252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the -authors grant the U.S. Government and others acting in its behalf -permission to use and distribute the software in accordance with the -terms specified in this license. - -This copy of Python includes a copy of Tk, which is licensed under the following terms: - -This software is copyrighted by the Regents of the University of -California, Sun Microsystems, Inc., and other parties. The following -terms apply to all files associated with the software unless explicitly -disclaimed in individual files. - -The authors hereby grant permission to use, copy, modify, distribute, -and license this software and its documentation for any purpose, provided -that existing copyright notices are retained in all copies and that this -notice is included verbatim in any distributions. No written agreement, -license, or royalty fee is required for any of the authorized uses. -Modifications to this software may be copyrighted by their authors -and need not follow the licensing terms described here, provided that -the new terms are clearly indicated on the first page of each file where -they apply. - -IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY -FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES -ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY -DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE -IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE -NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR -MODIFICATIONS. - -GOVERNMENT USE: If you are acquiring this software on behalf of the -U.S. government, the Government shall have only "Restricted Rights" -in the software and related documentation as defined in the Federal -Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you -are acquiring the software on behalf of the Department of Defense, the -software shall be classified as "Commercial Computer Software" and the -Government shall have only "Restricted Rights" as defined in Clause -252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the -authors grant the U.S. Government and others acting in its behalf -permission to use and distribute the software in accordance with the -terms specified in this license. - -This copy of Python includes a copy of Tix, which is licensed under the following terms: - -Copyright (c) 1993-1999 Ioi Kim Lam. -Copyright (c) 2000-2001 Tix Project Group. -Copyright (c) 2004 ActiveState - -This software is copyrighted by the above entities -and other parties. The following terms apply to all files associated -with the software unless explicitly disclaimed in individual files. - -The authors hereby grant permission to use, copy, modify, distribute, -and license this software and its documentation for any purpose, provided -that existing copyright notices are retained in all copies and that this -notice is included verbatim in any distributions. No written agreement, -license, or royalty fee is required for any of the authorized uses. -Modifications to this software may be copyrighted by their authors -and need not follow the licensing terms described here, provided that -the new terms are clearly indicated on the first page of each file where -they apply. - -IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY -FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES -ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY -DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE -IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE -NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR -MODIFICATIONS. - -GOVERNMENT USE: If you are acquiring this software on behalf of the -U.S. government, the Government shall have only "Restricted Rights" -in the software and related documentation as defined in the Federal -Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you -are acquiring the software on behalf of the Department of Defense, the -software shall be classified as "Commercial Computer Software" and the -Government shall have only "Restricted Rights" as defined in Clause -252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the -authors grant the U.S. Government and others acting in its behalf -permission to use and distribute the software in accordance with the -terms specified in this license. - ----------------------------------------------------------------------- - -Parts of this software are based on the Tcl/Tk software copyrighted by -the Regents of the University of California, Sun Microsystems, Inc., -and other parties. The original license terms of the Tcl/Tk software -distribution is included in the file docs/license.tcltk. - -Parts of this software are based on the HTML Library software -copyrighted by Sun Microsystems, Inc. The original license terms of -the HTML Library software distribution is included in the file -docs/license.html_lib.

1 0

[tor-browser-build/master] Bug 31932: Copy snowflake's license to the bundled data
by gk＠torproject.org 15 Oct '19

15 Oct '19

commit 9b0d98a51abdbad31d131b768e09e9a0c98b3f15 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Oct 11 20:07:14 2019 -0400 Bug 31932: Copy snowflake's license to the bundled data --- projects/snowflake/build | 2 +- .../Licenses/PluggableTransports/LICENSE.SNOWFLAKE | 32 ++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index 5309318..76546d8 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -21,7 +21,7 @@ go build -ldflags '-s' cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] cd .. -cp -a README.md LICENSE $DOCSDIR +cp -a README.md $DOCSDIR cd $distdir [% c('tar', { diff --git a/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.SNOWFLAKE b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.SNOWFLAKE new file mode 100644 index 0000000..f700c98 --- /dev/null +++ b/projects/tor-browser/Bundle-Data/Docs/Licenses/PluggableTransports/LICENSE.SNOWFLAKE @@ -0,0 +1,32 @@ + This file contains the license for "Snowflake" + a free software project which provides a WebRTC pluggable transport. + +================================================================================ +Copyright (c) 2016, Serene Han, Arlo Breault +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this +list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, +this list of conditions and the following disclaimer in the documentation and/or +other materials provided with the distribution. + + * Neither the names of the copyright owners nor the names of its +contributors may be used to endorse or promote products derived from this +software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +================================================================================

1 0

[tor-browser-build/master] Use branch -3 for nightly builds from now on
by gk＠torproject.org 13 Oct '19

13 Oct '19

commit e440b661281a35f3be31cd2165b19ab1dda17ca9 Author: Georg Koppen <gk(a)torproject.org> Date: Sun Oct 13 19:08:14 2019 +0000 Use branch -3 for nightly builds from now on --- projects/firefox/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/firefox/config b/projects/firefox/config index ac2ceb2..4370f01 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -51,7 +51,7 @@ targets: branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/official' nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-3' tag_gpg_id: 0 var: torbrowser_update_channel: default

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits October 2019