tor-commits
Threads by month
- ----- 2025 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
February 2014
- 23 participants
- 1529 discussions

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation@torproject.org 28 Feb '14
by translation@torproject.org 28 Feb '14
28 Feb '14
commit 9a6d6b4c6ab6d3a4d2b182836d35659bfa214809
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Feb 28 09:18:25 2014 +0000
Update translations for tor-launcher-network-settings
---
ach/network-settings.dtd | 10 +++++++---
ady/network-settings.dtd | 10 +++++++---
af/network-settings.dtd | 10 +++++++---
ak/network-settings.dtd | 10 +++++++---
am/network-settings.dtd | 10 +++++++---
ar/network-settings.dtd | 10 +++++++---
arn/network-settings.dtd | 10 +++++++---
ast/network-settings.dtd | 10 +++++++---
az/network-settings.dtd | 10 +++++++---
be/network-settings.dtd | 10 +++++++---
bg/network-settings.dtd | 10 +++++++---
bg_BG/network-settings.dtd | 10 +++++++---
bn/network-settings.dtd | 10 +++++++---
bn_IN/network-settings.dtd | 10 +++++++---
bo/network-settings.dtd | 10 +++++++---
br/network-settings.dtd | 10 +++++++---
bs/network-settings.dtd | 10 +++++++---
ca/network-settings.dtd | 10 +++++++---
cs/network-settings.dtd | 10 +++++++---
csb/network-settings.dtd | 10 +++++++---
cy/network-settings.dtd | 10 +++++++---
da/network-settings.dtd | 10 +++++++---
de/network-settings.dtd | 10 +++++++---
dz/network-settings.dtd | 10 +++++++---
el/network-settings.dtd | 10 +++++++---
el_GR/network-settings.dtd | 10 +++++++---
en/network-settings.dtd | 10 +++++++---
en_GB/network-settings.dtd | 10 +++++++---
eo/network-settings.dtd | 10 +++++++---
es/network-settings.dtd | 10 +++++++---
es_AR/network-settings.dtd | 10 +++++++---
es_CO/network-settings.dtd | 10 +++++++---
et/network-settings.dtd | 10 +++++++---
eu/network-settings.dtd | 10 +++++++---
fa/network-settings.dtd | 10 +++++++---
fi/network-settings.dtd | 10 +++++++---
fil/network-settings.dtd | 10 +++++++---
fo/network-settings.dtd | 10 +++++++---
fr/network-settings.dtd | 10 +++++++---
fr_CA/network-settings.dtd | 10 +++++++---
fur/network-settings.dtd | 10 +++++++---
fy/network-settings.dtd | 10 +++++++---
ga/network-settings.dtd | 10 +++++++---
gl/network-settings.dtd | 10 +++++++---
gu/network-settings.dtd | 10 +++++++---
gu_IN/network-settings.dtd | 10 +++++++---
gun/network-settings.dtd | 10 +++++++---
ha/network-settings.dtd | 10 +++++++---
he/network-settings.dtd | 10 +++++++---
hi/network-settings.dtd | 10 +++++++---
hr/network-settings.dtd | 10 +++++++---
hr_HR/network-settings.dtd | 10 +++++++---
ht/network-settings.dtd | 10 +++++++---
hu/network-settings.dtd | 10 +++++++---
hy/network-settings.dtd | 10 +++++++---
hy_AM/network-settings.dtd | 10 +++++++---
ia/network-settings.dtd | 10 +++++++---
id/network-settings.dtd | 10 +++++++---
is/network-settings.dtd | 10 +++++++---
it/network-settings.dtd | 10 +++++++---
ja/network-settings.dtd | 10 +++++++---
jv/network-settings.dtd | 10 +++++++---
ka/network-settings.dtd | 10 +++++++---
km/network-settings.dtd | 10 +++++++---
kn/network-settings.dtd | 10 +++++++---
ko/network-settings.dtd | 10 +++++++---
ko_KR/network-settings.dtd | 10 +++++++---
ku/network-settings.dtd | 10 +++++++---
kw/network-settings.dtd | 10 +++++++---
ky/network-settings.dtd | 10 +++++++---
lb/network-settings.dtd | 10 +++++++---
lg/network-settings.dtd | 10 +++++++---
ln/network-settings.dtd | 10 +++++++---
lo/network-settings.dtd | 10 +++++++---
lt/network-settings.dtd | 10 +++++++---
lv/network-settings.dtd | 10 +++++++---
mg/network-settings.dtd | 10 +++++++---
mi/network-settings.dtd | 10 +++++++---
mk/network-settings.dtd | 10 +++++++---
ml/network-settings.dtd | 10 +++++++---
mn/network-settings.dtd | 10 +++++++---
mr/network-settings.dtd | 10 +++++++---
ms_MY/network-settings.dtd | 10 +++++++---
mt/network-settings.dtd | 10 +++++++---
my/network-settings.dtd | 10 +++++++---
nah/network-settings.dtd | 10 +++++++---
nap/network-settings.dtd | 10 +++++++---
nb/network-settings.dtd | 10 +++++++---
nds/network-settings.dtd | 10 +++++++---
ne/network-settings.dtd | 10 +++++++---
nl/network-settings.dtd | 10 +++++++---
nl_BE/network-settings.dtd | 10 +++++++---
nn/network-settings.dtd | 10 +++++++---
nso/network-settings.dtd | 10 +++++++---
oc/network-settings.dtd | 10 +++++++---
or/network-settings.dtd | 10 +++++++---
pa/network-settings.dtd | 10 +++++++---
pap/network-settings.dtd | 10 +++++++---
pl/network-settings.dtd | 10 +++++++---
pms/network-settings.dtd | 10 +++++++---
ps/network-settings.dtd | 10 +++++++---
pt/network-settings.dtd | 10 +++++++---
pt_BR/network-settings.dtd | 10 +++++++---
ro/network-settings.dtd | 10 +++++++---
ru/network-settings.dtd | 10 +++++++---
ru(a)petr1708/network-settings.dtd | 10 +++++++---
sco/network-settings.dtd | 10 +++++++---
si/network-settings.dtd | 10 +++++++---
si_LK/network-settings.dtd | 10 +++++++---
sk/network-settings.dtd | 10 +++++++---
sk_SK/network-settings.dtd | 10 +++++++---
sl/network-settings.dtd | 10 +++++++---
sl_SI/network-settings.dtd | 10 +++++++---
sn/network-settings.dtd | 10 +++++++---
so/network-settings.dtd | 10 +++++++---
son/network-settings.dtd | 10 +++++++---
sq/network-settings.dtd | 10 +++++++---
sr/network-settings.dtd | 10 +++++++---
sr(a)latin/network-settings.dtd | 10 +++++++---
st/network-settings.dtd | 10 +++++++---
su/network-settings.dtd | 10 +++++++---
sv/network-settings.dtd | 10 +++++++---
sw/network-settings.dtd | 10 +++++++---
szl/network-settings.dtd | 10 +++++++---
ta/network-settings.dtd | 10 +++++++---
te/network-settings.dtd | 10 +++++++---
te_IN/network-settings.dtd | 10 +++++++---
tg/network-settings.dtd | 10 +++++++---
th/network-settings.dtd | 10 +++++++---
ti/network-settings.dtd | 10 +++++++---
tk/network-settings.dtd | 10 +++++++---
tr/network-settings.dtd | 10 +++++++---
uk/network-settings.dtd | 10 +++++++---
ur/network-settings.dtd | 10 +++++++---
ur_PK/network-settings.dtd | 10 +++++++---
uz/network-settings.dtd | 10 +++++++---
ve/network-settings.dtd | 10 +++++++---
vi/network-settings.dtd | 10 +++++++---
wa/network-settings.dtd | 10 +++++++---
wo/network-settings.dtd | 10 +++++++---
zh_CN/network-settings.dtd | 10 +++++++---
zh_HK/network-settings.dtd | 10 +++++++---
zh_TW/network-settings.dtd | 10 +++++++---
zu/network-settings.dtd | 10 +++++++---
144 files changed, 1008 insertions(+), 432 deletions(-)
diff --git a/ach/network-settings.dtd b/ach/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ach/network-settings.dtd
+++ b/ach/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ady/network-settings.dtd b/ady/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ady/network-settings.dtd
+++ b/ady/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/af/network-settings.dtd b/af/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/af/network-settings.dtd
+++ b/af/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ak/network-settings.dtd b/ak/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ak/network-settings.dtd
+++ b/ak/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/am/network-settings.dtd b/am/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/am/network-settings.dtd
+++ b/am/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ar/network-settings.dtd b/ar/network-settings.dtd
index 2f5977a..0c0f382 100644
--- a/ar/network-settings.dtd
+++ b/ar/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "هل اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة؟">
<!ENTITY torSettings.firewallHelp "إذا لم تكن متأكدا من كيفية الإجابة على هذا السؤال، اختار لا. إذا واجهتك مشاكل في الاتصال بشبكة تور, غيير هذا الإعداد.">
<!ENTITY torSettings.enterFirewall "إدخل قائمة مفصولة بفواصل من المنافذ التي يسمح بها جدار الحماية.">
-<!ENTITY torSettings.bridgeQuestion "إذا كان اتصال الإنترنت لهذا الكمبيوتر مُراقب، سوف تحتاج إلى الحصول على واستخدام جسور. إذا لم يكن مُراقب، اضغط اتصل.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "اتصال الإنترنت لهذا الكمبيوتر يمر بجدار حماية يسمح بالاتصال فقط من خلال منافذ معينة">
<!ENTITY torsettings.firewall.allowedPorts "المنافذ المسموح بها:">
<!ENTITY torsettings.useBridges.checkbox "مزود خدمة الإنترنت الخاص بي (ISP) يمنع الاتصالات بشبكة تور">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "ادخل جسر او اكثر (جسر واحد في كل سطر).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "نسخ سجل تور إلي الحافظة">
<!ENTITY torsettings.bridgeHelpTitle "المساعدة الخاصة بالجسور المُرحلة">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/arn/network-settings.dtd b/arn/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/arn/network-settings.dtd
+++ b/arn/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ast/network-settings.dtd b/ast/network-settings.dtd
index 90df3ec..029ef63 100644
--- a/ast/network-settings.dtd
+++ b/ast/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/az/network-settings.dtd b/az/network-settings.dtd
index aafa8f1..25b9a74 100644
--- a/az/network-settings.dtd
+++ b/az/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/be/network-settings.dtd b/be/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/be/network-settings.dtd
+++ b/be/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/bg/network-settings.dtd b/bg/network-settings.dtd
index eb7dbea..c19b7fb 100644
--- a/bg/network-settings.dtd
+++ b/bg/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Позволени портове:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Копирай Tor лога в клипборда">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/bg_BG/network-settings.dtd b/bg_BG/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/bg_BG/network-settings.dtd
+++ b/bg_BG/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/bn/network-settings.dtd b/bn/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/bn/network-settings.dtd
+++ b/bn/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/bn_IN/network-settings.dtd b/bn_IN/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/bn_IN/network-settings.dtd
+++ b/bn_IN/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/bo/network-settings.dtd b/bo/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/bo/network-settings.dtd
+++ b/bo/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/br/network-settings.dtd b/br/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/br/network-settings.dtd
+++ b/br/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/bs/network-settings.dtd b/bs/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/bs/network-settings.dtd
+++ b/bs/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ca/network-settings.dtd b/ca/network-settings.dtd
index 8e17ea5..1d89004 100644
--- a/ca/network-settings.dtd
+++ b/ca/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -45,13 +47,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Ports permesos:">
<!ENTITY torsettings.useBridges.checkbox "El meu proveidor d'internet (ISP) bloqueja les conexions a la xarxa Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Entra en un o més repetidors (un per linia).">
-<!ENTITY torsettings.useBridges.placeholder "adreça:port O transporta adreça:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copiar el Log al portapapers">
<!ENTITY torsettings.bridgeHelpTitle "Ajuda Repetidors">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/cs/network-settings.dtd b/cs/network-settings.dtd
index c9f2fe4..8efb42e 100644
--- a/cs/network-settings.dtd
+++ b/cs/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Je počítač připojen k internetu přes firewall, který povoluje připojení pouze přes některé porty?">
<!ENTITY torSettings.firewallHelp "Jestli si nejste jisti, jak odpovědět na otázku, odpovězte NE. Jestliže narazíte na problémy s připojením k Tor síti, změňte toto nastavení.">
<!ENTITY torSettings.enterFirewall "Zadejte čárkami oddělený seznam portů, které jsou povoleny firewallem.">
-<!ENTITY torSettings.bridgeQuestion "Jestli je toto internetové připojení cenzurováno, musíte použít mostní relé.&#160; Jestli ne, prostě klikněte na Připojit se.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "Tento počítač používá firewall, který povoluje připojení pouze přes některé porty.">
<!ENTITY torsettings.firewall.allowedPorts "Povolené porty:">
<!ENTITY torsettings.useBridges.checkbox "Můj internetový poskytovatel (ISP) blokuje připojení k Tor síti">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Zadejte jedno nebo více mostních relé (jedno na řádek).">
-<!ENTITY torsettings.useBridges.placeholder "address:port NEBO transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Zkopíruj logový soubor Toru do schránky">
<!ENTITY torsettings.bridgeHelpTitle "Nápověda o mostních relé">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/csb/network-settings.dtd b/csb/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/csb/network-settings.dtd
+++ b/csb/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/cy/network-settings.dtd b/cy/network-settings.dtd
index 48a64d5..e2cf960 100644
--- a/cy/network-settings.dtd
+++ b/cy/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!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.useBridges.checkbox "Mae fy Narparydd Gwasanaeth Rhyngrwyd (ISP) yn atal cysylltiadau â'r rhwydwaith Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copio'r Log Tor i'r Clipfwrdd">
<!ENTITY torsettings.bridgeHelpTitle "Cymorth Pont Relái">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/da/network-settings.dtd b/da/network-settings.dtd
index 25f573f..e204cd6 100644
--- a/da/network-settings.dtd
+++ b/da/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Går denne computers internetforbindelse igennem en firewall som kun tillader forbindelse til visse porte?">
<!ENTITY torSettings.firewallHelp "Hvis du ikke er sikker på hvordan du skal svare på dette spørgsmål, vælg Nej. Hvis du løber ind i problemer med at forbinde til Tor netværket, skal du ændre denne indstilling.">
<!ENTITY torSettings.enterFirewall "Indtast en komma-separeret liste over porte der er tilladt på firewallen.">
-<!ENTITY torSettings.bridgeQuestion "Hvis denne computers internetforbindelse er censureret, skal du få fat i og bruge bro-relæer.&#160; If ikke, klik bare på Forbind.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "Denne computer går gennem en firewall som kun tillader forbindelse til specifikke porte">
<!ENTITY torsettings.firewall.allowedPorts "Tilladte Porte:">
<!ENTITY torsettings.useBridges.checkbox "Min udbyder (ISP) blokerer forbindelse til Tor netværket">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Indtast et eller flere bro-relæer (et per linie)">
-<!ENTITY torsettings.useBridges.placeholder "adresse:port OR transport adresse:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Kopier Tor loggen til udklipsholderen">
<!ENTITY torsettings.bridgeHelpTitle "Bro-relæ hjælp">
<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke kan forbinde dig til Tor netværket er det muligt at din internet udbyder (ISP) eller anden myndighed blokerer Tor. &#160; Det er ofte muligt at komme rundt om en blokade ved at bruge en Tor bro. En bro er et relæ som ikke er på den offentliggjorte liste og som derfor er sværere at blokkere.">
-<!ENTITY torsettings.bridgeHelp1B "Her er tre måder at få fat på en bro adresse:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "På nettet">
<!ENTITY torsettings.bridgeHelp2 "Brug en browser og besøg https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Via den automatiske email service">
diff --git a/de/network-settings.dtd b/de/network-settings.dtd
index 9228922..efca5b8 100644
--- a/de/network-settings.dtd
+++ b/de/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Benutzt die Internetverbindung dieses Rechners eine Firewall, die nur Verbindungen zu bestimmten Anschlüssen zulässt?">
<!ENTITY torSettings.firewallHelp "Wenn Sie sich nicht sicher sind, wählen Sie Nein. Wenn Sie dann Probleme haben eine Verbindung zum Tor-Netzwerk herzustellen, ändern Sie diese Einstellung.">
<!ENTITY torSettings.enterFirewall "Geben Sie hier die Anschlüsse ein, die von der Firewall erlaubt werden. Trennen Sie die Anschlüsse jeweils mit einem Komma.">
-<!ENTITY torSettings.bridgeQuestion "Sollte die Internetverbindung dieses Rechners zensiert werden, dann müssen Sie Brückenrelais benutzen.&#160; Falls nicht, klicken Sie einfach auf Verbinden.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!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.useBridges.checkbox "Mein Internetdienstanbieter (ISP) blockiert Verbindungen zum Tor-Netzwerk">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Ein oder mehrere Brückenrelais eingeben (eins pro Zeile).">
-<!ENTITY torsettings.useBridges.placeholder "Adresse:Anschluss ODER Transportadresse:Anschluss">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Tor-Protokoll in die Zwischenablage kopieren">
<!ENTITY torsettings.bridgeHelpTitle "Hilfe zum Brückenrelais">
<!ENTITY torsettings.bridgeHelp1 "Sollten Sie sich nicht mit dem Tor-Netzwerk verbinden können, ist es möglich, dass Ihr Internetdienstanbieter (ISP) oder eine andere Organisation, Tor blockiert.&#160; Dieses Problem kann meist mit der Benutzung von Torbrücken umgangen werden, das sind versteckte Relais und damit schwerer zu blocken.">
-<!ENTITY torsettings.bridgeHelp1B "Hier sind drei Möglichkeiten, Brückenadressen zu erhalten:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Durch das Internet">
<!ENTITY torsettings.bridgeHelp2 "Benutzen Sie einen Browser und besuchen Sie https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Durch die automatische E-Mail-Antwort">
diff --git a/dz/network-settings.dtd b/dz/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/dz/network-settings.dtd
+++ b/dz/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/el/network-settings.dtd b/el/network-settings.dtd
index 07360a2..911d884 100644
--- a/el/network-settings.dtd
+++ b/el/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Πηγαίνει μέσω ενός τείχους προστασίας που επιτρέπει μόνο συνδέσεις σε ορισμένες θύρες σύνδεσης Internet αυτού του υπολογιστή;">
<!ENTITY torSettings.firewallHelp "Εάν δεν είστε βέβαιοι πώς να απαντήσετε στο ερώτημα αυτό, επιλέξτε Όχι. Εάν αντιμετωπίζετε προβλήματα με τη σύνδεση με το δίκτυο Tor, αλλάξτε αυτή τη ρύθμιση. ">
<!ENTITY torSettings.enterFirewall "Πληκτρολογήστε μια λίστα διαχωρισμένη με κόμματα των θυρών που επιτρέπονται από το firewall.">
-<!ENTITY torSettings.bridgeQuestion "Εάν η σύνδεση στο διαδικτυο αυτού του υπολογιστή λογοκρίνεται, θα χρειαστεί να αποκτήσετε και να χρησιμοποιήσετε ρελέ γέφυρα.&#160; Αν όχι, απλά κάντε κλικ στο Σύνδεση.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος">
<!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες Θύρες:">
<!ENTITY torsettings.useBridges.checkbox "Ο πάροχος διαδικτυου (ISP) μπλοκάρει τις συνδέσεις στο δίκτυο του Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Αντιγραφή στο πρόχειρο">
<!ENTITY torsettings.bridgeHelpTitle "Γεφυρες αναμεταδοτων Βοηθεια">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/el_GR/network-settings.dtd b/el_GR/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/el_GR/network-settings.dtd
+++ b/el_GR/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/en/network-settings.dtd b/en/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/en/network-settings.dtd
+++ b/en/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/en_GB/network-settings.dtd b/en_GB/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/en_GB/network-settings.dtd
+++ b/en_GB/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/eo/network-settings.dtd b/eo/network-settings.dtd
index ae52c60..e42f289 100644
--- a/eo/network-settings.dtd
+++ b/eo/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/es/network-settings.dtd b/es/network-settings.dtd
index d8ee547..a5d2946 100644
--- a/es/network-settings.dtd
+++ b/es/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "¿Va la conexión a Internet de esta computadora a través de un cortafuegos ('firewall') que sólo permite conexiones a ciertos puertos?">
<!ENTITY torSettings.firewallHelp "Si no está seguro de cómo responder a esta pregunta, elija No. Si encuentra problemas conectando a la red Tor, cambie esta configuración.">
<!ENTITY torSettings.enterFirewall "Introduzca una lista de puertos separada por comas que esté permitida por el cortafuegos ('firewall').">
-<!ENTITY torSettings.bridgeQuestion "Si la conexión a Internet de esta computadora está censurada, necesitará obtener y usar repetidores puente ('bridge relays').&#160; Si no, simplemente haga clic en Conectar.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!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.useBridges.checkbox "Mi Proveedor de Servicios de Internet (ISP) bloquea las conexiones a la red Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Introduzca uno o más repetidores puente ('bridge', uno por línea).">
-<!ENTITY torsettings.useBridges.placeholder "dirección:puerto O dirección:puerto de transporte">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copiar el registro de mensajes ('log') de Tor al portapapeles">
<!ENTITY torsettings.bridgeHelpTitle "Ayuda de Repetidores Puente ('Bridge Relays')">
<!ENTITY torsettings.bridgeHelp1 "Si no puede conectar a la red Tor, podría ser que su proveedor de servicios de Internet (ISP) u otra agencia, esté bloqueando Tor.&#160; A menudo, puede evitar este problema usando puentes ('bridges') de Tor, que son repetidores ('relays') de salida de la red Tor que no son publicitados, y es más difícil que sean bloqueados.">
-<!ENTITY torsettings.bridgeHelp1B "Aquí tiene tres formas de obtener direcciones de repetidores puente:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Mediante la web">
<!ENTITY torsettings.bridgeHelp2 "Use un navegador web para visitar https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Mediante el correo electrónico automático">
diff --git a/es_AR/network-settings.dtd b/es_AR/network-settings.dtd
index a014228..feb2436 100644
--- a/es_AR/network-settings.dtd
+++ b/es_AR/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/es_CO/network-settings.dtd b/es_CO/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/es_CO/network-settings.dtd
+++ b/es_CO/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/et/network-settings.dtd b/et/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/et/network-settings.dtd
+++ b/et/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/eu/network-settings.dtd b/eu/network-settings.dtd
index ffcc105..ebd4966 100644
--- a/eu/network-settings.dtd
+++ b/eu/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Ordenagailu honen Interneteko konexioa ataka zehatz batzuetara bakarrik konektatzea baimentzen duen sueten baten zehar al doa?">
<!ENTITY torSettings.firewallHelp "Galdera hau nola erantzuteaz zalantzan bazaude, hautatu Ez. Tor sarera konektatzen arazoak aurkitzen badituzu, aldatu ezarpen hau.">
<!ENTITY torSettings.enterFirewall "Suetenak baimendutako eta komaz banandutako ataka zerrenda bat sar ezazu ">
-<!ENTITY torSettings.bridgeQuestion "Ordenagailu honen Interneteko konexioa zentsuratuta badago, zubi erreleak lortu eta erabili beharko dituzu.&#160; Bestela, sakatu Konektatu besterik gabe.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!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.useBridges.checkbox "Nire Internet Zerbitzu Hornitzaileak (ISP ingeleraz) Tor sarera konektatzea blokeatzen dit.">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Sartu zubi errele bat edo gehiago (bat lerro bakoitzeko).">
-<!ENTITY torsettings.useBridges.placeholder "helbidea:ataka EDO garraio helbidea:ataka">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Kopiatu Tor erregistroa arbelera">
<!ENTITY torsettings.bridgeHelpTitle "Zubi errele laguntza">
<!ENTITY torsettings.bridgeHelp1 "Tor sarera konektatu ezin bazara, baliteke zure Internet Zerbitzu Hornitzaileak (ISP ingeleraz) edo beste agentziaren batek Tor blokeatzen egotea.&#160; Askotan, arazo honen inguruan Tor zubiak, ezkutatuta dauden eta blokeatzeko zailagoak diren erreleak erabiliz lan egin dezakezu.">
-<!ENTITY torsettings.bridgeHelp1B "Hemen dituzu zubi helbideak eskuratzeko hiru bide:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Webean bidez">
<!ENTITY torsettings.bridgeHelp2 "Erabili ezazu web nabigatzaile bat https://bridges.torproject.org bisitatzeko">
<!ENTITY torsettings.bridgeHelp3Heading "Email erantzule automatikoaren bidez">
diff --git a/fa/network-settings.dtd b/fa/network-settings.dtd
index d6da3bb..612eae4 100644
--- a/fa/network-settings.dtd
+++ b/fa/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "آیا در مسیر ارتباط شما به اینترنت یک فایروال وجود دارد؟ و فقط اجازه اتصال از یک درگاه خاص را می دهد؟">
<!ENTITY torSettings.firewallHelp "اگر مطمئن نیستید چه جوابی به این سوال دهید، «نه» و یا «خیر» را انتخاب کنید. سپس اگر مشکلی در ارتباط با شبکه تور داشتید، این مورد را تغییر دهید.">
<!ENTITY torSettings.enterFirewall "یک لیست جداشده با ویرگول از پورتهایی که توسط فایروال مجاز هستند.">
-<!ENTITY torSettings.bridgeQuestion "اگر اینترنت شما سانسور شده و فیلتر می شود، شما لازم دارید از «مسیرهای دور زدن فیلتر» استفاده کنید.&#160; اگر نه، کافیست روی «اتصال» و یا «وصل شدن» کلیک کنید.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,14 +46,16 @@
<!ENTITY torsettings.firewall.checkbox "به نظر می رسد شبکه ارتباطی شما به اینترنت، از یک فایروال استفاده می کند. یعنی فقط اجازه اتصال از یک سری درگاه های به خصوص را می دهد.">
<!ENTITY torsettings.firewall.allowedPorts "پورت های مجاز:">
<!ENTITY torsettings.useBridges.checkbox "سرویس دهنده اینترنت (ISP) من اتصال به شبکه تور را مسدود میکند.">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "یک یا چند پل ارتباطی را وارد نمایید. (در هر خط یکی)">
-<!ENTITY torsettings.useBridges.placeholder "address:port یا transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "کپی گزارش وقایع تور">
<!ENTITY torsettings.bridgeHelpTitle "کمک برای پل ارتباطی">
<!ENTITY torsettings.bridgeHelp1 "اگر نمی توانید به شبکه تور متصل شوید، ممکن است به این دلیل باشد که شرکت ارایه کننده اینترنت شما(ISP) و یا سازمان های دیگر شبکه تور را بسته اند.&#160;
غالباً می توانید این محدودیت را با استفاده از «پل» های تور دور بزنید. پل ها مسیرهای اضافی دور زدن فیلتر هستند که لیست آن در دسترس نیست و فیلتر کردن آن ها بسیار مشکل است.">
-<!ENTITY torsettings.bridgeHelp1B "سه راه برای به دست آوردن پل ها وجود دارد:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "از طریق اینترنت">
<!ENTITY torsettings.bridgeHelp2 "با استفاده از یک مرورگر به آدرس https://bridges.torproject.org بروید.">
<!ENTITY torsettings.bridgeHelp3Heading "از طریق آدرس ایمیل پاسخگوی خودکار">
diff --git a/fi/network-settings.dtd b/fi/network-settings.dtd
index 7c4adb1..12b8527 100644
--- a/fi/network-settings.dtd
+++ b/fi/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "Ellet ole varma kuinka vastata tähän kysymykseen, valitse Ei. Muuta tätä asetusta jos yhteyden saamisessa Tor-verkkoon on ongelmia.">
<!ENTITY torSettings.enterFirewall "Luettele pilkuin erotettuina ne portit, jotka palomuuri sallii. ">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "Tämän tietokoneen palomuuri sallii yhteydet vain tiettyjen porttien kautta.">
<!ENTITY torsettings.firewall.allowedPorts "Sallitut portit:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/fil/network-settings.dtd b/fil/network-settings.dtd
index 973b7b7..e2fbca3 100644
--- a/fil/network-settings.dtd
+++ b/fil/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/fo/network-settings.dtd b/fo/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/fo/network-settings.dtd
+++ b/fo/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd
index 9e50503..706ec46 100644
--- a/fr/network-settings.dtd
+++ b/fr/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Est-ce que votre connexion Internet est filtré par un pare-feu qui n'autorise les connexions que vers certains ports ?">
<!ENTITY torSettings.firewallHelp "Si vous ne savez par comment répondre à cette question, choisissez Non. Vous pourrez changer ce paramètre plus tard en cas de problèmes de connexion au réseau Tor.">
<!ENTITY torSettings.enterFirewall "Entrez la liste de ports, séparés par des virgules, qui sont autorisés par le pare-feu.">
-<!ENTITY torSettings.bridgeQuestion "Si la connexion Internet de cet ordinateur est censurée, il est nécessaire d'obtenir des adresses de bridges. Si ce n'est pas le cas, cliquez simplement sur « Se connecter ».">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui autorise uniquement les connexions à certains ports">
<!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :">
<!ENTITY torsettings.useBridges.checkbox "Mon Fournisseur d'Accès à Internet (FAI) bloque les connexions au réseau Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Saisir un ou davantage de bridges relais (un par ligne).">
-<!ENTITY torsettings.useBridges.placeholder "adresse:port OU adresse de transport:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copier le journal des messages de Tor dans le presse-papier">
<!ENTITY torsettings.bridgeHelpTitle "Aide pour les bridges">
<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se pourrait que votre fournisseur d'accès à Internet (FAI) ou une autre agence bloque le Tor.&#160; Souvent, vous pouvez contourner ce problème en utilisant des ponts Tor, qui sont des relais non listés qui sont plus difficiles à bloquer.">
-<!ENTITY torsettings.bridgeHelp1B "Voici trois façons d'obtenir des adresses de pont :">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Par le Web">
<!ENTITY torsettings.bridgeHelp2 "Utilisez un navigateur web pour visiter https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Par l'auto-répondeur de courrier électronique">
diff --git a/fr_CA/network-settings.dtd b/fr_CA/network-settings.dtd
index c4e15f1..fb9c7ff 100644
--- a/fr_CA/network-settings.dtd
+++ b/fr_CA/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Est-ce que la connexion Internet de cet ordinateur passe par un pare-feu qui n'autorise les connexions que vers certains ports?">
<!ENTITY torSettings.firewallHelp "Si vous ne savez par comment répondre à cette question, choisissez Non. Si vous éprouvez des difficultés à vous connecter au réseau Tor, changer ce paramètre.">
<!ENTITY torSettings.enterFirewall "Saisir une liste de ports, séparés par des virgules, qui sont autorisés par le pare-feu.">
-<!ENTITY torSettings.bridgeQuestion "Si la connexion Internet de cet ordinateur est censurée, il vous faudra obtenir et utiliser des relais-ponts.&#160; Sinon cliquer juste sur « Se connecter ».">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!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.useBridges.checkbox "Mon fournisseur d'accès à Internet (FAI) bloque les connexions au réseau Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Saisir un ou plusieurs relais-ponts (un par ligne).">
-<!ENTITY torsettings.useBridges.placeholder "adresse:port OU adresse de transport:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copier le journal de Tor dans le presse-papier">
<!ENTITY torsettings.bridgeHelpTitle "Aide pour les relais-ponts">
<!ENTITY torsettings.bridgeHelp1 "Si vous ne pouvez pas vous connecter au réseau Tor, il se peut que votre fournisseur d'accès à Internet (FAI) ou une autre agence bloque Tor.&#160; Vous pouvez souvent le contourner en utilisant des ponts Tor qui sont des relais non répertoriés, plus difficiles à bloquer.">
-<!ENTITY torsettings.bridgeHelp1B "Voici trois façons d'obtenir des adresses de pont :">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "par le Web">
<!ENTITY torsettings.bridgeHelp2 "en utilisant un navigateur Web pour visiter https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "par le répondeur automatique de courriel">
diff --git a/fur/network-settings.dtd b/fur/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/fur/network-settings.dtd
+++ b/fur/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/fy/network-settings.dtd b/fy/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/fy/network-settings.dtd
+++ b/fy/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ga/network-settings.dtd b/ga/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ga/network-settings.dtd
+++ b/ga/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/gl/network-settings.dtd b/gl/network-settings.dtd
index 37b2254..08d57d5 100644
--- a/gl/network-settings.dtd
+++ b/gl/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "A conexión á Internet deste computador pasa por unha devasa (firewall) que só permite conexións a certos portos?">
<!ENTITY torSettings.firewallHelp "Se non está seguro de como responder a esta pregunta, seleccione Non. Se atopa problemas para conectarse á rede Tor, cambie esta configuración.">
<!ENTITY torSettings.enterFirewall "Escriba unha lista separada por comas de portos permitidos pola devasa (firewall).">
-<!ENTITY torSettings.bridgeQuestion "Se a conexión deste computador a Internet é censurada, necesitará obter e utilizar repetidores ponte.&#160; Se non, basta con premer en Conectar.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!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.useBridges.checkbox "O meu Provedor Servizos de Internet (ISP) bloquea as conexións á rede Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copia o rexistro do Tor ao portapapeis">
<!ENTITY torsettings.bridgeHelpTitle "Axuda do Repetidor Ponte">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/gu/network-settings.dtd b/gu/network-settings.dtd
index eb4d7ce..fcf6b83 100644
--- a/gu/network-settings.dtd
+++ b/gu/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/gu_IN/network-settings.dtd b/gu_IN/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/gu_IN/network-settings.dtd
+++ b/gu_IN/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/gun/network-settings.dtd b/gun/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/gun/network-settings.dtd
+++ b/gun/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ha/network-settings.dtd b/ha/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ha/network-settings.dtd
+++ b/ha/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/he/network-settings.dtd b/he/network-settings.dtd
index efce28b..d42a684 100644
--- a/he/network-settings.dtd
+++ b/he/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "האם חיבור האינטרנט של מחשב זה עובר דרך חומת אש שרק מאפשר חיבורים ליציאות מסוימות?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "המידה וחיבור האינטרנט של מחשב זה הינו מצונזר, יהיה עליך להשיג ולהשתמש בממסרי גשר.&#160; היה ולא, פשוט לחץ על התחבר.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "מחשב זה עובר דרך חומת אש שרק מאפשר חיבורים ליציאות מסוימות">
<!ENTITY torsettings.firewall.allowedPorts "יציאות מורשות:">
<!ENTITY torsettings.useBridges.checkbox "ספק האינטרנט שלי (ISP) חוסם חיבורים אל הרשת Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "הקלד אחד או יותר ממסרי גשר (אחד לכל שורה)">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "העתק את יומן Tor אל לוח גזירה">
<!ENTITY torsettings.bridgeHelpTitle "עזרת ממסר גשר">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/hi/network-settings.dtd b/hi/network-settings.dtd
index 791e1c9..a8e0cfd 100644
--- a/hi/network-settings.dtd
+++ b/hi/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/hr/network-settings.dtd b/hr/network-settings.dtd
index 01d0eca..63784fd 100644
--- a/hr/network-settings.dtd
+++ b/hr/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/hr_HR/network-settings.dtd b/hr_HR/network-settings.dtd
index 8319a42..e1bbc9f 100644
--- a/hr_HR/network-settings.dtd
+++ b/hr_HR/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Prolazi li Internet veza ovog računala kroz vatrozid koji dopušta spajanje samo na određene portove?">
<!ENTITY torSettings.firewallHelp "Ako niste sigurni kako odgovoriti na ovo pitanje, odaberite "Ne". Ako uočite probleme pri spajanju na Tor mrežu, promijenite ovu postavku.">
<!ENTITY torSettings.enterFirewall "Unesite popis portova, odvojenih zarezom, koji su dopušteni na vatrozidu.">
-<!ENTITY torSettings.bridgeQuestion "Ukoliko je internetska veza ovog računala cenzurirana, trebat ćete dobaviti i koristiti bridge releje.&#160; U suprotnom, samo kliknite na Spoji.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!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.useBridges.checkbox "Moj pružatelj internetskih usluga (ISP) blokira veze prema Tor mreži">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Unesite jedan ili više mostova (jedan po retku).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik">
<!ENTITY torsettings.bridgeHelpTitle "Pomoć za bridge relej">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ht/network-settings.dtd b/ht/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ht/network-settings.dtd
+++ b/ht/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/hu/network-settings.dtd b/hu/network-settings.dtd
index 5179ef7..dc4090d 100644
--- a/hu/network-settings.dtd
+++ b/hu/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Ezen számítógép internet kapcsolata tűzfalon halad át, mely csak bizonyos portokhoz enged csatlakozni?">
<!ENTITY torSettings.firewallHelp "Nem biztos abban, hogy hogyan válaszoljon erre a kérdésre, válassza a 'Nem'-et. Ha problémákba ütközik a Tor hálózathoz való csatlakozáskor, változtassa meg ezt a beállítást.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Engedélyezett portok:">
<!ENTITY torsettings.useBridges.checkbox "Az internet szolgáltatóm (ISP) blokkolja a Tor hálózathoz való csatlakozásokat">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "cím:port VAGY átviteli cím:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "A Tor log Vágólapra másolása">
<!ENTITY torsettings.bridgeHelpTitle "Híd kapcsoló súgó">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/hy/network-settings.dtd b/hy/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/hy/network-settings.dtd
+++ b/hy/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/hy_AM/network-settings.dtd b/hy_AM/network-settings.dtd
index 800a190..f534bd0 100644
--- a/hy_AM/network-settings.dtd
+++ b/hy_AM/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ia/network-settings.dtd b/ia/network-settings.dtd
index 48ecfd5..3107399 100644
--- a/ia/network-settings.dtd
+++ b/ia/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/id/network-settings.dtd b/id/network-settings.dtd
index 9a724d4..fc6a285 100644
--- a/id/network-settings.dtd
+++ b/id/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Apakah koneksi Internet komputer ini melalui firewall yang hanya memperbolehkan koneksi ke port-port tertentu?">
<!ENTITY torSettings.firewallHelp "Jika anda tidak yakin atas jawaban pertanyaan ini, pilih Tidak. Jika anda mendapatkan masalah dalam menghubungi network Tor, ubah pengaturan ini.">
<!ENTITY torSettings.enterFirewall "Masukkan port-port (pisahkan dengan koma) yang diperbolehkan oleh firewall.">
-<!ENTITY torSettings.bridgeQuestion "Jika koneksi Internet komputer ini disensor, anda perlu mengumpulkan dan menggunakan bridge relays.&#160; Jika tidak, klik Hubungkan.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!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.useBridges.checkbox "Internet Service Provider (ISP) saya memblokir koneksi ke jaringan Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Masukkan satu atau beberapa jembatan penyambung (satu per baris).">
-<!ENTITY torsettings.useBridges.placeholder "address:port ATAU pindahkan address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Salin Log Tor Ke Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bantuan Bridge Relay">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/is/network-settings.dtd b/is/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/is/network-settings.dtd
+++ b/is/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/it/network-settings.dtd b/it/network-settings.dtd
index eed5a70..33d47bd 100644
--- a/it/network-settings.dtd
+++ b/it/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "La connessione ad Internet di questo computer passa attraverso un firewall che permette le connessioni solo ad alcune porte?">
<!ENTITY torSettings.firewallHelp "Se non sei sicuro su come rispondere a questa domanda, seleziona No. Nel caso in cui si verifichino problemi di connessione alla rete Tor, cambia queste impostazioni.">
<!ENTITY torSettings.enterFirewall "Inserisci una lista di porte consentite dal firewall, separate da una virgola.">
-<!ENTITY torSettings.bridgeQuestion "Se la connessione ad Internet di questo computer è censurata, sarà necessario ottenere ed usare dei ponti relé.&#160; Se non lo è, seleziona Connetti.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!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.useBridges.checkbox "Il mio fornitore di servizi Internet (ISP) blocca le connessioni alla rete Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Inserisci uno o più bridge relay (uno per riga)">
-<!ENTITY torsettings.useBridges.placeholder "indirzzo:porta OPPURE indirizzo:porta di trasporto">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copia il log di Tor negli "appunti" di sistema">
<!ENTITY torsettings.bridgeHelpTitle "Aiuto per i ponti relé">
<!ENTITY torsettings.bridgeHelp1 "Se non ti riesci a connettere alla rete Tor, è possibile che il tuo Internet Service Provider (ISP) o una qualche altra agenzia stiano bloccando Tor.&#160; Spesso puoi aggirare questo problema utilizzando un Bridge Tor, che è un relay non tracciato più difficile da bloccare.">
-<!ENTITY torsettings.bridgeHelp1B "Ecco tre modi per ottenere indirizzi bridge:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Attraverso il web">
<!ENTITY torsettings.bridgeHelp2 "Usa un browser per visitare https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Attraverso l'autorisponditore Email">
diff --git a/ja/network-settings.dtd b/ja/network-settings.dtd
index 7f2ac08..871a71e 100644
--- a/ja/network-settings.dtd
+++ b/ja/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "このコンピュータのインターネット接続は特定のポートへの接続のみ許可するファイアーウォールを通しますか?">
<!ENTITY torSettings.firewallHelp "この質問にどう答えるべきか確信が持てなければ、いいえを選択してください。 Torネットワークへ接続する時に問題に遭遇したなら、この設定を変更してください。">
<!ENTITY torSettings.enterFirewall "ファイアーウォールによって許可されているポートのコンマ区切りのリストを入力してください。">
-<!ENTITY torSettings.bridgeQuestion "このコンピュータのインターネット接続が検閲されていれば、ブリッジリレーの入手と使用が必要になります。&#160; そうでなければ、接続をクリックするだけで結構です。">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "このコンピューターは特定のポートへの接続のみ許可するファイアーウォールを通します。">
<!ENTITY torsettings.firewall.allowedPorts "許可されたポート:">
<!ENTITY torsettings.useBridges.checkbox "私のインターネットサービスプロバイダ(ISP)はTorネットワークへの接続をブロックします">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "1つ以上のブリッジリレーを入力してください(行あたり1つ)。">
-<!ENTITY torsettings.useBridges.placeholder "アドレス:ポート または トランスポートアドレス:ポート">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Torのログをクリップボードにコピー">
<!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ">
<!ENTITY torsettings.bridgeHelp1 "Tor ネットワークに接続できないなら、あなたのインターネットサービスプロバイダー(ISP)や別の機関が Tor をブロックしている可能性があります。&#160; ブロックが比較的困難なリストされていないリレーである Tor ブリッジを使用することでこの問題を回避できることもあります。">
-<!ENTITY torsettings.bridgeHelp1B "ブリッジアドレスを取得する三種の方法は:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "ウェブ経由">
<!ENTITY torsettings.bridgeHelp2 "ウェブを使用して、https://bridges.torproject.orgを開く">
<!ENTITY torsettings.bridgeHelp3Heading "メール自動応答システム経由">
diff --git a/jv/network-settings.dtd b/jv/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/jv/network-settings.dtd
+++ b/jv/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ka/network-settings.dtd b/ka/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ka/network-settings.dtd
+++ b/ka/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/km/network-settings.dtd b/km/network-settings.dtd
index 1516ae9..58cb643 100644
--- a/km/network-settings.dtd
+++ b/km/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "តើការភ្ជាប់អ៊ីនធឺណិតរបស់កុំព្យូទ័រនេះឆ្លងកាត់ជញ្ជាំងភ្លើងដែលអនុញ្ញាតតែការភ្ជាប់ទៅច្រកជាក់លាក់?">
<!ENTITY torSettings.firewallHelp "បើអ្នកមិនប្រាកដវិធីឆ្លើយតសំណួរនេះ ជ្រើស ទេ។ បើអ្នកមានបញ្ហាក្នុងការភ្ជាប់ទៅបណ្ដាញ Tor ប្ដូរការកំណត់នេះ។">
<!ENTITY torSettings.enterFirewall "បញ្ជីបញ្ជីច្រកដែលបំបែកដោយសញ្ញាក្បៀសដែលត្រូវបានអនុញ្ញាតដោយជញ្ជាំងភ្លើង។">
-<!ENTITY torSettings.bridgeQuestion "បើការភ្ជាប់អ៊ីនធឺណិតកុំព្យូទ័រនេះកែ អ្នកត្រូវទទួលយក និងប្រើការបញ្ជូនប៊្រីតបន្ត។ &#160; បើកមិនបានកែទេ គ្រាន់តែចុច ភ្ជាប់។">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "កុំព្យូទ័រនេះឆ្លងកាត់ជញ្ជាំងភ្លើងដែលអនុញ្ញាតតែការភ្ជាប់ទៅច្រកជាក់លាក់">
<!ENTITY torsettings.firewall.allowedPorts "ច្រកបានអនុញ្ញាត៖">
<!ENTITY torsettings.useBridges.checkbox "ក្រុមហ៊ុនផ្ដល់សេវាកម្មអ៊ីនធឺណិត (ISP) របស់ខ្ញុំទប់ស្កាត់ការភ្ជាប់ទៅបណ្ដាញ Tor ។">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "បញ្ចូលការបញ្ជូនប្រ៊ីតបន្តមួយ ឬច្រើន (មួយក្នុងមួយជួរ)។">
-<!ENTITY torsettings.useBridges.placeholder "address:port ឬ transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "ចម្លងកំណត់ហេតុ Tor ទៅក្ដារតម្បៀតខ្ទាស់">
<!ENTITY torsettings.bridgeHelpTitle "ជំនួយបញ្ជូនប្រ៊ីតបន្ត">
<!ENTITY torsettings.bridgeHelp1 "បើអ្នកមិនអាចភ្ជាប់ទៅបណ្ដាញ Tor វាអាចមកពីក្រុមហ៊ុនផ្ដល់សេវាកម្មអ៊ីនធឺណិត (ISP) ឬភ្នាក់ងារផ្សេងកំពុងទប់ស្កាត់ Tor ។ &#160; ជារឿយៗអ្នកអាចស្វែងយល់ពីបញ្ហានេះ ដោយប្រើប៊្រីត Tor ដែលត្រូវបានលាក់ការបញ្ជូនបន្តដែលពិបាកទប់ស្កាត់។">
-<!ENTITY torsettings.bridgeHelp1B "នេះជាវិធីបីយ៉ាង ដើម្បីទទួលអាសយដ្ឋានប៊្រីត៖">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "តាមរយៈបណ្ដាញ">
<!ENTITY torsettings.bridgeHelp2 "ប្រើកម្មវិធីរុករកបណ្ដាញ ដើម្បីមើល https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "តាមរយៈការឆ្លើយតបដោយស្វ័យប្រវត្តិរបស់អ៊ីមែល">
diff --git a/kn/network-settings.dtd b/kn/network-settings.dtd
index c88bbe4..f280130 100644
--- a/kn/network-settings.dtd
+++ b/kn/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ko/network-settings.dtd b/ko/network-settings.dtd
index 7f16c8e..a7030f4 100644
--- a/ko/network-settings.dtd
+++ b/ko/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "이 컴퓨터의 인터넷 연결은 방화벽을 통해서 특정 포트 접속만 허가합니까?">
<!ENTITY torSettings.firewallHelp "이 질문에 어떻게 대답해야 할지 확신이 서지 않으면 아니오를 선택하세요. Tor 네트워크에 접속할 때 문제를 만났다면 이 설정을 변경해 주세요.">
<!ENTITY torSettings.enterFirewall "방화벽에 따라 허가되고 있는 포트 목록 입력해 주세요. 포트 번호는 콤마로 구분됩니다.">
-<!ENTITY torSettings.bridgeQuestion "이 컴퓨터의 인터넷 접속이 검열로 인해 차단되어 있으면 브릿지 중계 서버를 얻어 사용해야 합니다.&#160; 그렇지 않으면 접속을 클릭하면 됩니다.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "이 컴퓨터는 특정 포트만 통과하는 방화벽을 지나 연결됩니다.">
<!ENTITY torsettings.firewall.allowedPorts "허용된 포트:">
<!ENTITY torsettings.useBridges.checkbox "인터넷 서비스 공급자(ISP)가 Tor 네트워크 접속을 차단합니다.">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Tor log를 클립보드에 복사하기">
<!ENTITY torsettings.bridgeHelpTitle "브릿지 중계 서버 도움말">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ko_KR/network-settings.dtd b/ko_KR/network-settings.dtd
index dc794eb..e5cdf8c 100644
--- a/ko_KR/network-settings.dtd
+++ b/ko_KR/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "허용된 포트:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ku/network-settings.dtd b/ku/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ku/network-settings.dtd
+++ b/ku/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/kw/network-settings.dtd b/kw/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/kw/network-settings.dtd
+++ b/kw/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ky/network-settings.dtd b/ky/network-settings.dtd
index 327acf2..028941c 100644
--- a/ky/network-settings.dtd
+++ b/ky/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/lb/network-settings.dtd b/lb/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/lb/network-settings.dtd
+++ b/lb/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/lg/network-settings.dtd b/lg/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/lg/network-settings.dtd
+++ b/lg/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ln/network-settings.dtd b/ln/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ln/network-settings.dtd
+++ b/ln/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/lo/network-settings.dtd b/lo/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/lo/network-settings.dtd
+++ b/lo/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/lt/network-settings.dtd b/lt/network-settings.dtd
index 4dd3f15..e41a3bd 100644
--- a/lt/network-settings.dtd
+++ b/lt/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/lv/network-settings.dtd b/lv/network-settings.dtd
index 1fe4e38..90f8f39 100644
--- a/lv/network-settings.dtd
+++ b/lv/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Vai šī datora interneta savienojums iet caur ugunsmūri, kurš atļauj savienojumus tikai ar atsevišķiem portiem?">
<!ENTITY torSettings.firewallHelp "Ja neesat pārliecināts par pareizo atbildi, izvēlieties atbildi "Nē". Ja rodas problēmas pievienojoties tīklam Tor, mainiet šo iestatījumu.">
<!ENTITY torSettings.enterFirewall "Ievadiet ar komatiem atdalītu ugusnmūra atļauto portu sarakstu.">
-<!ENTITY torSettings.bridgeQuestion "Ja šī datora interneta savienojums tiek cenzēts, Jums būs jāiegūst un jāizmanto tiltu releji.&#160; Ja cenzūra netiek veikta, noklikšķiniet Veidot savienojumu.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!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.useBridges.checkbox "Mans interneta pakalpojumu sniedzējs (IPS) bloķē savienojumu izveidošanu ar tīklu Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Ievadiet vienu vai vairākus tilta retranslatorus (vienu rindā).">
-<!ENTITY torsettings.useBridges.placeholder "adrese:ports VAI transporta adrese:ports">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Kopēt Tor žurnālu starpliktuvē">
<!ENTITY torsettings.bridgeHelpTitle "Palīdzība par tiltu retranslatoriem">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Šeit ir trīs veidi kā iegūt tilta adreses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Caur tīmekli">
<!ENTITY torsettings.bridgeHelp2 "Izmanto pārlūkprogrammu lai apmeklētu https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Caur E-pasta Auto-atbildētāju">
diff --git a/mg/network-settings.dtd b/mg/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/mg/network-settings.dtd
+++ b/mg/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/mi/network-settings.dtd b/mi/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/mi/network-settings.dtd
+++ b/mi/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/mk/network-settings.dtd b/mk/network-settings.dtd
index e9f594f..64ca987 100644
--- a/mk/network-settings.dtd
+++ b/mk/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ml/network-settings.dtd b/ml/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ml/network-settings.dtd
+++ b/ml/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/mn/network-settings.dtd b/mn/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/mn/network-settings.dtd
+++ b/mn/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/mr/network-settings.dtd b/mr/network-settings.dtd
index 5a767fe..4e7fb19 100644
--- a/mr/network-settings.dtd
+++ b/mr/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ms_MY/network-settings.dtd b/ms_MY/network-settings.dtd
index 44d9e61..77c45f8 100644
--- a/ms_MY/network-settings.dtd
+++ b/ms_MY/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Adakah sambungan internet komputer ini melalui firewall yang hanya membenarkan sambungan ke port tertentu?">
<!ENTITY torSettings.firewallHelp "Jika anda tidak pasti bagaimana untuk menjawab soalan ini, pilih Tidak. Jika anda menghadapi masalah untuk menyambung kepada rangkaian Tor, tukar tetapan ini.">
<!ENTITY torSettings.enterFirewall "Masukkan senarai port yang dipisahkan melalui koma yang dibenarkan oleh firewall.">
-<!ENTITY torSettings.bridgeQuestion "Jika sambungan Internet komputer ini adalah ditapis, anda akan perlu untuk mendapatkan dan menggunakan bridge relays.&#160; Jika tidak, hanya klik Sambung.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "Komputer ini melalui firewall yang hanya membenarkan sambungan ke port tertentu">
<!ENTITY torsettings.firewall.allowedPorts "Port yang dibenarkan:">
<!ENTITY torsettings.useBridges.checkbox "Pembekal Perkhidmatan Internet saya (ISP) menghalang sambungan kepada rangkaian Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Masukkan satu atau lebih bridge relay (satu per baris).">
-<!ENTITY torsettings.useBridges.placeholder "alamat:port ATAU transport alamat:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Salin log Tor ke clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bantuan Bridge Relay">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/mt/network-settings.dtd b/mt/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/mt/network-settings.dtd
+++ b/mt/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/my/network-settings.dtd b/my/network-settings.dtd
index 0cec182..bf20109 100644
--- a/my/network-settings.dtd
+++ b/my/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "ခွင့်ပြုထားသော Ports များ -">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/nah/network-settings.dtd b/nah/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/nah/network-settings.dtd
+++ b/nah/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/nap/network-settings.dtd b/nap/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/nap/network-settings.dtd
+++ b/nap/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd
index 3f393d0..c89bb93 100644
--- a/nb/network-settings.dtd
+++ b/nb/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Går denne datamaskinens Internett-tilkobling gjennom en brannmur som kun tillater forbindelser til visse porter?">
<!ENTITY torSettings.firewallHelp "Hvis du ikke er sikker på hvordan du skal svare på dette spørsmålet, velg nei. Hvis du støter på problemer med å koble til Tor-nettverket, endrer du denne innstillingen.">
<!ENTITY torSettings.enterFirewall "Skriv inn en liste, adskilt med komma, over porter som er tillatt av brannmuren.">
-<!ENTITY torSettings.bridgeQuestion "Hvis denne datamaskinens Internett-tilkobling er sensurert, vil du trenge å skaffe deg bro-reléer.&#160; Hvis ikke, bare klikk Koble til.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!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.useBridges.checkbox "Min Internettleverandør (ISP) blokkerer tilkoblinger til Tor-nettverket">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Skriv inn en, eller fler bro-reléer (èn pr linje).">
-<!ENTITY torsettings.useBridges.placeholder "adresse:port, ELLER transport adresse:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Kopier Torloggen til Utklippstavlen">
<!ENTITY torsettings.bridgeHelpTitle "Bro-relé Hjelp">
<!ENTITY torsettings.bridgeHelp1 "Hvis du ikke får koblet til Tor-nettverket, kan det være at internettleverandøren din (ISP), eller et annet byrå/institusjon/etat blokkerer Tor.&#160; Som regel kan du omgå dette problemet ved å bruke Tor-broer, som er ulistede reléer og derfor vanskeligere å blokkere.">
-<!ENTITY torsettings.bridgeHelp1B "Her er tre måter du kan skaffe bro-adresser på:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Via nettet">
<!ENTITY torsettings.bridgeHelp2 "Bruk en nettleser for å besøke https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar">
diff --git a/nds/network-settings.dtd b/nds/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/nds/network-settings.dtd
+++ b/nds/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ne/network-settings.dtd b/ne/network-settings.dtd
index 202ca2b..d77a064 100644
--- a/ne/network-settings.dtd
+++ b/ne/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd
index ef9df98..3d3c0fc 100644
--- a/nl/network-settings.dtd
+++ b/nl/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Loopt de internetverbinding van deze computer door een firewall die enkel toegang tot bepaalde poorten toestaat?">
<!ENTITY torSettings.firewallHelp "Als je niet zeker bent hoe je deze vraag moet beantwoorden, kies dan Nee. Als je op problemen botst tijdens het verbinden met het Tor netwerk, verander dan deze instelling.">
<!ENTITY torSettings.enterFirewall "Voer de poorten in die toegestaan zijn door de firewall, gescheiden door komma's.">
-<!ENTITY torSettings.bridgeQuestion "Als de internetverbinding van deze computer gecensureerd wordt, zal je bridge relays &#160; moeten verkrijgen en gebruiken. Als dit niet het geval is, klik op Verbind.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "Deze computer gebruikt een firewall die enkel verbindingen tot bepaalde poorten toestaat.">
<!ENTITY torsettings.firewall.allowedPorts "Toegestane poorten:">
<!ENTITY torsettings.useBridges.checkbox "Mijn Internet Service Provider (ISP) blokkeert verbindingen naar het Tor netwerk">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Voer een of meer bridge relays in (een per regel)">
-<!ENTITY torsettings.useBridges.placeholder "adres:poort OF transport adres:poort">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Kopieer Tor log naar het klembord">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Hulp">
<!ENTITY torsettings.bridgeHelp1 "Indien u geen verbinding kan maken met het Tor netwerk, zou het kunnen dat uw Internet Service Provider (ISP) of dergelijke Tor blokkeert.&#160; Vaak kan u dit voorkomen door gebruikt te maken van Tor Bridges, dit zijn ongeregistreerde routers die moeilijker te blokkeren zijn.">
-<!ENTITY torsettings.bridgeHelp1B "Hier zijn drie manieren om birdge adressen te verkrijgen:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Door middel van het Web">
<!ENTITY torsettings.bridgeHelp2 "Gebruik een browser om https://bridges.torproject.org te bezoeken">
<!ENTITY torsettings.bridgeHelp3Heading "Door middel van de E-mail Autoresponder">
diff --git a/nl_BE/network-settings.dtd b/nl_BE/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/nl_BE/network-settings.dtd
+++ b/nl_BE/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/nn/network-settings.dtd b/nn/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/nn/network-settings.dtd
+++ b/nn/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/nso/network-settings.dtd b/nso/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/nso/network-settings.dtd
+++ b/nso/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/oc/network-settings.dtd b/oc/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/oc/network-settings.dtd
+++ b/oc/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/or/network-settings.dtd b/or/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/or/network-settings.dtd
+++ b/or/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/pa/network-settings.dtd b/pa/network-settings.dtd
index c7176aa..43a2e9e 100644
--- a/pa/network-settings.dtd
+++ b/pa/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/pap/network-settings.dtd b/pap/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/pap/network-settings.dtd
+++ b/pap/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/pl/network-settings.dtd b/pl/network-settings.dtd
index 181ddd5..fb630ae 100644
--- a/pl/network-settings.dtd
+++ b/pl/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Czy połączenie internetowe Twojego komputera pozwala przejść przez zaporę sieciową w celu nawiązania połączenia z ustalonymi portami?">
<!ENTITY torSettings.firewallHelp "Jeśli nie jesteś pewien jak odpowiedzieć na to pytanie, wybierz Nie. W przypadku wystąpienia problemów z połączeniem, zmień tą opcję.">
<!ENTITY torSettings.enterFirewall "Wprowadź listę portów dozwolonych przez zaporę (kolejne porty oddzielaj przecinkiem).">
-<!ENTITY torSettings.bridgeQuestion "Jeśli połączenie internetowe tego komputera jest cenzurowane, wymagane będzie wykorzystanie przekaźników mostkowych.&#160; Jeśli nie, wybierz Połącz.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami">
<!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty:">
<!ENTITY torsettings.useBridges.checkbox "Mój dostawca internetu blokuje połączenia do sieci Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Dodaj jeden lub więcej przekaźników mostowych (jeden w każdej linijce)">
-<!ENTITY torsettings.useBridges.placeholder "adres:port ALBO transport adres:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Skopiuj log do schowka">
<!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych">
<!ENTITY torsettings.bridgeHelp1 "Jeśli nie jesteś w stanie połączyć się z siecią Tor, może to oznaczać, że Twój Dostawca Usług Internetowych (ISP) lub inna agencja blokuje dostęp do sieci Tor.&#160; Często można obejść ten problem używając Mostów Tor, które są nienotowanymi przekaźnikami, dzięki czemu trudniej je zablokować.">
-<!ENTITY torsettings.bridgeHelp1B "Oto trzy sposoby uzyskania adresów mostów:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Za pośrednictwem sieci Web">
<!ENTITY torsettings.bridgeHelp2 "Użyj przeglądarki internetowej do odwiedzenia https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Poprzez Email Autoresponder">
diff --git a/pms/network-settings.dtd b/pms/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/pms/network-settings.dtd
+++ b/pms/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ps/network-settings.dtd b/ps/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ps/network-settings.dtd
+++ b/ps/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/pt/network-settings.dtd b/pt/network-settings.dtd
index 96c3d92..03ac1a1 100644
--- a/pt/network-settings.dtd
+++ b/pt/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "A ligação à Internet deste computador atravessa um firewall que só permite algumas ligações a certas portas?">
<!ENTITY torSettings.firewallHelp "Se não tem a certeza de como responder esta questão, escolha Não. Se encontrar quaisquer problemas ao ligar-se á rede Tor, mude esta definição.">
<!ENTITY torSettings.enterFirewall "Introduza uma lista de portas separada por vírgulas que são permitidas pela firewall.">
-<!ENTITY torSettings.bridgeQuestion "Se a ligação à internet deste computador está a ser censurada, precisará de obter e usar bridge relays.&#160; Se não, clique apenas Ligar.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "Este computador está protegido por um firewall que permite apenas algumas ligações a algumas portas.">
<!ENTITY torsettings.firewall.allowedPorts "Portas permitidas:">
<!ENTITY torsettings.useBridges.checkbox "O meu Internet Service Provider (ISP) bloqueia ligações à rede Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Introduza um ou mais relays bridge (um por linha).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OU transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copiar o Tor Log para o Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Ajuda Bridge Relay">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd
index 7b2b5ce..decdafd 100644
--- a/pt_BR/network-settings.dtd
+++ b/pt_BR/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "A conexão Internet deste computador é filtrada por uma firewall que autoriza conexões somente para certas portas?">
<!ENTITY torSettings.firewallHelp "Se você não tiver certeza sobre como responder a esta questão, escolha Não. Em caso de dificuldades de conexão à rede Tor, modifique esta configuração.">
<!ENTITY torSettings.enterFirewall "Insira, separando-a por vírgulas, uma lista de portas habilitadas pelo firewall. ">
-<!ENTITY torSettings.bridgeQuestion "Se a conexão Internet deste computador tiver sido censurada, você precisará obter e utilizar retransmissores de pontes.&#160; Se não, clique em Conectar.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "A conexão Internet deste computador é filtrada por uma firewall que autoriza conexões somente para determinadas portas.">
<!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:">
<!ENTITY torsettings.useBridges.checkbox "Meu Provedor de Serviços Internet (ISP) bloqueia as conexões à rede Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Insira um ou mais retransmissores de pontes (um por linha).">
-<!ENTITY torsettings.useBridges.placeholder "endereço:porta OU endereço:porta de transporte">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copiar o Log do Tor na área de transferência">
<!ENTITY torsettings.bridgeHelpTitle "Ajuda Retransmissor de Ponte">
<!ENTITY torsettings.bridgeHelp1 "Se for impossível conectar-se à rede Tor, talvez o seu Provedor de Internet (ISP) ou outra instância esteja bloqueando o Tor.&#160; Normalmente, é possível contornar esse problema utilizando Pontes Tor, que são retransmissores ocultos, mais difíceis de bloquear.">
-<!ENTITY torsettings.bridgeHelp1B "Veja três modos de se obter endereços de pontes:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Através da Web">
<!ENTITY torsettings.bridgeHelp2 "Use um navegador de internet e visite ">
<!ENTITY torsettings.bridgeHelp3Heading "Através do Email Autoresponder">
diff --git a/ro/network-settings.dtd b/ro/network-settings.dtd
index 254cdb2..825eebc 100644
--- a/ro/network-settings.dtd
+++ b/ro/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Porturi permise:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ru/network-settings.dtd b/ru/network-settings.dtd
index 8940e07..10e23a9 100644
--- a/ru/network-settings.dtd
+++ b/ru/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Защищено ли соединение брандмауэром, разрешающим связь только через некоторые порты?">
<!ENTITY torSettings.firewallHelp "Если вы не уверены как отвечать, выберите нет. Если возникнут проблемы соединения с сетью Tor, измените эту настройку.">
<!ENTITY torSettings.enterFirewall "Введите список портов через запятую, которые брандмауэр не блокирует.">
-<!ENTITY torSettings.bridgeQuestion "Если интернет-соединение этого компьютера цензурируется, вам понадобится использовать ретрансляторы типа мост.&#160; Если нет, просто нажмите Соединение.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "Мой сетевой экран позволяет мне подключиться только к определенным портам">
<!ENTITY torsettings.firewall.allowedPorts "Разрешенные порты:">
<!ENTITY torsettings.useBridges.checkbox "Мой провайдер блокирует доступ к сети Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Введите один или несколько ретрансляторов типа мост (один на строку)">
-<!ENTITY torsettings.useBridges.placeholder "address:port ИЛИ transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Скопировать журнал Tor в буфер обмена">
<!ENTITY torsettings.bridgeHelpTitle "Помощь по ретрансляторам типа мост">
<!ENTITY torsettings.bridgeHelp1 "Если вы не можете подключиться к сети Tor, возможно ваш провайдер (ISP) или иная организация блокирует Tor.&#160; Часто эту проблему можно обойти при помощи мостов Tor, не перечисленных в публичных списках, которые сложнее заблокировать.">
-<!ENTITY torsettings.bridgeHelp1B "Существует 3 способа получить адреса мостов:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Из Веб">
<!ENTITY torsettings.bridgeHelp2 "Откройте в веб-браузере https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Через автоответчик электронной почты">
diff --git a/ru(a)petr1708/network-settings.dtd b/ru(a)petr1708/network-settings.dtd
index bea3a56..1c4ffee 100644
--- a/ru(a)petr1708/network-settings.dtd
+++ b/ru(a)petr1708/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/sco/network-settings.dtd b/sco/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/sco/network-settings.dtd
+++ b/sco/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/si/network-settings.dtd b/si/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/si/network-settings.dtd
+++ b/si/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/si_LK/network-settings.dtd b/si_LK/network-settings.dtd
index 17b75a7..b9f7ded 100644
--- a/si_LK/network-settings.dtd
+++ b/si_LK/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "මෙම පරිගණකයේ අන්තර්ජාල සබැදියාව විශේෂිත ports සදහා ඉඩදෙන පරිදි firewall එකක් හරහා ගමන් කරනවාද?">
<!ENTITY torSettings.firewallHelp "ඔබට මෙම ප්රශ්නයට පිළිතුරු දෙන්නේ කෙසේද යන්න විශ්වාස නැත්නම්, නැත යන්න තෝරන්න. Tor ජාලයට සම්බන්ධ වීමේදී ඔබට ගැටළු මතුවේ නම් මෙම සැකසුම වෙනස් කරන්න">
<!ENTITY torSettings.enterFirewall "firewall එක හරහා යාමට ඉඩදෙන ports වල ලැයිස්තුවක් කොමා වලින් වෙන්කර ඇතුළත් කරන්න.">
-<!ENTITY torSettings.bridgeQuestion "මෙම පරිගණකයේ අන්තර්ජාල සබදතාවය වාරණයට ලක්වී ඇත්නම්, ඔබ සේතු ප්රතියෝජකයක් ලබා ගත යුතුය.&#160; එසේ නොවේ නම් සමබන්ධ වන්න යන්න ක්ලික් කරන්න.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "මෙම පරිගණකය විශේෂිත ports සදහා සම්බන්ධ වීමට ඉඩදෙන පරිදි firewall එකක් හරහා ගමන් කරයි.">
<!ENTITY torsettings.firewall.allowedPorts "අනුමත Ports">
<!ENTITY torsettings.useBridges.checkbox "මාගේ අන්තර්ජාල සේවා සපයන්නා(ISP) විසින් TOR ජාලය සදහා සබදතාවය අවහිර කර ඇත.">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Clipboard එකට Tor ලොගය පිටපත් කරන්න.">
<!ENTITY torsettings.bridgeHelpTitle "සේතු ප්රතියෝජක (Bridge Relay) උපකාරකය">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/sk/network-settings.dtd b/sk/network-settings.dtd
index f5074a4..72fa2cf 100644
--- a/sk/network-settings.dtd
+++ b/sk/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Používa Internetové pripojenie tohto počítača bránu firewall, ktorá povoľuje pripojenia len na niektoré porty?">
<!ENTITY torSettings.firewallHelp "Ak si nieste istý ako odpovedať na túto otázku, zvoľte Nie. Ak narazíte na problémy s pripojením do siete Tor, zmeňte toto nastavenie.">
<!ENTITY torSettings.enterFirewall "Vložte zoznam portov oddelený čiarkou, ktoré sú povolené firewallom.">
-<!ENTITY torSettings.bridgeQuestion "Ak je internetové spojenie tohto počítača cenzurované, budete musieť získať a použiť relé premostení.&#160; Ak nie je, jednoducho kliknite na Pripojiť.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "Tento počítač ide cez firewall, ktorý povoľuje iba niektoré porty">
<!ENTITY torsettings.firewall.allowedPorts "Povolené porty:">
<!ENTITY torsettings.useBridges.checkbox "Môj Internetový provider (ISP) blokuje pripojenia do siete Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Vložte jedno alebo viacero relé premostení (každé do nového riadka).">
-<!ENTITY torsettings.useBridges.placeholder "address:port ALEBO transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Skopírovať záznam Tor do schránky clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Nápoveda o relé premosteniach">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/sk_SK/network-settings.dtd b/sk_SK/network-settings.dtd
index 61645e5..0ef5276 100644
--- a/sk_SK/network-settings.dtd
+++ b/sk_SK/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Zadajte čísla portov oddelené medzerou, ktoré sú povolené na firewalle.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Povolené porty:">
<!ENTITY torsettings.useBridges.checkbox "Môj poskytovateľ internetového pripojenia blokuje spojenie do siete Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Zadaj jeden alebo viac premosťovacích relays (jednu na riadok).">
-<!ENTITY torsettings.useBridges.placeholder "adresa:port ALEBO transport adresa:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Kopírovať log Toru do schránky">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/sl/network-settings.dtd b/sl/network-settings.dtd
index 12ffaaf..41fce0b 100644
--- a/sl/network-settings.dtd
+++ b/sl/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/sl_SI/network-settings.dtd b/sl_SI/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/sl_SI/network-settings.dtd
+++ b/sl_SI/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/sn/network-settings.dtd b/sn/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/sn/network-settings.dtd
+++ b/sn/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/so/network-settings.dtd b/so/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/so/network-settings.dtd
+++ b/so/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/son/network-settings.dtd b/son/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/son/network-settings.dtd
+++ b/son/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/sq/network-settings.dtd b/sq/network-settings.dtd
index 224f31c..d08b6ba 100644
--- a/sq/network-settings.dtd
+++ b/sq/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "A kalon lidhja internet e këtij kompjuteri nëpërmjet ndonjë mbrojtesi 'firewall' i cili lejon lidhje vetëm në disa porta?">
<!ENTITY torSettings.firewallHelp "Nëse nuk jeni i sigurt si ti përgjigjeni kësaj pyetjeje, zgjidhni JO. Nëse keni probleme gjatë lidhjes me rrjetin Tor, kthehuni këtu dhe ndryshoni këtë parametër.">
<!ENTITY torSettings.enterFirewall "Jepni një listë të portave të lejuara nga mbrojtësi 'firewall', të ndarë me presje.">
-<!ENTITY torSettings.bridgeQuestion "Nëse lidhja internet e këtij kompjuteri është e censuruar, juve do ju duhet që të merrni dhe përdorni rele urash.&#160; Nëse jo, thjesht klikoni Lidhu.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "Ky kompjuter kalon nëpërmjet një mbrojtësi 'firewall' i cili lejon lidhje vetëm në disa porta.">
<!ENTITY torsettings.firewall.allowedPorts "Portat e lejuara:">
<!ENTITY torsettings.useBridges.checkbox "Ofruesi im i shërbimit të internetit (ISP) bllokon lidhjet drejt rrjetit Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Jepni një ose më shumë rele urash (një për çdo rresht)">
-<!ENTITY torsettings.useBridges.placeholder "adresa:porta OSE transporti adresa:porta">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Kopjo ditarin e Tor në Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Ndihmë mbi relenë e urës">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/sr/network-settings.dtd b/sr/network-settings.dtd
index 35e22ac..25b9706 100644
--- a/sr/network-settings.dtd
+++ b/sr/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Дозвољени Портови:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/sr(a)latin/network-settings.dtd b/sr(a)latin/network-settings.dtd
index 8fe6752..425bc3c 100644
--- a/sr(a)latin/network-settings.dtd
+++ b/sr(a)latin/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/st/network-settings.dtd b/st/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/st/network-settings.dtd
+++ b/st/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/su/network-settings.dtd b/su/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/su/network-settings.dtd
+++ b/su/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/sv/network-settings.dtd b/sv/network-settings.dtd
index da85468..e1b6e45 100644
--- a/sv/network-settings.dtd
+++ b/sv/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Ansluter den här datorn till Internet genom en brandvägg som bara tillåter anslutningar på vissa specifika portar?">
<!ENTITY torSettings.firewallHelp "Om du är osäker på hur du ska svara på denna fråga, välj Nej. Om du då får problem med att ansluta till Tor-nätverket, ändra denna inställning till Ja.">
<!ENTITY torSettings.enterFirewall "Ange en komma-separerad lista över portar som brandväggen tillåter.">
-<!ENTITY torSettings.bridgeQuestion "Om denna dators internetanslutning är censurerad måste du skaffa och använda Tor-bryggor.&#160; Annars, bara tryck på Anslut.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!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.useBridges.checkbox "Min internetleverantör blockerar anslutningar till Tor-nätverket">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Ange en eller flera Tor-bryggor (en per rad).">
-<!ENTITY torsettings.useBridges.placeholder "adress:port ELLER transport adress:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Kopiera Tor-loggen till urklippet">
<!ENTITY torsettings.bridgeHelpTitle "Hjälp om bryggor">
<!ENTITY torsettings.bridgeHelp1 "Om du inte kan ansluta till Tor-nätverket är det möjligt att din internetleverantör eller annan myndighet blockerar Tor.&#160; Ofta kan du kringgå detta problem genom att använda Tor-bryggor, vilka är olistade reläer som är mer svårblockerade.">
-<!ENTITY torsettings.bridgeHelp1B "Här är tre sätt att skaffa bryggadresser:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Via nätet">
<!ENTITY torsettings.bridgeHelp2 "Använd en webbläsare för att besöka https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Via e-post autosvar">
diff --git a/sw/network-settings.dtd b/sw/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/sw/network-settings.dtd
+++ b/sw/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/szl/network-settings.dtd b/szl/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/szl/network-settings.dtd
+++ b/szl/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ta/network-settings.dtd b/ta/network-settings.dtd
index 40d25eb..d73e846 100644
--- a/ta/network-settings.dtd
+++ b/ta/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog " Tor பதிவுகளை கிளிப்போர்டுக்கு நகலெடு">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/te/network-settings.dtd b/te/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/te/network-settings.dtd
+++ b/te/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/te_IN/network-settings.dtd b/te_IN/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/te_IN/network-settings.dtd
+++ b/te_IN/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/tg/network-settings.dtd b/tg/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/tg/network-settings.dtd
+++ b/tg/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/th/network-settings.dtd b/th/network-settings.dtd
index 695f67f..b9e0a1a 100644
--- a/th/network-settings.dtd
+++ b/th/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "คอมพิวเตอร์เครื่องนี้ใช้งานผ่านไฟร์วอลล์ที่ยินยอมที่จะให้เชื่อมต่อกับบางพอร์ตเท่านั้นหรือไม่?">
<!ENTITY torSettings.firewallHelp "ถ้าคุณไม่แน่ใจว่าจะตอบคำถามยังไงให้เลือก "ไม่" ถ้าคุณประสบปัญหาในการเชื่อมต่อกับเครือข่าย Tor ให้กลับมาเปลี่ยนค่าติดตั้งนี้">
<!ENTITY torSettings.enterFirewall "ใส่รายการพอร์ตที่ไฟร์วอลล์อนุญาตโดยคั่นด้วยเครื่องหมายจุลภาค">
-<!ENTITY torSettings.bridgeQuestion "ถ้าอินเทอร์เน็ตจากเครื่องนี้โดนเซ็นเซอร์ คุณต้องใช้สะพานรีเลย์ ถ้าไม่ก็ให้คลิก "เชื่อมต่อ"">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "คอมพิวเตอร์เครื่องนี้ใช้งานผ่านไฟร์วอลล์ที่ยินยอมที่จะให้เชื่อมต่อกับบางพอร์ตเท่านั้น">
<!ENTITY torsettings.firewall.allowedPorts "พอร์ตที่อนุญาต:">
<!ENTITY torsettings.useBridges.checkbox "ผู้ให้บริการอินเทอร์เน็ต (ไอเอสพี) ของฉัน ปิดกั้นการเชื่อมต่อกับเครือข่าย Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "ใส่สะพานรีเลย์อย่างน้อยหนึ่งอัน (บรรทัดละอัน)">
-<!ENTITY torsettings.useBridges.placeholder "ที่อยู่:พอร์ต หรือ ที่อยู่:พอร์ต การส่งข้อมูล">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "คัดลอกปูม Tor ไปที่คลิปบอร์ด">
<!ENTITY torsettings.bridgeHelpTitle "การช่วยเหลือรีเลย์สะพาน">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ti/network-settings.dtd b/ti/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ti/network-settings.dtd
+++ b/ti/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/tk/network-settings.dtd b/tk/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/tk/network-settings.dtd
+++ b/tk/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/tr/network-settings.dtd b/tr/network-settings.dtd
index 369cc42..c9f3f8b 100644
--- a/tr/network-settings.dtd
+++ b/tr/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Bu bilgisayarın İnternet bağlantısı, sadece belirli bağlantı noktalarına izin veren bir güvenlik duvarından geçiyor mu?">
<!ENTITY torSettings.firewallHelp "Eğer bu soruya nasıl cevap vereceğinizden emin değilseniz, Hayır seçin. Eğer Tor ağına bağlanırken sorunla karşılaşırsanız, bu ayarı değiştirin.">
<!ENTITY torSettings.enterFirewall "Güvenlik duvarı tarafından izin verilen bağlantı noktalarının virgülle ayrılmış bir listesini girin.">
-<!ENTITY torSettings.bridgeQuestion "Eğer bu bilgisayarın İnternet bağlantısı sansürlü ise, köprü aynaları edinmeniz ve kullanmanız gerekecek.&#160; Eğer değilse, sadece Bağlan tıklayın.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "Bu bilgisayar, sadece belirli bağlantı noktalarına izin veren bir güvenlik duvarı ile bağlanıyor">
<!ENTITY torsettings.firewall.allowedPorts "İzin verilen portlar:">
<!ENTITY torsettings.useBridges.checkbox "İnternet Servis Sağlayıcım (İSS) Tor Ağı ile bağlantılarımı engelliyor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Bir veya daha fazla köprü aynası girin (her satıra bir tane).">
-<!ENTITY torsettings.useBridges.placeholder "adres:bağl.nokt. VEYA transport adres:bağl.nokt.">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Tor Günlüğünü Panoya Kopyala">
<!ENTITY torsettings.bridgeHelpTitle "Köprü Ayna Yardımı">
<!ENTITY torsettings.bridgeHelp1 "Tor ağına bağlanamıyorsanız, nedeni kullandığınız İnternet Servis Sağlayıcısı (ISS) veya başka bir kurum Tor'u engelliyor olabilir.&#160; Çoğunlukla bu problemi Tor köprüleri ile çözebilirisiniz bunlar engellenmesi daha zor olan listede olmayan aktarma noktalarıdır">
-<!ENTITY torsettings.bridgeHelp1B "Üç değişik şekil ile köprü adresi edinebilmeyi burada öğrenebilirisiniz:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Web aracılığıyla.">
<!ENTITY torsettings.bridgeHelp2 "https://bridges.torproject.org sitesini ziyaret etmek için web tarayıcısı kullanın.">
<!ENTITY torsettings.bridgeHelp3Heading "Eposta otomatik cevaplandırıcı aracılığıyla.">
diff --git a/uk/network-settings.dtd b/uk/network-settings.dtd
index 2922804..2593639 100644
--- a/uk/network-settings.dtd
+++ b/uk/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Дозволенні порти">
<!ENTITY torsettings.useBridges.checkbox "Мій провайдер блокує доступ до мережі Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ur/network-settings.dtd b/ur/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ur/network-settings.dtd
+++ b/ur/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ur_PK/network-settings.dtd b/ur_PK/network-settings.dtd
index b464a3d..0da2adc 100644
--- a/ur_PK/network-settings.dtd
+++ b/ur_PK/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/uz/network-settings.dtd b/uz/network-settings.dtd
index c1c4a9a..4e65bbb 100644
--- a/uz/network-settings.dtd
+++ b/uz/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/ve/network-settings.dtd b/ve/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/ve/network-settings.dtd
+++ b/ve/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/vi/network-settings.dtd b/vi/network-settings.dtd
index c1c4e0e..f85a8ee 100644
--- a/vi/network-settings.dtd
+++ b/vi/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "Nếu như bạn không chắc chắn làm thế nào trả lời câu hỏi này, chọn Không. Nếu như bạn gặp vấn đề kết nối đến mạng Tor, thay đổi thiết lập này.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Những Cổng Được phép:">
<!ENTITY torsettings.useBridges.checkbox "Nhà cung cấp dịch vụ của tôi (ISP) đã chặn kết nối đến mạng Tor">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "Nếu như bạn không thể kết nối đến mạng Tor, có thể là nhà cung cấp dịch vụ của bạn (ISP) hoặc cơ quan khác đã chặn kết nối đến Tor. Thông thường, bạn có thể giải quyết vấn này bằng cách sử dụng Tor Bridges, các Tor Bridges này sẽ không được liệt kê để làm cho việc ngăn chặn khó khăn hơn.">
-<!ENTITY torsettings.bridgeHelp1B "Ở đây có 3 cách để bạn lấy được địa chỉ cầu nối:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Đi qua Web">
<!ENTITY torsettings.bridgeHelp2 "Sử dụng trình duyệt web truy cập vào https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/wa/network-settings.dtd b/wa/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/wa/network-settings.dtd
+++ b/wa/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/wo/network-settings.dtd b/wo/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/wo/network-settings.dtd
+++ b/wo/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/zh_CN/network-settings.dtd b/zh_CN/network-settings.dtd
index 4b5b60a..2399424 100644
--- a/zh_CN/network-settings.dtd
+++ b/zh_CN/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "该计算机的防火墙是否仅允许特定端口的互联网连接?">
<!ENTITY torSettings.firewallHelp "如果不知道如何回答该问题,请选择否。如果连接 Tor 网络时出现问题,请更改该设置。">
<!ENTITY torSettings.enterFirewall "请输入防火墙允许的端口,中间用逗号隔开。">
-<!ENTITY torSettings.bridgeQuestion "如果该计算机的网络连接受到审查,你需要使用网桥中继,否则请直接点击“连接”。">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接">
<!ENTITY torsettings.firewall.allowedPorts "允许的端口:">
<!ENTITY torsettings.useBridges.checkbox "我的互联网服务提供商 (ISP) 封锁了 Tor 网络连接">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "输入一个或多个网桥中继(一行一个)。">
-<!ENTITY torsettings.useBridges.placeholder "地址:端口或 obfs 网桥地址:端口">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "请将 Tor 日志复制到剪贴板">
<!ENTITY torsettings.bridgeHelpTitle "网桥中继帮助">
<!ENTITY torsettings.bridgeHelp1 "如果您无法连接到 Tor 网络,可能是您的互联网服务提供商 (ISP) 或其他机构在阻挡 Tor。&#160; 通常来说,你可以使用 Tor 网桥解决此问题,因为它们是未公开的中继点,更不容易被封锁。">
-<!ENTITY torsettings.bridgeHelp1B "这里有几种获取网桥地址的方法:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "通过万维网">
<!ENTITY torsettings.bridgeHelp2 "使用网页浏览器访问 https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "通过电子邮件自动回复系统">
diff --git a/zh_HK/network-settings.dtd b/zh_HK/network-settings.dtd
index 02955c6..90c4837 100644
--- a/zh_HK/network-settings.dtd
+++ b/zh_HK/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
diff --git a/zh_TW/network-settings.dtd b/zh_TW/network-settings.dtd
index abf3353..c5dcf7a 100644
--- a/zh_TW/network-settings.dtd
+++ b/zh_TW/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "此電腦的網路連線,是否通過只允許連結特定連線埠的防火牆?">
<!ENTITY torSettings.firewallHelp "若您無法確定如何回答這個問題,請選擇「否」。若您在連結至 Tor 網路時遭遇問題,請再改變此設定。">
<!ENTITY torSettings.enterFirewall "請輸入防火牆允許的連線埠(請以逗號分隔)。">
-<!ENTITY torSettings.bridgeQuestion "若此電腦的網路連結被審查,您將需要取得和使用橋接中繼&#160;。若沒有,只需點擊「連線」。">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "這台電腦通過只允許連結至特定連線埠的防火牆">
<!ENTITY torsettings.firewall.allowedPorts "允許的連接埠:">
<!ENTITY torsettings.useBridges.checkbox "我的網際網路服務提供者(ISP)封鎖連結到Tor網絡">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "輸入一個或多個橋接中繼 (每行一個)。">
-<!ENTITY torsettings.useBridges.placeholder "「地址:連線埠」或「傳輸地址:連線埠」">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "複製 Tor 記錄到剪貼簿">
<!ENTITY torsettings.bridgeHelpTitle "橋接中繼說明">
<!ENTITY torsettings.bridgeHelp1 "若您無法連接到 Tor 網路,可能是您的網際網路服務提供者 (ISP) 或其他機構已封鎖 Tor。&#160; 通常你可以使用更難以封鎖之隱藏中繼的 Tor 橋接來解決問題。">
-<!ENTITY torsettings.bridgeHelp1B "有三種方式可以取得橋接位址:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "透過網路">
<!ENTITY torsettings.bridgeHelp2 "使用網路瀏覽器造訪 https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "透過 Email 自動回覆">
diff --git a/zu/network-settings.dtd b/zu/network-settings.dtd
index 7e3d9ca..eaf4f4a 100644
--- a/zu/network-settings.dtd
+++ b/zu/network-settings.dtd
@@ -22,7 +22,9 @@
<!ENTITY torSettings.firewallQuestion "Does this computer's Internet connection go through a firewall that only allows connections to certain ports?">
<!ENTITY torSettings.firewallHelp "If you are not sure how to answer this question, choose No. If you encounter problems connecting to the Tor network, change this setting.">
<!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall.">
-<!ENTITY torSettings.bridgeQuestion "If this computer's Internet connection is censored, you will need to obtain and use bridge relays.&#160; If not, just click Connect.">
+<!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?">
+<!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network.">
+<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges.">
<!-- Other: -->
@@ -44,13 +46,15 @@
<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:">
<!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network">
+<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type">
+<!ENTITY torsettings.useBridges.custom "Use Custom Bridges">
<!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line).">
-<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port">
+<!ENTITY torsettings.useBridges.placeholder "type address:port">
<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
<!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.&#160; Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block.">
-<!ENTITY torsettings.bridgeHelp1B "Here are three ways to obtain bridge addresses:">
+<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:">
<!ENTITY torsettings.bridgeHelp2Heading "Through the Web">
<!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org">
<!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder">
1
0

[translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed
by translation@torproject.org 28 Feb '14
by translation@torproject.org 28 Feb '14
28 Feb '14
commit 22e1c46d91576b78a1908150e49c0a1b460cb337
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Feb 28 09:16:58 2014 +0000
Update translations for tor-launcher-properties_completed
---
en/torlauncher.properties | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/en/torlauncher.properties b/en/torlauncher.properties
index bd8646e..38d314a 100644
--- a/en/torlauncher.properties
+++ b/en/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor unexpectedly exited.
torlauncher.please_restart_app=Please restart this application.
torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
torlauncher.tor_failed_to_start=Tor failed to start.
+torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
torlauncher.error_proxy_type_missing=You must select the proxy type.
torlauncher.error_bridges_missing=You must specify one or more bridges.
+torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Connect
torlauncher.quit=Quit
1
0

[translation/tor-launcher-properties] Update translations for tor-launcher-properties
by translation@torproject.org 28 Feb '14
by translation@torproject.org 28 Feb '14
28 Feb '14
commit feae4ff75820cd02930236ca0aedc9aad91f66da
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Feb 28 09:16:55 2014 +0000
Update translations for tor-launcher-properties
---
ach/torlauncher.properties | 5 +++++
ady/torlauncher.properties | 5 +++++
af/torlauncher.properties | 5 +++++
ak/torlauncher.properties | 5 +++++
am/torlauncher.properties | 5 +++++
ar/torlauncher.properties | 5 +++++
arn/torlauncher.properties | 5 +++++
ast/torlauncher.properties | 5 +++++
az/torlauncher.properties | 5 +++++
be/torlauncher.properties | 5 +++++
bg/torlauncher.properties | 5 +++++
bg_BG/torlauncher.properties | 5 +++++
bn/torlauncher.properties | 5 +++++
bn_IN/torlauncher.properties | 5 +++++
bo/torlauncher.properties | 5 +++++
br/torlauncher.properties | 5 +++++
bs/torlauncher.properties | 5 +++++
ca/torlauncher.properties | 5 +++++
cs/torlauncher.properties | 5 +++++
csb/torlauncher.properties | 5 +++++
cy/torlauncher.properties | 5 +++++
da/torlauncher.properties | 5 +++++
de/torlauncher.properties | 5 +++++
dz/torlauncher.properties | 5 +++++
el/torlauncher.properties | 5 +++++
el_GR/torlauncher.properties | 5 +++++
en/torlauncher.properties | 5 +++++
en_GB/torlauncher.properties | 5 +++++
eo/torlauncher.properties | 5 +++++
es/torlauncher.properties | 5 +++++
es_AR/torlauncher.properties | 5 +++++
es_CO/torlauncher.properties | 5 +++++
et/torlauncher.properties | 5 +++++
eu/torlauncher.properties | 5 +++++
fa/torlauncher.properties | 5 +++++
fi/torlauncher.properties | 5 +++++
fil/torlauncher.properties | 5 +++++
fo/torlauncher.properties | 5 +++++
fr/torlauncher.properties | 5 +++++
fr_CA/torlauncher.properties | 5 +++++
fur/torlauncher.properties | 5 +++++
fy/torlauncher.properties | 5 +++++
ga/torlauncher.properties | 5 +++++
gl/torlauncher.properties | 5 +++++
gu/torlauncher.properties | 5 +++++
gu_IN/torlauncher.properties | 5 +++++
gun/torlauncher.properties | 5 +++++
ha/torlauncher.properties | 5 +++++
he/torlauncher.properties | 5 +++++
hi/torlauncher.properties | 5 +++++
hr/torlauncher.properties | 5 +++++
hr_HR/torlauncher.properties | 5 +++++
ht/torlauncher.properties | 5 +++++
hu/torlauncher.properties | 5 +++++
hy/torlauncher.properties | 5 +++++
hy_AM/torlauncher.properties | 5 +++++
ia/torlauncher.properties | 5 +++++
id/torlauncher.properties | 5 +++++
is/torlauncher.properties | 5 +++++
it/torlauncher.properties | 5 +++++
ja/torlauncher.properties | 5 +++++
jv/torlauncher.properties | 5 +++++
ka/torlauncher.properties | 5 +++++
km/torlauncher.properties | 5 +++++
kn/torlauncher.properties | 5 +++++
ko/torlauncher.properties | 5 +++++
ko_KR/torlauncher.properties | 5 +++++
ku/torlauncher.properties | 5 +++++
kw/torlauncher.properties | 5 +++++
ky/torlauncher.properties | 5 +++++
lb/torlauncher.properties | 5 +++++
lg/torlauncher.properties | 5 +++++
ln/torlauncher.properties | 5 +++++
lo/torlauncher.properties | 5 +++++
lt/torlauncher.properties | 5 +++++
lv/torlauncher.properties | 5 +++++
mg/torlauncher.properties | 5 +++++
mi/torlauncher.properties | 5 +++++
mk/torlauncher.properties | 5 +++++
ml/torlauncher.properties | 5 +++++
mn/torlauncher.properties | 5 +++++
mr/torlauncher.properties | 5 +++++
ms_MY/torlauncher.properties | 5 +++++
mt/torlauncher.properties | 5 +++++
my/torlauncher.properties | 5 +++++
nah/torlauncher.properties | 5 +++++
nap/torlauncher.properties | 5 +++++
nb/torlauncher.properties | 5 +++++
nds/torlauncher.properties | 5 +++++
ne/torlauncher.properties | 5 +++++
nl/torlauncher.properties | 5 +++++
nl_BE/torlauncher.properties | 5 +++++
nn/torlauncher.properties | 5 +++++
nso/torlauncher.properties | 5 +++++
oc/torlauncher.properties | 5 +++++
or/torlauncher.properties | 5 +++++
pa/torlauncher.properties | 5 +++++
pap/torlauncher.properties | 5 +++++
pl/torlauncher.properties | 5 +++++
pms/torlauncher.properties | 5 +++++
ps/torlauncher.properties | 5 +++++
pt/torlauncher.properties | 5 +++++
pt_BR/torlauncher.properties | 5 +++++
ro/torlauncher.properties | 5 +++++
ru/torlauncher.properties | 5 +++++
ru(a)petr1708/torlauncher.properties | 5 +++++
sco/torlauncher.properties | 5 +++++
si/torlauncher.properties | 5 +++++
si_LK/torlauncher.properties | 5 +++++
sk/torlauncher.properties | 5 +++++
sk_SK/torlauncher.properties | 5 +++++
sl/torlauncher.properties | 5 +++++
sl_SI/torlauncher.properties | 5 +++++
sn/torlauncher.properties | 5 +++++
so/torlauncher.properties | 5 +++++
son/torlauncher.properties | 5 +++++
sq/torlauncher.properties | 5 +++++
sr/torlauncher.properties | 5 +++++
sr(a)latin/torlauncher.properties | 5 +++++
st/torlauncher.properties | 5 +++++
su/torlauncher.properties | 5 +++++
sv/torlauncher.properties | 5 +++++
sw/torlauncher.properties | 5 +++++
szl/torlauncher.properties | 5 +++++
ta/torlauncher.properties | 5 +++++
te/torlauncher.properties | 5 +++++
te_IN/torlauncher.properties | 5 +++++
tg/torlauncher.properties | 5 +++++
th/torlauncher.properties | 5 +++++
ti/torlauncher.properties | 5 +++++
tk/torlauncher.properties | 5 +++++
tr/torlauncher.properties | 5 +++++
uk/torlauncher.properties | 5 +++++
ur/torlauncher.properties | 5 +++++
ur_PK/torlauncher.properties | 5 +++++
uz/torlauncher.properties | 5 +++++
ve/torlauncher.properties | 5 +++++
vi/torlauncher.properties | 5 +++++
wa/torlauncher.properties | 5 +++++
wo/torlauncher.properties | 5 +++++
zh_CN/torlauncher.properties | 5 +++++
zh_HK/torlauncher.properties | 5 +++++
zh_TW/torlauncher.properties | 5 +++++
zu/torlauncher.properties | 5 +++++
144 files changed, 720 insertions(+)
diff --git a/ach/torlauncher.properties b/ach/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ach/torlauncher.properties
+++ b/ach/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ady/torlauncher.properties b/ady/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ady/torlauncher.properties
+++ b/ady/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/af/torlauncher.properties b/af/torlauncher.properties
index d82d688..15f99b2 100644
--- a/af/torlauncher.properties
+++ b/af/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ak/torlauncher.properties b/ak/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ak/torlauncher.properties
+++ b/ak/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/am/torlauncher.properties b/am/torlauncher.properties
index d82d688..15f99b2 100644
--- a/am/torlauncher.properties
+++ b/am/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ar/torlauncher.properties b/ar/torlauncher.properties
index 477bb27..ef90ed7 100644
--- a/ar/torlauncher.properties
+++ b/ar/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=توقف تور عن العمل بشكل غير متوق
torlauncher.please_restart_app=يرجي إعادة تشغيل هذا البرنامج.
torlauncher.tor_controlconn_failed=تعذر الاتصال بمنفذ التحكم الخاص بتور.
torlauncher.tor_failed_to_start=تور فشل في بدء التشغيل.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=فشل تور في إنشاء اتصال بشبكة تور.
torlauncher.tor_bootstrap_failed_details=%1$S فشل(%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=الرجاء التأكد أن تور يعمل
torlauncher.error_proxy_addr_missing=من الضروري تحديد كل من عنوان الانترنت IP أو عنوان مستضيف واحد و منفذ وذلك لتهيئة تور لأستخدام بروكسي حتي يستطيع الوصول إلي شبكة الانترنت.
torlauncher.error_proxy_type_missing=من الضروري تحديد نوع البروكسي.
torlauncher.error_bridges_missing=من الضروري تحديد جسر واحد أو أكثر.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=اتصل
torlauncher.quit=إنهاء
diff --git a/arn/torlauncher.properties b/arn/torlauncher.properties
index d82d688..15f99b2 100644
--- a/arn/torlauncher.properties
+++ b/arn/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ast/torlauncher.properties b/ast/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ast/torlauncher.properties
+++ b/ast/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/az/torlauncher.properties b/az/torlauncher.properties
index 9d4fe46..bfce050 100644
--- a/az/torlauncher.properties
+++ b/az/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/be/torlauncher.properties b/be/torlauncher.properties
index d82d688..15f99b2 100644
--- a/be/torlauncher.properties
+++ b/be/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/bg/torlauncher.properties b/bg/torlauncher.properties
index b44e1e0..b5c5e9f 100644
--- a/bg/torlauncher.properties
+++ b/bg/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Тор спря принудително
torlauncher.please_restart_app=Моля, рестартирайте приложението.
torlauncher.tor_controlconn_failed=Тор няма връзка с контролния порт
torlauncher.tor_failed_to_start=Тор не стартира успешно
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Моля, уверете се, че Tor се
torlauncher.error_proxy_addr_missing=Трябва да определите IP адрес или хост име и номер на порта, за да настроите Тор да използва прокси достъп до интернет.
torlauncher.error_proxy_type_missing=Трябва да изберете вида на проксито.
torlauncher.error_bridges_missing=Трябва да зададете един или повече бриджа
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Свържи се
torlauncher.quit=Край
diff --git a/bg_BG/torlauncher.properties b/bg_BG/torlauncher.properties
index d82d688..15f99b2 100644
--- a/bg_BG/torlauncher.properties
+++ b/bg_BG/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/bn/torlauncher.properties b/bn/torlauncher.properties
index d82d688..15f99b2 100644
--- a/bn/torlauncher.properties
+++ b/bn/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/bn_IN/torlauncher.properties b/bn_IN/torlauncher.properties
index d82d688..15f99b2 100644
--- a/bn_IN/torlauncher.properties
+++ b/bn_IN/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/bo/torlauncher.properties b/bo/torlauncher.properties
index d82d688..15f99b2 100644
--- a/bo/torlauncher.properties
+++ b/bo/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/br/torlauncher.properties b/br/torlauncher.properties
index d82d688..15f99b2 100644
--- a/br/torlauncher.properties
+++ b/br/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/bs/torlauncher.properties b/bs/torlauncher.properties
index d82d688..15f99b2 100644
--- a/bs/torlauncher.properties
+++ b/bs/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ca/torlauncher.properties b/ca/torlauncher.properties
index d76296b..2d8ccf8 100644
--- a/ca/torlauncher.properties
+++ b/ca/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor ha sortit inesperadament.
torlauncher.please_restart_app=Si us plau reinicia l'aplicació.
torlauncher.tor_controlconn_failed=Nos'ha pogut conectar al port de control Tor
torlauncher.tor_failed_to_start=Tor ha fallat al iniciar.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Si us plau assegurat de que Tor esta funcionan
torlauncher.error_proxy_addr_missing=Heu d'especificar tant una adreça IP o domini com un número de port per a configurar el Tor per tal que pugui utilitzar un servidor intermediari per a accedir a Internet.
torlauncher.error_proxy_type_missing=Heu de seleccionar el tipus de proxy.
torlauncher.error_bridges_missing=Has d'especificar un o mes repetidors.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Conectar
torlauncher.quit=Surt
diff --git a/cs/torlauncher.properties b/cs/torlauncher.properties
index 45ec42f..afca004 100644
--- a/cs/torlauncher.properties
+++ b/cs/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor znenadání skončil.
torlauncher.please_restart_app=Prosím restartujte aplikaci.
torlauncher.tor_controlconn_failed=Nemohu se připojit ke kontrolnímu portu Tor.
torlauncher.tor_failed_to_start=Tor nenastartoval.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Prosím zkontrolujte zda Tor je spuštěn.
torlauncher.error_proxy_addr_missing=Pro nastavení Toru pro použití proxy serveru musíte specifikovat jak IP adresu (nebo jméno hostitele) tak číslo portu
torlauncher.error_proxy_type_missing=Musíte vybrat typ proxy
torlauncher.error_bridges_missing=Musíte specifikovat jeden nebo více mostů.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Připojit
torlauncher.quit=Ukoncit
diff --git a/csb/torlauncher.properties b/csb/torlauncher.properties
index d82d688..15f99b2 100644
--- a/csb/torlauncher.properties
+++ b/csb/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/cy/torlauncher.properties b/cy/torlauncher.properties
index 34bdffb..e545dfa 100644
--- a/cy/torlauncher.properties
+++ b/cy/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Gadawodd Tor ar hap.
# torlauncher.please_restart_app=Please restart this application.
torlauncher.tor_controlconn_failed=Ni allai gysylltu â'r porth rheolaeth Tor.
torlauncher.tor_failed_to_start=Methodd Tor gychwyn.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Gwnewch yn siŵr bod Tor yn rhedeg.
torlauncher.error_proxy_addr_missing=Dylech bonodi cyfeiriad IP ac enw gwesteiwr er mwyn gosod Tor i ddefnydio dirprwy i gael mynediad i'r we.
torlauncher.error_proxy_type_missing=Dylech benodi'r fath o dirprwy.
torlauncher.error_bridges_missing=Dylech benodi un neu mwy o bontydd.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Cysylltu
torlauncher.quit=Cau
diff --git a/da/torlauncher.properties b/da/torlauncher.properties
index 53ac9ed..e12c6f6 100644
--- a/da/torlauncher.properties
+++ b/da/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor lukkede uventet.
torlauncher.please_restart_app=Genstart venligst programmet
torlauncher.tor_controlconn_failed=Kunne ikke forbinde til Tor kontrol-porten.
torlauncher.tor_failed_to_start=Tor kunne ikke starte.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor kunne ikke etablere forbindelse til Tor netværket
torlauncher.tor_bootstrap_failed_details=%1$S fejlede (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Kontroller venligst at Tor kører.
torlauncher.error_proxy_addr_missing=Du skal angive både IP adresse eller værts navn og en port, for at indstille Tor til at bruge en proxy som forbindelse til Internettet.
torlauncher.error_proxy_type_missing=Du skal vælge proxy-typen:
torlauncher.error_bridges_missing=Du skal angive en eller flere broer.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Tilslut
torlauncher.quit=Afslut
diff --git a/de/torlauncher.properties b/de/torlauncher.properties
index dd8e7e3..7153963 100644
--- a/de/torlauncher.properties
+++ b/de/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor wurde unerwartet geschlossen.
torlauncher.please_restart_app=Bitte starten Sie die Anwendung neu.
torlauncher.tor_controlconn_failed=Zum Tor-Kontrollanschluss konnte keine Verbindung hergestellt werden.
torlauncher.tor_failed_to_start=Der Start von Tor ist fehlgeschlagen.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor konnte keine Verbindung zum Tor-Netzwerk herstellen.
torlauncher.tor_bootstrap_failed_details=%1$S gescheitert (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Bitte stellen Sie sicher, dass Tor läuft.
torlauncher.error_proxy_addr_missing=Damit Tor einen Vermittlungsserver benutzt, um auf das Internet zuzugreifen, muss eine IP-Adresse oder ein Rechnername und eine Anschlussnummer angegeben werden.
torlauncher.error_proxy_type_missing=Sie müssen eine Vermittlungstyp auswählen.
torlauncher.error_bridges_missing=Sie müssen eine oder mehrere Brücken eingeben.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Verbinden
torlauncher.quit=Schließen
diff --git a/dz/torlauncher.properties b/dz/torlauncher.properties
index d82d688..15f99b2 100644
--- a/dz/torlauncher.properties
+++ b/dz/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/el/torlauncher.properties b/el/torlauncher.properties
index 949b4e9..924d515 100644
--- a/el/torlauncher.properties
+++ b/el/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Το Tor σταμάτησε απροσδόκητα
torlauncher.please_restart_app=Παρακαλώ επανεκκινήστε την εφαρμογή.
torlauncher.tor_controlconn_failed=Δεν ήταν δυνατή η σύνδεση με την υποδοχη ελέγχου του Tor.
torlauncher.tor_failed_to_start=Αδυναμία εκκίνησης του Tor.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Βεβαιωθείτε ότι το Tor τρέ
torlauncher.error_proxy_addr_missing=Πρέπει να καθορίσετε μία διεύθυνση IP ή ένα όνομα υπολογιστή και μία θύρα συστήματος για να ρυθμίσετε το Tor να χρησιμοποιεί διακομιστή μεσολάβησης για πρόσβαση στο διαδίκτυο.
torlauncher.error_proxy_type_missing=Πρέπει να επιλέξετε τον τύπο του πληρεξούσιου διακομηστή.
torlauncher.error_bridges_missing=Πρέπει να καθορίσετε μια ή περισσότερες γέφυρες.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Σύνδεση
torlauncher.quit=Έξοδος
diff --git a/el_GR/torlauncher.properties b/el_GR/torlauncher.properties
index d82d688..15f99b2 100644
--- a/el_GR/torlauncher.properties
+++ b/el_GR/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/en/torlauncher.properties b/en/torlauncher.properties
index bd8646e..38d314a 100644
--- a/en/torlauncher.properties
+++ b/en/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor unexpectedly exited.
torlauncher.please_restart_app=Please restart this application.
torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
torlauncher.tor_failed_to_start=Tor failed to start.
+torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
torlauncher.error_proxy_type_missing=You must select the proxy type.
torlauncher.error_bridges_missing=You must specify one or more bridges.
+torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Connect
torlauncher.quit=Quit
diff --git a/en_GB/torlauncher.properties b/en_GB/torlauncher.properties
index 896ab0c..1ab22fa 100644
--- a/en_GB/torlauncher.properties
+++ b/en_GB/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor unexpectedly exited.
torlauncher.please_restart_app=Please restart this application.
torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
torlauncher.error_proxy_type_missing=You must select the proxy type.
torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Connect
torlauncher.quit=Quit
diff --git a/eo/torlauncher.properties b/eo/torlauncher.properties
index b0c84a7..fa90e65 100644
--- a/eo/torlauncher.properties
+++ b/eo/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/es/torlauncher.properties b/es/torlauncher.properties
index 367df1c..8c78353 100644
--- a/es/torlauncher.properties
+++ b/es/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor se cerró inesperadamente.
torlauncher.please_restart_app=Por favor reinicie esta aplicación.
torlauncher.tor_controlconn_failed=No se pudo conectar al puerto de control de Tor
torlauncher.tor_failed_to_start=Tor no pudo iniciarse.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor no pudo establecer una conexión a la red Tor.
torlauncher.tor_bootstrap_failed_details=%1$S falló (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Por favor, asegúrese de que Tor se está ejec
torlauncher.error_proxy_addr_missing=Debe especificar tanto una dirección IP o nombre de máquina ('hostname') como un número de puerto para configurar Tor para que utilice un 'proxy' para acceder a la Internet.
torlauncher.error_proxy_type_missing=Debe seleccionar el tipo de 'proxy'.
torlauncher.error_bridges_missing=Debe especificar uno o más puentes ('bridges').
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Conectar
torlauncher.quit=Salir
diff --git a/es_AR/torlauncher.properties b/es_AR/torlauncher.properties
index 3dfeeee..02b8afe 100644
--- a/es_AR/torlauncher.properties
+++ b/es_AR/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Salida inesperada de Tor
torlauncher.please_restart_app=Por favor, reinicie esta aplicación
torlauncher.tor_controlconn_failed=No se pudo conectar Tor con el puerto de control
torlauncher.tor_failed_to_start=Fallo al iniciar Tor
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Por favor, asegurese que Tor esta ejecutandose
torlauncher.error_proxy_addr_missing=Debes especificar tu IP o el nombre de tu Host y un puerto para que Tor utilize un Proxy para acceder a internet.
torlauncher.error_proxy_type_missing=Debes seleccionar el tipo de Proxy.
torlauncher.error_bridges_missing=Debes especificar uno o más puentes.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Conectar
torlauncher.quit=Quitar
diff --git a/es_CO/torlauncher.properties b/es_CO/torlauncher.properties
index d82d688..15f99b2 100644
--- a/es_CO/torlauncher.properties
+++ b/es_CO/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/et/torlauncher.properties b/et/torlauncher.properties
index d82d688..15f99b2 100644
--- a/et/torlauncher.properties
+++ b/et/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/eu/torlauncher.properties b/eu/torlauncher.properties
index df8d0d0..ee0a8d1 100644
--- a/eu/torlauncher.properties
+++ b/eu/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor ustekabean irten da.
torlauncher.please_restart_app=Mesedez aplikazio hau berrabiarazi ezazu.
torlauncher.tor_controlconn_failed=Tor kontrol atakara ezin konektatu.
torlauncher.tor_failed_to_start=Torek huts egin du abiarazterakoan.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Torek huts egin du Tor sare konexio bat ezartzerakoan.
torlauncher.tor_bootstrap_failed_details=%1$S huts egin du (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Mesedez egiaztatu Tor exekutatzen ari dela.
torlauncher.error_proxy_addr_missing=Torek proxy bat erabiliz Interneten sartzeko konfiguratu nahi baduzu edo IP helbidea edo ostalari-izena edo portu zenbakia zehaztu behar duzu.
torlauncher.error_proxy_type_missing=Proxy mota hautatu behar duzu.
torlauncher.error_bridges_missing=Zubi bat edo gehiago zehaztu behar duzu.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Konektatu
torlauncher.quit=Irten
diff --git a/fa/torlauncher.properties b/fa/torlauncher.properties
index ec2cbd7..aff1a2e 100644
--- a/fa/torlauncher.properties
+++ b/fa/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=تور بدلیلی نامشخص خارج شد.
torlauncher.please_restart_app=لطفا نرم افزار را مجددا راه اندازی نمایید.
torlauncher.tor_controlconn_failed=اتصال به پورت کنترل تور امکان پذیر نمی باشد.
torlauncher.tor_failed_to_start=خطا در راه اندازی.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=تور در برقراری یک ارتباط شبکهای توری ناموفق بود.
torlauncher.tor_bootstrap_failed_details=%1$S ناموفق (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=لطفا از فعال بودن تور اطم
torlauncher.error_proxy_addr_missing=شما میبایست یک آدرس آی پی یا یک نام میزبان و یک شماره درگاه برای پیکربندی تُر مشخص کنید جهت استفاده ار یک پیشکار برای دسترسی به اینترنت.
torlauncher.error_proxy_type_missing=شما باید نوع پراکسی را انتخاب کنید.
torlauncher.error_bridges_missing=شما باید یک یا پل های بیشتری را مشخص کنید.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=اتصال
torlauncher.quit=خروج
diff --git a/fi/torlauncher.properties b/fi/torlauncher.properties
index 5866f20..d7fc754 100644
--- a/fi/torlauncher.properties
+++ b/fi/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor lopetti toimintansa yllättäen.
torlauncher.please_restart_app=Käynnistä sovellus uudestaan.
torlauncher.tor_controlconn_failed=Ei voi ottaa yhteyttä Tor-hallintaporttiin.
torlauncher.tor_failed_to_start=Tor ei käynnistynyt.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Varmista, että Tor on käynnissä.
torlauncher.error_proxy_addr_missing=Sinun on määriteltävä IP-osoite tai verkkonimi sekä porttinumero, jotta Tor voi yhdistää välityspalvelimen kautta Internetiin.
torlauncher.error_proxy_type_missing=Sinun on valittava välityspalvelimen tyyppi.
torlauncher.error_bridges_missing=Määrittele yksi tai useampi silta.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Yhdistä
torlauncher.quit=Lopeta
diff --git a/fil/torlauncher.properties b/fil/torlauncher.properties
index 730bc86..882faf9 100644
--- a/fil/torlauncher.properties
+++ b/fil/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/fo/torlauncher.properties b/fo/torlauncher.properties
index d82d688..15f99b2 100644
--- a/fo/torlauncher.properties
+++ b/fo/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/fr/torlauncher.properties b/fr/torlauncher.properties
index 89e3981..1ad50ba 100644
--- a/fr/torlauncher.properties
+++ b/fr/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Le programme Tor s'est terminé de manière inatendue.
torlauncher.please_restart_app=Veuillez redémarrer l'application.
torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor.
torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor n'a pas réussi à établir une connexion au réseau Tor.
torlauncher.tor_bootstrap_failed_details=%1$S échoué (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor est lancé.
torlauncher.error_proxy_addr_missing=Pour configurer Tor afin qu'il utilise un proxy, vous devez spécifier une adresse IP ou un nom d'hôte ainsi qu'un numéro de port.
torlauncher.error_proxy_type_missing=Vous devez sélectionner un type de proxy.
torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Se connecter
torlauncher.quit=Quitter
diff --git a/fr_CA/torlauncher.properties b/fr_CA/torlauncher.properties
index 4ccf11d..f85896a 100644
--- a/fr_CA/torlauncher.properties
+++ b/fr_CA/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor a quitté de manière imprévue.
torlauncher.please_restart_app=Veuillez redémarrer cette application.
torlauncher.tor_controlconn_failed=Impossible de se connecter au port de contrôle de Tor.
torlauncher.tor_failed_to_start=Tor n'a pas pu démarrer.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Échec lors de la connexion de Tor au réseau Tor.
torlauncher.tor_bootstrap_failed_details=%1$S a échoué (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Veuillez-vous assurer que Tor tourne.
torlauncher.error_proxy_addr_missing=Vous devez spécifier à la fois une adresse IP ou un nom d'hôte et un numéro de port afin de configurer Tor à l'usage d'un mandataire pour accéder à Internet.
torlauncher.error_proxy_type_missing=Vous devez choisir le type de mandataire.
torlauncher.error_bridges_missing=Vous devez spécifier un ou plusieurs ponts.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Se connecter
torlauncher.quit=Quitter
diff --git a/fur/torlauncher.properties b/fur/torlauncher.properties
index d82d688..15f99b2 100644
--- a/fur/torlauncher.properties
+++ b/fur/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/fy/torlauncher.properties b/fy/torlauncher.properties
index d82d688..15f99b2 100644
--- a/fy/torlauncher.properties
+++ b/fy/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ga/torlauncher.properties b/ga/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ga/torlauncher.properties
+++ b/ga/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/gl/torlauncher.properties b/gl/torlauncher.properties
index 9b0346d..40a348c 100644
--- a/gl/torlauncher.properties
+++ b/gl/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=O Tor saíu de vez.
torlauncher.please_restart_app=Por favor reinicie esta aplicación.
torlauncher.tor_controlconn_failed=Non se puido conectar ao porto de control do Tor.
torlauncher.tor_failed_to_start=Non se puido iniciar o Tor.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Asegúrese de que o Tor está en execución.
torlauncher.error_proxy_addr_missing=Debe especificar un enderezo IP ou un nome de máquina e un número de porto para configurar o Tor para que use un proxy para acceder a Internet.
torlauncher.error_proxy_type_missing=Debe seleccionar o tipo de proxy.
torlauncher.error_bridges_missing=Debe especificar unha ou máis pontes.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Conectar
torlauncher.quit=Abandonar
diff --git a/gu/torlauncher.properties b/gu/torlauncher.properties
index d82d688..15f99b2 100644
--- a/gu/torlauncher.properties
+++ b/gu/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/gu_IN/torlauncher.properties b/gu_IN/torlauncher.properties
index d82d688..15f99b2 100644
--- a/gu_IN/torlauncher.properties
+++ b/gu_IN/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/gun/torlauncher.properties b/gun/torlauncher.properties
index d82d688..15f99b2 100644
--- a/gun/torlauncher.properties
+++ b/gun/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ha/torlauncher.properties b/ha/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ha/torlauncher.properties
+++ b/ha/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/he/torlauncher.properties b/he/torlauncher.properties
index 6f2d0ef..ba524bb 100644
--- a/he/torlauncher.properties
+++ b/he/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor יצא במפתיעה.
torlauncher.please_restart_app=אנא הפעל מחדש את יישום זה.
torlauncher.tor_controlconn_failed=לא הצליח להתחבר ליציאת שליטת Tor.
torlauncher.tor_failed_to_start=Tor נכשל בהפעלה.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=אנא וודא כי Tor מורץ כעת.
torlauncher.error_proxy_addr_missing=עליך לציין כתובת IP או שם מארח וגם מספר יציאה בכדי להגדיר את Tor לשימוש בשרת פרוקסי כדי לעשות שימוש בפרוקסי כדי להיכנס אל האינטרנט.
torlauncher.error_proxy_type_missing=עליך לבחור את טיפוס הפרוקסי.
torlauncher.error_bridges_missing=עליך לציין גשר אחד או יותר.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=התחבר
torlauncher.quit=יציאה
diff --git a/hi/torlauncher.properties b/hi/torlauncher.properties
index d82d688..15f99b2 100644
--- a/hi/torlauncher.properties
+++ b/hi/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/hr/torlauncher.properties b/hr/torlauncher.properties
index d82d688..15f99b2 100644
--- a/hr/torlauncher.properties
+++ b/hr/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/hr_HR/torlauncher.properties b/hr_HR/torlauncher.properties
index b92bc9c..5c360f2 100644
--- a/hr_HR/torlauncher.properties
+++ b/hr_HR/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor je neočekivano izašao.
torlauncher.please_restart_app=Molimo Vas da ponovno pokrenete ovu aplikaciju.
torlauncher.tor_controlconn_failed=Nije se moguće spojiti na Torov upravljački port.
torlauncher.tor_failed_to_start=Tor se nije uspio pokrenuti.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Molimo osigurajte da Tor radi.
torlauncher.error_proxy_addr_missing=Morate navesti i IP adresu ili ime računala i broj porta da biste konfigurirali Tor za korištenje proxyja za pristup Internetu.
torlauncher.error_proxy_type_missing=Morate odabrati tip proxyja.
torlauncher.error_bridges_missing=Morate odrediti jedan ili više mostova.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Spajanje
torlauncher.quit=Odustani
diff --git a/ht/torlauncher.properties b/ht/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ht/torlauncher.properties
+++ b/ht/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/hu/torlauncher.properties b/hu/torlauncher.properties
index f8b8a86..f6daaf1 100644
--- a/hu/torlauncher.properties
+++ b/hu/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=A Tor váratlanul kilépett.
torlauncher.please_restart_app=Kérjük indítsa újra ezt az alkalmazást.
torlauncher.tor_controlconn_failed=Nem lehetséges csatlakozni a Tor vezérlő portjára
torlauncher.tor_failed_to_start=Nem sikerült elindulnia a Tor-nak.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Kérjük ellenőrizze, hogy a Tor fut-e.
torlauncher.error_proxy_addr_missing=Meg kell adnia egy IP címet, vagy egy gépnevet (host) és egy portot , ahhoz, hogy a Tor ezen a proxy-n keresztül kapcsolódjon az Internethez.
torlauncher.error_proxy_type_missing=Ki kell választania a proxy típusát.
torlauncher.error_bridges_missing=Meg kell adnia egy vagy több hidat.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Csatlakozás
torlauncher.quit=Kilépés
diff --git a/hy/torlauncher.properties b/hy/torlauncher.properties
index d82d688..15f99b2 100644
--- a/hy/torlauncher.properties
+++ b/hy/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/hy_AM/torlauncher.properties b/hy_AM/torlauncher.properties
index b930fb1..0530685 100644
--- a/hy_AM/torlauncher.properties
+++ b/hy_AM/torlauncher.properties
@@ -7,6 +7,7 @@
torlauncher.please_restart_app=Վերաթողարկեք այս ծրագիրը:
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
torlauncher.tor_failed_to_start=Tor-ի թողարկման սխալ;
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.failed_to_save_settings=Tor-ի կարգավորումներ չեն
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
torlauncher.error_proxy_type_missing=Դուք պետո է ընտրեք proxy-ի տիպը:
torlauncher.error_bridges_missing=Դուք պետք է կանխորոշեք մեկ կամ մի քանի կամուրջներ;
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Միանալ
torlauncher.quit=Չեղարկել
diff --git a/ia/torlauncher.properties b/ia/torlauncher.properties
index ce9581d..8aefb5c 100644
--- a/ia/torlauncher.properties
+++ b/ia/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
torlauncher.error_proxy_type_missing=Tu debe seliger un typo de proxy
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
torlauncher.quit=Quitar
diff --git a/id/torlauncher.properties b/id/torlauncher.properties
index e26b77a..24da8d3 100644
--- a/id/torlauncher.properties
+++ b/id/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
torlauncher.error_proxy_addr_missing=Anda harus menentukan baik alamat IP atau nama host dan nomor port untuk mengkonfigurasi Tor untuk menggunakan proxy untuk mengakses Internet.
torlauncher.error_proxy_type_missing=Anda harus memilih jenis proxy.
torlauncher.error_bridges_missing=Anda harus menspesifikan satu bridge atau lebih.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Hubungi
torlauncher.quit=Berhenti
diff --git a/is/torlauncher.properties b/is/torlauncher.properties
index 22b1b9d..9b30fca 100644
--- a/is/torlauncher.properties
+++ b/is/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/it/torlauncher.properties b/it/torlauncher.properties
index 08f817c..08400e5 100644
--- a/it/torlauncher.properties
+++ b/it/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor si è arrestato inaspettatamente.
torlauncher.please_restart_app=Per favore riavvia questa applicazione.
torlauncher.tor_controlconn_failed=Impossibile connettersi alla porta di controllo di Tor.
torlauncher.tor_failed_to_start=Si è verificato un errore nell'avvio di Tor.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor ha fallito a stabilire una connessione Tor
torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Per favore assicurati che Tor sia in esecuzion
torlauncher.error_proxy_addr_missing=Affinché Tor sia configurato all'utilizzo di un proxy per l'accesso ad Internet, devi specificare sia un indirizzo IP o nome Host, sia un numero di porta.
torlauncher.error_proxy_type_missing=Devi selezionare il tipo di proxy.
torlauncher.error_bridges_missing=Devi specificare uno o più ponti.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Connetti
torlauncher.quit=Esci
diff --git a/ja/torlauncher.properties b/ja/torlauncher.properties
index c806f37..2237501 100644
--- a/ja/torlauncher.properties
+++ b/ja/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Torは予期せず終了しました。
torlauncher.please_restart_app=このアプリケーションを再起動してください。
torlauncher.tor_controlconn_failed=Torのコントロールポートに接続出来ませんでした。
torlauncher.tor_failed_to_start=Torは開始出来ませんでした。
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor は Tor ネットワーク接続の確立に失敗しました。
torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Torが起動しているかご確認くださ
torlauncher.error_proxy_addr_missing=インターネットのアクセスにプロキシを使用するには Tor の構成へ IP アドレスまたはホスト名とポート番号を両方指定する必要があります。
torlauncher.error_proxy_type_missing=プロキシの種類を選択する必要があります。
torlauncher.error_bridges_missing=一つ以上のブリッジを記述する必要があります。
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=接続
torlauncher.quit=終了
diff --git a/jv/torlauncher.properties b/jv/torlauncher.properties
index d82d688..15f99b2 100644
--- a/jv/torlauncher.properties
+++ b/jv/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ka/torlauncher.properties b/ka/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ka/torlauncher.properties
+++ b/ka/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/km/torlauncher.properties b/km/torlauncher.properties
index a3f382e..21d88df 100644
--- a/km/torlauncher.properties
+++ b/km/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=បានចេញពី Tor ដោយមិន
torlauncher.please_restart_app=សូមចាប់ផ្ដើមកម្មវិធីនេះឡើងវិញ។
torlauncher.tor_controlconn_failed=មិនអាចភ្ជាប់ទៅច្រកពិនិត្យរបស់ Tor
torlauncher.tor_failed_to_start=បានបរាជ័យក្នុងការចាប់ផ្ដើម Tor
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor បានបរាជ័យក្នុងការបង្កើតការតភ្ជាប់បណ្ដាញ Tor ។
torlauncher.tor_bootstrap_failed_details=បានបរាជ័យ %1$S (%2$S) ។
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=សូមប្រាកដថា Tor
torlauncher.error_proxy_addr_missing=អ្នកត្រូវតែបញ្ជាក់ទាំងអាសយដ្ឋាន IP ឬឈ្មោះម៉ាស៊ីន និងលេខច្រក ដើម្បីកំណត់រចនាសម្ព័ន្ធ Tor ឲ្យប្រើប្រូកស៊ីដើម្បីចូលដំណើរការអ៊ីនធឺណិត។
torlauncher.error_proxy_type_missing=អ្នកត្រូវតែជ្រើសប្រភេទប្រូកស៊ី។
torlauncher.error_bridges_missing=អ្នកត្រូវតែបញ្ជាក់ប្រ៊ីតមួយ ឬច្រើន។
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=តភ្ជាប់
torlauncher.quit=ចេញ
diff --git a/kn/torlauncher.properties b/kn/torlauncher.properties
index f53698a..c48b139 100644
--- a/kn/torlauncher.properties
+++ b/kn/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ko/torlauncher.properties b/ko/torlauncher.properties
index df1625a..dd4d51b 100644
--- a/ko/torlauncher.properties
+++ b/ko/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다.
torlauncher.please_restart_app=이 응용프로그램을 다시 시작해 주세요.
torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결이 어렵습니다.
torlauncher.tor_failed_to_start=Tor 시작 실패.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor 네트워크 연결 설정 실패
torlauncher.tor_bootstrap_failed_details=%1$S 실패 (%2$S)
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Tor가 실행중인 지 확인하여 주십시
torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, Ip주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다.
torlauncher.error_proxy_type_missing=프록시 유형을 선택해 주십시오.
torlauncher.error_bridges_missing=하나 이상의 bridge를 지정해야 합니다.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=연결
torlauncher.quit=끝내기
diff --git a/ko_KR/torlauncher.properties b/ko_KR/torlauncher.properties
index fe03802..899b1c9 100644
--- a/ko_KR/torlauncher.properties
+++ b/ko_KR/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
torlauncher.error_proxy_addr_missing=프록시를 써서 인터넷에 접속하도록 Tor를 설정하려면 IP 주소 또는 호스트 이름이랑 포트 숫자를 적어 주셔야 해요.
torlauncher.error_proxy_type_missing=프록시 종류를 정해 주세요.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ku/torlauncher.properties b/ku/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ku/torlauncher.properties
+++ b/ku/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/kw/torlauncher.properties b/kw/torlauncher.properties
index d82d688..15f99b2 100644
--- a/kw/torlauncher.properties
+++ b/kw/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ky/torlauncher.properties b/ky/torlauncher.properties
index 104cdd7..1007549 100644
--- a/ky/torlauncher.properties
+++ b/ky/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/lb/torlauncher.properties b/lb/torlauncher.properties
index d82d688..15f99b2 100644
--- a/lb/torlauncher.properties
+++ b/lb/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/lg/torlauncher.properties b/lg/torlauncher.properties
index d82d688..15f99b2 100644
--- a/lg/torlauncher.properties
+++ b/lg/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ln/torlauncher.properties b/ln/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ln/torlauncher.properties
+++ b/ln/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/lo/torlauncher.properties b/lo/torlauncher.properties
index d82d688..15f99b2 100644
--- a/lo/torlauncher.properties
+++ b/lo/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/lt/torlauncher.properties b/lt/torlauncher.properties
index 7d8adfc..21871e6 100644
--- a/lt/torlauncher.properties
+++ b/lt/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/lv/torlauncher.properties b/lv/torlauncher.properties
index 054fba5..c86ce2e 100644
--- a/lv/torlauncher.properties
+++ b/lv/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor negaidīti beidza darbu.
torlauncher.please_restart_app=Lūdzu, pārstartējiet šo lietotni.
torlauncher.tor_controlconn_failed=Nevarēja veikt savienojumu ar Tor kontrolportu.
torlauncher.tor_failed_to_start=Tor'am neizdevās startēt.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor nevarēja savienoties ar Tor tiklu.
torlauncher.tor_bootstrap_failed_details=%1$S neizdevas (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Lūdzu pārliecinieties par to, ka Tor strād
torlauncher.error_proxy_addr_missing=Lai konfigurētu Tor'u tā, ka tas interneta piekļuvei lietotu starpnieku, ir jānorāda gan IP adrese vai viesotāja nosaukums, gan porta numurs.
torlauncher.error_proxy_type_missing=Jums jāatlasa starpnieka tips.
torlauncher.error_bridges_missing=Jums jānorāda viens vai vairāki tilti.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Veidot savienojumu
torlauncher.quit=Beigt
diff --git a/mg/torlauncher.properties b/mg/torlauncher.properties
index d82d688..15f99b2 100644
--- a/mg/torlauncher.properties
+++ b/mg/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/mi/torlauncher.properties b/mi/torlauncher.properties
index d82d688..15f99b2 100644
--- a/mi/torlauncher.properties
+++ b/mi/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/mk/torlauncher.properties b/mk/torlauncher.properties
index bb8a341..85124ef 100644
--- a/mk/torlauncher.properties
+++ b/mk/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ml/torlauncher.properties b/ml/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ml/torlauncher.properties
+++ b/ml/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/mn/torlauncher.properties b/mn/torlauncher.properties
index d82d688..15f99b2 100644
--- a/mn/torlauncher.properties
+++ b/mn/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/mr/torlauncher.properties b/mr/torlauncher.properties
index 2d8f655..8dc1540 100644
--- a/mr/torlauncher.properties
+++ b/mr/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=टॉर अनपेक्षितपणे बंद
torlauncher.please_restart_app=हे अप्लिकेशन परत सुरू करा.
torlauncher.tor_controlconn_failed=टॉर नियंत्रण पोर्टला जोडण्यात अपयश.
torlauncher.tor_failed_to_start=टॉर सुरू होण्यात अपयश.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=कृपया टॉर सुरू अस
torlauncher.error_proxy_addr_missing=टॉरद्वारे महाजालाचा वापर करण्यासाठी IP अॅड्रेस किंवा होस्टनेम आणि पोर्ट क्रमांक ह्या दोन्ही गोष्टी पुरवणे आवश्यक आहे.
torlauncher.error_proxy_type_missing=प्रॉक्सी प्रकार निवडणे अनिवार्य आहे.
torlauncher.error_bridges_missing=एक किंवा अधिक ब्रिजेस नमुद करणे अनिवार्य आहे.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=जोडा
torlauncher.quit=बाहेर पडा
diff --git a/ms_MY/torlauncher.properties b/ms_MY/torlauncher.properties
index b50e30e..27ee641 100644
--- a/ms_MY/torlauncher.properties
+++ b/ms_MY/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor telah terkeluar secara tidak sengaja.
torlauncher.please_restart_app=Sila mulakan semula aplikasi ini.
torlauncher.tor_controlconn_failed=Tidak dapat menyambung ke port kawalan Tor.
torlauncher.tor_failed_to_start=Tor gagal untuk bermula.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Sila pastikan bahawa Tor sedang berjalan.
torlauncher.error_proxy_addr_missing=Anda mesti nyatakan kedua-dua alamat IP atau nama host dan beberapa port bagi mengkonfigurasi Tor untuk menggunakan proksi bagi mengakses Internet.
torlauncher.error_proxy_type_missing=Anda mesti memilih jenis proksi.
torlauncher.error_bridges_missing=Anda mesti menentukan satu atau lebih bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Menyambung
torlauncher.quit=Henti
diff --git a/mt/torlauncher.properties b/mt/torlauncher.properties
index d82d688..15f99b2 100644
--- a/mt/torlauncher.properties
+++ b/mt/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/my/torlauncher.properties b/my/torlauncher.properties
index ae67239..7c840ef 100644
--- a/my/torlauncher.properties
+++ b/my/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
torlauncher.error_proxy_addr_missing=အင်တာနက်ကို သုံးစွဲနိုင်ရန် ပရောက်ဇီကို ခံပြီး Tor ကို ပြင်ဆင်ရန် IP လိပ်စာ (သို့) host အမည် နှင့် port နံပါတ် တစ်ခုကို တွဲပြီး သတ်မှတ်ဖို့ လိုသည်။
torlauncher.error_proxy_type_missing=ပရောင်ဇီ အမျိုးအစားကို ရွေးချယ်ရမည်။
torlauncher.error_bridges_missing=Bridge တစ်ခု (သို့) တစ်ခုမက ရွေးချယ်ရမည်။
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
torlauncher.quit=ထွက်ရန်
diff --git a/nah/torlauncher.properties b/nah/torlauncher.properties
index d82d688..15f99b2 100644
--- a/nah/torlauncher.properties
+++ b/nah/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/nap/torlauncher.properties b/nap/torlauncher.properties
index d82d688..15f99b2 100644
--- a/nap/torlauncher.properties
+++ b/nap/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/nb/torlauncher.properties b/nb/torlauncher.properties
index 9dac98a..9298f70 100644
--- a/nb/torlauncher.properties
+++ b/nb/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor ble uventet avsluttet.
torlauncher.please_restart_app=Vennligst start denne applikasjonen på nytt.
torlauncher.tor_controlconn_failed=Kunne ikke koble til Tor kontrollport.
torlauncher.tor_failed_to_start=Tor kunne ikke starte.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor fikk ikke etablert en forbindelse til Tor-nettverket.
torlauncher.tor_bootstrap_failed_details=%1$S feilet (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Vennligst sjekk at Tor kjører.
torlauncher.error_proxy_addr_missing=Du må spesifisere både IP-adresse eller vertsnavn og et portnummer for å konfigurere Tor til å bruke en proxy for å koble til Internett.
torlauncher.error_proxy_type_missing=Du må velge proxytypen
torlauncher.error_bridges_missing=Du må velge én eller flere broer.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Koble til
torlauncher.quit=Avslutt
diff --git a/nds/torlauncher.properties b/nds/torlauncher.properties
index d82d688..15f99b2 100644
--- a/nds/torlauncher.properties
+++ b/nds/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ne/torlauncher.properties b/ne/torlauncher.properties
index dbd15bc..dbda2e7 100644
--- a/ne/torlauncher.properties
+++ b/ne/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=टोर अनपेक्षित रुपमा ब
torlauncher.please_restart_app=कृपया यो सफ्टओएर पुन: संचालन गर्नुहोस |
torlauncher.tor_controlconn_failed=टोरको नियेंत्रण पोर्टसंग जडान विफल भयो|
torlauncher.tor_failed_to_start=टोर खुल्न विफल भयो |
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=कृपया टोर सन्चाल
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
torlauncher.error_bridges_missing=एक वा एक भन्दा बढी पुल संकेत गर्नुहोस् |
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=जडान गर्नुहोस्
torlauncher.quit=बन्द गर्नुहोस
diff --git a/nl/torlauncher.properties b/nl/torlauncher.properties
index 66b5e55..694b8f3 100644
--- a/nl/torlauncher.properties
+++ b/nl/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor is onverwacht afgesloten.
torlauncher.please_restart_app=Herstart deze applicatie alstublieft.
torlauncher.tor_controlconn_failed=Kon niet verbinden met een Tor controlepoort.
torlauncher.tor_failed_to_start=Tor kon niet starten.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor kon geen Tor netwerkverbinding maken
torlauncher.tor_bootstrap_failed_details=%1$S mislukte (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Controleer dat Tor actief is alstublieft.
torlauncher.error_proxy_addr_missing=Je moet zowel een IP-adres of hostnaam en een poortnummer invoeren om Tor te configureren om een proxy te gebruiken om toegang te krijgen tot het internet.
torlauncher.error_proxy_type_missing=Je moet het proxy-type kiezen.
torlauncher.error_bridges_missing=Je moet één of meerdere bridges opgeven.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Verbind
torlauncher.quit=Stop
diff --git a/nl_BE/torlauncher.properties b/nl_BE/torlauncher.properties
index d82d688..15f99b2 100644
--- a/nl_BE/torlauncher.properties
+++ b/nl_BE/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/nn/torlauncher.properties b/nn/torlauncher.properties
index d82d688..15f99b2 100644
--- a/nn/torlauncher.properties
+++ b/nn/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/nso/torlauncher.properties b/nso/torlauncher.properties
index d82d688..15f99b2 100644
--- a/nso/torlauncher.properties
+++ b/nso/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/oc/torlauncher.properties b/oc/torlauncher.properties
index d82d688..15f99b2 100644
--- a/oc/torlauncher.properties
+++ b/oc/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/or/torlauncher.properties b/or/torlauncher.properties
index d82d688..15f99b2 100644
--- a/or/torlauncher.properties
+++ b/or/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/pa/torlauncher.properties b/pa/torlauncher.properties
index d82d688..15f99b2 100644
--- a/pa/torlauncher.properties
+++ b/pa/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/pap/torlauncher.properties b/pap/torlauncher.properties
index d82d688..15f99b2 100644
--- a/pap/torlauncher.properties
+++ b/pap/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/pl/torlauncher.properties b/pl/torlauncher.properties
index 2a003cc..3e2526c 100644
--- a/pl/torlauncher.properties
+++ b/pl/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor wyłączył się niespodziewanie.
torlauncher.please_restart_app=Proszę zrestartuj tą aplikację.
torlauncher.tor_controlconn_failed=Nie można połączyć się z portem kontrolnym Tora.
torlauncher.tor_failed_to_start=Nie powiodło się włączenie Tora.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Błąd Tor, nie udało się nawiązać połączenia z siecią Tora.
torlauncher.tor_bootstrap_failed_details=%1$S błąd (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Proszę upewnić się, czy Tor jest włączony
torlauncher.error_proxy_addr_missing=Musisz określić adres IP lub nazwę hosta oraz numer portu, aby Tor mógł używać serwera proxy w dostępie do Internetu.
torlauncher.error_proxy_type_missing=Musisz wybrać typ proxy.
torlauncher.error_bridges_missing=Musisz podać jeden lub więcej mostów. (bridges)
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Połącz
torlauncher.quit=Wyjście
diff --git a/pms/torlauncher.properties b/pms/torlauncher.properties
index d82d688..15f99b2 100644
--- a/pms/torlauncher.properties
+++ b/pms/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ps/torlauncher.properties b/ps/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ps/torlauncher.properties
+++ b/ps/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/pt/torlauncher.properties b/pt/torlauncher.properties
index 7697319..a57f3cd 100644
--- a/pt/torlauncher.properties
+++ b/pt/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=O Tor fechou-se insperadamente.
torlauncher.please_restart_app=Por favor reinicie a aplicação.
torlauncher.tor_controlconn_failed=Não foi possível ligar à porta de controlo do Tor.
torlauncher.tor_failed_to_start=O Tor falhou a inicialização.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Por favor confirme que o Tor está a correr.
torlauncher.error_proxy_addr_missing=Deve especificar tanto um endereço IP ou nome do hospedeiro como um número de porta, para configurar o Tor para utilizar um proxy para aceder à Internet.
torlauncher.error_proxy_type_missing=Tem de seleccionar o tipo de proxy
torlauncher.error_bridges_missing=Deve especificar uma ou mais pontes.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Ligar
torlauncher.quit=Sair
diff --git a/pt_BR/torlauncher.properties b/pt_BR/torlauncher.properties
index 6b338a0..c4c3a8f 100644
--- a/pt_BR/torlauncher.properties
+++ b/pt_BR/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor fechou inesperadamente.
torlauncher.please_restart_app=Por favor, reinicie esta aplicação.
torlauncher.tor_controlconn_failed=Não foi possível conectar-se à porta de controle Tor.
torlauncher.tor_failed_to_start=Falha ao iniciar Tor.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Falha ao tentar estabelecer uma conexão com a rede Tor.
torlauncher.tor_bootstrap_failed_details=%1$S falhou (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Por favor, verifique que Tor esteja rodando.
torlauncher.error_proxy_addr_missing=Você deve especificar um endereço IP ou um servidor, e um número de porta para configurar Tor para usar um proxy de acesso a Internet.
torlauncher.error_proxy_type_missing=Você deve selecionar um tipo de proxy.
torlauncher.error_bridges_missing=Você deve especificar uma ou mais pontes.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Conectar
torlauncher.quit=Encerrar
diff --git a/ro/torlauncher.properties b/ro/torlauncher.properties
index f7b78ac..6f45c75 100644
--- a/ro/torlauncher.properties
+++ b/ro/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor a ieșit în mod neașteptat.
torlauncher.please_restart_app=Vă rugăm reporniți aplicația.
torlauncher.tor_controlconn_failed=Nu sa putut conecta la portul de control Tor.
torlauncher.tor_failed_to_start=Tor nu poate porni.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Vă rugăm asigurați-vă că Tor este pornit.
torlauncher.error_proxy_addr_missing=Pentru a folosi Tor ca proxy, prin care să accesaţi internetul, este nevoie să specificaţi atât o adresă de IP, cât şi un port.
torlauncher.error_proxy_type_missing=Trebuie să selectezi un tip de proxy.
torlauncher.error_bridges_missing=Trebuie sa specifici una sau mai multe poduri.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Conectare
torlauncher.quit=Revocare
diff --git a/ru/torlauncher.properties b/ru/torlauncher.properties
index 59899a1..bef2e05 100644
--- a/ru/torlauncher.properties
+++ b/ru/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor неожиданно завершился.
torlauncher.please_restart_app=Пожалуйста, перезапустите приложение
torlauncher.tor_controlconn_failed=Невозможно соединиться с портом управления Tor.
torlauncher.tor_failed_to_start=Невозможно запустить Tor.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Тор не удалось установить подключение к сети Tor.
torlauncher.tor_bootstrap_failed_details=%1$S неудачно (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Убедитесь что Tor запущен.
torlauncher.error_proxy_addr_missing=Вы должны указать IP-адрес или имя хоста и порт, чтобы настроить Tor и использовать прокси для доступа в Интернет.
torlauncher.error_proxy_type_missing=Необходимо выбрать тип прокси.
torlauncher.error_bridges_missing=Необходимо задать один или несколько мостов.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Соединиться
torlauncher.quit=Выйти
diff --git a/ru(a)petr1708/torlauncher.properties b/ru(a)petr1708/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ru(a)petr1708/torlauncher.properties
+++ b/ru(a)petr1708/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/sco/torlauncher.properties b/sco/torlauncher.properties
index d82d688..15f99b2 100644
--- a/sco/torlauncher.properties
+++ b/sco/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/si/torlauncher.properties b/si/torlauncher.properties
index d82d688..15f99b2 100644
--- a/si/torlauncher.properties
+++ b/si/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/si_LK/torlauncher.properties b/si_LK/torlauncher.properties
index d066a03..83778cd 100644
--- a/si_LK/torlauncher.properties
+++ b/si_LK/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor අනපේක්ෂිත ලෙස නැතිව
# torlauncher.please_restart_app=Please restart this application.
torlauncher.tor_controlconn_failed=Tor පාලක පොර්ටයට සම්බන්ධ විය නොහැක.
torlauncher.tor_failed_to_start=Tor ආරම්භ කිරීමට අපොහොසත්ය.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=කරුණාකර Tor ක්රිය
torlauncher.error_proxy_addr_missing=අන්තර්ජාලයට පිවිසීමට නියුතු සේවා දායකයෙකු භාවිතා කිරීමට Tor වින්යාසගත කිරීමේදී IP ලිපිනයක් හෝ සත්කාරක නාමයක් සහ පෝර්ට අංකයක් සදහන් කල යුතුය.
torlauncher.error_proxy_type_missing=ඔබ විසින් සේවාදායක වර්ගය තේරීම කලයුතුය.
torlauncher.error_bridges_missing=ඔබ විසින් සේතු එකක් හෝ කිහිපයක් සදහන් කලයුතුය.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=සම්බන්ධ වෙන්න
torlauncher.quit=ඉවත් වෙන්න
diff --git a/sk/torlauncher.properties b/sk/torlauncher.properties
index 706c86e..38af247 100644
--- a/sk/torlauncher.properties
+++ b/sk/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor bol neočakávane ukončený.
torlauncher.please_restart_app=Prosím reštartujte túto aplikáciu.
torlauncher.tor_controlconn_failed=Nepodarilo sa pripojiť ku kontrolnému portu Tor.
torlauncher.tor_failed_to_start=Tor sa nepodarilo spustiť.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Prosím uistite sa že Tor je spustený.
torlauncher.error_proxy_addr_missing=Musíte špecifikovať IP adresu alebo názov hostiteľa a číslo portu aby bolo možné nakonfigurovať Tor na používanie proxy na prístup k Internetu.
torlauncher.error_proxy_type_missing=Musíte zvoliť typ proxy.
torlauncher.error_bridges_missing=Musíte špecifikovať jeden alebo viac mostov.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Pripojiť
torlauncher.quit=Ukončiť
diff --git a/sk_SK/torlauncher.properties b/sk_SK/torlauncher.properties
index 96802ef..e448600 100644
--- a/sk_SK/torlauncher.properties
+++ b/sk_SK/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor sa nečakane vypol.
torlauncher.please_restart_app=Prosím, reštartujte túto aplikáciu.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
torlauncher.tor_failed_to_start=Nepodarilo sa spustiť Tor.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Prosím, uistite sa že Tor beží.
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
torlauncher.error_proxy_type_missing=Musíte si vybrať proxy typ.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Pripojiť
# torlauncher.quit=Quit
diff --git a/sl/torlauncher.properties b/sl/torlauncher.properties
index 1b4c995..c714ddc 100644
--- a/sl/torlauncher.properties
+++ b/sl/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor je se je nepredvideno zaustavil.
torlauncher.please_restart_app=Prosimo, da ponovno zaženete to aplikacijo.
torlauncher.tor_controlconn_failed=Povezava na Tor nadzorna vrata ni uspela.
torlauncher.tor_failed_to_start=Tor se ni zagnal.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Prepričajte se, da Tor teče.
torlauncher.error_proxy_addr_missing=Morate vnesti oboje, IP naslov ali ime gostitelja in vrata, da bi nastavili Tor za uporabo posredniškega strežnika pri dostopu do interneta.
torlauncher.error_proxy_type_missing=Morate izbrati vrsto posredniškega strežnika.
torlauncher.error_bridges_missing=Morate določiti vsaj en ali več mostov.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Poveži
torlauncher.quit=Zapusti
diff --git a/sl_SI/torlauncher.properties b/sl_SI/torlauncher.properties
index d82d688..15f99b2 100644
--- a/sl_SI/torlauncher.properties
+++ b/sl_SI/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/sn/torlauncher.properties b/sn/torlauncher.properties
index 175cc93..291eb47 100644
--- a/sn/torlauncher.properties
+++ b/sn/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/so/torlauncher.properties b/so/torlauncher.properties
index d82d688..15f99b2 100644
--- a/so/torlauncher.properties
+++ b/so/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/son/torlauncher.properties b/son/torlauncher.properties
index d82d688..15f99b2 100644
--- a/son/torlauncher.properties
+++ b/son/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/sq/torlauncher.properties b/sq/torlauncher.properties
index 9fc7eb8..48529ec 100644
--- a/sq/torlauncher.properties
+++ b/sq/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
torlauncher.error_proxy_addr_missing=Ju duhet të përcaktoni si adresën IP ose emrin e serverit edhe numrin e portës për të konfiguruar Torin të përdori një proxy për tu lidhur në Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Lidhu
torlauncher.quit=Dil
diff --git a/sr/torlauncher.properties b/sr/torlauncher.properties
index 3d39c8d..5978412 100644
--- a/sr/torlauncher.properties
+++ b/sr/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
torlauncher.error_proxy_addr_missing=Морате навести IP адресу или име и порт да би подесили Tor да користи прокси на интернету.
torlauncher.error_proxy_type_missing=Morate izabrati tip proxya.
torlauncher.error_bridges_missing=Morate odrediti jedan ili vise mostova
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
torlauncher.quit=Искључити
diff --git a/sr(a)latin/torlauncher.properties b/sr(a)latin/torlauncher.properties
index d82d688..15f99b2 100644
--- a/sr(a)latin/torlauncher.properties
+++ b/sr(a)latin/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/st/torlauncher.properties b/st/torlauncher.properties
index d82d688..15f99b2 100644
--- a/st/torlauncher.properties
+++ b/st/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/su/torlauncher.properties b/su/torlauncher.properties
index d82d688..15f99b2 100644
--- a/su/torlauncher.properties
+++ b/su/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/sv/torlauncher.properties b/sv/torlauncher.properties
index 99eaa65..f1170b4 100644
--- a/sv/torlauncher.properties
+++ b/sv/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor stängdes av oväntat.
torlauncher.please_restart_app=Var god starta om det här programmet.
torlauncher.tor_controlconn_failed=Kunde inte ansluta till Tors kontrollport.
torlauncher.tor_failed_to_start=Uppstart av Tor misslyckades.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor misslyckades med att upprätta en anslutning till Tor nätverket.
torlauncher.tor_bootstrap_failed_details=%1$S misslyckades (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Försäkra dig om att Tor är startad.
torlauncher.error_proxy_addr_missing=Du måste ange både en IP-adress eller värdnamn, samt ett port-nummer för att konfigurera Tor till att använda en proxy för att nå Internet.
torlauncher.error_proxy_type_missing=Du måste välja typ av proxy.
torlauncher.error_bridges_missing=Du måste ange en eller flera bryggor.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Anslut
torlauncher.quit=Avsluta
diff --git a/sw/torlauncher.properties b/sw/torlauncher.properties
index d82d688..15f99b2 100644
--- a/sw/torlauncher.properties
+++ b/sw/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/szl/torlauncher.properties b/szl/torlauncher.properties
index d82d688..15f99b2 100644
--- a/szl/torlauncher.properties
+++ b/szl/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ta/torlauncher.properties b/ta/torlauncher.properties
index 3c572b3..3790611 100644
--- a/ta/torlauncher.properties
+++ b/ta/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor எதிர்பாராத விதமாக வ
torlauncher.please_restart_app=இந்த பயன்பாட்டை மறுதொடக்கம் செய்க.
torlauncher.tor_controlconn_failed=Tor கட்டுப்பாட்டு துறையை இணைக்க முடியவில்லை.
torlauncher.tor_failed_to_start=Tor தொடங்க முடியவில்லை.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Tor இயங்கிக்கொண்ட
torlauncher.error_proxy_addr_missing=நீங்கள் இணையத்தை அணுக ஒரு ப்ராக்ஸி பயன்படுத்தி Tor கட்டமைக்க ஒரு ஐபி முகவரி அல்லது புரவலன் மற்றும் ஒரு போர்ட் எண் குறிப்பிட வேண்டும்.
torlauncher.error_proxy_type_missing=பதிலாள் வகை தேர்ந்தெடுக்க வேண்டும்.
torlauncher.error_bridges_missing=நீங்கள் ஒன்று அல்லது அதற்கு மேற்பட்ட பாலங்களை குறிப்பிட வேண்டும்.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=இணைக்க
torlauncher.quit=விடுவி
diff --git a/te/torlauncher.properties b/te/torlauncher.properties
index d82d688..15f99b2 100644
--- a/te/torlauncher.properties
+++ b/te/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/te_IN/torlauncher.properties b/te_IN/torlauncher.properties
index d82d688..15f99b2 100644
--- a/te_IN/torlauncher.properties
+++ b/te_IN/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/tg/torlauncher.properties b/tg/torlauncher.properties
index d82d688..15f99b2 100644
--- a/tg/torlauncher.properties
+++ b/tg/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/th/torlauncher.properties b/th/torlauncher.properties
index 82d0904..665d1e8 100644
--- a/th/torlauncher.properties
+++ b/th/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor ออกจากโปรแกรมโดยไ
torlauncher.please_restart_app=กรุณาปิดเปิดแอพพลิเคชัน
torlauncher.tor_controlconn_failed=ไม่สามารถเชื่อมต่อกับพอร์ตควบคุมของ Tor ได้
torlauncher.tor_failed_to_start=การเริ่ม Tor ล้มเหลว
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=กรุณาตรวจให้แน่
torlauncher.error_proxy_addr_missing=คุณต้องระบุทั้งที่อยู่ IP หรือชื่อเครื่อง และหมายเลขพอร์ต เพื่อปรับแต่ง Tor ให้ใช้พร็อกซีในการเชื่อมต่ออินเทอร์เน็ต
torlauncher.error_proxy_type_missing=คุณต้องเลือกชนิดพร็อกซี
torlauncher.error_bridges_missing=คุณต้องระบุสะพานอย่างน้อยหนึ่งตัว
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=เชื่อมต่อ
torlauncher.quit=ออก
diff --git a/ti/torlauncher.properties b/ti/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ti/torlauncher.properties
+++ b/ti/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/tk/torlauncher.properties b/tk/torlauncher.properties
index d82d688..15f99b2 100644
--- a/tk/torlauncher.properties
+++ b/tk/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/tr/torlauncher.properties b/tr/torlauncher.properties
index 6b15409..17e5d88 100644
--- a/tr/torlauncher.properties
+++ b/tr/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor beklenmedik bir şekilde kapandı.
torlauncher.please_restart_app=Lütfen bu uygulamayı yeniden başlatın.
torlauncher.tor_controlconn_failed=Tor yönetim portuna bağlanılamadı.
torlauncher.tor_failed_to_start=Tor başlatılamadı.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor'un ağ bağlantısı kurulumu başarısız oldu.
torlauncher.tor_bootstrap_failed_details=%1$S başarısız oldu (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Lütfen Tor'un çalıştığından emin olun.
torlauncher.error_proxy_addr_missing=İnternet bağlanırken proxy kullanmak için IP adresi veya Sunucu ve port numarası girmeniz gerekiyor.
torlauncher.error_proxy_type_missing=Vekil sunucu türünü seçmelisiniz.
torlauncher.error_bridges_missing=Bir ya da daha fazla köprü belirtmelisiniz.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Bağlan
torlauncher.quit=Çık
diff --git a/uk/torlauncher.properties b/uk/torlauncher.properties
index 74ad9b5..4a4eed9 100644
--- a/uk/torlauncher.properties
+++ b/uk/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor несподівано завершився.
torlauncher.please_restart_app=Будь ласка, перезапустіть пристрій
torlauncher.tor_controlconn_failed=Неможливо з'єднатися з портом управління Tor.
torlauncher.tor_failed_to_start=Неможливо запустити Tor.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor не вдалося встановити з'єднання з мережею Tor.
torlauncher.tor_bootstrap_failed_details=%1$S невдало (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Переконайтеся що Tor запущ
torlauncher.error_proxy_addr_missing=Ви повинні вказати IP-адресу або ім'я хоста і порт, щоб налаштувати Tor і використовувати проксі для доступу в Інтернет.
torlauncher.error_proxy_type_missing=Необхідно вибрати тип проксі.
torlauncher.error_bridges_missing=Необхідно задати один або кілька мостів.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=З'єднатися
torlauncher.quit=Вийти
diff --git a/ur/torlauncher.properties b/ur/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ur/torlauncher.properties
+++ b/ur/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/ur_PK/torlauncher.properties b/ur_PK/torlauncher.properties
index 8c84457..eb3eeef 100644
--- a/ur_PK/torlauncher.properties
+++ b/ur_PK/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
torlauncher.quit=چھوڑدیجیے (Quit)
diff --git a/uz/torlauncher.properties b/uz/torlauncher.properties
index 53e1bb4..6f05096 100644
--- a/uz/torlauncher.properties
+++ b/uz/torlauncher.properties
@@ -7,6 +7,7 @@
torlauncher.please_restart_app=Dasturni qayta ishga tushiring
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
torlauncher.tor_failed_to_start=Tor ishga tushirish muvaffaqiyatsiz tugadi.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.torrc_missing=torrc fayli mavjud emas.
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Ulanish
torlauncher.quit=Chiqish
diff --git a/ve/torlauncher.properties b/ve/torlauncher.properties
index d82d688..15f99b2 100644
--- a/ve/torlauncher.properties
+++ b/ve/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/vi/torlauncher.properties b/vi/torlauncher.properties
index 88938b6..150742d 100644
--- a/vi/torlauncher.properties
+++ b/vi/torlauncher.properties
@@ -7,6 +7,7 @@
torlauncher.please_restart_app=Vui lòng khởi động lại ứng dụng này.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
torlauncher.tor_failed_to_start=Chạy Tor thất bại.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor đã thất bại khi thiết lập kết nối đến mạng Tor
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=Hãy chắc chắn rằng Tor đang chạy.
torlauncher.error_proxy_addr_missing=Bạn phải xác định cả hai một địa chỉ IP hay tên máy và số cổng để cấu hình Tor để sử dụng một proxy ủy quyền truy cập vào Liên mạng
torlauncher.error_proxy_type_missing=Bạn phải chọn kiểu proxy.
torlauncher.error_bridges_missing=Bạn phải chỉ dẫn một hoặc nhiều cầu nối.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=Kết nối
torlauncher.quit=Thoát
diff --git a/wa/torlauncher.properties b/wa/torlauncher.properties
index d82d688..15f99b2 100644
--- a/wa/torlauncher.properties
+++ b/wa/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/wo/torlauncher.properties b/wo/torlauncher.properties
index d82d688..15f99b2 100644
--- a/wo/torlauncher.properties
+++ b/wo/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
diff --git a/zh_CN/torlauncher.properties b/zh_CN/torlauncher.properties
index 0f7eaa2..4704cb0 100644
--- a/zh_CN/torlauncher.properties
+++ b/zh_CN/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor 意外退出。
torlauncher.please_restart_app=请重启该应用程序。
torlauncher.tor_controlconn_failed=无法连接 Tor 控制端口。
torlauncher.tor_failed_to_start=Tor 无法启动。
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=Tor 建立到 Tor 网络的连接失败。
torlauncher.tor_bootstrap_failed_details=%1$S 失败 (%2$S)。
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=请确保 Tor 正在运行。
torlauncher.error_proxy_addr_missing=为了将 Tor 配置为使用代理访问互联网,必须指定 IP 地址或主机名以及端口号。
torlauncher.error_proxy_type_missing=必须选择代理类型。
torlauncher.error_bridges_missing=必须指定一个或多个网桥。
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=连接
torlauncher.quit=退出
diff --git a/zh_HK/torlauncher.properties b/zh_HK/torlauncher.properties
index 1e9952c..a0692ad 100644
--- a/zh_HK/torlauncher.properties
+++ b/zh_HK/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
torlauncher.quit=離開
diff --git a/zh_TW/torlauncher.properties b/zh_TW/torlauncher.properties
index 5f4bdba..c1e5ea7 100644
--- a/zh_TW/torlauncher.properties
+++ b/zh_TW/torlauncher.properties
@@ -7,6 +7,7 @@ torlauncher.tor_exited=Tor 未預期的關閉。
torlauncher.please_restart_app=請重新啟動應用程式。
torlauncher.tor_controlconn_failed=無法連結至 Tor 控制連接埠。
torlauncher.tor_failed_to_start=Tor 啟動失敗
+# torlauncher.tor_control_failed=Failed to take control of Tor.
torlauncher.tor_bootstrap_failed=建立 Tor 網絡連結失敗。
torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。
@@ -23,6 +24,10 @@ torlauncher.ensure_tor_is_running=請確定 Tor 正在執行。
torlauncher.error_proxy_addr_missing=想要設定 Tor 透過 Proxy 存取網路,您必須指定一個 IP 位置或主機名稱、以及連接埠號碼。
torlauncher.error_proxy_type_missing=您必須選擇代理伺服器類型。
torlauncher.error_bridges_missing=您必須指定一或多個橋接。
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
torlauncher.connect=連接
torlauncher.quit=離開
diff --git a/zu/torlauncher.properties b/zu/torlauncher.properties
index d82d688..15f99b2 100644
--- a/zu/torlauncher.properties
+++ b/zu/torlauncher.properties
@@ -7,6 +7,7 @@
# torlauncher.please_restart_app=Please restart this application.
# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
@@ -23,6 +24,10 @@
# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
# torlauncher.error_proxy_type_missing=You must select the proxy type.
# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges.
+# torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings.
+
+# torlauncher.recommended_bridge=(recommended)
# torlauncher.connect=Connect
# torlauncher.quit=Quit
1
0

28 Feb '14
commit 66ac308bf1bf59bec0c94e6adcb09a744805c976
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Feb 28 08:45:28 2014 +0000
Update translations for torbirdy
---
zh_TW/torbirdy.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/zh_TW/torbirdy.properties b/zh_TW/torbirdy.properties
index 77016cd..ddd6120 100644
--- a/zh_TW/torbirdy.properties
+++ b/zh_TW/torbirdy.properties
@@ -10,10 +10,10 @@ torbirdy.disabled=TorBirdy: 停用!
# torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration wizard to protect your anonymity.\n\nThe recommended security settings for %S have been set.\n\nYou can now configure the other account settings manually.
# torbirdy.email.advanced=Please note that changing the advanced settings of TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of what you are doing.
-# torbirdy.email.advanced.nextwarning=Show this warning next time
-# torbirdy.email.advanced.title=TorBirdy Advanced Settings
+torbirdy.email.advanced.nextwarning=下次顯示這個警告
+torbirdy.email.advanced.title=TorBirdy 進階設定
# torbirdy.restart=You must restart Thunderbird for the time zone preference to take effect.
# torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your anonymity, TorBirdy will enforce the Thunderbird settings it has set, preventing them from being changed by you or by any add-on. There are some settings that can be changed and those are accessed through TorBirdy's preferences dialog. When TorBirdy is uninstalled or disabled, all settings that it changes are reset to their default values (the values prior to TorBirdy's install).\n\nIf you are a new user, it is recommended that you read through the TorBirdy website to understand what we are trying to accomplish with TorBirdy for our users.
-# torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy
+torbirdy.website= https://trac.torproject.org/projects/tor/wiki/torbirdy
1
0
commit 0e5010a5d72cab1352c268c5470e6acf337a1419
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Feb 28 08:45:08 2014 +0000
Update translations for tsum
---
zh_TW/short-user-manual_zh_TW_noimg.xhtml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/zh_TW/short-user-manual_zh_TW_noimg.xhtml b/zh_TW/short-user-manual_zh_TW_noimg.xhtml
index 681e5b7..e68c5c1 100644
--- a/zh_TW/short-user-manual_zh_TW_noimg.xhtml
+++ b/zh_TW/short-user-manual_zh_TW_noimg.xhtml
@@ -4,18 +4,18 @@
<title/>
</head>
<body>
- <h1 id="the-short-user-manual">The Short User Manual</h1>
+ <h1 id="the-short-user-manual">簡短使用說明書</h1>
<p>This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email help(a)rt.torproject.org.</p>
<p>Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away.</p>
- <h2 id="how-tor-works">How Tor works</h2>
+ <h2 id="how-tor-works">Tor 如何運作</h2>
<p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p>
<p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay.</p>
<p>Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination.</p>
<p>If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <strong>https</strong>://torproject.org/, not <strong>http</strong>://torproject.org/).</p>
- <h2 id="how-to-download-tor">How to download Tor</h2>
+ <h2 id="how-to-download-tor">如何下載 Tor</h2>
<p>The bundle we recommend to most users is the <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. This bundle contains a browser preconfigured to safely browse the Internet through Tor, and requires no installation. You download the bundle, extract the archive, and start Tor.</p>
<p>There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder.</p>
- <h3 id="how-to-get-tor-via-email">How to get Tor via email</h3>
+ <h3 id="how-to-get-tor-via-email">如何通過電子郵件得到 Tor</h3>
<p>To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with <strong>windows</strong> in the body of the message. You can leave the subject blank.</p>
<p>You can also request the Tor Browser Bundle for Mac OS X (write <strong>macos-i386</strong>), and Linux (write <strong>linux-i386</strong> for 32-bit systems or <strong>linux-x86_64</strong> for 64-bit systems).</p>
<p>If you want a translated version of Tor, write <strong>help</strong> instead. You will then receive an email with instructions and a list of available languages.</p>
1
0

[tor-browser-bundle/master] Bug #10104: Use new rebased gitian checkout.
by mikeperry@torproject.org 28 Feb '14
by mikeperry@torproject.org 28 Feb '14
28 Feb '14
commit 014725628fdb30d612c5276581eb70202d1d1c59
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Wed Feb 26 12:56:47 2014 -0800
Bug #10104: Use new rebased gitian checkout.
Should fix LXC builds.
---
gitian/versions | 2 +-
gitian/versions.alpha | 2 +-
gitian/versions.beta | 2 +-
gitian/versions.nightly | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gitian/versions b/gitian/versions
index a29a4ba..389e3e1 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -17,7 +17,7 @@ OBFSPROXY_TAG=obfsproxy-0.2.4
FLASHPROXY_TAG=1.6
LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
-GITIAN_TAG=tor-browser-builder-3.0-4
+GITIAN_TAG=tor-browser-builder-3.x-5
OPENSSL_VER=1.0.1f
GMP_VER=5.1.3
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 55efa38..87b68ca 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -17,7 +17,7 @@ OBFSPROXY_TAG=obfsproxy-0.2.4
FLASHPROXY_TAG=1.6
LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
-GITIAN_TAG=tor-browser-builder-3.0-4
+GITIAN_TAG=tor-browser-builder-3.x-5
OPENSSL_VER=1.0.1f
GMP_VER=5.1.3
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 241e855..d68854a 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -19,7 +19,7 @@ FLASHPROXY_TAG=1.6
FTEPROXY_TAG=0.2.6
LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
-GITIAN_TAG=tor-browser-builder-3.0-4
+GITIAN_TAG=tor-browser-builder-3.x-5
OPENSSL_VER=1.0.1f
GMP_VER=5.1.3
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 5a8fcd0..0c7f50d 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -17,7 +17,7 @@ OBFSPROXY_TAG=master
FLASHPROXY_TAG=master
LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
-GITIAN_TAG=tor-browser-builder-3.0-4
+GITIAN_TAG=tor-browser-builder-3.x-5
OPENSSL_VER=1.0.1f
GMP_VER=5.1.3
1
0

[tor-browser-bundle/master] Use versions file itself to decide which locales to build.
by mikeperry@torproject.org 28 Feb '14
by mikeperry@torproject.org 28 Feb '14
28 Feb '14
commit 3618f8600080f675a4592c5a7667c349bb3364a2
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Thu Feb 27 21:53:10 2014 -0800
Use versions file itself to decide which locales to build.
---
gitian/descriptors/linux/gitian-bundle.yml | 6 +++---
gitian/descriptors/windows/gitian-bundle.yml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml
index 958fb65..36c2efc 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -134,11 +134,11 @@ script: |
#
unzip linux-langpacks.zip
cd linux-langpacks
- for i in *.xpi
+ for LANG in $BUNDLE_LOCALES
do
- LANG=`basename $i .xpi`
+ xpi=$LANG.xpi
cp -a ../tor-browser ../tor-browser_$LANG
- cp $i ../tor-browser_$LANG/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi
+ cp $xpi ../tor-browser_$LANG/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi
cd ..
# FF24 puts the prefs in a different jar:
diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml
index f8e6d1b..8cf2f05 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -131,10 +131,10 @@ script: |
#
unzip ../win32-langpacks.zip
cd win32-langpacks
- for i in *.xpi
+ for LANG in $BUNDLE_LOCALES
do
- LANG=`basename $i .xpi`
- cp $i ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi
+ xpi=$LANG.xpi
+ cp $xpi ../"Tor Browser"/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi
cd ..
# FF24 puts the prefs in a different jar:
1
0

28 Feb '14
commit fb91914f6901509eab2daaa11b607a789646393d
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Thu Feb 27 21:46:23 2014 -0800
Bump versions for Tor Launcher.
---
gitian/versions.alpha | 2 +-
gitian/versions.beta | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 87b68ca..f190d5a 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -5,7 +5,7 @@ VERIFY_TAGS=1
TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2
TOR_TAG=tor-0.2.5.1-alpha
-TORLAUNCHER_TAG=0.2.4.4
+TORLAUNCHER_TAG=0.2.5.0
TORBUTTON_TAG=1.6.6.0
HTTPSE_TAG=3.4.5
NSIS_TAG=v0.1
diff --git a/gitian/versions.beta b/gitian/versions.beta
index d68854a..a2c91b9 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -1,4 +1,4 @@
-TORBROWSER_VERSION=3.6-beta-2
+TORBROWSER_VERSION=3.6-beta-1
BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN"
BUILD_PT_BUNDLES=1
@@ -6,7 +6,7 @@ VERIFY_TAGS=1
TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2
TOR_TAG=tor-0.2.4.20
-TORLAUNCHER_TAG=0.2.4.4
+TORLAUNCHER_TAG=0.2.5.0
TORBUTTON_TAG=1.6.6.0
HTTPSE_TAG=3.4.5
NSIS_TAG=v0.1
1
0

[tor-browser-bundle/master] Bug #4261: Generate DMGs for MacOS.
by mikeperry@torproject.org 28 Feb '14
by mikeperry@torproject.org 28 Feb '14
28 Feb '14
commit 535c7ebbdcdc0c5def8ec640e2f8626fb7396f78
Author: Mike Perry <mikeperry-git(a)torproject.org>
Date: Wed Feb 26 10:45:24 2014 -0800
Bug #4261: Generate DMGs for MacOS.
Compressed with bzip2 (UDBZ) and complete with a background and desktop
shortcut!
---
Bundle-Data/mac.dmg/.DS_Store | Bin 0 -> 12292 bytes
Bundle-Data/mac.dmg/._Desktop | Bin 0 -> 303592 bytes
Bundle-Data/mac.dmg/.background/background.png | Bin 0 -> 50020 bytes
Bundle-Data/mac.dmg/Desktop | Bin 0 -> 300120 bytes
gitian/build-helpers/ddmg.sh | 28 ++++++
gitian/descriptors/mac/gitian-bundle.yml | 108 ++++++++++++++++--------
gitian/fetch-inputs.sh | 1 +
gitian/mkbundle-mac.sh | 7 +-
gitian/versions | 1 +
gitian/versions.alpha | 1 +
gitian/versions.beta | 1 +
gitian/versions.diff | 45 ++++++++++
gitian/versions.nightly | 1 +
13 files changed, 156 insertions(+), 37 deletions(-)
diff --git a/Bundle-Data/mac.dmg/.DS_Store b/Bundle-Data/mac.dmg/.DS_Store
new file mode 100644
index 0000000..9bec18c
Binary files /dev/null and b/Bundle-Data/mac.dmg/.DS_Store differ
diff --git a/Bundle-Data/mac.dmg/._Desktop b/Bundle-Data/mac.dmg/._Desktop
new file mode 100644
index 0000000..a1e0b7f
Binary files /dev/null and b/Bundle-Data/mac.dmg/._Desktop differ
diff --git a/Bundle-Data/mac.dmg/.background/background.png b/Bundle-Data/mac.dmg/.background/background.png
new file mode 100644
index 0000000..94e4584
Binary files /dev/null and b/Bundle-Data/mac.dmg/.background/background.png differ
diff --git a/Bundle-Data/mac.dmg/Desktop b/Bundle-Data/mac.dmg/Desktop
new file mode 100644
index 0000000..3c88450
Binary files /dev/null and b/Bundle-Data/mac.dmg/Desktop differ
diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh
new file mode 100755
index 0000000..f9f54da
--- /dev/null
+++ b/gitian/build-helpers/ddmg.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Crappy deterministic dmg wrapper
+export LC_ALL=C
+
+DMGFILE=$1
+shift
+
+# Attempt to normalize inode ordering..
+# XXX: the genisoimage -path-list argument seems broken
+mkdir -p ~/build/tmp/dmg
+cd $@
+for i in `find . | sort`
+do
+ if [ -d $i ];
+ then
+ mkdir -p ~/build/tmp/dmg/$i
+ else
+ cp --parents -d --preserve=all $i ~/build/tmp/dmg/
+ fi
+done
+
+find ~/build/tmp/dmg -executable -exec chmod 700 {} \;
+find ~/build/tmp/dmg ! -executable -exec chmod 600 {} \;
+
+genisoimage -D -V "Tor Browser" -no-pad -R -apple -o tbb-uncompressed.dmg ~/build/tmp/dmg/
+~/build/libdmg-hfsplus/dmg/dmg dmg tbb-uncompressed.dmg $DMGFILE
+rm tbb-uncompressed.dmg
+rm -rf ~/build/tmp/dmg/
diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index 428dbee..da7e918 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -12,6 +12,11 @@ packages:
- "nsis"
- "faketime"
- "python"
+- "hfsprogs"
+- "genisoimage"
+- "cmake"
+- "zlib1g-dev"
+- "libbz2-dev"
reference_datetime: "2000-01-01 00:00:00"
remotes:
- "url": "https://git.torproject.org/tor-launcher.git"
@@ -20,6 +25,8 @@ remotes:
"dir": "torbutton"
- "url": "https://git.torproject.org/https-everywhere.git"
"dir": "https-everywhere"
+- "url": "https://github.com/vasi/libdmg-hfsplus.git"
+ "dir": "libdmg-hfsplus"
files:
# TODO: Can we use an env for this file+version??
- "tor-browser-mac32-gbuilt.zip"
@@ -28,9 +35,11 @@ files:
- "torrc-defaults-appendix-mac"
- "relativelink-src.zip"
- "mac-skeleton.zip"
+- "mac-dmg.zip"
- "mac-langpacks.zip"
- "noscript(a)noscript.net.xpi"
- "dzip.sh"
+- "ddmg.sh"
- "bare-version"
- "bundle.inputs"
- "versions"
@@ -46,12 +55,20 @@ script: |
export TORBROWSER_VERSION=`cat bare-version`
export LC_ALL=C
umask 0022
+ if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then
+ export TORBROWSER_APP="TorBrowserBundle"
+ export TORBROWSER_NAME="TorBrowserBundle"
+ else
+ export TORBROWSER_APP="TorBrowser"
+ export TORBROWSER_NAME="TorBrowserBundle"
+ fi
#
mkdir -p $OUTDIR/
- mkdir -p TorBrowserBundle.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org
- mkdir -p TorBrowserBundle.app/Data/Browser/Caches
- mkdir -p TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/
- mkdir -p TorBrowserBundle.app/Docs/sources
+ mkdir -p dmg
+ mkdir -p $TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org
+ mkdir -p $TORBROWSER_NAME.app/Data/Browser/Caches
+ mkdir -p $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/
+ mkdir -p $TORBROWSER_NAME.app/Docs/sources
#
cd tor-launcher
make clean
@@ -62,7 +79,7 @@ script: |
unzip ../*.xpi
rm ../*.xpi
~/build/dzip.sh ../tor-launcher(a)torproject.org.xpi .
- mv ../tor-launcher(a)torproject.org.xpi ../../../TorBrowserBundle.app/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi
+ mv ../tor-launcher(a)torproject.org.xpi ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/tor-launcher(a)torproject.org.xpi
cd ../../../
#
cd torbutton
@@ -74,7 +91,7 @@ script: |
unzip ../*.xpi
rm ../*.xpi
~/build/dzip.sh ../torbutton(a)torproject.org.xpi .
- mv ../torbutton(a)torproject.org.xpi ../../../TorBrowserBundle.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi
+ mv ../torbutton(a)torproject.org.xpi ../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/torbutton(a)torproject.org.xpi
cd ../../../
#
cd https-everywhere
@@ -82,11 +99,11 @@ script: |
# makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
rm -f .git/refs/heads/master
./makexpi.sh
- cp ./pkg/*.xpi ../TorBrowserBundle.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi
+ cp ./pkg/*.xpi ../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywhere(a)eff.org.xpi
cd ..
#
- cp *.xpi ./TorBrowserBundle.app/Data/Browser/profile.default/extensions/
- cd ./TorBrowserBundle.app/Data/Browser/profile.default/extensions/
+ cp *.xpi ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/
+ cd ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/
mv noscript(a)noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
cd https-everywhere(a)eff.org
unzip ../https-everywhere(a)eff.org.xpi
@@ -95,14 +112,14 @@ script: |
#
unzip relativelink-src.zip
cd RelativeLink
- cp RelativeLinkOSX.sh ../TorBrowserBundle.app/Contents/MacOS/TorBrowserBundle
+ cp RelativeLinkOSX.sh ../$TORBROWSER_NAME.app/Contents/MacOS/TorBrowserBundle
cd ..
#
unzip ~/build/tor-mac$GBUILD_BITS-gbuilt.zip
if [ $BUILD_PT_BUNDLES ]; then
unzip ~/build/pluggable-transports-mac$GBUILD_BITS-gbuilt.zip
fi
- cd TorBrowserBundle.app
+ cd $TORBROWSER_NAME.app
unzip ~/build/mac-skeleton.zip
sed -i -e "s/TORBROWSER_VERSION/$TORBROWSER_VERSION/" Contents/Info.plist
unzip ~/build/tbb-docs.zip
@@ -117,40 +134,54 @@ script: |
cd ../../../
#
# Copy reproducibility info
- cp versions TorBrowserBundle.app/Docs/sources/
- cp bundle.inputs TorBrowserBundle.app/Docs/sources/bundle.inputs
+ cp versions $TORBROWSER_NAME.app/Docs/sources/
+ cp bundle.inputs $TORBROWSER_NAME.app/Docs/sources/bundle.inputs
#
- # FF24 puts the prefs in a different jar:
- if [ -f TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then
- pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/
- else
- pushd TorBrowserBundle.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/
- fi
+ # Set up DMG skeleton
+ cd libdmg-hfsplus
+ cmake CMakeLists.txt
+ cd dmg
+ make
+ cd ../../
+ cd dmg
+ unzip ~/build/mac-dmg.zip
+ cd ..
+ #
+ # FF24 puts the prefs in the browser jar:
+ pushd $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/
unzip omni.ja defaults/preferences/000-tor-browser.js
cp defaults/preferences/000-tor-browser.js ~/build/
echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js
zip -Xm omni.ja defaults/preferences/000-tor-browser.js
popd
- # XXX: DMG plz
- cp -a TorBrowserBundle.app TorBrowserBundle_en-US.app
- ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip TorBrowserBundle_en-US.app
- rm -rf TorBrowserBundle_en-US.app
+ #
+ if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then
+ cp -a ~/build/$TORBROWSER_NAME.app ~/build/${TORBROWSER_NAME}_en-US.app
+ ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip ${TORBROWSER_NAME}_en-US.app
+ rm -rf ~/build/${TORBROWSER_NAME}_en-US.app
+ else
+ cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app
+ ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg
+ rm -rf ~/build/dmg/$TORBROWSER_APP.app
+ fi
+ mv $TORBROWSER_NAME.app ${TORBROWSER_NAME}_plain.app
#
unzip mac-langpacks.zip
cd mac-langpacks
- for i in *.xpi
+ for LANG in $BUNDLE_LOCALES
do
- LANG=`basename $i .xpi`
- cp -a ../TorBrowserBundle.app ../TorBrowserBundle_$LANG.app
- cp $i ../TorBrowserBundle_$LANG.app/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi
- cd ..
-
- # FF24 puts the prefs in a different jar:
- if [ -f TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/omni.ja ]; then
- pushd TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/
+ xpi=$LANG.xpi
+ if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then
+ DEST=${TORBROWSER_APP}_$LANG
else
- pushd TorBrowserBundle_$LANG.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/
+ DEST=$TORBROWSER_APP
fi
+ cp -a ../${TORBROWSER_NAME}_plain.app ~/build/dmg/$DEST.app
+ cp $xpi ~/build/dmg/$DEST.app/Data/Browser/profile.default/extensions/langpack-$LANG(a)firefox.mozilla.org.xpi
+ cd ..
+
+ # FF24 puts the prefs in the browser jar:
+ pushd ~/build/dmg/$DEST.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/
mkdir -p defaults/preferences
cp ~/build/000-tor-browser.js defaults/preferences/000-tor-browser.js
@@ -158,8 +189,15 @@ script: |
zip -Xm omni.ja defaults/preferences/000-tor-browser.js
popd
- ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip TorBrowserBundle_$LANG.app
- rm -rf TorBrowserBundle_$LANG.app
+ if [ ${TORBROWSER_VERSION::3} == "3.5" ]; then
+ pushd ~/build/dmg/
+ ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.zip $DEST.app
+ rm -rf TorBrowserBundle_$LANG.app
+ popd
+ else
+ ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_$LANG.dmg ~/build/dmg/
+ rm -rf ~/build/dmg/$DEST.app
+ fi
cd mac-langpacks
done
cd ..
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index d757f4d..c2bf811 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -292,6 +292,7 @@ pyptlib https://git.torproject.org/pluggable-transports/pyptlib.gi
obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git
flashproxy https://git.torproject.org/flashproxy.git
fteproxy https://github.com/kpdyer/fteproxy.git
+libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG
EOF
exit 0
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index e8b3aa1..d6bffce 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -62,6 +62,9 @@ cp mac-tor.sh $GITIAN_DIR/inputs/
cd mac
rm -f $GITIAN_DIR/inputs/mac-skeleton.zip
$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-skeleton.zip .
+cd ../mac.dmg
+rm -f $GITIAN_DIR/inputs/mac-dmg.zip
+$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-dmg.zip .
cd $WRAPPER_DIR
@@ -155,7 +158,7 @@ then
cd $WRAPPER_DIR && ./record-inputs.sh $VERSIONS_FILE && cd $GITIAN_DIR
- ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml
+ ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libdmg-hfsplus=$LIBDMG_TAG,https-everywhere=$HTTPSE_TAG,torbutton=$TORBUTTON_TAG,tor-launcher=$TORLAUNCHER_TAG $DESCRIPTOR_DIR/mac/gitian-bundle.yml
if [ $? -ne 0 ];
then
#mv var/build.log ./bundle-fail-mac.log.`date +%Y%m%d%H%M%S`
@@ -164,7 +167,7 @@ then
#cp -a build/out/*.dmg $WRAPPER_DIR
mkdir -p $WRAPPER_DIR/$TORBROWSER_VERSION/
- cp -a build/out/*.zip $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1
+ cp -a build/out/* $WRAPPER_DIR/$TORBROWSER_VERSION/ || exit 1
touch $GITIAN_DIR/inputs/bundle-mac.gbuilt
else
echo
diff --git a/gitian/versions b/gitian/versions
index f3dfe9d..a29a4ba 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -15,6 +15,7 @@ MINGW_REV=6184
PYPTLIB_TAG=pyptlib-0.0.5
OBFSPROXY_TAG=obfsproxy-0.2.4
FLASHPROXY_TAG=1.6
+LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
GITIAN_TAG=tor-browser-builder-3.0-4
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 0741b8f..55efa38 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -15,6 +15,7 @@ MINGW_REV=6184
PYPTLIB_TAG=pyptlib-0.0.5
OBFSPROXY_TAG=obfsproxy-0.2.4
FLASHPROXY_TAG=1.6
+LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
GITIAN_TAG=tor-browser-builder-3.0-4
diff --git a/gitian/versions.beta b/gitian/versions.beta
index 6ac5a34..241e855 100755
--- a/gitian/versions.beta
+++ b/gitian/versions.beta
@@ -17,6 +17,7 @@ PYPTLIB_TAG=pyptlib-0.0.5
OBFSPROXY_TAG=obfsproxy-0.2.4
FLASHPROXY_TAG=1.6
FTEPROXY_TAG=0.2.6
+LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
GITIAN_TAG=tor-browser-builder-3.0-4
diff --git a/gitian/versions.diff b/gitian/versions.diff
new file mode 100644
index 0000000..69001a8
--- /dev/null
+++ b/gitian/versions.diff
@@ -0,0 +1,45 @@
+diff --git a/gitian/versions.nightly b/gitian/versions.nightly
+index b9b5835..f3dfe9d 100755
+--- a/gitian/versions.nightly
++++ b/gitian/versions.nightly
+@@ -12,13 +12,14 @@ NSIS_TAG=v0.1
+ ZLIB_TAG=v1.2.8
+ LIBEVENT_TAG=release-2.0.21-stable
+ MINGW_REV=6184
+-PYPTLIB_TAG=pyptlib-0.0.4
+-OBFSPROXY_TAG=obfsproxy-0.2.3
++PYPTLIB_TAG=pyptlib-0.0.5
++OBFSPROXY_TAG=obfsproxy-0.2.4
+ FLASHPROXY_TAG=1.6
+
+ GITIAN_TAG=tor-browser-builder-3.0-4
+
+ OPENSSL_VER=1.0.1f
++GMP_VER=5.1.3
+ FIREFOX_LANG_VER=24.3.0esr
+ BINUTILS_VER=2.22
+ GCC_VER=4.6.3
+@@ -33,6 +34,7 @@ SETUPTOOLS_VER=1.4
+
+ ## File names for the source packages
+ OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
++GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
+ NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi
+ TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
+ OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb
+@@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz
+
+ # Hashes for packages with weak sigs or no sigs
+ OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a
++GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
+ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
+ TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
+ NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1
+@@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39
+
+ ## Non-git package URLs
+ OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE}
++GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE}
+ TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T…
+ OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX…
+ BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 5e6bc6f..5a8fcd0 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -15,6 +15,7 @@ MINGW_REV=6184
PYPTLIB_TAG=master
OBFSPROXY_TAG=master
FLASHPROXY_TAG=master
+LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
GITIAN_TAG=tor-browser-builder-3.0-4
1
0

[tor-browser-bundle/master] Put the "Tor" subdirectory at the head of PATH for DLL access.
by mikeperry@torproject.org 28 Feb '14
by mikeperry@torproject.org 28 Feb '14
28 Feb '14
commit fadb9d2edb3ded8b66e7b2da3182bf78af329339
Author: David Fifield <david(a)bamsoftware.com>
Date: Thu Feb 20 19:15:17 2014 +0000
Put the "Tor" subdirectory at the head of PATH for DLL access.
Pluggable transport executables are in their own subdirectory,
PluggableTransports, but they need to have access to the OpenSSL DLLs.
Adding the directory containing the DLLs to PATH makes them visible. I
put the directory at the front of PATH and not the end, just in case
there is a libeay32.dll or ssleay32.dll somewhere else on the system.
https://trac.torproject.org/projects/tor/ticket/10845
---
RelativeLink/RelativeLink.c | 123 +++++++++++++++++++++++++++++++++++++++++--
1 file changed, 120 insertions(+), 3 deletions(-)
diff --git a/RelativeLink/RelativeLink.c b/RelativeLink/RelativeLink.c
index bae4647..9a6c9f5 100755
--- a/RelativeLink/RelativeLink.c
+++ b/RelativeLink/RelativeLink.c
@@ -1,4 +1,6 @@
#include <windows.h>
+#include <stdio.h>
+#include <tchar.h>
//
// RelativeLink.c
@@ -22,8 +24,119 @@
// Put it in the proper place.
//
-int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+// Get the absolute path to a subdirectory of the current directory; i.e.
+// "C:\cwd\reldir". Returns a malloc-allocated string or NULL on error.
+LPTSTR GetSubdirectory(LPCTSTR reldir)
+{
+ DWORD bufsize, n;
+ int len;
+ LPTSTR cwd, subdir;
+
+ cwd = NULL;
+ subdir = NULL;
+
+ // The first call to GetCurrentDirectory gets the buffer size; the second
+ // fills the buffer.
+ bufsize = GetCurrentDirectory(0, NULL);
+ if (bufsize == 0)
+ goto bail;
+ cwd = (LPTSTR) malloc(bufsize * sizeof(TCHAR));
+ if (cwd == NULL)
+ goto bail;
+ n = GetCurrentDirectory(bufsize, cwd);
+ if (n == 0 || n >= bufsize)
+ goto bail;
+
+ bufsize = _tcslen(cwd) + 1 + _tcslen(reldir) + 1;
+ subdir = (LPTSTR) malloc(bufsize * sizeof(TCHAR));
+ if (subdir == NULL)
+ goto bail;
+ len = _sntprintf(subdir, bufsize, "%s\\%s", cwd, reldir);
+ if (len < 0 || (DWORD) len >= bufsize)
+ goto bail;
+
+ free(cwd);
+ return subdir;
+
+bail:
+ if (cwd != NULL)
+ free(cwd);
+ if (subdir != NULL)
+ free(subdir);
+ return NULL;
+}
+
+// Add a directory to the beginning of the PATH environment variable. Returns 0
+// on failure, nonzero on success.
+// http://msdn.microsoft.com/en-us/library/windows/desktop/ms682009%28v=vs.85%…
+DWORD PrependToPath(LPCTSTR dir)
+{
+ DWORD bufsize, n, rc, err;
+ int len;
+ LPTSTR path, value;
+
+ path = NULL;
+ value = NULL;
+
+ // First find out how big a buffer we need.
+ bufsize = GetEnvironmentVariable(TEXT ("PATH"), NULL, 0);
+ if (bufsize == 0)
+ {
+ err = GetLastError();
+ if (err == ERROR_ENVVAR_NOT_FOUND)
+ // If the variable doesn't yet exist, just set it and return.
+ return SetEnvironmentVariable(TEXT ("PATH"), dir);
+ else
+ goto bail;
+ }
+ // Now that we know the buffer size, get the value.
+ path = (LPTSTR) malloc(bufsize * sizeof(TCHAR));
+ if (path == NULL)
+ goto bail;
+ n = GetEnvironmentVariable(TEXT ("PATH"), path, bufsize);
+ if (n == 0 || n >= bufsize)
+ goto bail;
+
+ bufsize = _tcslen(dir) + 1 + _tcslen(path) + 1;
+ value = (LPTSTR) malloc(bufsize * sizeof(TCHAR));
+ if (value == NULL)
+ goto bail;
+ len = _sntprintf(value, bufsize, "%s;%s", dir, path);
+ if (len < 0 || (DWORD) len >= bufsize)
+ goto bail;
+
+ rc = SetEnvironmentVariable(TEXT ("PATH"), value);
+ if (rc == 0)
+ goto bail;
+
+ free(path);
+ free(value);
+ return 1;
+
+bail:
+ if (path != NULL)
+ free(path);
+ if (value != NULL)
+ free(value);
+ return 0;
+}
+
+// Returns 0 on failure and nonzero on success.
+DWORD StartTorBrowser(void)
{
+ TCHAR *TorDir;
+ DWORD rc;
+ // Put the Tor subdirectory at the beginning of PATH so that pluggable
+ // transports (in their own subdirectory) can access DLLs.
+ // https://trac.torproject.org/projects/tor/ticket/10845
+ TorDir = GetSubdirectory(TEXT ("Tor"));
+ if (TorDir == NULL)
+ return 0;
+ rc = PrependToPath(TorDir);
+ free(TorDir);
+ if (rc == 0)
+ return 0;
+
STARTUPINFO si;
PROCESS_INFORMATION pi;
@@ -34,8 +147,12 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
TCHAR *ProgramToStart;
ProgramToStart = TEXT ("Browser\\firefox.exe -no-remote -profile .\\Data\\Browser\\profile.default\\");
- if( !CreateProcess(
- NULL, ProgramToStart, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ))
+ return CreateProcess( NULL, ProgramToStart, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi );
+}
+
+int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+{
+ if (!StartTorBrowser())
{
MessageBox ( NULL, TEXT ("Unable to start Tor Browser"), NULL, MB_OK);
return -1;
1
0