[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [translation/tba-torbrowserstringsdtd] new file for TBA, ref: #30015
commit 52910ac5cc9ac34c69aad391ba17dd9f1a9873f2
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date: Thu Apr 4 08:03:50 2019 +0000
new file for TBA, ref: #30015
---
am/android_strings.dtd | 25 ----------
ar/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
az/android_strings.dtd | 25 ----------
be/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
bg/android_strings.dtd | 25 ----------
.../torbrowser_strings.dtd | 34 ++++++++++++-
bn_BD/android_strings.dtd | 25 ----------
bo/android_strings.dtd | 25 ----------
ca/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
cs/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
cy/android_strings.dtd | 25 ----------
da/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
de/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
el/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
.../torbrowser_strings.dtd | 32 ++++++++++++
...{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
en/torbrowser_strings.dtd | 57 ++++++++++++++++++++++
.../torbrowser_strings.dtd | 32 ++++++++++++
.../torbrowser_strings.dtd | 32 ++++++++++++
et/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
eu/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
fa/{android_strings.dtd => torbrowser_strings.dtd} | 34 ++++++++++++-
fi/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
fr/{android_strings.dtd => torbrowser_strings.dtd} | 34 ++++++++++++-
.../torbrowser_strings.dtd | 32 ++++++++++++
he/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
hi/android_strings.dtd | 25 ----------
.../torbrowser_strings.dtd | 32 ++++++++++++
hr/{android_strings.dtd => torbrowser_strings.dtd} | 38 +++++++++++++--
hu/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
id/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
is/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
it/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
ja/{android_strings.dtd => torbrowser_strings.dtd} | 34 ++++++++++++-
ka/{android_strings.dtd => torbrowser_strings.dtd} | 34 ++++++++++++-
kk/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
ko/android_strings.dtd | 25 ----------
ky/android_strings.dtd | 25 ----------
lt/android_strings.dtd | 25 ----------
lt/torbrowser_strings.dtd | 57 ++++++++++++++++++++++
lv/android_strings.dtd | 25 ----------
mk/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
my/android_strings.dtd | 25 ----------
.../torbrowser_strings.dtd | 32 ++++++++++++
nl/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
pl/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
.../torbrowser_strings.dtd | 32 ++++++++++++
.../torbrowser_strings.dtd | 38 +++++++++++++--
pt/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
ro/{android_strings.dtd => torbrowser_strings.dtd} | 34 ++++++++++++-
ru/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
sk/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
sl/android_strings.dtd | 25 ----------
sl_SI/android_strings.dtd | 25 ----------
sq/android_strings.dtd | 25 ----------
.../torbrowser_strings.dtd | 32 ++++++++++++
ta/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
tg/android_strings.dtd | 25 ----------
tk/android_strings.dtd | 25 ----------
tr/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
uk/android_strings.dtd | 25 ----------
uz/{android_strings.dtd => torbrowser_strings.dtd} | 32 ++++++++++++
vi/android_strings.dtd | 25 ----------
.../torbrowser_strings.dtd | 34 ++++++++++++-
.../torbrowser_strings.dtd | 34 ++++++++++++-
65 files changed, 1536 insertions(+), 489 deletions(-)
diff --git a/am/android_strings.dtd b/am/android_strings.dtd
deleted file mode 100644
index c075ed15f..000000000
--- a/am/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "á?¥á??á?³á?? á?°á??á?? á??á?¡ ">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "á??á??á??á??á?µ">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "á??á?£á? ">
-<!ENTITY firstrun_secsettings_tab_title "á?°á??á??á??á?µ ">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "á??á?£á? ">
-<!ENTITY firstrun_tips_tab_title "Tips">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "á??á?£á? ">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/ar/android_strings.dtd b/ar/torbrowser_strings.dtd
similarity index 59%
rename from ar/android_strings.dtd
rename to ar/torbrowser_strings.dtd
index 4aace79db..ffd8497bd 100644
--- a/ar/android_strings.dtd
+++ b/ar/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "خدÙ?ات اÙ?بصÙ?Ø© Onion">
<!ENTITY firstrun_onionservices_message "خدÙ?ات اÙ?Ù?Ù?Ù?Ù? Ù?Ù? Ù?Ù?اÙ?ع تÙ?تÙ?Ù? ب .onion Ù? اÙ?تÙ? تÙ?Ù?ØÙ? Ù?زÙ?د Ù?Ù? اÙ?ØÙ?اÙ?Ù? Ù?Ù?Ù?اشرÙ?Ù? Ù? اÙ?زائرÙ?Ù?. Ù? تتضÙ?Ù? ØÙ?اÙ?Ù? اضاÙ?Ù?Ù? ضد اÙ?رÙ?ابÙ?. خدÙ?ات اÙ?Ù?Ù?Ù?Ù? تÙ?Ù?Ù? اÙ? شخص Ù?Ù? تÙ?دÙ?Ù? اÙ?خدÙ?ات Ù? اÙ?Ù?ØتÙ?Ù? بشÙ?Ù? Ù?جÙ?Ù?Ù?">
<!ENTITY firstrun_onionservices_next "اÙ?Ø°Ù?اب Ù?إستÙ?شاÙ?">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "اتصÙ?">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "اÙ?شبÙ?Ø©">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "اÙ?عÙ?Ù?اÙ?:اÙ?Ù?Ù?Ù?Ø°">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/az/android_strings.dtd b/az/android_strings.dtd
deleted file mode 100644
index 7d38456d8..000000000
--- a/az/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "XoÅ? gÉ?lmisiniz">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "MÉ?xfilik ">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "NövbÉ?ti">
-<!ENTITY firstrun_secsettings_tab_title "TÉ?hlükÉ?sizlik">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "NövbÉ?ti">
-<!ENTITY firstrun_tips_tab_title "Tips">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "NövbÉ?ti">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/be/android_strings.dtd b/be/torbrowser_strings.dtd
similarity index 63%
rename from be/android_strings.dtd
rename to be/torbrowser_strings.dtd
index 029ee250c..ae470e20d 100644
--- a/be/android_strings.dtd
+++ b/be/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "СÑ?Ñ?вÑ?Ñ?Ñ? Onion">
<!ENTITY firstrun_onionservices_message "СÑ?Ñ?вÑ?Ñ?Ñ? Onion â?? гÑ?Ñ?а Ñ?айÑ?Ñ?, Ñ?кÑ?Ñ? законÑ?ваÑ?Ñ?Ñ?а на .onion. ЯнÑ? забÑ?Ñ?пеÑ?ваÑ?Ñ?Ñ? дадаÑ?ковÑ?Ñ? абаÑ?онÑ? Ñ?ладалÑ?нÑ?кам Ñ? наведнÑ?кам Ñ?айÑ?аÑ?. Ð?Ñ?Ñ?а Ñ?Ñ?Ñ?Ñ? адзÑ?н заÑ?ад Ñ?Ñ?пÑ?аÑ?Ñ? Ñ?Ñ?нзÑ?Ñ?Ñ?. СÑ?Ñ?вÑ?Ñ?Ñ? Onion дазвалÑ?Ñ?Ñ?Ñ? вам ананÑ?мна пÑ?блÑ?каваÑ?Ñ? канÑ?Ñ?нÑ? Ñ? надаваÑ?Ñ? паÑ?лÑ?гÑ?.">
<!ENTITY firstrun_onionservices_next "Ð?аведаÑ?Ñ?а болей">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Ð?лÑ?Ñ?Ñ?нне">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Network">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/bg/android_strings.dtd b/bg/android_strings.dtd
deleted file mode 100644
index 2c1c621e7..000000000
--- a/bg/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "Welcome">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "Ð?овеÑ?иÑ?елноÑ?Ñ?">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "СледваÑ?">
-<!ENTITY firstrun_secsettings_tab_title "СигÑ?Ñ?ноÑ?Ñ?">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "СледваÑ?">
-<!ENTITY firstrun_tips_tab_title "Сведение">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "СледваÑ?">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/bn/android_strings.dtd b/bn-BD/torbrowser_strings.dtd
similarity index 68%
rename from bn/android_strings.dtd
rename to bn-BD/torbrowser_strings.dtd
index 930b697ef..e26478271 100644
--- a/bn/android_strings.dtd
+++ b/bn-BD/torbrowser_strings.dtd
@@ -11,7 +11,7 @@
<!ENTITY firstrun_tornetwork_title "à¦?à¦?à¦?ি বিà¦?à§?নà§?দà§?রà§?à¦?রণà§?র নà§?à¦?à¦?য়ারà§?à¦? পরিà¦à§?রমণ à¦?রà§? ।">
<!ENTITY firstrun_tornetwork_message "à¦?র বà§?রাà¦?à¦?ার à¦?পনাà¦?à§? বিশà§?বà§?র হাà¦?ার হাà¦?ার সà§?বà§?à¦?à§?à¦?াসà§?বà¦?দà§?র দà§?বারা পরিà¦?ালিত à¦?র নà§?à¦?à¦?য়ারà§?à¦?à§? সà¦?যà§?à¦?à§?ত à¦?রà§?। à¦?à¦?à¦?ি à¦à¦¿à¦ªà¦¿à¦?ন à¦?র থà§?à¦?à§? à¦à¦¿à¦¨à§?ন, à¦?নà§?à¦?ারনà§?à¦?à§?র à¦?পà¦à§?à¦? à¦?রার à¦?নà§?য à¦?পনার à¦?à§?নà¦? বà§?যরà§?থতা বা à¦?à§?নà§?দà§?রà§?য় সতà§?তাà¦?à§? বিশà§?বাস à¦?রতà§? হবà§?।">
<!ENTITY firstrun_tornetwork_next "পরবর�ত�">
-<!ENTITY firstrun_secsettings_tab_title "নিরাপত�তা">
+<!ENTITY firstrun_secsettings_tab_title "স�র��ষা">
<!ENTITY firstrun_secsettings_title "à¦?পনার à¦?à¦à¦¿à¦?à§?à¦?তা পà¦?নà§?দ à¦?রà§?ন ।">
<!ENTITY firstrun_secsettings_message "�মরা �পনার ব�রা��ার নিরাপত�তা �ন�নয়ন�র �ন�য �তিরি��ত স��ি�স প�রদান �রি। �মাদ�র স�র��ষা স��ি�স �পনা�� �মন �পাদান��লি�� ব�ল� �রার �ন�মতি দ�য় যা �পনার �ম�পি��ার� ���রমণ �রার �ন�য ব�যবহার �রা য�ত� পার�।">
<!ENTITY firstrun_secsettings_next "পরবর�ত�">
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "�নি�ন স�বা">
<!ENTITY firstrun_onionservices_message "�নি�ন স�বা সা�� যা ���ি .onion দিয়� শ�ষ হয়যা প�র�াশ� �ব� দর�শ�দ�র �তিরি��ত স�র��ষা প�রদান �র�, স�ন�সরশিপ�র বির�দ�ধ� �তিরি��ত স�র��ষা সহ। �নি�ন স�বা য� ��� ব�নাম� বিষয়বস�ত� �ব� স�বা প�রদান �রার �ন�মতি দ�য়।">
<!ENTITY firstrun_onionservices_next "���সপ�ল�র �রত� যান">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "স�য�� �রা">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "ন���য়ার��">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/bn_BD/android_strings.dtd b/bn_BD/android_strings.dtd
deleted file mode 100644
index e5eb5a097..000000000
--- a/bn_BD/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "স�বা�তম">
-<!ENTITY firstrun_welcome_title "ত�মি র�ডি ।">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "��পন�য়তা">
-<!ENTITY firstrun_privacy_title "Snub ডায়���র � snoopers ।">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "�র ন���য়ার��� যান">
-<!ENTITY firstrun_tornetwork_tab_title "�র ন���য়ার��">
-<!ENTITY firstrun_tornetwork_title "à¦?à¦?à¦?ি বিà¦?à§?নà§?দà§?রà§?à¦?রণà§?র নà§?à¦?à¦?য়ারà§?à¦? পরিà¦à§?রমণ à¦?রà§? ।">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "পরবর�ত�">
-<!ENTITY firstrun_secsettings_tab_title "নিরাপত�তা">
-<!ENTITY firstrun_secsettings_title "à¦?পনার à¦?à¦à¦¿à¦?à§?à¦?তা পà¦?নà§?দ à¦?রà§?ন ।">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "পরবর�ত�">
-<!ENTITY firstrun_tips_tab_title "Tips">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "পরবর�ত�">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/bo/android_strings.dtd b/bo/android_strings.dtd
deleted file mode 100644
index 4e2ae70b7..000000000
--- a/bo/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "�ྱོ����ལེ�ས�">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "�ས���ོ��">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "ར�ེས���">
-<!ENTITY firstrun_secsettings_tab_title "སྲུ��ས�ྱོ��">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "ར�ེས���">
-<!ENTITY firstrun_tips_tab_title "Tips">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "ར�ེས���">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/ca/android_strings.dtd b/ca/torbrowser_strings.dtd
similarity index 56%
rename from ca/android_strings.dtd
rename to ca/torbrowser_strings.dtd
index 5c56c01c6..a0276d6f1 100644
--- a/ca/android_strings.dtd
+++ b/ca/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Serveis Ceba">
<!ENTITY firstrun_onionservices_message "Els serveis ceba són llocs que acaben amb un .onion que proporciona proteccions addicionals a editors i visitants, incloses les mesures addicionals de protecció contra la censura. Els serveis de onion permeten que qualsevol persona proporcioni continguts i serveis de forma anònima. Feu clic a continuació per visitar el lloc de onion de DuckDuckGo.">
<!ENTITY firstrun_onionservices_next "Exploreu">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Connecta">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Xarxa">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/cs/android_strings.dtd b/cs/torbrowser_strings.dtd
similarity index 53%
rename from cs/android_strings.dtd
rename to cs/torbrowser_strings.dtd
index b296d4224..3c1decfba 100644
--- a/cs/android_strings.dtd
+++ b/cs/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Služby Onion.">
<!ENTITY firstrun_onionservices_message "Služby Onion jsou stránky, které konÄ?à na .onion a poskytujà extra ochranu pro autory i návÅ¡tÄ?vnÃky, vÄ?etnÄ? pojistek proti cenzuÅ?e. UmožÅ?ujà každému poskytovat obsah a služby anonymnÄ?.">
<!ENTITY firstrun_onionservices_next "Jdeme na to">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "PÅ?ipojit">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "SÃÅ¥">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "adresa:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/cy/android_strings.dtd b/cy/android_strings.dtd
deleted file mode 100644
index a529ffa29..000000000
--- a/cy/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "Welcome">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "Preifatrwydd">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "Nesaf">
-<!ENTITY firstrun_secsettings_tab_title "Diogeledd">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "Nesaf">
-<!ENTITY firstrun_tips_tab_title "Argymhellion">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "Nesaf">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/da/android_strings.dtd b/da/torbrowser_strings.dtd
similarity index 54%
rename from da/android_strings.dtd
rename to da/torbrowser_strings.dtd
index e5dc84311..8702d6acb 100644
--- a/da/android_strings.dtd
+++ b/da/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Løg-tjenester.">
<!ENTITY firstrun_onionservices_message "Onion-tjenester er steder som slutter med .onion som giver yderligere beskyttelse til udgivere og besøgende, inklusiv tilføjelse af sikkhedsforanstaltninger mod censur. Onion-tjenester giver alle mulighed for at levere indhold og tjenester anonymt.">
<!ENTITY firstrun_onionservices_next "Udforsk">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Opret forbindelse">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Netværk">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "adresse:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/de/android_strings.dtd b/de/torbrowser_strings.dtd
similarity index 55%
rename from de/android_strings.dtd
rename to de/torbrowser_strings.dtd
index b0112c911..5a5a8a8bf 100644
--- a/de/android_strings.dtd
+++ b/de/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion-Dienste">
<!ENTITY firstrun_onionservices_message "Onion-Dienste sind Websites, die auf .onion enden, die Herausgebern und Besuchern zusätzlichen Schutz bieten, einschlie�lich zusätzlicher Schutzma�nahmen gegen Zensur. Onion-Dienste ermöglichen es jedem, Inhalte und Dienste anonym bereitzustellen.">
<!ENTITY firstrun_onionservices_next "Gehe zur Erkundung">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Verbinden">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Netzwerk">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "Adresse:Port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/el/android_strings.dtd b/el/torbrowser_strings.dtd
similarity index 66%
rename from el/android_strings.dtd
rename to el/torbrowser_strings.dtd
index 94555ddda..c8bdd02d5 100644
--- a/el/android_strings.dtd
+++ b/el/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Î¥Ï?ηÏ?εÏ?ίεÏ? Onion">
<!ENTITY firstrun_onionservices_message "Î?ι Ï?Ï?ηÏ?εÏ?ίεÏ? Ï?οÏ? Onion είναι ιÏ?Ï?οÏ?ελίδεÏ? Ï?οÏ? Ï?ελειÏ?νοÏ?ν Ï?ε .onion και Ï?αÏ?ÎÏ?οÏ?ν εÏ?ιÏ?λÎον Ï?Ï?οÏ?Ï?αÏ?ία Ï?ε Ï?Ï?οÏ?Ï? δημοÏ?ιεÏ?οÏ?ν και εÏ?ιÏ?κÎÏ?Ï?ονÏ?αι, Ï?Ï?μÏ?εÏ?ιλαμβανομÎνοÏ? και αÏ?Ï?αλειÏ?ν ενάνÏ?ια Ï?Ï?η λογοκÏ?ιÏ?ία. Î?ι Ï?Ï?ηÏ?εÏ?ίεÏ? Ï?οÏ? Onion εÏ?ιÏ?Ï?ÎÏ?οÏ?ν Ï?Ï?ον καθÎνα να Ï?αÏ?άÏ?Ï?ει Ï?λικά και Ï?Ï?ηÏ?εÏ?ίεÏ? ανÏ?νÏ?μα.">
<!ENTITY firstrun_onionservices_next "Î?ξεÏ?εÏ?νήÏ?Ï?ε">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "ΣÏ?νδεÏ?η">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Î?ίκÏ?Ï?ο">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/en_GB/android_strings.dtd b/en-GB/torbrowser_strings.dtd
similarity index 53%
rename from en_GB/android_strings.dtd
rename to en-GB/torbrowser_strings.dtd
index 494dac250..7183e666b 100644
--- a/en_GB/android_strings.dtd
+++ b/en-GB/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion Services.">
<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
<!ENTITY firstrun_onionservices_next "Go to explore">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Connect">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Network">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/en-US/android_strings.dtd b/en-US/torbrowser_strings.dtd
similarity index 53%
rename from en-US/android_strings.dtd
rename to en-US/torbrowser_strings.dtd
index 5419f4942..83528cbd0 100644
--- a/en-US/android_strings.dtd
+++ b/en-US/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion Services.">
<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
<!ENTITY firstrun_onionservices_next "Go to explore">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Connect">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Network">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/en/torbrowser_strings.dtd b/en/torbrowser_strings.dtd
new file mode 100644
index 000000000..83528cbd0
--- /dev/null
+++ b/en/torbrowser_strings.dtd
@@ -0,0 +1,57 @@
+<!-- Location note: Tor First run messages -->
+<!ENTITY firstrun_welcome_tab_title "Welcome">
+<!ENTITY firstrun_welcome_title "You\'re ready.">
+<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
+<!ENTITY firstrun_welcome_next "Start now">
+<!ENTITY firstrun_privacy_tab_title "Privacy">
+<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
+<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
+<!ENTITY firstrun_privacy_next "Go to Tor Network">
+<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
+<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
+<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
+<!ENTITY firstrun_tornetwork_next "Next">
+<!ENTITY firstrun_secsettings_tab_title "Security">
+<!ENTITY firstrun_secsettings_title "Choose your experience.">
+<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
+<!ENTITY firstrun_secsettings_next "Next">
+<!ENTITY firstrun_tips_tab_title "Tips">
+<!ENTITY firstrun_tips_title "Experience Tips.">
+<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
+<!ENTITY firstrun_tips_next "Next">
+<!ENTITY firstrun_onionservices_tab_title "Onions">
+<!ENTITY firstrun_onionservices_title "Onion Services.">
+<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
+<!ENTITY firstrun_onionservices_next "Go to explore">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Connect">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Network">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/es_AR/android_strings.dtd b/es-AR/torbrowser_strings.dtd
similarity index 55%
rename from es_AR/android_strings.dtd
rename to es-AR/torbrowser_strings.dtd
index d12b6532d..242a333a1 100644
--- a/es_AR/android_strings.dtd
+++ b/es-AR/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Servicios Onion">
<!ENTITY firstrun_onionservices_message "Servicios Onion son sitios que terminan en .onion y proveen protección extra a editores y visitantes, incluyendo defensas adicionales contra la censura. Los servicios Onion le permiten a cualquiera proveer contenido y servicios anónimamente.">
<!ENTITY firstrun_onionservices_next "Ir a Explorar">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Conectar">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Red">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/es/android_strings.dtd b/es-ES/torbrowser_strings.dtd
similarity index 55%
rename from es/android_strings.dtd
rename to es-ES/torbrowser_strings.dtd
index 871397c77..9b92bb28e 100644
--- a/es/android_strings.dtd
+++ b/es-ES/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Servicios Cebolla">
<!ENTITY firstrun_onionservices_message "Los servicios onion son sitios que terminan con .onion y proveen protecciones extra a editores y visitantes, incluyendo salvaguardas adicionales contra la censura. Los mismos permiten a cualquiera proveer contenido y servicios anónimamente.">
<!ENTITY firstrun_onionservices_next "Ir a explorar">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Conectar">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Red">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "dirección:puerto">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/et/android_strings.dtd b/et/torbrowser_strings.dtd
similarity index 54%
rename from et/android_strings.dtd
rename to et/torbrowser_strings.dtd
index 49fd5d517..fcf640d3e 100644
--- a/et/android_strings.dtd
+++ b/et/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion-teenused.">
<!ENTITY firstrun_onionservices_message "Onion-teenused on veebilehed mis lõppevad .onion'iga ja mis pakuvad lisakaitset nii külastajatele kui ka veebilehtede autoritele, sealhulgas ka kaitse tsensuuri vastu. Onion-teenused võimaldavad ükskõik kellel pakkuda sisu ja teenuseid anonüümselt.">
<!ENTITY firstrun_onionservices_next "Mine uurima">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Ã?hendu">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Võrk">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/eu/android_strings.dtd b/eu/torbrowser_strings.dtd
similarity index 53%
rename from eu/android_strings.dtd
rename to eu/torbrowser_strings.dtd
index 2d8c75d09..f73833383 100644
--- a/eu/android_strings.dtd
+++ b/eu/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion zerbitzuak.">
<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
<!ENTITY firstrun_onionservices_next "Go to explore">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Konektatu">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Sarea">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "helbidea:ataka">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/fa/android_strings.dtd b/fa/torbrowser_strings.dtd
similarity index 63%
rename from fa/android_strings.dtd
rename to fa/torbrowser_strings.dtd
index c76949d67..6892f5b89 100644
--- a/fa/android_strings.dtd
+++ b/fa/torbrowser_strings.dtd
@@ -6,7 +6,7 @@
<!ENTITY firstrun_privacy_tab_title "ØرÛ?Ù? خصÙ?صÛ?">
<!ENTITY firstrun_privacy_title "بÙ? Ú©Ø´Ù?دÙ? Ù?ا Ù? جاسÙ?س Ù?ا">
<!ENTITY firstrun_privacy_message "Ù?رÙ?رگر تÙ?ر بعد از Ù?ر Ù?شست Ú©Ù?Ù?Ú?Ù? Ù?ا Ù? تارÛ?Ø®Ú?Ù? گشت Ù? گذار Ø´Ù?ا را پاک Ù?Û?Ú©Ù?د. اÛ?Ù?Ú¯Ù?Ù?Ù? اصÙ?اØات اÙ?Ù?Û?ت Ù? ØرÛ?Ù? شخصÛ? Ø´Ù?ا را تضÙ?Û?Ù? Ù?Û?Ú©Ù?د. بر رÙ?Û? «شبکÙ? Ù¾Û?ازÛ?» Ú©Ù?Û?Ú© Ú©Ù?Û?د تا Û?ادبگÛ?رÛ?د Ú©Ù? Ù?ا Ú?Ø·Ù?ر از Ø´Ù?ا درÙ?Ù? شبکÙ? Ù?ØاÙ?ظت Ù?Û?Ú©Ù?Û?Ù?.">
-<!ENTITY firstrun_privacy_next "بÙ? شبکÙ? تÙ?ر برÙ?">
+<!ENTITY firstrun_privacy_next "برÙ? بÙ? شبکÙ? تÙ?ر">
<!ENTITY firstrun_tornetwork_tab_title "شبکÙ? تÙ?ر">
<!ENTITY firstrun_tornetwork_title "در Û?Ú© شبکÙ? تÙ?ضÛ?ع شدÙ? سÙ?ر Ú©Ù?Û?د.">
<!ENTITY firstrun_tornetwork_message "Ù?رÙ?رگر تÙ?ر Ø´Ù?ا را بÙ? شبکÙ? تÙ?ر Ú©Ù? تÙ?سط Ù?زاراÙ? داÙ?Ø·Ù?ب از Ú¯Ù?Ø´Ù? Ú¯Ù?Ø´Ù?â??Û? جÙ?اÙ? برپا شدÙ? استØ? Ù?تصÙ? Ù?Û?â??Ú©Ù?د. برخÙ?اÙ? Ù?Û?â??Ù¾Û?â??اÙ? در اÛ?Ù?جا Ù?Û?Ú? Ù?Ù?Ø·Ù? تکÛ? شکستÛ? Ú©Ù? باعث خرابÛ? سÛ?ستÙ? بشÙ?د Ù?جÙ?د Ù?دارد Ù? Û?ا Ù?Ù?جÙ?دÛ?ت Ù?رکزÛ? Ù?Û?ست Ú©Ù? Ù?جبÙ?ر باشÛ?د بÙ? Ø¢Ù? اعتÙ?اد Ú©Ù?Û?د تا از اÛ?Ù? طرÛ?Ù? از اÛ?Ù?ترÙ?ت بÙ? Ø´Ú©Ù? Ù?ØرÙ?اÙ?Ù? Ù?ذت ببرÛ?د .">
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "خدÙ?ات Ù¾Û?ازÛ?">
<!ENTITY firstrun_onionservices_message "سرÙ?Û?سâ??Ù?اÛ? Ù¾Û?ازÛ? ساÛ?تâ??Ù?اÛ?Û? Ù?ستÙ?د Ú©Ù? با onion. تÙ?اÙ? Ù?Û?â??Ø´Ù?Ù?د Ù? Ù?ØاÙ?ظت بسÛ?ارÛ? را براÛ? Ù?اشراÙ? Ù? Ù?راجعÙ?â?? Ú©Ù?Ù?دگاÙ? Ù?راÙ?Ù? Ù?Û?â??Ú©Ù?Ù?د. Ú©Ù? اÛ?Ù? Ù?ØاÙ?ظت شاÙ?Ù? اضاÙ?Ù? شدÙ? ØÙ?اظت در برابر ساÙ?سÙ?ر Ù?Û?â??Ø´Ù?د. سرÙ?Û?سâ??Ù?اÛ? Ù¾Û?ازÛ? بÙ? Ù?ر کسÛ? اجازÙ? Ù?Û?â??دÙ?د تا Ù?ØتÙ?ا Ù? سرÙ?Û?سâ??Ù?اÛ? بÛ?â??Ù?اÙ? را در دسترس Ù?رار دÙ?د .">
<!ENTITY firstrun_onionservices_next "برÙ? Ù? گشت Ù?گذار Ú©Ù?">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "اتصاÙ?">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "شبکÙ?">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/fi/android_strings.dtd b/fi/torbrowser_strings.dtd
similarity index 54%
rename from fi/android_strings.dtd
rename to fi/torbrowser_strings.dtd
index e58e19289..eb266ca17 100644
--- a/fi/android_strings.dtd
+++ b/fi/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Sipulipalvelut.">
<!ENTITY firstrun_onionservices_message "Sipulipalvelut ovat verkkosivuja joilla on .onion -pääte. Nämä palvelut tarjoavat lisäsuojausta julkaisijoille ja kävijöille, sekä sisältävät suojakeinoja sensuuria vastaan. Sipulipalvelut mahdollistavat kenen tahansa tarjota sisältöä ja palveluita anonyymisti.">
<!ENTITY firstrun_onionservices_next "Aloita tutkiminen">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Yhdistä">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Verkko">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/fr/android_strings.dtd b/fr/torbrowser_strings.dtd
similarity index 56%
rename from fr/android_strings.dtd
rename to fr/torbrowser_strings.dtd
index 62ade3aff..ce1717a2f 100644
--- a/fr/android_strings.dtd
+++ b/fr/torbrowser_strings.dtd
@@ -6,7 +6,7 @@
<!ENTITY firstrun_privacy_tab_title "Confidentialité">
<!ENTITY firstrun_privacy_title "Repoussez les traqueurs et les fouineurs.">
<!ENTITY firstrun_privacy_message "Le Navigateur Tor isole les témoins et supprime lâ??historique de votre navigateur en fin de session. Ces modifications garantissent que confidentialité et sécurité sont protégées dans le navigateur. Cliquez sur « Réseau Tor » pour savoir comment nous vous protégeons au niveau du réseau.">
-<!ENTITY firstrun_privacy_next "Se rendre sur le Réseau Tor">
+<!ENTITY firstrun_privacy_next "Aller vers Réseau Tor">
<!ENTITY firstrun_tornetwork_tab_title "Réseau Tor">
<!ENTITY firstrun_tornetwork_title "Naviguez sur un réseau décentralisé.">
<!ENTITY firstrun_tornetwork_message "Le Navigateur Tor vous connecte au réseau Tor exploité par des milliers de bénévoles dans le monde entier. Contrairement à un RPV, il nâ??y a pas de point de défaillance unique ou dâ??entité centralisée auxquels vous devez faire confiance pour profiter dâ??Internet en toute confidentialité.">
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Les services onion.">
<!ENTITY firstrun_onionservices_message "Les services onion sont des sites qui se terminent par .onion Ils offrent des protections accrues aux diffuseurs et aux visiteurs, y compris des mesures de protection contre la censure. Les services onion permettent à tous de proposer anonymement du contenu et des services.">
<!ENTITY firstrun_onionservices_next "Aller explorer">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Se connecter">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Réseau">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "adresse:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/ga/android_strings.dtd b/ga-IE/torbrowser_strings.dtd
similarity index 57%
rename from ga/android_strings.dtd
rename to ga-IE/torbrowser_strings.dtd
index 90f26da3d..64e7c65cd 100644
--- a/ga/android_strings.dtd
+++ b/ga-IE/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "SeirbhÃsà Onion.">
<!ENTITY firstrun_onionservices_message "Is éard atá i seirbhÃs onion ná suÃomh speisialta ón fhearann barrleibhéil .onion a sholáthraÃonn cosaintà breise d'fhoilsitheoirà agus do chuairteoirÃ, cosaintà ar an gcinsireacht san áireamh. Is féidir le haon duine seirbhÃsà onion a úsáid chun ábhar a fhoilsiú agus seirbhÃsà a sholáthar gan a ainm a nochtadh.">
<!ENTITY firstrun_onionservices_next "Ar aghaidh leat">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Ceangail">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Network">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/he/android_strings.dtd b/he/torbrowser_strings.dtd
similarity index 58%
rename from he/android_strings.dtd
rename to he/torbrowser_strings.dtd
index 740847b62..6d5ad238a 100644
--- a/he/android_strings.dtd
+++ b/he/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "ש×?ר×?ת×? ×?צ×?">
<!ENTITY firstrun_onionservices_message "ש×?ר×?ת×? ×?צ×? ×?×? ×?תר×?×? ×?×?סת×?×?×?×?×? ×¢×? .onion ×?×?ספק×?×? ×?×?× ×?ת ×?קס×?ר×? ×?×? ×?פרס×?×?×? ×?×?×?קר×?×?, ×?×?×?×? ×?×?צע×?×? ×?×?× ×? ש×?ת×?×?ספ×? × ×?×? ×¦× ×?×?ר×?. ש×?ר×?ת×? ×?צ×? ×?ת×?ר×?×? ×?×?×? ×?×?×? ×?ספק ת×?×?×? ×?ש×?ר×?ת×?×? ×?×?×?פ×? ×?×?×?×?× ×?.">
<!ENTITY firstrun_onionservices_next "×?×? ×?ס×?×?ר">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "×?ת×?×?ר">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "רשת">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/hi/android_strings.dtd b/hi/android_strings.dtd
deleted file mode 100644
index 22b4e36c2..000000000
--- a/hi/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "स�वा�त ह�">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "��ा�त">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "��ला">
-<!ENTITY firstrun_secsettings_tab_title "स�र��षा ">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "��ला">
-<!ENTITY firstrun_tips_tab_title "Tips">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "��ला">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/hr_HR/android_strings.dtd b/hr-HR/torbrowser_strings.dtd
similarity index 53%
rename from hr_HR/android_strings.dtd
rename to hr-HR/torbrowser_strings.dtd
index 518892f72..69f39bb99 100644
--- a/hr_HR/android_strings.dtd
+++ b/hr-HR/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion Services.">
<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
<!ENTITY firstrun_onionservices_next "Go to explore">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Spoji se">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Mreža">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "adresa:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/hr/android_strings.dtd b/hr/torbrowser_strings.dtd
similarity index 50%
rename from hr/android_strings.dtd
rename to hr/torbrowser_strings.dtd
index 7c9c56ce6..69f39bb99 100644
--- a/hr/android_strings.dtd
+++ b/hr/torbrowser_strings.dtd
@@ -10,16 +10,48 @@
<!ENTITY firstrun_tornetwork_tab_title "Tor mreža">
<!ENTITY firstrun_tornetwork_title "Putujte decentraliziranoj mreži">
<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "SljedeÄ?i">
+<!ENTITY firstrun_tornetwork_next "SljedeÄ?e">
<!ENTITY firstrun_secsettings_tab_title "Sigurnost">
<!ENTITY firstrun_secsettings_title "Odaberite vaše iskustvo.">
<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "SljedeÄ?i">
+<!ENTITY firstrun_secsettings_next "SljedeÄ?e">
<!ENTITY firstrun_tips_tab_title "Dojave">
<!ENTITY firstrun_tips_title "Experience Tips.">
<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "SljedeÄ?i">
+<!ENTITY firstrun_tips_next "SljedeÄ?e">
<!ENTITY firstrun_onionservices_tab_title "Onions">
<!ENTITY firstrun_onionservices_title "Onion Services.">
<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
<!ENTITY firstrun_onionservices_next "Go to explore">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Spoji se">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Mreža">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "adresa:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/hu/android_strings.dtd b/hu/torbrowser_strings.dtd
similarity index 56%
rename from hu/android_strings.dtd
rename to hu/torbrowser_strings.dtd
index cf3b44cf8..d6947d61d 100644
--- a/hu/android_strings.dtd
+++ b/hu/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion szolgáltatások">
<!ENTITY firstrun_onionservices_message "Az Onion szolgáltatások olyan oldalak, amelyek .onion-ra végzÅ?dnek, és extra védelmet adnak a fenntartójuknak és látogatóiknak, beleértve a a cenzúra ellenes funkciókat is. Az Onion szolgáltatások lehetÅ?vé teszik bárkinek, hogy tartalmat és szolgáltatásokat nyújtson névtelenül.">
<!ENTITY firstrun_onionservices_next "Menjen a vizsgálóhóz">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Csatlakozás">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Hálózat">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "cÃm:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/id/android_strings.dtd b/id/torbrowser_strings.dtd
similarity index 56%
rename from id/android_strings.dtd
rename to id/torbrowser_strings.dtd
index 05f4fcdba..ebaf7b8a3 100644
--- a/id/android_strings.dtd
+++ b/id/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Layanan Onion">
<!ENTITY firstrun_onionservices_message "Layanan Onion adalah situs yang berakhir dengan sebuah .onion yang menyediakan perlindungan lebih kepada penerbit dan pengunjung, termasuk tambahan penjagaan terhadap sensor. Layanan Onion mengizinkan siapa saja untuk menyediakan konten dan layanan secara anonim.">
<!ENTITY firstrun_onionservices_next "Pergi menjelajah">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Sambung">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Jaringan">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/is/android_strings.dtd b/is/torbrowser_strings.dtd
similarity index 56%
rename from is/android_strings.dtd
rename to is/torbrowser_strings.dtd
index 8a32815c8..c42877f82 100644
--- a/is/android_strings.dtd
+++ b/is/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion-þjónustur.">
<!ENTITY firstrun_onionservices_message "Onion-þjónustur eru vefsvæði sem enda á .onion viðskeyti, vefsvæði sem gefa útgefendum efnis og þeim sem skoða það aukna vernd gagnvart ritskoðun. Onion-þjónustur gera öllum kleift að birta efni eða eigin þjónustu nafnlaust.">
<!ENTITY firstrun_onionservices_next "Farðu að skoða">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Tengjast">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Net">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/it/android_strings.dtd b/it/torbrowser_strings.dtd
similarity index 55%
rename from it/android_strings.dtd
rename to it/torbrowser_strings.dtd
index 5a9afd1fb..568006033 100644
--- a/it/android_strings.dtd
+++ b/it/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Servizi Onion.">
<!ENTITY firstrun_onionservices_message "I servizi onion sono siti che terminano con .onion che forniscono protezioni extra ad editori e visitatori, incluse ulteriori salvaguardie contro la censura. I servizi onion consentono a chiunque di fornire contenuti e servizi in forma anonima. ">
<!ENTITY firstrun_onionservices_next "Vai ad esplorare">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Connetti">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Rete">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "indirizzo:porta">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/ja/android_strings.dtd b/ja/torbrowser_strings.dtd
similarity index 59%
rename from ja/android_strings.dtd
rename to ja/torbrowser_strings.dtd
index e6d638e4c..100150751 100644
--- a/ja/android_strings.dtd
+++ b/ja/torbrowser_strings.dtd
@@ -6,7 +6,7 @@
<!ENTITY firstrun_privacy_tab_title "ã??ã?©ã?¤ã??ã?·ã?¼">
<!ENTITY firstrun_privacy_title "ã??ã?©ã??ã?«ã?¼ã?¨ã?¹ã??ã?¼ã??ã?¼ã??追ã??æ??ã??ã??">
<!ENTITY firstrun_privacy_message "Tor Browser ã?¯ã??Cookie ã??å??é?¢ã??ã??ã?»ã??ã?·ã?§ã?³å¾?ã?«ã??ã?©ã?¦ã?¶ã?®å±¥æ´ã??å??é?¤ã??ã?¾ã??ã??ã??ã??ã??ã?®å¤?æ?´ã?«ã??ã??ã??ã??ã?ªã??ã?®ã??ã?©ã?¤ã??ã?·ã?¼ã?¨ã?»ã?ã?¥ã?ªã??ã?£ã??ã??ã?©ã?¦ã?¶ã?«ã??ã?£ã?¦ä¿?è·ã??ã??ã?¾ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯ã?¬ã??ã?«ã?§ã?®ä¿?è·æ?¹æ³?ã?«ã?¤ã??ã?¦ã?¯ã??ã??Tor ã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??">
-<!ENTITY firstrun_privacy_next "次ã?®ã??ã?¼ã?¸ã?¸">
+<!ENTITY firstrun_privacy_next "Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸">
<!ENTITY firstrun_tornetwork_tab_title "Tor ã??ã??ã??ã?¯ã?¼ã?¯">
<!ENTITY firstrun_tornetwork_title "å??æ?£å??ã??ã??ã??ã?¯ã?¼ã?¯ã??æ??ã??ã??ã??">
<!ENTITY firstrun_tornetwork_message "é ?Tor Browser ã?¯ã??ä¸?ç??ä¸ã?®ä½?å??人ã??ã?®ã??ã?©ã?³ã??ã?£ã?¢ã?«ã??ã?£ã?¦é??å?¶ã??ã??ã?¦ã??ã?? Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?«ã??ã?ªã??ã??æ?¥ç¶?ã??ã?¾ã??ã?? VPN ã?¨ã?¯ç?°ã?ªã??ã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã??ã?©ã?¤ã??ã?¼ã??ã?«æ¥½ã??ã??ã??ã??ã?«ä¿¡é ¼ã??ã??å¿?è¦?ã??ã??ã??ã?®ã?¯ã??1ã?¤ã?®é??害ç?¹ã??1ã?¤ã?®å?å?¨ã?§ã?¯ã??ã??ã?¾ã??ã??ã??">
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion ã?µã?¼ã??ã?¹ã??">
<!ENTITY firstrun_onionservices_message "Onion ã?µã?¼ã??ã?¹ã?¯ã??æ¤?é?²ã?«å¯¾ã??ã??追å? ã?®ã?»ã?¼ã??ã?¬ã?¼ã??ã??å?«ã??ã??æ??ä¾?è??ã?¨è¨ªå??è??ã?¸ã?®ä½?å??ã?ªä¿?è·ã??æ??ä¾?ã??ã?? .onion ã?§çµ?ã??ã??ã?µã?¤ã??ã?§ã??ã??Onion ã?µã?¼ã??ã?¹ã?§ã?¯ã??誰ã?§ã??ã?³ã?³ã??ã?³ã??ã??ã?µã?¼ã??ã?¹ã??å?¿å??ã?§æ??ä¾?ã?§ã??ã?¾ã??ã??">
<!ENTITY firstrun_onionservices_next "ã??ã?©ã?¦ã?¸ã?³ã?°ã??é??å§?">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "��">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "ã??ã??ã??ã?¯ã?¼ã?¯">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "ã?¢ã??ã?¬ã?¹:ã??ã?¼ã??">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/ka/android_strings.dtd b/ka/torbrowser_strings.dtd
similarity index 73%
rename from ka/android_strings.dtd
rename to ka/torbrowser_strings.dtd
index 2cbb43e50..7029b2e75 100644
--- a/ka/android_strings.dtd
+++ b/ka/torbrowser_strings.dtd
@@ -6,7 +6,7 @@
<!ENTITY firstrun_privacy_tab_title "á??á??á? á??á??á?£á??á??á??á??">
<!ENTITY firstrun_privacy_title "á??á??á??á?ªá??á??á??á?? á??á??á??á??á??á??á?§á?£á? á??á??á??á?? á??á?? á?ªá??á??á??á??á?¡á??á??á?§á??á??á? á??á??á??á??">
<!ENTITY firstrun_privacy_message "Tor-á??á? á??á?£á??á??á? á?? á??á?ªá??á??á??á??á??á??á??á?¡ á?¡á??á??á?¢á??á?¡ á?¤á?£á??á??á?£á?¨á??á??á?¡ á??á?? á?¨á??á??á?¡ á??á??á??á??á?®á?£á??á??á??á?£á??á?? á??á??á??á? á??á??á??á??á?¡ á??á?¡á?¢á??á? á??á??á?¡ á??á??á?®á?£á? á??á??á?¡á??á??á??á??á??á??. á??á?¡á??á??á??á?¡á?? á??á??á??á??á?¢á??á??á?£á??á?? á?ªá??á??á??á??á??á??á??á??á?? á?£á??á? á?£á??á??á??á??á?§á??á?¤á?¡ á??á??á? á??á??á?? á??á??á??á??á?ªá??á??á??á??á??á?¡ á??á??á?ªá??á??á?¡á?? á??á?? á?£á?¡á??á?¤á? á??á?®á??á??á??á??á?¡ á??á??á?¦á??á?? á?®á??á? á??á?¡á?®á?¡ á??á? á??á?£á??á??á? á?¨á??. á??á??á?¬á??á??á??á??á?? â??Tor-á?¥á?¡á??á??á??â?? á??á?? á??á?®á??á??á??á??, á??á?£ á? á??á??á??á? á?®á??á??á??á?? á??á??á?ªá??á?? á?¥á?¡á??á??á??á?¡ á??á??á??á??á??á??.">
-<!ENTITY firstrun_privacy_next "Tor-á?¥á?¡á??á??á?¨á?? á?¨á??á?¡á??á??á??">
+<!ENTITY firstrun_privacy_next "á??á?®á??á??á??á?? Tor-á?¥á?¡á??á??á??">
<!ENTITY firstrun_tornetwork_tab_title "Tor-á?¥á?¡á??á??á??">
<!ENTITY firstrun_tornetwork_title "á??á?¡á??á? á??á??á??á??á??á?? á??á? á??á??á??á? á??á??á??á?£á??á?? á??á??á??á? á??á??á??á??á??á??á??á?¡á??á??á?? á??á??á??á??á?£á??á??á??á??á??á??á??á?? á?¥á?¡á??á??á??á??.">
<!ENTITY firstrun_tornetwork_message "Tor-á??á? á??á?£á??á??á? á?? á??á??á??á??á??á?¨á??á? á??á??á?? Tor-á?¥á?¡á??á??á??á??á??, á? á??á??á??á??á??á?ª á?¨á??á??á??á??á??á?? á??á??á??á?¡á??á??á??á?? á??á??á?®á??á??á??á?¡á??á?¡á??á??á?? á??á??á??á??á?? á??á?¡á??á?¤á??á??á??á??á??á??. á??á??á??á?¡á?®á??á??á??á??á??á??á?? VPN-á??á?¡á??á??á??, á??á?¥ á??á? á??á? á?¡á??á??á??á??á?¡ á?¡á??á??á? á??á?? á??á??á??á? á??á??á??á??á?? á??á?? á??á??á??á??á??á??á??á?? á??á??á?¬á??á?¡á??á??á?£á??á??á??á??, á? á??á??á??á??á?¡á??á?ª á?£á??á??á?? á??á??á??á??á?? á??á?¥á??á??á??á?? á??á??á??á??á?ªá??á??á??á??á?? á??á??á?¢á??á? á??á??á?¢á??á?? á?¡á??á? á??á??á??á??á??á??á??á?¡á??á?¡.">
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion-á??á??á??á?¡á??á?®á?£á? á??á??á??á??á??.">
<!ENTITY firstrun_onionservices_message "Onion-á??á??á??á?¡á??á?®á?£á? á??á??á??á??á?? á??á? á??á?¡ á?¡á??á??á?¢á??á??á??, á? á??á??á??á??á??á?? á??á??á?¡á??á??á??á? á??á??á??á?¡á??á?ª á??á??á??á?©á??á??á?? .onion á??á??á??á??á??á??á??á??á??, á? á??á?ª á??á??á?¢ á?£á?¡á??á?¤á? á??á?®á??á??á??á??á?¡ á??á??á??á?á??á??á?¡ á? á??á??á??á? á?ª á??á??á?¤á??á? á??á??á?ªá??á??á?¡ á??á??á??á??á??á?¥á??á??á?§á??á??á??á??á??á??á?¡, á??á?¡á??á??á?? á?¡á??á??á?¢á??á?¡ á??á??á??á?®á??á??á??á??á??á?¡, á??á??á? á??á??á??á?? á??á??á??á??á?¡á??á??á??á??á??á?? á?ªá??á??á??á?£á? á??á?¡á??á??á?? á??á??á??á??á?¡ á??á?¡á??á? á??á??á??á??á??á??á??. Onion-á??á??á??á?¡á??á?®á?£á? á??á??á??á??á?? á?¡á??á?¨á?£á??á??á??á??á??á?¡ á??á?«á??á??á??á?¡ á?§á??á??á??á??á?¡, á??á??á??á?¬á??á??á??á?? á??á?? á??á?¡á??á? á??á??á??á??á??á?? á?¨á??á??á??á??á??á?¡á??á?? á??á?? á??á??á??á?¡á??á?®á?£á? á??á??á??á??á??á?? á??á??á??á??á??á??á??á?¡ á??á??á?£á??á?®á??á??á??á??á??á??.">
<!ENTITY firstrun_onionservices_next "á??á??á??á??á?? á??á??á??á??á?ªá??á??á??á??">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "á??á??á??á??á??á?¨á??á? á??á??á??">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Network">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/kk/android_strings.dtd b/kk/torbrowser_strings.dtd
similarity index 57%
rename from kk/android_strings.dtd
rename to kk/torbrowser_strings.dtd
index 3ff695808..40ca428ba 100644
--- a/kk/android_strings.dtd
+++ b/kk/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion Services.">
<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
<!ENTITY firstrun_onionservices_next "Go to explore">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Ò?оÑ?Ñ?лÑ? ">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Network">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/ko/android_strings.dtd b/ko/android_strings.dtd
deleted file mode 100644
index 5d3caa3e4..000000000
--- a/ko/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "í??ì??í?©ë??ë?¤">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "ì§?ê¸? ì??ì??">
-<!ENTITY firstrun_privacy_tab_title "ì?¬ì??í??">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "ë?¤ì??">
-<!ENTITY firstrun_secsettings_tab_title " ë³´ì??">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "ë?¤ì??">
-<!ENTITY firstrun_tips_tab_title "Tips">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "ë?¤ì??">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion ì??ë¹?ì?¤">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/ky/android_strings.dtd b/ky/android_strings.dtd
deleted file mode 100644
index 371fafd5c..000000000
--- a/ky/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "Ð?оÑ? келиниз">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "Ð?Ñ?пÑ?Ñ?лÑ?к">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "Ð?ийинки">
-<!ENTITY firstrun_secsettings_tab_title "Ð?оопÑ?Ñ?здÑ?к">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "Ð?ийинки">
-<!ENTITY firstrun_tips_tab_title "Tips">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "Ð?ийинки">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/lt/android_strings.dtd b/lt/android_strings.dtd
deleted file mode 100644
index 60b62d566..000000000
--- a/lt/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "Sveiki">
-<!ENTITY firstrun_welcome_title "Viskas paruošta">
-<!ENTITY firstrun_welcome_message "Tor Browser leidžia narÅ¡yti po saitynÄ? ir tuo paÄ?iu siÅ«lo aukÅ¡Ä?iausius privatumo bei saugumo standartus. Ä?ia jÅ«s esate apsaugoti nuo sekimo, stebÄ?jimo ir cenzÅ«ros. Å iame trumpame įvade jums parodysime kaip tai daroma.">
-<!ENTITY firstrun_welcome_next "PradÄ?ti dabar">
-<!ENTITY firstrun_privacy_tab_title "Privatumas">
-<!ENTITY firstrun_privacy_title "Ignoruoti sekiklius ir Å¡niukÅ¡tinÄ?tojus. ">
-<!ENTITY firstrun_privacy_message "Tor Browser izoliuoja slapukus, o po kiekvienos jÅ«sų narÅ¡ymo sesijos yra iÅ¡trinama narÅ¡ymo istorija. Å ie pakeitimai garantuoja, kad jÅ«sų privatumas ir saugumas narÅ¡yklÄ?je yra apsaugoti. Spauskite 'Tor tinklas', norÄ?dami sužinoti, kaip mes jus apsaugome tinklo lygmenyje.">
-<!ENTITY firstrun_privacy_next "Prisijungti prie Tor tinklo">
-<!ENTITY firstrun_tornetwork_tab_title "Tor tinklas">
-<!ENTITY firstrun_tornetwork_title "Keliauti per decentralizuotÄ? tinklÄ?.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser prijungia jus prie Tor tinklo, veikianÄ?io tÅ«kstanÄ?ių po visÄ? pasaulį iÅ¡sibarsÄ?iusių savanorių dÄ?ka. Skirtingai nei VPN, Ä?ia nÄ?ra vieno trikdžio taÅ¡ko, arba centralizuoto mazgo, kuriuo turÄ?tumÄ?te pasitikÄ?ti, norÄ?dami džiaugtis privaÄ?iu narÅ¡ymu saityne.">
-<!ENTITY firstrun_tornetwork_next "Kitas">
-<!ENTITY firstrun_secsettings_tab_title "Saugumas">
-<!ENTITY firstrun_secsettings_title "Pasirinkite savo patyrimÄ?.">
-<!ENTITY firstrun_secsettings_message "Mes taip pat siÅ«lome papildomus nustatymus, kurių pagalba galima bÅ«tų dar pagerinti jÅ«sų narÅ¡yklÄ?s saugumÄ?. MÅ«sų Saugumo nustatymai leidžia jums blokuoti reikiamus elementus, kurie galÄ?tų bÅ«ti panaudoti siekiant atakuoti jÅ«sų kompiuterį. ">
-<!ENTITY firstrun_secsettings_next "Kitas">
-<!ENTITY firstrun_tips_tab_title "Patarimai">
-<!ENTITY firstrun_tips_title "Patyrimo patarimai">
-<!ENTITY firstrun_tips_message "Su visomis Tor suteikiamomis saugumo ir privatumo ypatybÄ?mis, jÅ«sų patyrimas narÅ¡ant saitynÄ? gali bÅ«ti Å¡iek tiek kitoks. Priklausomai nuo jÅ«sų saugumo lygmens, viskas gali veikti Å¡iek tiek lÄ?Ä?iau, o kai kurie elementai - neveikti arba nepasikrauti. Taip pat jÅ«sų gali bÅ«ti papraÅ¡yta įrodyti, kad jÅ«s žmogus, o ne robotas. ">
-<!ENTITY firstrun_tips_next "Kitas">
-<!ENTITY firstrun_onionservices_tab_title "Onion svetainÄ?s">
-<!ENTITY firstrun_onionservices_title "Onion svetainÄ?s">
-<!ENTITY firstrun_onionservices_message "Onion svetainÄ?s yra tokios, kurių adresai baigiasi .onion - turinio skleidÄ?jams bei lankytojams jos suteikia papildomÄ? apsaugÄ?, taip pat prideda apsaugÄ? prieÅ¡ cenzÅ«rÄ?. Onion svetainÄ?s leidžia visiems skelbti turinį bei teikti paslaugas anonimiÅ¡kai.">
-<!ENTITY firstrun_onionservices_next "Naršykite">
diff --git a/lt/torbrowser_strings.dtd b/lt/torbrowser_strings.dtd
new file mode 100644
index 000000000..b5e40cab8
--- /dev/null
+++ b/lt/torbrowser_strings.dtd
@@ -0,0 +1,57 @@
+<!-- Location note: Tor First run messages -->
+<!ENTITY firstrun_welcome_tab_title "Sveiki">
+<!ENTITY firstrun_welcome_title "Viskas paruošta">
+<!ENTITY firstrun_welcome_message "Tor Browser leidžia narÅ¡yti po saitynÄ? ir tuo paÄ?iu siÅ«lo aukÅ¡Ä?iausius privatumo bei saugumo standartus. Ä?ia jÅ«s esate apsaugoti nuo sekimo, stebÄ?jimo ir cenzÅ«ros. Å iame trumpame įvade jums parodysime kaip tai daroma.">
+<!ENTITY firstrun_welcome_next "PradÄ?ti dabar">
+<!ENTITY firstrun_privacy_tab_title "Privatumas">
+<!ENTITY firstrun_privacy_title "Nepaisykite sekiklių ir Å¡niukÅ¡tinÄ?tojų.">
+<!ENTITY firstrun_privacy_message "Tor Browser izoliuoja slapukus ir po kiekvieno narÅ¡ymo seanso iÅ¡trina narÅ¡ymo istorijÄ?. Å ie pakeitimai užtikrina, kad jÅ«sų privatumas ir saugumas narÅ¡yklÄ?je yra apsaugoti. SpustelÄ?kite "Tor tinklas", norÄ?dami sužinoti, kaip mes jus apsaugome tinklo lygmenyje.">
+<!ENTITY firstrun_privacy_next "Pereiti prie Tor tinklo">
+<!ENTITY firstrun_tornetwork_tab_title "Tor tinklas">
+<!ENTITY firstrun_tornetwork_title "Keliaukite po decentralizuotÄ? tinklÄ?.">
+<!ENTITY firstrun_tornetwork_message "Tor Browser prijungia jus prie Tor tinklo, veikianÄ?io tÅ«kstanÄ?ių po visÄ? pasaulį iÅ¡sibarsÄ?iusių savanorių dÄ?ka. Skirtingai nei VPN, Ä?ia nÄ?ra vieno trikdžio taÅ¡ko, arba centralizuoto mazgo, kuriuo turÄ?tumÄ?te pasitikÄ?ti, norÄ?dami džiaugtis privaÄ?iu narÅ¡ymu saityne.">
+<!ENTITY firstrun_tornetwork_next "Kitas">
+<!ENTITY firstrun_secsettings_tab_title "Saugumas">
+<!ENTITY firstrun_secsettings_title "Pasirinkite savo patyrimÄ?.">
+<!ENTITY firstrun_secsettings_message "Mes taip pat siÅ«lome papildomus nustatymus, kurių pagalba galima bÅ«tų dar pagerinti jÅ«sų narÅ¡yklÄ?s saugumÄ?. MÅ«sų Saugumo nustatymai leidžia jums blokuoti reikiamus elementus, kurie galÄ?tų bÅ«ti panaudoti siekiant atakuoti jÅ«sų kompiuterį. ">
+<!ENTITY firstrun_secsettings_next "Kitas">
+<!ENTITY firstrun_tips_tab_title "Patarimai">
+<!ENTITY firstrun_tips_title "Patyrimo patarimai">
+<!ENTITY firstrun_tips_message "Su visomis Tor suteikiamomis saugumo ir privatumo ypatybÄ?mis, jÅ«sų patyrimas narÅ¡ant saitynÄ? gali bÅ«ti Å¡iek tiek kitoks. Priklausomai nuo jÅ«sų saugumo lygmens, viskas gali veikti Å¡iek tiek lÄ?Ä?iau, o kai kurie elementai - neveikti arba nepasikrauti. Taip pat jÅ«sų gali bÅ«ti papraÅ¡yta įrodyti, kad jÅ«s žmogus, o ne robotas. ">
+<!ENTITY firstrun_tips_next "Kitas">
+<!ENTITY firstrun_onionservices_tab_title "Onion svetainÄ?s">
+<!ENTITY firstrun_onionservices_title "Onion svetainÄ?s">
+<!ENTITY firstrun_onionservices_message "Onion svetainÄ?s yra tokios, kurių adresai baigiasi .onion - turinio skleidÄ?jams bei lankytojams jos suteikia papildomÄ? apsaugÄ?, taip pat prideda apsaugÄ? prieÅ¡ cenzÅ«rÄ?. Onion svetainÄ?s leidžia visiems skelbti turinį bei teikti paslaugas anonimiÅ¡kai.">
+<!ENTITY firstrun_onionservices_next "Naršykite">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Prisijungti">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Tinklas">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/lv/android_strings.dtd b/lv/android_strings.dtd
deleted file mode 100644
index 2839d0f38..000000000
--- a/lv/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "Welcome">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "PrivÄ?tums">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "TÄ?lÄ?k">
-<!ENTITY firstrun_secsettings_tab_title "Drošība">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "TÄ?lÄ?k">
-<!ENTITY firstrun_tips_tab_title "ZiÅ?ojumi">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "TÄ?lÄ?k">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/mk/android_strings.dtd b/mk/torbrowser_strings.dtd
similarity index 65%
rename from mk/android_strings.dtd
rename to mk/torbrowser_strings.dtd
index 9c5ad8d43..222801cd1 100644
--- a/mk/android_strings.dtd
+++ b/mk/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion УÑ?лÑ?ги">
<!ENTITY firstrun_onionservices_message "Onion Ñ?Ñ?лÑ?гиÑ?е Ñ?е веб Ñ?Ñ?Ñ?ани кои завÑ?Ñ?Ñ?вааÑ? Ñ?о домеин .onion коÑ? овозможÑ?ва екÑ?Ñ?Ñ?а заÑ?Ñ?иÑ?и на издаваÑ?иÑ?е и поÑ?еÑ?иÑ?елиÑ?е, вклÑ?Ñ?Ñ?ваÑ?Ñ?и и додадени заÑ?Ñ?иÑ?и пÑ?оÑ?ив Ñ?ензÑ?Ñ?аÑ?а. Onion Ñ?Ñ?лÑ?гиÑ?е мÑ? овозможÑ?вааÑ? на Ñ?екого да овозможи Ñ?одÑ?жина и Ñ?Ñ?лÑ?ги анонимно.">
<!ENTITY firstrun_onionservices_next "Ð?деÑ?е да иÑ?Ñ?Ñ?ажÑ?ваÑ?е">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Ð?овÑ?зи">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Network">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/my/android_strings.dtd b/my/android_strings.dtd
deleted file mode 100644
index 003177088..000000000
--- a/my/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "á?¾á??á?á?³á??á?á?¯á??á?«á??á??á?¹á??">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "á??á?á?¯á??á?ºá??á?±á?¸á??á?á?¯á??á?ºá??á?¬á?¡á??á?»á??á?ºá?¡á??á??á?º á??á?¯á?¶á??á?¼á?¯á?¶á??á?±á?¸">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "á??á?¾á?±á?·á??á??á?ºá??á??á?º">
-<!ENTITY firstrun_secsettings_tab_title "á??á?¯á?¶á??á?¼á?¯á?¶á??á?±á?¸">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "á??á?¾á?±á?·á??á??á?ºá??á??á?º">
-<!ENTITY firstrun_tips_tab_title "Tips">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "á??á?¾á?±á?·á??á??á?ºá??á??á?º">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/nb/android_strings.dtd b/nb-NO/torbrowser_strings.dtd
similarity index 54%
rename from nb/android_strings.dtd
rename to nb-NO/torbrowser_strings.dtd
index 50ff65af5..aea18d1a2 100644
--- a/nb/android_strings.dtd
+++ b/nb-NO/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Løk Tjenester.">
<!ENTITY firstrun_onionservices_message "Løktjenester er nettsteder som slutter med en .onion som gir ekstra beskyttelse til utgivere og besøkende, inkludert ekstra sikkerhetstiltak mot sensur. Løktjenester tillater alle å gi innhold og tjenester anonymt.">
<!ENTITY firstrun_onionservices_next "Gå til å utforske">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Koble til">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Nettverk">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "adresse:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/nl/android_strings.dtd b/nl/torbrowser_strings.dtd
similarity index 54%
rename from nl/android_strings.dtd
rename to nl/torbrowser_strings.dtd
index 67a5bda7a..445e70dad 100644
--- a/nl/android_strings.dtd
+++ b/nl/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion-services.">
<!ENTITY firstrun_onionservices_message "Onion-services zijn websites die op .onion eindigen en extra bescherming bieden voor publicisten en bezoekers, waaronder toegevoegde beschermingsmechanismen tegen censuur. Via Onion-services kan iedereen anoniem inhoud en diensten aanbieden.">
<!ENTITY firstrun_onionservices_next "Ga verkennen">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Verbinden">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Netwerk">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "adres:poort">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/pl/android_strings.dtd b/pl/torbrowser_strings.dtd
similarity index 56%
rename from pl/android_strings.dtd
rename to pl/torbrowser_strings.dtd
index 3fed5b109..6173deda4 100644
--- a/pl/android_strings.dtd
+++ b/pl/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "UsÅ?ugi Onion.">
<!ENTITY firstrun_onionservices_message "UsÅ?ugi Onion to strony koÅ?czoÅ?ce siÄ? z .onion, które dostarczajÄ? dodatkowe zabezpieczenie dla publikujÄ?cych i odwiedzajÄ?cych, wÅ?Ä?cznie z zabezpieczeniami przeciwko cenzurze. UsÅ?ugi Onion pozwalajÄ? każdemu na dostarczanie kontentu oraz usÅ?ug anonimowo.">
<!ENTITY firstrun_onionservices_next "Przejdź do eksplorowania">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "PoÅ?Ä?cz">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "SieÄ?">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "adres:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/pt_BR/android_strings.dtd b/pt-BR/torbrowser_strings.dtd
similarity index 56%
rename from pt_BR/android_strings.dtd
rename to pt-BR/torbrowser_strings.dtd
index e9737a363..d7b15ae6c 100644
--- a/pt_BR/android_strings.dtd
+++ b/pt-BR/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Serviços Cebola">
<!ENTITY firstrun_onionservices_message "Serviços Onion são sites que terminam com .onion e que fornecem proteções extras para editores e visitantes, incluindo proteções a mais contra censura. Serviços Onion permitem que qualquer pessoa forneça conteúdo e serviços anonimamente.">
<!ENTITY firstrun_onionservices_next "Ir para explorar">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Conectar-se">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Rede">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "endereço: porta">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/pt_PT/android_strings.dtd b/pt-PT/torbrowser_strings.dtd
similarity index 53%
rename from pt_PT/android_strings.dtd
rename to pt-PT/torbrowser_strings.dtd
index 79234cdc4..2b21335d4 100644
--- a/pt_PT/android_strings.dtd
+++ b/pt-PT/torbrowser_strings.dtd
@@ -10,16 +10,48 @@
<!ENTITY firstrun_tornetwork_tab_title "Rede Tor">
<!ENTITY firstrun_tornetwork_title "Viajar numa rede descentralizada.">
<!ENTITY firstrun_tornetwork_message "O Tor Browser conecta-o à rede Tor, composta por milhares de voluntários em todo o mundo. Ao contrário de uma VPN (Rede Privada Virtual), não existe uma entidade ou ponto de falha central em que tem de confiar para desfrutar da internet com privacidade.">
-<!ENTITY firstrun_tornetwork_next "Seguinte">
+<!ENTITY firstrun_tornetwork_next "Próximo">
<!ENTITY firstrun_secsettings_tab_title "Segurança">
<!ENTITY firstrun_secsettings_title "Escolha a sua experiência.">
<!ENTITY firstrun_secsettings_message "Também lhe fornecemos configurações adicionais para aumentar a segurança do seu navegador de internet. As nossas Configurações de Segurança permitem-lhe bloquear elementos que poderiam ser utilizados para atacar o seu computador.">
-<!ENTITY firstrun_secsettings_next "Seguinte">
+<!ENTITY firstrun_secsettings_next "Próximo">
<!ENTITY firstrun_tips_tab_title "Denúncias">
<!ENTITY firstrun_tips_title "Dicas de Experiência.">
<!ENTITY firstrun_tips_message "Com toda segurança e funcionalidades de privacidade fornecidos pelo Tor, a sua experiência na utilização da internet pode ser um pouco diferente. As coisas podem ficar um pouco mais lentas, e dependendo do seu nÃvel de segurança, alguns elementos podem não funcionar ou não serem carregados. Também poderá ser questionado para provar que é um humano e não um robô.">
-<!ENTITY firstrun_tips_next "Seguinte">
+<!ENTITY firstrun_tips_next "Próximo">
<!ENTITY firstrun_onionservices_tab_title "Onions">
<!ENTITY firstrun_onionservices_title "Serviços Onion.">
<!ENTITY firstrun_onionservices_message "Os serviços Onion são sites que terminam com .onion e que fornecem proteções extras para editores e visitantes, incluindo proteções adicionais contra censura. Os serviços Onion permitem que qualquer pessoa forneça conteúdos e serviços de forma anónima.">
<!ENTITY firstrun_onionservices_next "Ir para explorar">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Ligar">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Rede">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/pt/android_strings.dtd b/pt/torbrowser_strings.dtd
similarity index 53%
rename from pt/android_strings.dtd
rename to pt/torbrowser_strings.dtd
index 4c28f7ffa..fa724cd5a 100644
--- a/pt/android_strings.dtd
+++ b/pt/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion Services.">
<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
<!ENTITY firstrun_onionservices_next "Go to explore">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Ligar">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Rede">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/ro/android_strings.dtd b/ro/torbrowser_strings.dtd
similarity index 55%
rename from ro/android_strings.dtd
rename to ro/torbrowser_strings.dtd
index 6670da3bc..28a60c138 100644
--- a/ro/android_strings.dtd
+++ b/ro/torbrowser_strings.dtd
@@ -3,7 +3,7 @@
<!ENTITY firstrun_welcome_title "Gata.">
<!ENTITY firstrun_welcome_message "Navigatorul Tor Browser oferÄ? cel mai ridicat standard de intimitate È?i securitate în timpul navigÄ?rii pe Internet. Acesta protejeazÄ? acum împotriva urmÄ?ririi, supravegherii È?i aplicÄ?rii cenzurii. Acest scurt tur îÈ?i va arÄ?ta cum.">
<!ENTITY firstrun_welcome_next "Ã?ncepe acum">
-<!ENTITY firstrun_privacy_tab_title "Intimitate">
+<!ENTITY firstrun_privacy_tab_title "ConfidenÈ?ialitate">
<!ENTITY firstrun_privacy_title "Cei ce îÈ?i urmÄ?resc activitatea.">
<!ENTITY firstrun_privacy_message "Navigatorul Tor Browser izoleazÄ? cookie-urile È?i È?terge istoricul de navigare dupÄ? fiecare sesiune. Aceste modificÄ?ri îÈ?i asigurÄ? intimitatea È?i siguranÈ?a. ApasÄ? â??ReÈ?ea Torâ?? pentru a afla cum te protejÄ?m la nivel de reÈ?ea. ">
<!ENTITY firstrun_privacy_next "Sari la ReÈ?eaua Tor ">
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Servicii Onion">
<!ENTITY firstrun_onionservices_message "Serviciile Onion sunt site-uri a cÄ?ror adresÄ? se terminÄ? cu '.onion', ce oferÄ? extra protecÈ?ie atât celor care le publicÄ? cât È?i celor care le viziteazÄ?, È?i care includ mÄ?suri suplimentare împotriva cenzurii. Serviciile Onion permit oricui sÄ? procure conÈ?inut sau servicii în mod anonim.">
<!ENTITY firstrun_onionservices_next "ExploreazÄ?">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Conectare">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Reţea">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/ru/android_strings.dtd b/ru/torbrowser_strings.dtd
similarity index 64%
rename from ru/android_strings.dtd
rename to ru/torbrowser_strings.dtd
index 5e6866ddb..7c8036068 100644
--- a/ru/android_strings.dtd
+++ b/ru/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "СлÑ?жбÑ? Onion">
<!ENTITY firstrun_onionservices_message "СлÑ?жбÑ? Onion â?? Ñ?Ñ?о Ñ?айÑ?Ñ?, коÑ?оÑ?Ñ?е заканÑ?иваÑ?Ñ?Ñ?Ñ? на .onion. Ð?ни обеÑ?пеÑ?иваÑ?Ñ? дополниÑ?елÑ?нÑ?Ñ? заÑ?иÑ?Ñ? владелÑ?Ñ?ам и поÑ?еÑ?иÑ?елÑ?м, пÑ?едоÑ?Ñ?авлÑ?Ñ? дополниÑ?елÑ?нÑ?е гаÑ?анÑ?ии пÑ?оÑ?ив Ñ?ензÑ?Ñ?Ñ?. СлÑ?жбÑ? Onion позволÑ?Ñ?Ñ? лÑ?бомÑ? анонимно пÑ?едоÑ?Ñ?авлÑ?Ñ?Ñ? конÑ?енÑ? и Ñ?Ñ?лÑ?ги.">
<!ENTITY firstrun_onionservices_next "Ð?зÑ?Ñ?иÑ?Ñ?">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "СоединиÑ?Ñ?Ñ?Ñ?">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "СеÑ?Ñ?">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "адÑ?еÑ?:поÑ?Ñ?">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/sk/android_strings.dtd b/sk/torbrowser_strings.dtd
similarity index 55%
rename from sk/android_strings.dtd
rename to sk/torbrowser_strings.dtd
index 817d3bf74..4ddf27da3 100644
--- a/sk/android_strings.dtd
+++ b/sk/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Služby Onion">
<!ENTITY firstrun_onionservices_message "Služby Onion sú stránky, ktoré konÄ?ia koncovkou .onion a poskytujú extra ochranu svojim vydavateľom a návÅ¡tevnÃkom, vrátane zabudovaných bezpeÄ?nostných prvkov týkajúcich sa cenzúry. Služby Onion umožÅ?ujú komukoľvek poskytovaÅ¥ obsah a služby anonymne.">
<!ENTITY firstrun_onionservices_next "ZaÄ?nite s objavovanÃm">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Pripojiť">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Sieť">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "adresa:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/sl/android_strings.dtd b/sl/android_strings.dtd
deleted file mode 100644
index 6175208f9..000000000
--- a/sl/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "Welcome">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "Zasebnost">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "Naprej">
-<!ENTITY firstrun_secsettings_tab_title "Varnost">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "Naprej">
-<!ENTITY firstrun_tips_tab_title "Naznanitve">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "Naprej">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/sl_SI/android_strings.dtd b/sl_SI/android_strings.dtd
deleted file mode 100644
index 6175208f9..000000000
--- a/sl_SI/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "Welcome">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "Zasebnost">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "Naprej">
-<!ENTITY firstrun_secsettings_tab_title "Varnost">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "Naprej">
-<!ENTITY firstrun_tips_tab_title "Naznanitve">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "Naprej">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/sq/android_strings.dtd b/sq/android_strings.dtd
deleted file mode 100644
index 9f2bd1875..000000000
--- a/sq/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "Mirë se vini">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "Privatësi">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "Pasuesi">
-<!ENTITY firstrun_secsettings_tab_title "Siguri">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "Pasuesi">
-<!ENTITY firstrun_tips_tab_title "Këshilla">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "Pasuesi">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/sv/android_strings.dtd b/sv-SE/torbrowser_strings.dtd
similarity index 54%
rename from sv/android_strings.dtd
rename to sv-SE/torbrowser_strings.dtd
index defd2ee7d..8ac13eb72 100644
--- a/sv/android_strings.dtd
+++ b/sv-SE/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion-tjänster">
<!ENTITY firstrun_onionservices_message "Onion-tjänster är webbplatser som slutar med .onion som ger extra skydd till publicerare och besökare, inklusive extra garantier mot censur. Onion-tjänster tillåter alla att tillhandahålla innehåll och tjänster anonymt.">
<!ENTITY firstrun_onionservices_next "Kör för att utforska">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Anslut">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Nätverk">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "adress:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/ta/android_strings.dtd b/ta/torbrowser_strings.dtd
similarity index 73%
rename from ta/android_strings.dtd
rename to ta/torbrowser_strings.dtd
index a9b4eacb2..09f82da7a 100644
--- a/ta/android_strings.dtd
+++ b/ta/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion ��வ��ள�.">
<!ENTITY firstrun_onionservices_message "Onion ��வ��ள� �ன�பத� are sites that end with a .onion �ன ம��ிய�ம� தள���ளா��ம� �வ� வ�ளிய����ாளர��ள�����ம� பார�வ�யாளர�����ம�, தணி�������� �திரான பாத��ாப�ப� �ள�ளி��� ����தல� பாத��ாப�ப��ள� வழ�����ின�றன. Onion ��வ��ள� ப�யரிலாமல� �ள�ள����ம� மற�ற�ம� ��வ��ள� வழ��� �வர�ய�ம� �ன�மதி���ின�றன.">
<!ENTITY firstrun_onionservices_next "�ராயத� த���������ள�">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "�ண����">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Network">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/tg/android_strings.dtd b/tg/android_strings.dtd
deleted file mode 100644
index ddf88415d..000000000
--- a/tg/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "Ð?аÑ?ҳабо">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "Ð?аÑ?Ñ?иÑ?Ñ?">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "Ð?авбаÑ?Ó£">
-<!ENTITY firstrun_secsettings_tab_title "Ð?мниÑ?Ñ?">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "Ð?авбаÑ?Ó£">
-<!ENTITY firstrun_tips_tab_title "Tips">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "Ð?авбаÑ?Ó£">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/tk/android_strings.dtd b/tk/android_strings.dtd
deleted file mode 100644
index 86f7ff413..000000000
--- a/tk/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "HoÅ? geldiÅ?iz!">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "Gizlinlik">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "Indiki">
-<!ENTITY firstrun_secsettings_tab_title "Gorag">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "Indiki">
-<!ENTITY firstrun_tips_tab_title "Tips">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "Indiki">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/tr/android_strings.dtd b/tr/torbrowser_strings.dtd
similarity index 56%
rename from tr/android_strings.dtd
rename to tr/torbrowser_strings.dtd
index 95d7e1aba..3fc953dce 100644
--- a/tr/android_strings.dtd
+++ b/tr/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion Hizmetleri">
<!ENTITY firstrun_onionservices_message "Onion hizmetleri, yayıncılar ile ziyaretçilerin ek güvenlik ve engellemeleri aÅ?ması için koruma saÄ?layan, sonu .onion uzantısı ile biten web siteleridir. Onion hizmetleri sayesinde isteyen herkes anonim olarak içerik ve hizmet sunabilir.">
<!ENTITY firstrun_onionservices_next "KeÅ?fedin">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "BaÄ?lanma">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "AÄ?">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "adres:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/uk/android_strings.dtd b/uk/android_strings.dtd
deleted file mode 100644
index 2a667c27f..000000000
--- a/uk/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "Ð?аÑ?каво пÑ?оÑ?имо">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "Ð?Ñ?иваÑ?нÑ?Ñ?Ñ?Ñ?">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Ð?еÑ?ежа Tor">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "Ð?пеÑ?ед">
-<!ENTITY firstrun_secsettings_tab_title "Ð?езпека">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "Ð?пеÑ?ед">
-<!ENTITY firstrun_tips_tab_title "Ð?аÑ?еÑ?Ñ?али">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "Ð?пеÑ?ед">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/uz/android_strings.dtd b/uz/torbrowser_strings.dtd
similarity index 53%
rename from uz/android_strings.dtd
rename to uz/torbrowser_strings.dtd
index f31dd6daf..fa264c214 100644
--- a/uz/android_strings.dtd
+++ b/uz/torbrowser_strings.dtd
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion Services.">
<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
<!ENTITY firstrun_onionservices_next "Go to explore">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "Ulanish">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "Network">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/vi/android_strings.dtd b/vi/android_strings.dtd
deleted file mode 100644
index 2f25d2849..000000000
--- a/vi/android_strings.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- Location note: Tor First run messages -->
-<!ENTITY firstrun_welcome_tab_title "Xin chà o">
-<!ENTITY firstrun_welcome_title "You\'re ready.">
-<!ENTITY firstrun_welcome_message "Tor Browser offers the highest standard of privacy and security while browsing the web. You\'re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how.">
-<!ENTITY firstrun_welcome_next "Start now">
-<!ENTITY firstrun_privacy_tab_title "Riêng tư">
-<!ENTITY firstrun_privacy_title "Snub trackers and snoopers.">
-<!ENTITY firstrun_privacy_message "Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.">
-<!ENTITY firstrun_privacy_next "Go to Tor Network">
-<!ENTITY firstrun_tornetwork_tab_title "Tor Network">
-<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
-<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
-<!ENTITY firstrun_tornetwork_next "Kế tiếp">
-<!ENTITY firstrun_secsettings_tab_title "Bảo máºt">
-<!ENTITY firstrun_secsettings_title "Choose your experience.">
-<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
-<!ENTITY firstrun_secsettings_next "Kế tiếp">
-<!ENTITY firstrun_tips_tab_title "Gợi �">
-<!ENTITY firstrun_tips_title "Experience Tips.">
-<!ENTITY firstrun_tips_message "With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot.">
-<!ENTITY firstrun_tips_next "Kế tiếp">
-<!ENTITY firstrun_onionservices_tab_title "Onions">
-<!ENTITY firstrun_onionservices_title "Onion Services.">
-<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
-<!ENTITY firstrun_onionservices_next "Go to explore">
diff --git a/zh_CN/android_strings.dtd b/zh-CN/torbrowser_strings.dtd
similarity index 51%
rename from zh_CN/android_strings.dtd
rename to zh-CN/torbrowser_strings.dtd
index 2c577c587..652aedecc 100644
--- a/zh_CN/android_strings.dtd
+++ b/zh-CN/torbrowser_strings.dtd
@@ -6,7 +6,7 @@
<!ENTITY firstrun_privacy_tab_title "é??ç§?">
<!ENTITY firstrun_privacy_title "æ??ç»?è·?踪å??å??æ?¢ã??">
<!ENTITY firstrun_privacy_message "Tor Browser ä¼?é??离 Cookie ï¼?并å?¨ä½ æµ?è§?ç»?æ??æ?¶å? é?¤ Cookies å??å??å?²è®°å½?ã??è¿?äº?ä¿®æ?¹ä¿?è¯?äº?ä½ ç??å®?å?¨å??é??ç§?å?¨æµ?è§?è¿?ç¨?ä¸æ?¶å?°ä¿?æ?¤ã??ç?¹å?» â??Tor ç½?ç»?â?? äº?解æ??们å¦?ä½?å?¨ç½?ç»?å±?级è¿?è¡?ä¿?æ?¤ã??">
-<!ENTITY firstrun_privacy_next "å??å¾? â??Tor ç½?ç»?â??">
+<!ENTITY firstrun_privacy_next "å??å¾?â??Tor ç½?ç»?â??">
<!ENTITY firstrun_tornetwork_tab_title "Tor ç½?ç»?">
<!ENTITY firstrun_tornetwork_title "é??è¿?é??ä¸å¿?å??ç??ç½?ç»?è¿?è¡?æµ?è§?ã??">
<!ENTITY firstrun_tornetwork_message "Tor Browser å°?ä½ å??ä¸?ç??æ?°å??å??å¿?æ?¿è??æ?¯æ??ç?? Tor ç½?ç»?ç?¸è¿?ã??å?? VPN ä¸?å??ç??æ?¯ï¼?è¿?é??ä¸?ä¼?æ??å??ç?¹æ??é??ï¼?ä¹?ä¸?é??è¦?ä½ ä¸ºäº?ç§?å¯?æµ?è§?ä¿¡ä»»æ??ä¸?个ä¸å¿?å??ç??å®?ä½?ã??">
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "æ´?è?±æ??å?¡">
<!ENTITY firstrun_onionservices_message "æ´?è?±æ??å?¡æ?¯ä»¥ .onion å??å??ç»?å°¾ç??ç½?ç«?ï¼?å?¯ä»¥ä¸ºè®¿é?®è??å??å??å¸?è??æ??ä¾?é¢?å¤?ç??ä¿?æ?¤ï¼?ä¾?å¦?对æ??审æ?¥ã??æ´?è?±æ??å?¡å??许任ä½?人以å?¿å??ç??æ?¹å¼?æ??ä¾?å??容å??æ??å?¡ã??">
<!ENTITY firstrun_onionservices_next "��索">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "è¿?æ?¥">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "ç½?ç»?">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "å?°å??:端å?£">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
diff --git a/zh_TW/android_strings.dtd b/zh-TW/torbrowser_strings.dtd
similarity index 52%
rename from zh_TW/android_strings.dtd
rename to zh-TW/torbrowser_strings.dtd
index c38669cf4..329fd630a 100644
--- a/zh_TW/android_strings.dtd
+++ b/zh-TW/torbrowser_strings.dtd
@@ -11,7 +11,7 @@
<!ENTITY firstrun_tornetwork_title "Travel a decentralized network.">
<!ENTITY firstrun_tornetwork_message "Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there\'s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately.">
<!ENTITY firstrun_tornetwork_next "ä¸?ä¸?å??">
-<!ENTITY firstrun_secsettings_tab_title "å®?å?¨">
+<!ENTITY firstrun_secsettings_tab_title "���">
<!ENTITY firstrun_secsettings_title "é?¸æ??æ?¨ç??ç?¨æ?¶é«?é©?ã??">
<!ENTITY firstrun_secsettings_message "We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer.">
<!ENTITY firstrun_secsettings_next "ä¸?ä¸?å??">
@@ -23,3 +23,35 @@
<!ENTITY firstrun_onionservices_title "Onion Services.">
<!ENTITY firstrun_onionservices_message "Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously.">
<!ENTITY firstrun_onionservices_next "Go to explore">
+
+<!ENTITY tor_bootstrap_swipe_for_logs "Swipe to the left to see Tor logs">
+<!ENTITY tor_bootstrap_connect "��">
+<!ENTITY tor_bootstrap_starting_status "We are connecting to the Tor network...">
+
+<!ENTITY pref_tor_network_title "網路">
+<!ENTITY pref_tor_select_a_bridge_title "Select a Bridge">
+<!ENTITY pref_tor_provide_a_bridge_title "Provide a Bridge">
+
+<!ENTITY pref_category_tor_network_summary "Tor Browser connects you to the Tor Network run by thousands of volunteers around the world! Can these options help you?">
+<!ENTITY pref_category_tor_bridge_summary "Bridges are unlisted Tor relays that make it more difficult to block connections into the Tor network. Because of how some countries try to block Tor, certain bridges work in some countries but not others.">
+
+<!ENTITY pref_choice_tor_bridges_enabled_title "Internet is censored here">
+<!ENTITY pref_choice_tor_bridges_enabled_summary "Tap to configure a bridge to connect to Tor">
+
+<!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know">
+<!ENTITY pref_tor_bridges_provide_select_text_title "Select a Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge">
+<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source">
+<!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "address:port">
+<!ENTITY pref_tor_hint_type_one_per_line "Type one per line">
+
+<!-- When another PT is recommended, change TorNetworkBridgeSelectPreference::saveCurrentCheckedRadioButton(), too -->
+<!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)">
+<!ENTITY pref_bridges_type_meek_azure "meek-azure">
+<!ENTITY pref_bridges_type_obfs3 "obfs3">
+<!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change">
+<!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges.">
+<!ENTITY pref_tor_network_using_a_provided_bridge "You\'re using &formatS; bridge.">
+
+<!ENTITY tor_notify_user_about_error "An error occurred, please swipe for more information.">
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits