[tor-commits] [translation/tba-torbrowserstringsdtd] new file for TBA, ref: #30015
translation at torproject.org
translation at torproject.org
Thu Apr 4 08:03:57 UTC 2019
commit 52910ac5cc9ac34c69aad391ba17dd9f1a9873f2
Author: Translation commit bot <translation at torproject.org>
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.">
More information about the tor-commits
mailing list