[tbb-commits] [tor-launcher] 01/02: Update translations

Wed May 11 16:26:13 UTC 2022

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch master
in repository tor-launcher.

commit e145868d951f55faa84a095c2208fe561c302f81
Author: Richard Pospesel <richard at torproject.org>
AuthorDate: Wed May 11 16:24:12 2022 +0000

    Update translations
---
 src/chrome/locale/af/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/ar/network-settings.dtd      | 116 +++++++++++++---
 src/chrome/locale/ast/network-settings.dtd     | 114 +++++++++++++---
 src/chrome/locale/az/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/be/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/bg/network-settings.dtd      | 120 ++++++++++++++---
 src/chrome/locale/bn-BD/network-settings.dtd   | 112 +++++++++++++---
 src/chrome/locale/br/network-settings.dtd      | 112 +++++++++++++---
 src/chrome/locale/bs/network-settings.dtd      | 116 +++++++++++++---
 src/chrome/locale/ca/network-settings.dtd      | 136 +++++++++++++++----
 src/chrome/locale/ca/torlauncher.properties    |  10 +-
 src/chrome/locale/cs/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/cy/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/da/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/de/network-settings.dtd      | 112 +++++++++++++---
 src/chrome/locale/el/network-settings.dtd      | 156 ++++++++++++++++------
 src/chrome/locale/el/torlauncher.properties    |   2 +-
 src/chrome/locale/eo/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/es-AR/network-settings.dtd   | 112 +++++++++++++---
 src/chrome/locale/es-ES/network-settings.dtd   | 114 +++++++++++++---
 src/chrome/locale/es-MX/network-settings.dtd   | 114 +++++++++++++---
 src/chrome/locale/et/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/eu/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/fa/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/fi/network-settings.dtd      | 116 +++++++++++++---
 src/chrome/locale/fr/network-settings.dtd      | 112 +++++++++++++---
 src/chrome/locale/fy-NL/network-settings.dtd   | 114 +++++++++++++---
 src/chrome/locale/ga-IE/network-settings.dtd   | 114 +++++++++++++---
 src/chrome/locale/gl/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/gu-IN/network-settings.dtd   | 114 +++++++++++++---
 src/chrome/locale/he/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/he/torlauncher.properties    |   6 +-
 src/chrome/locale/hi-IN/network-settings.dtd   | 112 +++++++++++++---
 src/chrome/locale/hr/network-settings.dtd      | 112 +++++++++++++---
 src/chrome/locale/hu/network-settings.dtd      | 126 ++++++++++++++----
 src/chrome/locale/hy-AM/network-settings.dtd   | 142 +++++++++++++++-----
 src/chrome/locale/hy-AM/torlauncher.properties |  76 +++++------
 src/chrome/locale/id/network-settings.dtd      | 116 +++++++++++++---
 src/chrome/locale/is/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/it/network-settings.dtd      | 116 +++++++++++++---
 src/chrome/locale/ja/network-settings.dtd      | 137 +++++++++++++++----
 src/chrome/locale/ja/torlauncher.properties    |  30 ++---
 src/chrome/locale/ka/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/kk/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/km/network-settings.dtd      | 116 +++++++++++++---
 src/chrome/locale/ko/network-settings.dtd      | 146 +++++++++++++++-----
 src/chrome/locale/ko/torlauncher.properties    |  68 +++++-----
 src/chrome/locale/lt/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/lv/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/mk/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/ml/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/mr/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/ms/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/my/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/nb-NO/network-settings.dtd   | 112 +++++++++++++---
 src/chrome/locale/ne/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/nl-BE/network-settings.dtd   | 114 +++++++++++++---
 src/chrome/locale/nl/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/nn-NO/network-settings.dtd   | 126 ++++++++++++++----
 src/chrome/locale/oc/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/pa-IN/network-settings.dtd   | 114 +++++++++++++---
 src/chrome/locale/pl/network-settings.dtd      | 124 +++++++++++++----
 src/chrome/locale/pt-BR/network-settings.dtd   | 114 +++++++++++++---
 src/chrome/locale/pt-PT/network-settings.dtd   | 114 +++++++++++++---
 src/chrome/locale/ro/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/ru/network-settings.dtd      | 116 +++++++++++++---
 src/chrome/locale/sk/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/sl/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/sl/torlauncher.properties    |   2 +-
 src/chrome/locale/sq/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/sr/network-settings.dtd      | 116 +++++++++++++---
 src/chrome/locale/sv-SE/network-settings.dtd   | 120 ++++++++++++++---
 src/chrome/locale/sv-SE/torlauncher.properties |  12 +-
 src/chrome/locale/sw/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/ta/network-settings.dtd      | 112 +++++++++++++---
 src/chrome/locale/te/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/th/network-settings.dtd      | 112 +++++++++++++---
 src/chrome/locale/tr/network-settings.dtd      | 112 +++++++++++++---
 src/chrome/locale/uk/network-settings.dtd      | 124 +++++++++++++----
 src/chrome/locale/ur/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/uz/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/vi/network-settings.dtd      | 114 +++++++++++++---
 src/chrome/locale/zh-CN/network-settings.dtd   | 120 ++++++++++++++---
 src/chrome/locale/zh-HK/network-settings.dtd   | 114 +++++++++++++---
 src/chrome/locale/zh-TW/network-settings.dtd   | 176 ++++++++++++++++++-------
 src/chrome/locale/zh-TW/torlauncher.properties |  66 +++++-----
 86 files changed, 7738 insertions(+), 1577 deletions(-)

diff --git a/src/chrome/locale/af/network-settings.dtd b/src/chrome/locale/af/network-settings.dtd
index 387ecd4..6217b03 100644
--- a/src/chrome/locale/af/network-settings.dtd
+++ b/src/chrome/locale/af/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connection">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Remove">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Advanced">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Kanselleer">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/ar/network-settings.dtd b/src/chrome/locale/ar/network-settings.dtd
index b8e98c1..016c6eb 100644
--- a/src/chrome/locale/ar/network-settings.dtd
+++ b/src/chrome/locale/ar/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "الرجاء الانتظار بينما ننشئ اتصالا لشبكة تور.  قد يستغرق هذا عدة دقائق.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "تور">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "الاتصال">
 <!ENTITY torPreferences.torSettings "إعدادات تور Tor">
 <!ENTITY torPreferences.torSettingsDescription "متصفح Tor Browser يوجه حركة بياناتك عبر شبكة تور Tor Network, التي يشغلها آلاف المتطوعون حول العالم." >
-<!ENTITY torPreferences.learnMore "إعرف/ي أكثر ">
+<!ENTITY torPreferences.learnMore "تعرف على المزيد">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "افحص">
+<!ENTITY torPreferences.statusInternetOnline "متصل">
+<!ENTITY torPreferences.statusInternetOffline "غير متصل">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "متصل">
+<!ENTITY torPreferences.statusTorNotConnected "غير متصل">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "تعرف على المزيد">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "بداية سريعة">
-<!ENTITY torPreferences.quickstartDescription "ﺎﻠﺑﺩﺎﻳﺓ ﺎﻠﺳﺮﻴﻋﺓ ﺖﺴﻤﺣ ﻞﻤﺘﺼﻔﺣ ﺕﻭﺭ ﺏﺍﻸﺘﺻﺎﻟ ﺐﺸﻜﻟ ﺖﻠﻗﺎﺌﻳ">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "اتصل تلقائيا بشكل دائم">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "الجسور">
 <!ENTITY torPreferences.bridgesDescription "تساعدك الجسور على دخول شبكة تور Tor Network في الأماكن التي تحظر تور Tor. وبالاعتماد على مكان تواجدك فإن أحد الجسور قد يعمل بشكل أفضل من غيره.  ">
-<!ENTITY torPreferences.useBridge "استخدم جِسْر">
-<!ENTITY torPreferences.requestNewBridge "اطلب جسرا جديدا…">
-<!ENTITY torPreferences.provideBridge "أدخل عنوان جِسْر">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "تلقائي">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "حذف">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "تم النسخ!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "اطلب جسرا…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "متقدم">
-<!ENTITY torPreferences.advancedDescription "قم بإعداد كيفية اتصال متصفح Tor Browser بالانترنت">
-<!ENTITY torPreferences.firewallPortsPlaceholder "قيم مفصولة بالفاصلة">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "شاهد السجلات...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "إلغاء ">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "اطلب جسراً">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "يتصل بقاعدة بيانات الجسور BridgeDB. يرجى الانتظار.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "حل كاباتشا لطلب جسر.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "الحل ليس سليمًا. يُرجى إعادة المحاولة.">
-<!ENTITY torPreferences.viewTorLogs "شاهد سجلات تور Tor">
-<!ENTITY torPreferences.viewLogs "شاهد السجلات...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "أدخل معلومات الجسر من مصدر موثوق">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "سجلات تور Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "حاول الاتصال مرة أخرى">
-<!ENTITY torConnect.offline "غير متصل">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "فشل متصفح Tor في إنشاء اتصال بشبكة Tor">
-<!ENTITY torConnect.connectingConcise "جاري الاتصال ...">
-<!ENTITY torConnect.connectedConcise "متصل">
 <!ENTITY torConnect.notConnectedConcise "غير متصل">
-<!ENTITY torConnect.copyLog "انسخ سجلات Tor">
+<!ENTITY torConnect.connectingConcise "جاري الاتصال ...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "تلقائي">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "تكوين الاتصال…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "الرجاء المحاولة مجددًا">
+<!ENTITY torConnect.offline "Internet not reachable">
+<!ENTITY torConnect.connectMessage "لن تسري التغييرات على إعدادات Tor حتى تقوم بالاتصال">
+<!ENTITY torConnect.tryAgainMessage "فشل متصفح Tor في إنشاء اتصال بشبكة Tor">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "جرب الجسر">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/ast/network-settings.dtd b/src/chrome/locale/ast/network-settings.dtd
index 5e71a43..baa66fa 100644
--- a/src/chrome/locale/ast/network-settings.dtd
+++ b/src/chrome/locale/ast/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connection">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "En llinia">
+<!ENTITY torPreferences.statusInternetOffline "Sin conexón">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Desaniciar">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avanzao">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Encaboxar">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Sin conexón">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Tentar nuevamente">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/az/network-settings.dtd b/src/chrome/locale/az/network-settings.dtd
index 9ce9960..826c142 100644
--- a/src/chrome/locale/az/network-settings.dtd
+++ b/src/chrome/locale/az/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Bağlantı">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Daha ətraflı öyrən">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Qoşuldu">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Daha ətraflı öyrən">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Körpülər">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Avtomatik">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Sil">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Qabaqcıl">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Ləğv et">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Qoşulur...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Avtomatik">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Yenidən cəhd elə">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Qoşulur...">
-<!ENTITY torConnect.connectedConcise "Qoşuldu">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/be/network-settings.dtd b/src/chrome/locale/be/network-settings.dtd
index b9ee4eb..9a4c36b 100644
--- a/src/chrome/locale/be/network-settings.dtd
+++ b/src/chrome/locale/be/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Злучэнне">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Даведацца больш">
+<!ENTITY torPreferences.learnMore "Даведайцеся больш">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Тэст">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Падлучана">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Даведайцеся больш">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Масты">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Выдаліць">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Дадаткова">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Адмяніць">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Ідзе злучэнне...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Ідзе злучэнне...">
-<!ENTITY torConnect.connectedConcise "Падлучана">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/bg/network-settings.dtd b/src/chrome/locale/bg/network-settings.dtd
index a3a7c96..8748de8 100644
--- a/src/chrome/locale/bg/network-settings.dtd
+++ b/src/chrome/locale/bg/network-settings.dtd
@@ -1,7 +1,7 @@
-<!ENTITY torsettings.dialog.title "Настройки на Tor мрежата">
+<!ENTITY torsettings.dialog.title "Настройки на мрежата на Tor">
 <!ENTITY torsettings.wizard.title.default "Свързване с Tor">
-<!ENTITY torsettings.wizard.title.configure "Настройки на Tor мрежата">
-<!ENTITY torsettings.wizard.title.connecting "Осъществяване на Тор връзка">
+<!ENTITY torsettings.wizard.title.configure "Настройки на мрежата на Tor">
+<!ENTITY torsettings.wizard.title.connecting "Осъществяване на връзка">
 
 <!-- For locale picker: -->
 <!ENTITY torlauncher.localePicker.title "Език на Tor браузъра">
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Моля изчакайте, докато установим връзка с Тор мрежата..  Toва може да отнеме няколко минути.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Връзка">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Научете повече">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Тест">
+<!ENTITY torPreferences.statusInternetOnline "На линия">
+<!ENTITY torPreferences.statusInternetOffline "Извън линия">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Свързан">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Научете повече">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Бриджове">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Заявка за нов bridge...">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Автоматично">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Премахване">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Заявка за bridge...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Напреднали">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Отмяна">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Решете CAPTCHA за заявка на bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Решението не е правилно. Моля, опитайте пак.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Извън линия">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Свързване…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Автоматично">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Нов опит">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Свързване…">
-<!ENTITY torConnect.connectedConcise "Свързан">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/bn-BD/network-settings.dtd b/src/chrome/locale/bn-BD/network-settings.dtd
index 1625187..7fe044f 100644
--- a/src/chrome/locale/bn-BD/network-settings.dtd
+++ b/src/chrome/locale/bn-BD/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "আমরা টর নেটওয়ার্কে একটি সংযোগ স্থাপন করার সময় অনুগ্রহ করে অপেক্ষা করুন।   এই কয়েক মিনিট সময় নিতে পারে.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "সংযোগ">
 <!ENTITY torPreferences.torSettings "টর সেটিংস">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser আপনার ট্র্যাফিকটি সারা বিশ্বে হাজার হাজার স্বেচ্ছাসেবীর দ্বারা পরিচালিত টর নেটওয়ার্কের পথে নিয়ে যায়।" >
 <!ENTITY torPreferences.learnMore "আরও জানুন">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "অনলাইন">
+<!ENTITY torPreferences.statusInternetOffline "অফলাইন">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "সংযুক্ত">
+<!ENTITY torPreferences.statusTorNotConnected "যুক্ত নয়">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "আরও জানুন">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "দ্রুত শুরু">
-<!ENTITY torPreferences.quickstartDescription "দ্রুত শুরু স্বয়ংক্রিয়ভাবে টর ব্রাউজার শুরু করতে সাহায্য করে।">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "সবসময় স্বয়ংক্রিয়ভাবে যুক্ত হও">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "ব্রিজ">
 <!ENTITY torPreferences.bridgesDescription "ব্রিজগুলি যেখানে টরকে অবরুদ্ধ করা হয়েছে সেখানে টর নেটওয়ার্ক অ্যাক্সেস করতে আপনাকে সহায়তা করে। আপনি কোথায় আছেন তার উপর নির্ভর করে একটি সেতু অন্যের চেয়ে ভাল কাজ করতে পারে।">
-<!ENTITY torPreferences.useBridge "একটি ব্রিজ ব্যবহার করুন">
-<!ENTITY torPreferences.requestNewBridge "একটি নতুন ব্রিজ অনুরোধ করুন">
-<!ENTITY torPreferences.provideBridge "একটি ব্রিজ সরবরাহ করুন">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "অপসারণ">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "অনুলিপিত!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "ব্রিজ অনুরোধ করুন........">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "অগ্রবর্তী">
-<!ENTITY torPreferences.advancedDescription "Tor Browser কীভাবে ইন্টারনেটে সংযুক্ত হয় তা কনফিগার করুন।">
-<!ENTITY torPreferences.firewallPortsPlaceholder "কমা পৃথক করা মান">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "লগ দেখুন....">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "বাতিল">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "একটি ব্রিজের জন্য অনুরোধ করুন">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDB এর সাথে যোগাযোগ করা হচ্ছে। অনুগ্রহপূর্বক অপেক্ষা করুন.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "একটি ব্রিজ অনুরোধ করার জন্য ক্যাপচা সমাধান করুন।...">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "সমাধান সঠিক নয়। অনুগ্রহপূর্বক আবার চেষ্টা করুন.">
-<!ENTITY torPreferences.viewTorLogs "টর লগগুলি দেখুন।">
-<!ENTITY torPreferences.viewLogs "লগ দেখুন....">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "বিশ্বস্ত সূত্র থেকে সেতু তথ্য দাও">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "টর লগ">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "যুক্ত হতে আবার চেষ্টা করো">
-<!ENTITY torConnect.offline "অফলাইন">
+<!ENTITY torConnect.notConnectedConcise "যুক্ত নয়">
+<!ENTITY torConnect.connectingConcise "সংযুক্ত হচ্ছে ...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "স্বয়ংক্রিয়">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "আবার চেষ্টা কর">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "টর নেটওয়ার্কে যুক্ত হতে টর ব্রাউজার ব্যর্থ হয়েছে।">
-<!ENTITY torConnect.connectingConcise "সংযুক্ত হচ্ছে ...">
-<!ENTITY torConnect.connectedConcise "সংযুক্ত">
-<!ENTITY torConnect.notConnectedConcise "যুক্ত নয়">
-<!ENTITY torConnect.copyLog "টর সূচী অনুলিপি করো">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/br/network-settings.dtd b/src/chrome/locale/br/network-settings.dtd
index da8f67d..12b1f1a 100644
--- a/src/chrome/locale/br/network-settings.dtd
+++ b/src/chrome/locale/br/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Gortozit mar plij ma tiazefemp ur gevreadenn ouzh ar genrouedad Tor.   Gellout a rafe kemer meur a vunutenn.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connection">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
 <!ENTITY torPreferences.learnMore "Gouzout hiroc'h">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Enlinenn">
+<!ENTITY torPreferences.statusInternetOffline "Ezlinenn">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Kevreet">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Gouzout hiroc'h">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Pontoù">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Dilemel">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Araokaet">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Nullañ">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Ezlinenn">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Emgefreek">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Klask adarre">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Kevreet">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/bs/network-settings.dtd b/src/chrome/locale/bs/network-settings.dtd
index 56c8457..cdbe382 100644
--- a/src/chrome/locale/bs/network-settings.dtd
+++ b/src/chrome/locale/bs/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Povezivanje">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
-<!ENTITY torPreferences.advanced "Advanced">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Ukloni">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
+<!ENTITY torPreferences.advanced "Napredni">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Odustanite">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Konektovanje…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Probajte ponovo">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Konektovanje…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/ca/network-settings.dtd b/src/chrome/locale/ca/network-settings.dtd
index fa7ae57..c9a1856 100644
--- a/src/chrome/locale/ca/network-settings.dtd
+++ b/src/chrome/locale/ca/network-settings.dtd
@@ -9,7 +9,7 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torSettings.connectPrompt "Feu clic a «Connectar» per a connectar a Tor.">
+<!ENTITY torSettings.connectPrompt "Feu clic a «Connecta» per a connectar a Tor.">
 <!ENTITY torSettings.configurePrompt "Feu clic a «Configura» per a ajustar la configuració de la xarxa si esteu en un país que censura Tor (com ara Egipte, Xina, Turquia) o si us esteu connectant des d'una xarxa privada que requereix un servidor intermediari.">
 <!ENTITY torSettings.configure "Configura">
 <!ENTITY torSettings.connect "Conecta't">
@@ -27,7 +27,7 @@
 ">
 
 <!ENTITY torsettings.useProxy.checkbox "Utilitzo un servidor intermediari per a accedir a Internet">
-<!ENTITY torsettings.useProxy.type "Tipus de Servidor intermediari">
+<!ENTITY torsettings.useProxy.type "Tipus de servidor intermediari">
 <!ENTITY torsettings.useProxy.type.placeholder "seleccioneu un tipus de servidor intermediari">
 <!ENTITY torsettings.useProxy.address "Adreça">
 <!ENTITY torsettings.useProxy.address.placeholder "Adreça IP o nom del host">
@@ -45,53 +45,133 @@
 <!ENTITY torsettings.useBridges.bridgeDB "Sol·licita un pont a torproject.org">
 <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Introduïu els caràcters de la imatge">
 <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Obtén un repte nou">
-<!ENTITY torsettings.useBridges.captchaSubmit "Tramet">
-<!ENTITY torsettings.useBridges.custom "Proveeix un pont conegut">
+<!ENTITY torsettings.useBridges.captchaSubmit "Envia">
+<!ENTITY torsettings.useBridges.custom "Proporciona un pont conegut">
 <!ENTITY torsettings.useBridges.label "Introdueix informació d'un pont d'una font fiable.">
 <!ENTITY torsettings.useBridges.placeholder "introduïu adreça:port (un per línia)">
 
 <!ENTITY torsettings.copyLog "Copia el registre de Tor al porta-retalls">
 
 <!ENTITY torsettings.proxyHelpTitle "Ajuda del servidor intermediari">
-<!ENTITY torsettings.proxyHelp1 "Pot ser necessari un servidor intermediari local quan us connecteu a través de la xarxa d'una empresa, escola o universitat. Si no esteu segur de necessitar un servidor intermediari, mireu els paràmetres d'un altre navegador o comproveu la configuració de xarxa del vostre sistema.">
+<!ENTITY torsettings.proxyHelp1 "Pot ser necessari un servidor intermediari local quan us connecteu a través de la xarxa d'una empresa, escola o universitat. En cas de dubte si us cal o no un servidor intermediari, mireu els paràmetres d'altre navegador o bé comproveu la configuració de xarxa del vostre sistema.">
 
 <!ENTITY torsettings.bridgeHelpTitle "Ajuda per als repetidors de pont">
 <!ENTITY torsettings.bridgeHelp1 "Els ponts són repetidors no llistats que fan més difícil el bloqueig de connexions a la xarxa Tor.  Cada tipus de pont usa un mètode diferent per a evitar la censura.  Els tipus OBFS fan passar el vostre tràfic com a soroll aleatori, mentre que els MEEK fan que paregui que es connecta a un altre servei diferent a Tor.">
-<!ENTITY torsettings.bridgeHelp2 "Depenent de com intente bloquejar Tor cada país, alguns ponts poden funcionar correctament en certs països però no en altres.  Si no esteu segurs de quins ponts funcionen al vostre país, visiteu torproject.org/about/contact.html#support">
+<!ENTITY torsettings.bridgeHelp2 "Depenent del bloqueig aplicat al Tor a cada país, alguns ponts poden funcionar correctament en certs països, però en altres no.  En cas de dubte dels ponts que funcionen al vostre país, visiteu torproject.org/about/contact.html#support">
 
 <!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Espereu mentre establim una connexió amb la xarxa Tor.  Això pot tardar uns minuts.">
+<!ENTITY torprogress.pleaseWait "S'està establint una connexió amb la xarxa Tor.  Això pot trigar una mica.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connexió">
 <!ENTITY torPreferences.torSettings "Configuració del Tor">
 <!ENTITY torPreferences.torSettingsDescription "El navegador Tor encamina el vostre trànsit cap a la xarxa Tor, gestionada per milers de voluntaris de tot el món." >
-<!ENTITY torPreferences.learnMore "Aprèn més">
-<!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
-<!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!ENTITY torPreferences.learnMore "Més informació">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "En línia">
+<!ENTITY torPreferences.statusInternetOffline "Fora de línia">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connectat">
+<!ENTITY torPreferences.statusTorNotConnected "No connectat">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Més informació">
+<!-- Quickstart -->
+<!ENTITY torPreferences.quickstart "Inici ràpid">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
+<!ENTITY torPreferences.quickstartCheckbox "Activa sempre la connexió automàtica">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Ponts">
 <!ENTITY torPreferences.bridgesDescription "Els ponts us ajuden a accedir a la xarxa Tor en llocs on Tor està bloquejat. Depenent d'on sigueu, un pont pot funcionar millor que un altre.">
-<!ENTITY torPreferences.useBridge "Utilitza un pont">
-<!ENTITY torPreferences.requestNewBridge "Sol·licita un pont nou...">
-<!ENTITY torPreferences.provideBridge "Proporciona un pont">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Suprimeix la subscripció">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "S'ha copiat!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Sol·licita un pont...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avançat">
-<!ENTITY torPreferences.advancedDescription "Configureu la manera en què el navegador Tor es connecta a Internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Valors separats per comes">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Mostra els registres…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Cancel·la">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Sol·licita un pont">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "S'està contactant amb el BridgeDB. Espereu.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolgueu el CAPTCHA per a sol·licitar un pont.">
+<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solucioneu el CAPTCHA per sol·licitar un pont.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "La solució no és correcta. Torneu a provar-ho.">
-<!ENTITY torPreferences.viewTorLogs "Mostra els registres de Tor.">
-<!ENTITY torPreferences.viewLogs "Mostra els registres…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Introduïu la informació del pont d'una font confiable">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Registres del Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Fora de línia">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
+<!ENTITY torConnect.notConnectedConcise "No connectat">
 <!ENTITY torConnect.connectingConcise "S'està connectant...">
-<!ENTITY torConnect.connectedConcise "Connectat">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automàtic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configuració de la connexió…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Torna-ho a provar">
+<!ENTITY torConnect.offline "Internet not reachable">
+<!ENTITY torConnect.connectMessage "Els canvis a la configuració del Tor no seran aplicats fins que no connecteu">
+<!ENTITY torConnect.tryAgainMessage "Ha fallat en establir una connexió amb la xarxa Tor">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Proveu un pont">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/ca/torlauncher.properties b/src/chrome/locale/ca/torlauncher.properties
index ee69a6f..29353e2 100644
--- a/src/chrome/locale/ca/torlauncher.properties
+++ b/src/chrome/locale/ca/torlauncher.properties
@@ -14,7 +14,7 @@ torlauncher.tor_bootstrap_failed_details=%1$S ha fallat (%2$S).
 
 torlauncher.unable_to_start_tor=No s'ha pogut iniciar Tor.\n%S
 torlauncher.tor_missing=Falta l'executable de Tor.
-torlauncher.torrc_missing=El fitxer torrc no hi és i no s'ha pogut crear.
+torlauncher.torrc_missing=El fitxer torrc no existeix i no s'ha pogut crear.
 torlauncher.datadir_missing=La carpeta de dades de Tor no existeix i no s'ha pogut crear.
 torlauncher.onionauthdir_missing=El directori d'autenticació Tor onion no existeix o no s'ha pogut crear.
 torlauncher.password_hash_missing=Ha fallat l'obtenció de la contrasenya hash.
@@ -36,7 +36,7 @@ torlauncher.bridge_suffix.meek-azure=(funciona a la Xina)
 torlauncher.request_a_bridge=Sol·licita un pont...
 torlauncher.request_a_new_bridge=Sol·licita un pont nou...
 torlauncher.contacting_bridgedb=S'està contactant amb el BridgeDB. Espereu.
-torlauncher.captcha_prompt=Resolgueu el CAPTCHA per a sol·licitar un pont.
+torlauncher.captcha_prompt=Solucioneu el CAPTCHA per sol·licitar un pont.
 torlauncher.bad_captcha_solution=La solució no és correcta. Torneu a provar-ho.
 torlauncher.unable_to_get_bridge=No s'ha pogut obtenir un pont des de BridgeDB.
 torlauncher.no_meek=Aquest navegador no està configurat per al MEEK, necessari per a obtenir ponts.
@@ -56,8 +56,8 @@ torlauncher.copiedNLogMessages=Còpia completada. Els missatges del registre de
 torlauncher.bootstrapStatus.starting=Iniciant
 torlauncher.bootstrapStatus.conn_pt=Connectant a pont
 torlauncher.bootstrapStatus.conn_done_pt=Connectat a pont
-torlauncher.bootstrapStatus.conn_proxy=Connectant a proxy
-torlauncher.bootstrapStatus.conn_done_proxy=Connectat a proxy
+torlauncher.bootstrapStatus.conn_proxy=S'està connectant al servidor intermediari
+torlauncher.bootstrapStatus.conn_done_proxy=Connectat al servidor intermediari
 torlauncher.bootstrapStatus.conn=S'està connectant a un relé de Tor
 torlauncher.bootstrapStatus.conn_done=Connectat a un relé de Tor
 torlauncher.bootstrapStatus.handshake=S'està negociant amb un repetidor de Tor
@@ -94,4 +94,4 @@ torlauncher.nsresult.NS_ERROR_NET_RESET=S'ha perdut la connexió amb el servidor
 torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=No s'ha pogut connectar al servidor.
 torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=No s'ha pogut connectar al servidor intermediari.
 
-torlauncher.copiedNLogMessagesShort=Copied %S Logs
+torlauncher.copiedNLogMessagesShort=Copiat %S registres
diff --git a/src/chrome/locale/cs/network-settings.dtd b/src/chrome/locale/cs/network-settings.dtd
index 2fbe1e0..37eeb38 100644
--- a/src/chrome/locale/cs/network-settings.dtd
+++ b/src/chrome/locale/cs/network-settings.dtd
@@ -47,7 +47,7 @@
 <!ENTITY torsettings.useBridges.captchaSubmit "Odeslat">
 <!ENTITY torsettings.useBridges.custom "Zadat známý most">
 <!ENTITY torsettings.useBridges.label "Zadejte informace o mostu z důvěryhodného zdroje.">
-<!ENTITY torsettings.useBridges.placeholder "zadávejte ve tvaru adresa:post (jedna položka na řádek)">
+<!ENTITY torsettings.useBridges.placeholder "zadávejte ve tvaru adresa:port (jedna položka na řádek)">
 
 <!ENTITY torsettings.copyLog "Zkopírovat protokol Toru do schránky">
 
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Počkejte prosím na vytvoření spojení do sítě Tor.  Může to trvat několik minut.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Připojení">
 <!ENTITY torPreferences.torSettings "Nastavení sítě Tor">
 <!ENTITY torPreferences.torSettingsDescription "Prohlížeč Tor vás připojí k síti Tor, provozované tisíci dobrovolníků po celém světě." >
 <!ENTITY torPreferences.learnMore "Zjistit více">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Síť Tor:">
+<!ENTITY torPreferences.statusTorConnected "Připojeno">
+<!ENTITY torPreferences.statusTorNotConnected "Nepřipojeno">
+<!ENTITY torPreferences.statusTorBlocked "Potenciálně Blokováno">
+<!ENTITY torPreferences.learnMore "Zjistit více">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Rychlý start">
-<!ENTITY torPreferences.quickstartDescription "Rychlý start umožňuje automatické připojení prohlížeče Tor Browser.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Rychlý Start připojí Prohlížeč Tor do Sítě Tor automaticky při startu, za použitím naposledy použitého nastavení.">
 <!ENTITY torPreferences.quickstartCheckbox "Vždy připojit automaticky">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Mosty">
 <!ENTITY torPreferences.bridgesDescription "Mosty pomáhají v přístupu k sítě Tor na místech, kde je Tor blokován. Podle toho, kde se nacházíte, mohou některé mosty fungovat lépe než jiné.">
-<!ENTITY torPreferences.useBridge "Použít most">
-<!ENTITY torPreferences.requestNewBridge "Požádat o nový most…">
-<!ENTITY torPreferences.provideBridge "Poskytnout most">
+<!ENTITY torPreferences.bridgeLocation "Vaše umístění">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automaticky">
+<!ENTITY torPreferences.bridgeLocationFrequent "Často použitá umístění">
+<!ENTITY torPreferences.bridgeLocationOther "Jiná umístění">
+<!ENTITY torPreferences.bridgeChooseForMe "Vyber pro mě Most…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Vaše aktuální Mosty">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Můžete si uložit jeden nebo více mostů a Tor si vybere, který pro připojení využije. Tor automaticky přepne most jakmile to bude potřeba.">
+<!ENTITY torPreferences.bridgeId "#1 most: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Odstranit">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Vypnout vestavěné mosty">
+<!ENTITY torPreferences.bridgeShare "Sdílejte tento most pomocí QR kódu nebo kopírováním jeho adresy:">
+<!ENTITY torPreferences.bridgeCopy "Kopírovat Adresu Mostu">
+<!ENTITY torPreferences.copied "Zkopírováno!">
+<!ENTITY torPreferences.bridgeShowAll "Zobrazit Všechny Mosty">
+<!ENTITY torPreferences.bridgeRemoveAll "Odebrat Všechny Mosty">
+<!ENTITY torPreferences.bridgeAdd "Přidat Nový Most">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Vyberte z vestavěných mostů Prohlížeče Tor">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Vyberte vestavěný Most…">
+<!ENTITY torPreferences.bridgeRequest "Požádat o most…">
+<!ENTITY torPreferences.bridgeEnterKnown "Vložte adresu mostu, kterou již znáte">
+<!ENTITY torPreferences.bridgeAddManually "Přidat Most Manuálně…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Rozšířené">
-<!ENTITY torPreferences.advancedDescription "Nastavení, jak se prohlížeč Tor připojuje k internetu.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Hodnoty oddělené čárkou">
+<!ENTITY torPreferences.advancedDescription "Nastavte jak se má Prohlížeč Tor připojovat do internetu">
+<!ENTITY torPreferences.advancedButton "Nastavení…">
+<!ENTITY torPreferences.viewTorLogs "Zobrazit logy Tor">
+<!ENTITY torPreferences.viewLogs "Zobrazit protokol…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Odebrat Všechny Mosty?">
+<!ENTITY torPreferences.removeBridgesWarning "Takto akce nepůjde vzít zpět.">
+<!ENTITY torPreferences.cancel "Zrušit">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Skenovat QR kód">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Vestavěné Mosty">
+<!ENTITY torPreferences.builtinBridgeDescription "Prohlížeč Tor zahrnuje některé specifické typy mostů známé jako “zásuvné přenosy”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 je typ vestavěného mostu který zajišťuje že data vypadají náhodně. Tyto mosty nejsou tak často blokovány jako jejich předchůdci, obfs3 mosty.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake je vestavěný most kterým je obcházena cenzura přesměrováním připojení přes Snowflake proxy, které provozují dobrovolníci.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure je vestavěný most díky kterému se bude zdát, že používáte web Microsoftu místo Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Požádat o most">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktování BridgeDB. Čekejte prosím.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Pro vyžádání mostu prosím opište kód CAPTCHA.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Neopsali jste kód správně. Zkuste to prosím znovu.">
-<!ENTITY torPreferences.viewTorLogs "Zobrazit protokol sítě Tor">
-<!ENTITY torPreferences.viewLogs "Zobrazit protokol…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Zadejte Most">
+<!ENTITY torPreferences.provideBridgeHeader "Zadejte informace o bridgi z důvěryhodného zdroje">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Nastavení Připojení">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Nastavte jak se bude Prohlížeč Tor připojovat k internetu">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Hodnoty oddělené čárkami">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Protokol sítě Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Zkusit se připojit znovu">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Nepřipojeno">
+<!ENTITY torConnect.connectingConcise "Spojuji...">
+<!ENTITY torConnect.tryingAgain "Zkouším to znovu...">
+<!ENTITY torConnect.noInternet "Prohlížeč Tor se nemohl připojit k internetu">
+<!ENTITY torConnect.couldNotConnect "Prohlížeč Tor se nemohl připojit k síti Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "nastavte své připojení"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Pokud je Tor blokován tam, kde nyní jste, zkuste použít most. Asistent připojení vám pomůže most vybrat na základě vašeho umístění a nebo to můžete udělat #1 manuálně."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Zkouším most…">
+<!ENTITY torConnect.tryingBridgeAgain "Zkouším to ještě jednou...">
+<!ENTITY torConnect.errorLocation "Prohlížeč Tor vás nedokáže lokalizovat">
+<!ENTITY torConnect.errorLocationDescription "Prohlížeč Tor potřebuje znát vaše umístě k tomu, aby vám vybral nejvhodnější most. Pokud nechcete uvést umístění, můžete zvolit #1 manuální metodu."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Jsou tato nastavení umístění v pořádku?">
+<!ENTITY torConnect.isLocationCorrectDescription "Prohlížeč Tor se stále nemohl připojit k Tor. Prosím zkontrolujte vaše nastavení umístění a zkuste to znovu a nebo #1."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Asistent připojení">
+<!ENTITY torConnect.breadcrumbLocation "Nastavení umístění">
+<!ENTITY torConnect.breadcrumbTryBridge "Zkusit most">
+<!ENTITY torConnect.automatic "Automaticky">
+<!ENTITY torConnect.selectCountryRegion "Vyberte Zemi nebo Region">
+<!ENTITY torConnect.frequentLocations "Často použitá umístění">
+<!ENTITY torConnect.otherLocations "Jiná umístění">
+<!ENTITY torConnect.restartTorBrowser "Restartovat Prohlížeč Tor">
+<!ENTITY torConnect.configureConnection "Nastavit Připojení…">
+<!ENTITY torConnect.viewLog "Zobrazit logy...">
+<!ENTITY torConnect.tryAgain "Zkusit znovu">
+<!ENTITY torConnect.offline "Internet není dostupný">
 <!ENTITY torConnect.connectMessage "Změny v nastavení Tor se neprojeví, dokud se nepřipojíte">
 <!ENTITY torConnect.tryAgainMessage "Tor prohlížeči se nepodařilo navázat spojení se sítí Tor">
-<!ENTITY torConnect.connectingConcise "Spojuji...">
-<!ENTITY torConnect.connectedConcise "Připojeno">
-<!ENTITY torConnect.notConnectedConcise "Nepřipojeno">
-<!ENTITY torConnect.copyLog "Zkopírovat Tor logy">
+<!ENTITY torConnect.yourLocation "Vaše umístění">
+<!ENTITY torConnect.tryBridge "Zkusit Most">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatické nastavení selhalo">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatické nastavení selhalo">
+<!ENTITY torConnect.cannotDetermineCountry "Nebylo možné rozpoznat zemi uživatele">
+<!ENTITY torConnect.noSettingsForCountry "Žádná nastavení nejsou k dispozici pro vaše umístění">
diff --git a/src/chrome/locale/cy/network-settings.dtd b/src/chrome/locale/cy/network-settings.dtd
index b99dde7..5b023c3 100644
--- a/src/chrome/locale/cy/network-settings.dtd
+++ b/src/chrome/locale/cy/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connection">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Remove">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Advanced">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Diddymu">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/da/network-settings.dtd b/src/chrome/locale/da/network-settings.dtd
index 6b06499..e881c43 100644
--- a/src/chrome/locale/da/network-settings.dtd
+++ b/src/chrome/locale/da/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Vent venligst mens der etableres forbindelse til Tor-netværket.  Det kan tage flere minutter.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Forbindelse">
 <!ENTITY torPreferences.torSettings "Tor-indstillinger">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser sender din trafik over Tor-netværket som køres af tusindvis af frivillige verden over." >
-<!ENTITY torPreferences.learnMore "Læs mere">
+<!ENTITY torPreferences.learnMore "Lær mere">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Forbundet">
+<!ENTITY torPreferences.statusTorNotConnected "Ikke forbundet">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Lær mere">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Hurtig start">
-<!ENTITY torPreferences.quickstartDescription "Hurtig start giver Tor Browser mulighed for at oprette forbindelse automatisk.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Opret altid forbindelse automatisk">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Broer">
 <!ENTITY torPreferences.bridgesDescription "Broer hjælper dig med at tilgå Tor-netværket steder hvor Tor er blokeret. Afhængig af hvor du er, så kan en bro virke bedre end en anden.">
-<!ENTITY torPreferences.useBridge "Brug en bro">
-<!ENTITY torPreferences.requestNewBridge "Anmod om en ny bro…">
-<!ENTITY torPreferences.provideBridge "Formidl en bro">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatisk">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Fjern">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Kopieret!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Anmod om en bro…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avanceret">
-<!ENTITY torPreferences.advancedDescription "Konfigurer hvordan Tor Browser opretter forbindelse til internettet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Kommaseparerede værdier">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Vis logge…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Annuller">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Anmod om bro">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontakter BridgeDB. Vent venligst.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Løs CAPTCHA'en for at anmode om en bro.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Løsningen er ikke korrekt. Prøv venligst igen.">
-<!ENTITY torPreferences.viewTorLogs "Vis Tor-loggene.">
-<!ENTITY torPreferences.viewLogs "Vis logge…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Indtast broinformation fra en betroet kilde">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor-logge">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Prøv at oprette forbindelse igen">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Ikke forbundet">
+<!ENTITY torConnect.connectingConcise "Forbinder...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatisk">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser kunne ikke etablere en forbindelse til Tor-netværket">
-<!ENTITY torConnect.connectingConcise "Forbinder...">
-<!ENTITY torConnect.connectedConcise "Forbundet">
-<!ENTITY torConnect.notConnectedConcise "Ikke forbundet">
-<!ENTITY torConnect.copyLog "Kopiér Tor-logge">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/de/network-settings.dtd b/src/chrome/locale/de/network-settings.dtd
index f7226a1..e577d85 100644
--- a/src/chrome/locale/de/network-settings.dtd
+++ b/src/chrome/locale/de/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Bitte warten Sie, während eine Verbindung zum Tor-Netzwerk hergestellt wird.  Das kann einige Minuten dauern.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Verbindung">
 <!ENTITY torPreferences.torSettings "Tor-Einstellungen">
 <!ENTITY torPreferences.torSettingsDescription "Der Tor Browser leitet deinen Datenverkehr über das Tor-Netzwerk, das von Tausenden von Freiwilligen auf der ganzen Welt betrieben wird." >
 <!ENTITY torPreferences.learnMore "Mehr erfahren">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor-Netzwerk:">
+<!ENTITY torPreferences.statusTorConnected "Verbunden">
+<!ENTITY torPreferences.statusTorNotConnected "Nicht verbunden">
+<!ENTITY torPreferences.statusTorBlocked "Potenziell blockiert">
+<!ENTITY torPreferences.learnMore "Mehr erfahren">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Schnellstart">
-<!ENTITY torPreferences.quickstartDescription "Der Schnellstart ermöglicht es Tor Browser, sich automatisch zu verbinden.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart verbindet den Tor Browser automatisch mit dem Tor-Netzwerk, wenn er gestartet wird, basierend auf den zuletzt verwendeten Verbindungseinstellungen.">
 <!ENTITY torPreferences.quickstartCheckbox "Immer automatisch verbinden">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Brücken">
 <!ENTITY torPreferences.bridgesDescription "Brücken helfen dir beim Zugriff auf das Tor-Netzwerk an Orten, an denen Tor blockiert ist. Je nachdem, wo du dich befindest, kann eine Brücke besser funktionieren als eine andere.">
-<!ENTITY torPreferences.useBridge "Eine Brücke verwenden">
-<!ENTITY torPreferences.requestNewBridge "Neue Brücke anfordern...">
-<!ENTITY torPreferences.provideBridge "Eine Brücke zur Verfügung stellen">
+<!ENTITY torPreferences.bridgeLocation "Dein Standort">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatisch">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Wähle eine Brücke für mich …">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Deine aktuellen Brücken">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 Brücke: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Entfernen">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Eingebaute Brücken deaktivieren">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Kopiere die Brücken-Adresse">
+<!ENTITY torPreferences.copied "Kopiert!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Eine neue Brücke hinzufügen">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Eine der eingebauten Brücken von Tor Browser auswählen ">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Eine bereitgestellte Brücke auswählen ...">
+<!ENTITY torPreferences.bridgeRequest "Brücke anfordern...">
+<!ENTITY torPreferences.bridgeEnterKnown "Eine bereits bekannte Brücken-Adresse auswählen">
+<!ENTITY torPreferences.bridgeAddManually "Brücke manuell hinzufügen …">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Fortgeschritten">
-<!ENTITY torPreferences.advancedDescription "Konfiguriere, wie sich der Tor Browser mit dem Internet verbindet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Kommagetrennte Werte">
+<!ENTITY torPreferences.advancedDescription "Konfigurieren, wie Tor Browser sich mit dem Internet verbindet">
+<!ENTITY torPreferences.advancedButton "Einstellungen ...">
+<!ENTITY torPreferences.viewTorLogs "Tor-Logs ansehen">
+<!ENTITY torPreferences.viewLogs "Logs ansehen …">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "Dieser Vorgang kann nicht rückgängig gemacht werden.">
+<!ENTITY torPreferences.cancel "Abbrechen">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Den QR-Code scannen">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Bereitgestellte Brücken">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser enthält einige spezielle Arten von Brücken, die als "austauschbare Übertragungsarten" bekannt sind.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 ist eine Art von eingebauter Brücke, die deinen Tor-Verkehr zufällig aussehen lässt. Es ist auch weniger wahrscheinlich, dass sie blockiert werden als ihre Vorgänger, die obfs3-Brücken.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake ist eine integrierte Brücke, die die Zensur umgeht, indem sie deine Verbindung über Snowflake-Proxys weiterleitet, die von Freiwilligen betrieben werden.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure ist eine eingebaute Brücke, die es so aussehen lässt, als würdest du eine Microsoft-Webseite benutzen, anstatt Tor zu verwenden.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Brücke anfordern">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktiere BridgeDB. Bitte warten.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Löse das CAPTCHA, um eine Brücke anzufordern.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Die Lösung ist nicht korrekt. Bitte versuchen Sie es erneut.">
-<!ENTITY torPreferences.viewTorLogs "Tor logs ansehen.">
-<!ENTITY torPreferences.viewLogs "Logs ansehen …">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Brücke bereitstellen">
+<!ENTITY torPreferences.provideBridgeHeader "Brückeninformationen von einer vertrauenswürdigen Quelle eingeben">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Verbindungseinstellungen">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Konfigurieren, wie Tor Browser sich mit dem Internet verbindet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Kommagetrennte Werte">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Versuche erneut, eine Verbindung herzustellen">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Nicht verbunden">
+<!ENTITY torConnect.connectingConcise "Verbinde…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser konnte sich nicht mit Tor verbinden">
+<!ENTITY torConnect.assistDescriptionConfigure "Deine Verbindung konfigurieren"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Wenn Tor an deinem Standort blockiert ist, kann es helfen, eine Brücke zu benutzen. Der Verbindungsassistent kann eine für dich anhand deines Standorts auswählen, oder du kannst stattdessen manuell eine wählen."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Eine Brücke versuchen ...">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser konnte dich nicht lokalisieren">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser muss deinen Standort kennen, um die richtige Brücke für dich zu wählen. Wenn du deinen Standort nicht teilen möchtest, wähle stattdessen eine manuell."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Verbindungsassistent">
+<!ENTITY torConnect.breadcrumbLocation "Standorteinstellungen">
+<!ENTITY torConnect.breadcrumbTryBridge "Eine Brücke versuchen">
+<!ENTITY torConnect.automatic "Automatisch">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Tor Browser neu starten">
+<!ENTITY torConnect.configureConnection "Verbindung konfigurieren ...">
+<!ENTITY torConnect.viewLog "Logs ansehen …">
+<!ENTITY torConnect.tryAgain "Noch einmal versuchen">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Änderungen an den Tor-Einstellungen werden erst wirksam, wenn du dich verbindest">
 <!ENTITY torConnect.tryAgainMessage "Verbindung des Tor Browser mit dem Tor-Netzwerk ist fehlgeschlagen">
-<!ENTITY torConnect.connectingConcise "Verbinde…">
-<!ENTITY torConnect.connectedConcise "Verbunden">
-<!ENTITY torConnect.notConnectedConcise "Nicht verbunen">
-<!ENTITY torConnect.copyLog "Kopiere Tor Logs">
+<!ENTITY torConnect.yourLocation "Dein Standort">
+<!ENTITY torConnect.tryBridge "Eine Brücke versuchen">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatische Konfiguration fehlgeschlagen">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatische Konfiguration fehlgeschlagen">
+<!ENTITY torConnect.cannotDetermineCountry "Benutzerland kann nicht ermittelt werden">
+<!ENTITY torConnect.noSettingsForCountry "Keine Einstellungen für deinen Standort verfügbar">
diff --git a/src/chrome/locale/el/network-settings.dtd b/src/chrome/locale/el/network-settings.dtd
index ff3bd35..0cd1596 100644
--- a/src/chrome/locale/el/network-settings.dtd
+++ b/src/chrome/locale/el/network-settings.dtd
@@ -5,27 +5,27 @@
 
 <!-- For locale picker: -->
 <!ENTITY torlauncher.localePicker.title "Γλώσσα του Tor Browser">
-<!ENTITY torlauncher.localePicker.prompt "Παρακαλώ επιλέξτε μια γλώσσα.">
+<!ENTITY torlauncher.localePicker.prompt "Παρακαλούμε επιλέξτε γλώσσα.">
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torSettings.connectPrompt "Πατήστε "Σύνδεση" για να συνδεθείτε στο Tor.">
-<!ENTITY torSettings.configurePrompt "Πατήστε "Ρύθμιση" για να προσαρμόσετε τις ρυθμίσεις δικτύου αν βρίσκεστε σε χώρα που αποκλείει το Tor (όπως η Αίγυπτος, η Κίνα, η Τουρκία) ή αν συνδέεστε από προσωπικό δίκτυο που χρειάζεται διακομιστή μεσολάβησης.">
+<!ENTITY torSettings.connectPrompt "Κάντε κλικ στο "Σύνδεση" για να συνδεθείτε στο Tor.">
+<!ENTITY torSettings.configurePrompt "Κάντε κλικ στο "Ρύθμιση" για να προσαρμόσετε τις ρυθμίσεις δικτύου αν βρίσκεστε σε χώρα που λογοκρίνει το Tor (όπως η Αίγυπτος, η Κίνα, η Τουρκία) ή αν συνδέεστε από προσωπικό δίκτυο και χρειάζεται διακομιστή μεσολάβησης.">
 <!ENTITY torSettings.configure "Ρύθμιση ">
 <!ENTITY torSettings.connect "Σύνδεση">
 
 <!-- Other: -->
 
-<!ENTITY torsettings.startingTor "Αναμονή για να ξεκινήσει το Tor... ">
+<!ENTITY torsettings.startingTor "Αναμονή έναρξης του Tor... ">
 <!ENTITY torsettings.restartTor "Eπανεκκίνηση Tor">
 <!ENTITY torsettings.reconfigTor "Αναδιαμόρφωση">
 
 <!ENTITY torsettings.discardSettings.prompt "Έχετε ρυθμισμένες γέφυρες Tor ή έχετε εισάγει ρυθμίσεις για το τοπικό διακομιστή μεσολάβησης.  Για να πραγματοποιήσετε απευθείας σύνδεση με το δίκτυο Tor οι ρυθμίσεις αυτές πρέπει να αφαιρεθούν.">
-<!ENTITY torsettings.discardSettings.proceed "Απομακρύνετε τις ρυθμίσεις και συνδεθείτε">
+<!ENTITY torsettings.discardSettings.proceed "Αφαιρέστε τις ρυθμίσεις και συνδεθείτε">
 
-<!ENTITY torsettings.optional "Προαιρετικά">
+<!ENTITY torsettings.optional "Προαιρετικό">
 
-<!ENTITY torsettings.useProxy.checkbox "Χρησιμοποιώ διακομιστή μεσολάβησης για να συνδεθώ στο διαδίκτυο.">
+<!ENTITY torsettings.useProxy.checkbox "Χρήση διακομιστή μεσολάβησης για σύνδεση στο διαδίκτυο.">
 <!ENTITY torsettings.useProxy.type "Τύπος διακομιστή μεσολάβησης">
 <!ENTITY torsettings.useProxy.type.placeholder "Επιλέξτε τύπο διακομιστή μεσολάβησης.">
 <!ENTITY torsettings.useProxy.address "Διεύθυνση">
@@ -36,61 +36,141 @@
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "Το τείχος προστασίας μου με αφήνει να συνδέομαι μόνο σε συγκεκριμένες θύρες συστήματος">
+<!ENTITY torsettings.firewall.checkbox "Ο υπολογιστής χρησιμοποιεί τείχος προστασίας και επιτρέπει μόνο συγκεκριμένες θύρες για σύνδεση">
 <!ENTITY torsettings.firewall.allowedPorts "Επιτρεπόμενες θύρες">
 <!ENTITY torsettings.useBridges.checkbox "Το Tor είναι αποκλεισμένο στη χώρα μου.">
-<!ENTITY torsettings.useBridges.default "Επιλέξτε ένα ενσωματωμένη γέφυρα">
+<!ENTITY torsettings.useBridges.default "Επιλέξτε μια ενσωματωμένη γέφυρα">
 <!ENTITY torsettings.useBridges.default.placeholder "Επιλέξτε μια γέφυρα">
-<!ENTITY torsettings.useBridges.bridgeDB "Ζητήστε μια γέφυρα από το torproject.org">
+<!ENTITY torsettings.useBridges.bridgeDB "Αιτηθείτε γέφυρα από torproject.org">
 <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Πληκτρολογήστε τους χαρακτήρες της εικόνας">
 <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Πάρτε μία νέα πρόκληση.">
 <!ENTITY torsettings.useBridges.captchaSubmit "Υποβολή">
-<!ENTITY torsettings.useBridges.custom "Δώστε μου μια γέφυρα που να το γνωρίζω">
-<!ENTITY torsettings.useBridges.label "Συμπληρώστε πληροφορίες γέφυρας από αξιόπιστη πηγή.">
-<!ENTITY torsettings.useBridges.placeholder "πληκτρολογήστε διεύθυνση:θύρα (μια σε κάθε σειρά)">
+<!ENTITY torsettings.useBridges.custom "Παραχωρήστε μια γέφυρα">
+<!ENTITY torsettings.useBridges.label "Εισαγάγετε πληροφορίες γέφυρας από αξιόπιστη πηγή.">
+<!ENTITY torsettings.useBridges.placeholder "Πληκτρολογήστε διεύθυνση:θύρα (μια σε κάθε σειρά)">
 
-<!ENTITY torsettings.copyLog "Αντιγραφή στο πρόχειρο">
+<!ENTITY torsettings.copyLog "Αντιγραφή του αρχείου καταγραφής Tor στο πρόχειρο">
 
 <!ENTITY torsettings.proxyHelpTitle "Βοήθεια διακομιστή μεσολάβησης">
-<!ENTITY torsettings.proxyHelp1 "Ο τοπικός διακομιστής μεσολάβησης μπορεί να χρειαστεί, όταν συνδέεστε από μία εταιρία, ένα σχολείο ή ένα δίκτυο πανεπιστημίου. Αν δεν είστε σίγουρος αν χρειάζεστε διακομιστή μεσολάβησης, ελέγξτε τις ρυθμίσεις ίντερνετ ενός άλλου περιηγητή ή τις ρυθμίσεις του δικτύου συστήματος. ">
+<!ENTITY torsettings.proxyHelp1 "Ο τοπικός διακομιστής μεσολάβησης μπορεί να χρειαστεί, όταν συνδέεστε από μία εταιρία, ένα σχολείο ή ένα δίκτυο πανεπιστημίου. Αν δεν είστε σίγουροι αν χρειάζεστε διακομιστή μεσολάβησης, ελέγξτε τις ρυθμίσεις ίντερνετ ενός άλλου περιηγητή ή τις ρυθμίσεις του δικτύου σας. ">
 
 <!ENTITY torsettings.bridgeHelpTitle "Βοήθεια με Αναμεταδότες Γέφυρες">
 <!ENTITY torsettings.bridgeHelp1 "Οι γέφυρες είναι μη καταχωρημένοι αναμεταδότες που κάνουν πιο δύσκολο τον αποκλεισμό της σύνδεσης στο δίκτυο Tor.  Κάθε τύπος γέφυρας χρησιμοποιεί διαφορετική μέθοδο για να αποφύγει τον αποκλεισμό.  Οι obfs κάνουν τις κινήσεις σας να μοιάζουν με τυχαίο θόρυβο και οι meek κάνουν τις συνδέσεις σας να μοιάζουν πως γίνονται μέσω της αντίστοιχης υπηρεσίας αντί του Tor.">
 <!ENTITY torsettings.bridgeHelp2 "Λόγω του τρόπου που προσπαθούν κάποιες χώρες να αποκλείσουν το Tor, κάποιες γέφυρες λειτουργούν σε κάποιες χώρες, ενώ σε άλλες όχι.  Αν δεν είστε σίγουρος για το ποιές γέφυρες λειτουργούν στη χώρα σας, επισκεφτείτε το torproject.org/about/contact.html#support">
 
 <!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Παρακαλώ περιμένετε καθώς δημιουργούμε σύνδεση στο δίκτυο Tor.  Αυτό μπορεί να πάρει μερικά λεπτά.">
+<!ENTITY torprogress.pleaseWait "Παρακαλούμε περιμένετε καθώς δημιουργούμε σύνδεση στο δίκτυο Tor.  Μπορεί να διαρκέσει μερικά λεπτά.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Σύνδεση">
 <!ENTITY torPreferences.torSettings "Ρυθμίσεις Tor">
 <!ENTITY torPreferences.torSettingsDescription "Ο Tor Browser δρομολογεί την κίνηση δικτύου σας μέσα από το δίκτυο Tor, που λειτουργεί χάρη σε χιλιάδες εθελοντές σε όλο τον κόσμο." >
 <!ENTITY torPreferences.learnMore "Μάθετε περισσότερα">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Δοκιμασία">
+<!ENTITY torPreferences.statusInternetOnline "Συνδεδεμένο">
+<!ENTITY torPreferences.statusInternetOffline "Εκτός σύνδεσης">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Συνδεδεμένο">
+<!ENTITY torPreferences.statusTorNotConnected "Αποσυνδεδεμένο">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Μάθετε περισσότερα">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Γρήγορη έναρξη">
-<!ENTITY torPreferences.quickstartDescription "Η γρήγορη έναρξη επιτρέπει στο Tor Browser να συνδεθεί αυτόματα.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Πάντοτε αυτόματη σύνδεση">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Γέφυρες">
-<!ENTITY torPreferences.bridgesDescription "Οι γέφυρες σας βοηθούν στην πρόσβαση στο δίκτυο Tor σε τοποθεσίες που δεν επιτρέπεται. Εξαρτάται που βρίσκεστε, κάποια γέφυρα μπορεί να λειτουργεί από άλλες.">
-<!ENTITY torPreferences.useBridge "Χρήση γέφυρας">
-<!ENTITY torPreferences.requestNewBridge "Ζητήστε μία καινούρια γέφυρα...">
-<!ENTITY torPreferences.provideBridge "Παραχωρήστε μια γέφυρα">
-<!ENTITY torPreferences.advanced "Ρυθμίσεις για προχωρημένους">
-<!ENTITY torPreferences.advancedDescription "Ρυθμίστε τον τρόπο που συνδέεται ο Tor Browser στο διαδίκτυο.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Τιμές διαχωρισμένες με κόμμα">
-<!ENTITY torPreferences.requestBridgeDialogTitle "Αίτηση γέφυρας">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Επικοινωνία με τη BridgeDB. Παρακαλώ, περιμένετε.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Λύστε το CAPTCHA για να ζητήσετε γέφυρα.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Η λύση δεν είναι σωστή. Παρακαλώ προσπαθήστε ξανά.">
-<!ENTITY torPreferences.viewTorLogs "Προβολή αρχείων καταγραφής του Tor.">
+<!ENTITY torPreferences.bridgesDescription "Οι γέφυρες σας βοηθούν στην πρόσβαση στο δίκτυο Tor σε τοποθεσίες που δεν επιτρέπεται. Ανάλογα με την τοποθεσία σας, κάποια γέφυρα μπορεί να λειτουργεί καλύτερα από άλλες.">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Αυτόματο">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Απομάκρυνση">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Αντιγράφηκε!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Ζητήστε μια γέφυρα...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
+<!ENTITY torPreferences.advanced "Για προχωρημένους">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
 <!ENTITY torPreferences.viewLogs "Προβολή αρχείων καταγραφής...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Ακύρωση">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
+<!ENTITY torPreferences.requestBridgeDialogTitle "Αίτηση γέφυρας">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Επικοινωνία με BridgeDB. Παρακαλούμε περιμένετε.">
+<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Λύστε το CAPTCHA για να αιτηθείτε γέφυρα.">
+<!ENTITY torPreferences.requestBridgeErrorBadSolution "Η επίλυση δεν είναι σωστή. Παρακαλούμε προσπαθήστε ξανά.">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Εισάγετε τις πληροφορίες γέφυρας από μια αξιόπιστη πηγή.">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Αρχεία καταγραφών Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Προσπάθεια επανασύνδεσης">
-<!ENTITY torConnect.offline "Εκτός σύνδεσης">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Η σύνδεση του Tor Browser με το δίκτυο Tor απέτυχε.">
-<!ENTITY torConnect.connectingConcise "Γίνεται σύνδεση...">
-<!ENTITY torConnect.connectedConcise "Συνδεδεμένος/η">
 <!ENTITY torConnect.notConnectedConcise "Αποσυνδεδεμένο">
-<!ENTITY torConnect.copyLog "Αντιγραφή αρχείων καταγραφής του Tor">
+<!ENTITY torConnect.connectingConcise "Γίνεται σύνδεση...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Αυτόματο">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Ρύθμιση σύνδεσης...">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Προσπάθησε ξανά">
+<!ENTITY torConnect.offline "Internet not reachable">
+<!ENTITY torConnect.connectMessage "Οι αλλαγές των ρυθμίσεων του Tor θα εφαρμοστούν όταν συνδεθείτε με το δίκτυο Tor.">
+<!ENTITY torConnect.tryAgainMessage "Η σύνδεση του Tor Browser με το δίκτυο Tor απέτυχε.">
+<!ENTITY torConnect.yourLocation "Η τοποθεσία σας">
+<!ENTITY torConnect.tryBridge "Δοκιμάστε μια γέφυρα">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/el/torlauncher.properties b/src/chrome/locale/el/torlauncher.properties
index 54c29a9..7ec7467 100644
--- a/src/chrome/locale/el/torlauncher.properties
+++ b/src/chrome/locale/el/torlauncher.properties
@@ -77,7 +77,7 @@ torlauncher.bootstrapStatus.ap_conn=Κτίσιμο κυκλωμάτων: Συν
 torlauncher.bootstrapStatus.ap_conn_done=Κτίσιμο κυκλωμάτων: Συνδεθήκαμε σε έναν αναμεταδότη Tor
 torlauncher.bootstrapStatus.ap_handshake=Δημιουργία κυκλώματος: Διαπραγμάτευση με αναμεταδότη Tor
 torlauncher.bootstrapStatus.ap_handshake_done=Δημιουργία κυκλώματος: Ολοκλήρωση διαπραγμάτευσης με αναμεταδότη Tor
-torlauncher.bootstrapStatus.circuit_create=Κτίσιμο κυκλωμάτων: Δημιουργία ενός κυκλώματος Tor
+torlauncher.bootstrapStatus.circuit_create=Δημιουργία κυκλωμάτων: υλοποιείται ένα κύκλωμα Tor
 torlauncher.bootstrapStatus.done=Συνδεθήκατε στο δίκτυο Tor!
 
 torlauncher.bootstrapWarning.done=έγινε
diff --git a/src/chrome/locale/eo/network-settings.dtd b/src/chrome/locale/eo/network-settings.dtd
index 90b9172..56777b7 100644
--- a/src/chrome/locale/eo/network-settings.dtd
+++ b/src/chrome/locale/eo/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Toro">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Konekto">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Pontoj">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Forigi">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Altnivela">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Rezigni">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Provu Denove">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd
index 153d649..eb8949f 100644
--- a/src/chrome/locale/es-AR/network-settings.dtd
+++ b/src/chrome/locale/es-AR/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Por favor, esperá mientras establecemos una conexión a la red de Tor.   Puede tardar varios minutos.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Conexión">
 <!ENTITY torPreferences.torSettings "Configuraciones de Tor">
 <!ENTITY torPreferences.torSettingsDescription "El navegador Tor enruta tu tráfico a través de la red Tor, mantenida por miles de voluntarios en todo el mundo." >
 <!ENTITY torPreferences.learnMore "Aprendé más">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Fuera de línea">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Conectado">
+<!ENTITY torPreferences.statusTorNotConnected "No Conectado">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Aprendé más">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Arranque rápido">
-<!ENTITY torPreferences.quickstartDescription "El arranque rápido le permite al Navegador Tor conectarse automáticamente.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Siempre conectar automáticamente">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Puentes">
 <!ENTITY torPreferences.bridgesDescription "Los puentes te permiten acceder a la red Tor desde lugares donde Tor está bloqueado. Dependiendo de dónde te encuentres, algunos puentes funcionarán mejor que otros.">
-<!ENTITY torPreferences.useBridge "Usar un puente">
-<!ENTITY torPreferences.requestNewBridge "Solicitá un nuevo puente...">
-<!ENTITY torPreferences.provideBridge "Proveer un puente">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automática">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Remover">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "¡Copiado!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Solicitá un puente...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avanzado">
-<!ENTITY torPreferences.advancedDescription "Configurar cómo se conecta a internet el Navegador Tor.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por coma">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Ver bitácora de sucesos">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Cancelar">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Solicitá un puente">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactando BridgeDB. Por favor esperá.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solucioná el CAPTCHA para solicitar un puente.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "La solución no es correcta. Por favor intentá de nuevo.">
-<!ENTITY torPreferences.viewTorLogs "Ver la bitácora sucesos de Tor.">
-<!ENTITY torPreferences.viewLogs "Ver bitácora de sucesos">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Entrar información del puente desde una fuente confiable">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Bitácora de eventos de Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Intentá conectar de nuevo">
-<!ENTITY torConnect.offline "Fuera de línea">
+<!ENTITY torConnect.notConnectedConcise "No Conectado">
+<!ENTITY torConnect.connectingConcise "Conectando...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automática">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configurar la conexión...">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Los cambios en la configuración de Tor no van a tener efecto hasta que te conectes">
 <!ENTITY torConnect.tryAgainMessage "El Navegador Tor ha fallado al establecer una conexión a la red Tor">
-<!ENTITY torConnect.connectingConcise "Conectando...">
-<!ENTITY torConnect.connectedConcise "Conectado">
-<!ENTITY torConnect.notConnectedConcise "No Conectado">
-<!ENTITY torConnect.copyLog "Copiar registros Tor">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Probar un puente">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/es-ES/network-settings.dtd b/src/chrome/locale/es-ES/network-settings.dtd
index f0a23de..4a433e8 100644
--- a/src/chrome/locale/es-ES/network-settings.dtd
+++ b/src/chrome/locale/es-ES/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Espera mientras establecemos una conexión a la red Tor.  Esto puede durar varios minutos.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Conexión">
 <!ENTITY torPreferences.torSettings "Configuración de Tor">
 <!ENTITY torPreferences.torSettingsDescription "El Navegador Tor enruta tu tráfico a través de la Red Tor, mantenida por miles de voluntarios alrededor del mundo." >
-<!ENTITY torPreferences.learnMore "Más información">
+<!ENTITY torPreferences.learnMore "Aprende más">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Probar">
+<!ENTITY torPreferences.statusInternetOnline "Conectado">
+<!ENTITY torPreferences.statusInternetOffline "Desconectado">
+<!ENTITY torPreferences.statusTorLabel "Red Tor:">
+<!ENTITY torPreferences.statusTorConnected "Conectado">
+<!ENTITY torPreferences.statusTorNotConnected "No conectado">
+<!ENTITY torPreferences.statusTorBlocked "Posiblemente bloqueado">
+<!ENTITY torPreferences.learnMore "Aprende más">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Inicio rápido">
-<!ENTITY torPreferences.quickstartDescription "El inicio rápido le permite al Navegador Tor conectarse automáticamente.">
+<!ENTITY torPreferences.quickstartDescriptionLong "El inicio rápido conecta el Navegador Tor a la Red Tor automáticamente cuando se lanza, basándose en la última configuración de conexión utilizada.">
 <!ENTITY torPreferences.quickstartCheckbox "Siempre conectar automáticamente">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Puentes">
 <!ENTITY torPreferences.bridgesDescription "Los puentes te ayudan a acceder a la Red Tor en lugares donde Tor está bloqueado. Dependiendo de dónde te encuentres, un puente puede funcionar mejor que otro.">
-<!ENTITY torPreferences.useBridge "Usa un puente">
-<!ENTITY torPreferences.requestNewBridge "Solicitar un nuevo puente...">
-<!ENTITY torPreferences.provideBridge "Proporcionar un puente">
+<!ENTITY torPreferences.bridgeLocation "Tu ubicación">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automática">
+<!ENTITY torPreferences.bridgeLocationFrequent "Ubicaciones seleccionadas con frecuencia">
+<!ENTITY torPreferences.bridgeLocationOther "Otras ubicaciones">
+<!ENTITY torPreferences.bridgeChooseForMe "Elige un Puente Para Mí...">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Tus puentes actuales">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Puedes guardar uno o más puentes, y Tor escogerá cuál de ellos usar cuando te conectes. Tor automáticamente cambiara a otro puente cuando se necesite.">
+<!ENTITY torPreferences.bridgeId "Puente #1: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Eliminar">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Desactivar los puentes incorporados">
+<!ENTITY torPreferences.bridgeShare "Comparte este puente usando el código QR o copiando su dirección:">
+<!ENTITY torPreferences.bridgeCopy "Copiar la dirección del puente">
+<!ENTITY torPreferences.copied "¡Copiado!">
+<!ENTITY torPreferences.bridgeShowAll "Mostrar todos los puentes">
+<!ENTITY torPreferences.bridgeRemoveAll "Eliminar todos los puentes">
+<!ENTITY torPreferences.bridgeAdd "Añadir un Nuevo Puente">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Elija uno de los puentes incorporados al Navegador Tor">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Selecciona un puente incorporado...">
+<!ENTITY torPreferences.bridgeRequest "Solicitar un puente...">
+<!ENTITY torPreferences.bridgeEnterKnown "Pon una dirección de puente que ya sepas">
+<!ENTITY torPreferences.bridgeAddManually "Añade un Puente Manualmente...">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avanzado">
-<!ENTITY torPreferences.advancedDescription "Configura cómo el Navegador Tor se conecta a Internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por comas">
+<!ENTITY torPreferences.advancedDescription "Configurar cómo se conecta el Navegador Tor a Internet">
+<!ENTITY torPreferences.advancedButton "Ajustes...">
+<!ENTITY torPreferences.viewTorLogs "Ver los registros de Tor">
+<!ENTITY torPreferences.viewLogs "Ver registros…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "¿Eliminar todos los puentes?">
+<!ENTITY torPreferences.removeBridgesWarning "Esta acción no se puede deshacer.">
+<!ENTITY torPreferences.cancel "Cancelar">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Escanear el código QR">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Puentes incorporados">
+<!ENTITY torPreferences.builtinBridgeDescription "El Navegador Tor incluye algunos tipos específicos de puentes conocidos como "transportes conectables".">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "Los obfs4 son un tipo de puente incorporado que hace que tu tráfico en Tor parezca aleatorio. También es menos probable que se bloquee que sus predecesores, los puentes obfs3.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake es un puente incorporado que evita la censura enrutando tu conexión a través de proxies Snowflake, administrados por voluntarios.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure es un puente incorporado que hace que parezca que estás usando un sitio web de Microsoft en lugar de usar Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Solicitar Puente">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactando con BridgeDB. Espera por favor.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resuelve el CAPTCHA para solicitar un puente.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "La solución no es correcta. Por favor, inténtalo de nuevo.">
-<!ENTITY torPreferences.viewTorLogs "Ver los registros de Tor.">
-<!ENTITY torPreferences.viewLogs "Ver registros…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Proporcionar el puente">
+<!ENTITY torPreferences.provideBridgeHeader "Introduce la información del puente desde una fuente de confianza">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Configuración de conexión">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configurar cómo el Navegador Tor se conecta a Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por coma">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Registros de Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Intenta Conectar de Nuevo">
-<!ENTITY torConnect.offline "Desconectado">
+<!ENTITY torConnect.notConnectedConcise "No conectado">
+<!ENTITY torConnect.connectingConcise "Conectando...">
+<!ENTITY torConnect.tryingAgain "Intentando de nuevo…">
+<!ENTITY torConnect.noInternet "El Navegador Tor no pudo acceder a Internet">
+<!ENTITY torConnect.couldNotConnect "El Navegador Tor no pudo conectarse a Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configurar la conexión"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Si Tor está bloqueado en tu ubicación, probar un puente puede ayudar. El asistente de conexión puede elegir uno por ti usando tu ubicación, o puedes #1 manualmente en su lugar."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Probando un puente...">
+<!ENTITY torConnect.tryingBridgeAgain "Intentando una vez más…">
+<!ENTITY torConnect.errorLocation "El Navegador Tor no pudo localizarte">
+<!ENTITY torConnect.errorLocationDescription "El Navegador Tor necesita saber tu ubicación para elegirte el puente adecuado. Si prefieres no compartir la ubicación, #1 manualmente en su lugar."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "¿Son correctas estas configuraciones de ubicación?">
+<!ENTITY torConnect.isLocationCorrectDescription "El navegador Tor aún no ha podido conectarse a Tor. Verifica que la configuración de tu ubicación sea correcta e intentalo de nuevo, o #1 en su lugar."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Ayuda a la conexión">
+<!ENTITY torConnect.breadcrumbLocation "Configuración del lugar">
+<!ENTITY torConnect.breadcrumbTryBridge "Intenta un puente">
+<!ENTITY torConnect.automatic "Automática">
+<!ENTITY torConnect.selectCountryRegion "Seleccionar País o Región">
+<!ENTITY torConnect.frequentLocations "Ubicaciones seleccionadas con frecuencia">
+<!ENTITY torConnect.otherLocations "Otras ubicaciones">
+<!ENTITY torConnect.restartTorBrowser "Reiniciar el Navegador Tor">
+<!ENTITY torConnect.configureConnection "Configurar la conexión...">
+<!ENTITY torConnect.viewLog "Ver registros...">
+<!ENTITY torConnect.tryAgain "Volver a intentar">
+<!ENTITY torConnect.offline "Internet no accesible">
 <!ENTITY torConnect.connectMessage "Los cambios en la configuración de Tor no tendrán efecto hasta que te conectes.">
 <!ENTITY torConnect.tryAgainMessage "Fallo del Navegador Tor al establecer conexión con la Red Tor.">
-<!ENTITY torConnect.connectingConcise "Conectando...">
-<!ENTITY torConnect.connectedConcise "Conectado">
-<!ENTITY torConnect.notConnectedConcise "No conectado">
-<!ENTITY torConnect.copyLog "Copiar registros de Tor">
+<!ENTITY torConnect.yourLocation "Su ubicación">
+<!ENTITY torConnect.tryBridge "Probar un puente">
+<!ENTITY torConnect.autoBootstrappingFailed "Falló la configuración automática">
+<!ENTITY torConnect.autoBootstrappingFailed "Falló la configuración automática">
+<!ENTITY torConnect.cannotDetermineCountry "Incapaz de determinar el país usuario">
+<!ENTITY torConnect.noSettingsForCountry "No hay ajustes disponibles para tu ubicación">
diff --git a/src/chrome/locale/es-MX/network-settings.dtd b/src/chrome/locale/es-MX/network-settings.dtd
index 5eb719e..0c1a9de 100644
--- a/src/chrome/locale/es-MX/network-settings.dtd
+++ b/src/chrome/locale/es-MX/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Por favor, espera mientras establecemos una conexión con Tor network.  Esto puede llevar varios minutos.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Conexión ">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Fuera de Linea">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Conectado">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Puentes">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Remover">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avanzado">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Cancelar">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Fuera de Linea">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Conectado">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/et/network-settings.dtd b/src/chrome/locale/et/network-settings.dtd
index f652c10..a6bcc64 100644
--- a/src/chrome/locale/et/network-settings.dtd
+++ b/src/chrome/locale/et/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Palun oodake kuni loome ühenduse Tor\'i võrguga.  See võib võtta mitu minutit.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Ühendus">
 <!ENTITY torPreferences.torSettings "Tor\'i seaded">
 <!ENTITY torPreferences.torSettingsDescription "Tor\'i brauser suunab Teie andmeliikluse üle Tor\'i võrgu, mis koosneb tuhandetest vabatahtlikest üle maailma." >
-<!ENTITY torPreferences.learnMore "Loe lähemalt">
+<!ENTITY torPreferences.learnMore "Loe lisaks">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Võrguühenduseta">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Ühendatud">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Loe lisaks">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Sillad">
 <!ENTITY torPreferences.bridgesDescription "Sillad aitavad Teil pääseda Tor\'i võrku kohtades, kus Tor on blokeeritud. Olenevalt Teie asukohast, üks sild võib töötada paremini, kui teine.">
-<!ENTITY torPreferences.useBridge "Kasuta silda">
-<!ENTITY torPreferences.requestNewBridge "Taotle uut silda…">
-<!ENTITY torPreferences.provideBridge "Paku silda">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Eemalda">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Kopeeritud!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Taotle Silda…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Peenhäälestus">
-<!ENTITY torPreferences.advancedDescription "Seadistage, kuidas Tor\'i brauser ühendub internetiga.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Komaga eraldatud väärtused">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Vaata logisid...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Loobu">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Taotle silda">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDBga kontakteerumine. Palun oodake.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Lahenda CAPTCHA, et taotleda silda.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Lahendus ei ole õige. Palun proovige uuesti.">
-<!ENTITY torPreferences.viewTorLogs "Vaata Tor\'i logisid.">
-<!ENTITY torPreferences.viewLogs "Vaata logisid...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor\'i logid">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Võrguühenduseta">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Ühendatud">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/eu/network-settings.dtd b/src/chrome/locale/eu/network-settings.dtd
index 4fd7304..8c28800 100644
--- a/src/chrome/locale/eu/network-settings.dtd
+++ b/src/chrome/locale/eu/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Mesedez itxaron Tor sarera konexioa ezartzen dugun bitartean.  Honek minutu batzuk har litzake.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Konexioa">
 <!ENTITY torPreferences.torSettings "Tor ezarpenak">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Ikasi gehiago">
+<!ENTITY torPreferences.learnMore "Gehiago jakin">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Lineaz kanpo">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Konektatuta">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Gehiago jakin">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Zubiak">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Zubi berri bat eskatu…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Kendu">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Zubi bat eskatu…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Aurreratua">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Utzi">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "CAPTCHAa ebatzi ezazu zubi bat eskatzeko.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ebazpena ez da zuzena. Mesedez saiatu berriro.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Lineaz kanpo">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Konektatzen...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Saiatu berriro">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Konektatzen...">
-<!ENTITY torConnect.connectedConcise "Konektatuta">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/fa/network-settings.dtd b/src/chrome/locale/fa/network-settings.dtd
index fa93e5d..f5ffa34 100644
--- a/src/chrome/locale/fa/network-settings.dtd
+++ b/src/chrome/locale/fa/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "لطفا صبر کنید. در حال برقراری ارتباط با شبکه تٌر.&160; این پروسه ممکن است چند دقیقه به طول بینجامد.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "اتصال">
 <!ENTITY torPreferences.torSettings "تنظیمات Tor">
 <!ENTITY torPreferences.torSettingsDescription "مرورگر Tor ترافیک شما را از طریق شبکه Tor هدایت می‌کند، که به واسطه هزاران داوطلب در سراسر جهان به اجرا در‌آمده‌ است." >
-<!ENTITY torPreferences.learnMore "بیشتر بدانید">
+<!ENTITY torPreferences.learnMore "اطلاعات بیشتر">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "اینترنت:">
+<!ENTITY torPreferences.statusInternetTest "آزمایش">
+<!ENTITY torPreferences.statusInternetOnline "روی خط ">
+<!ENTITY torPreferences.statusInternetOffline "آفلاین">
+<!ENTITY torPreferences.statusTorLabel "شبکه تور:">
+<!ENTITY torPreferences.statusTorConnected "متصل">
+<!ENTITY torPreferences.statusTorNotConnected "عدم اتصال">
+<!ENTITY torPreferences.statusTorBlocked "بالقوه مسدود است">
+<!ENTITY torPreferences.learnMore "اطلاعات بیشتر">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "شروع سریع">
-<!ENTITY torPreferences.quickstartDescription "Quickstart به مرورگر Tor اجازه می دهد تا به طور خودکار متصل شود.">
+<!ENTITY torPreferences.quickstartDescriptionLong "شروع سریع، بر اساس آخرین تنظیمات اتصال استفاده‌شده توسط شما، در هنگام راه‌اندازی مرورگر تور را به طور خودکار به شبکه تور متصل می‌کند.">
 <!ENTITY torPreferences.quickstartCheckbox "اتصال به صورت خودکار در همه وقت">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "پل ها">
 <!ENTITY torPreferences.bridgesDescription "پل‌ها به شما کمک می‌کنند که در مناطقی که Tor مسدود شده است، به شبکه Tor دسترسی پیدا کنید. وابسته به منطقه‌ای که در آن هستید، ممکن است یک پل بهتر از دیگری عمل کند.">
-<!ENTITY torPreferences.useBridge "از یک پل استفاده کن">
-<!ENTITY torPreferences.requestNewBridge "درخواست یک پل جدید...">
-<!ENTITY torPreferences.provideBridge "یک پل فراهم کن">
+<!ENTITY torPreferences.bridgeLocation "موقعیت شما">
+<!ENTITY torPreferences.bridgeLocationAutomatic "خودکار">
+<!ENTITY torPreferences.bridgeLocationFrequent "مکان‌های متداول">
+<!ENTITY torPreferences.bridgeLocationOther "سایر مکان‌ها">
+<!ENTITY torPreferences.bridgeChooseForMe "یک پل برای من انتخاب کن…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "پل‌های فعلی شما">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "شما می‌توانید یک یا چند پل را ذخیره کنید و Tor انتخاب خواهد کرد که هنگام اتصال از کدام یک استفاده کند. Tor در صورت نیاز، به طور خودکار از پل دیگر استفاده خواهد کرد.">
+<!ENTITY torPreferences.bridgeId "پل #1: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "پاک کردن">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "غیرفعال‌سازی پل‌های داخلی">
+<!ENTITY torPreferences.bridgeShare "این پل را با استفاده از کد QR یا با کپی آدرس آن به اشتراک بگذارید:">
+<!ENTITY torPreferences.bridgeCopy "کپی آدرس پل">
+<!ENTITY torPreferences.copied "کپی‌ شد!">
+<!ENTITY torPreferences.bridgeShowAll "نمایش همه پل‌ها">
+<!ENTITY torPreferences.bridgeRemoveAll "حذف همه پل‌ها">
+<!ENTITY torPreferences.bridgeAdd "افزودن یک پل جدید">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "یکی از پل‌های داخلی مرورگر تور را انتخاب کنید">
+<!ENTITY torPreferences.bridgeSelectBuiltin "یک پل داخلی را انتخاب کنید…">
+<!ENTITY torPreferences.bridgeRequest "درخواست یک پل...">
+<!ENTITY torPreferences.bridgeEnterKnown "آدرس پلی که می‌دانید را وارد کنید">
+<!ENTITY torPreferences.bridgeAddManually "افزودن دستی پل…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "پیشرفته ">
-<!ENTITY torPreferences.advancedDescription "روش دسترسی مرورگر تور به اینترنت را ویرایش کنید.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "مقادیر جدا‌شده با ویرگول">
+<!ENTITY torPreferences.advancedDescription "روش اتصال مرورگر تور به اینترنت را پیکربندی کنید">
+<!ENTITY torPreferences.advancedButton "تنظیمات…">
+<!ENTITY torPreferences.viewTorLogs "مشاهده وقایع تور">
+<!ENTITY torPreferences.viewLogs "مشاهده وقایع...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "همه پل‌ها حذف شوند؟">
+<!ENTITY torPreferences.removeBridgesWarning "این عمل قابل بازگشت نیست.">
+<!ENTITY torPreferences.cancel "لغو">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "اسکن کد QR">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "پل‌های داخلی">
+<!ENTITY torPreferences.builtinBridgeDescription "مرورگر تور انواع خاصی از پل‌ها با نام "حامل‌های اتصال" را شامل می‌شود.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 نوعی پل داخلی است که ترافیک تور شما را تصادفی جلوه می‌دهد. همچنین احتمال مسدود شدن آن نسبت به پل قبلی خود، یعنی obfs3، کمتر است.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake یک پل داخلی است که با مسیریابی اتصال شما از طریق پراکسی‌های Snowflake که توسط داوطلبان اداره می‌شود، سانسور را شکست می‌دهد.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure یک پل داخلی است که وانمود می‌کند شما به جای استفاده از تور از یک وب‌سایت مایکروسافت بازدید می‌کنید.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "پل درخواست کن">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "در حال تماس با BridgeDB. لطفا منتظر بمانید.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "برای درخواست یک پل کپچا را حل کنید.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "راه حل درست نیست. لطفا دوباره تلاش کنید.">
-<!ENTITY torPreferences.viewTorLogs "وقایع Tor را مشاهده کنید.">
-<!ENTITY torPreferences.viewLogs "مشاهده وقایع...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "ارائه پل">
+<!ENTITY torPreferences.provideBridgeHeader "وارد کردن اطلاعات پل از یک منبع مورد اعتماد">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "تنظیمات اتصال">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "روش اتصال مرورگر تور به اینترنت را پیکربندی کنید">
+<!ENTITY torPreferences.firewallPortsPlaceholder "مقادیر جدا‌شده با ویرگول">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "وقایع Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "دوباره وصل شوید">
-<!ENTITY torConnect.offline "آفلاین">
+<!ENTITY torConnect.notConnectedConcise "عدم اتصال">
+<!ENTITY torConnect.connectingConcise "در حال اتصال...">
+<!ENTITY torConnect.tryingAgain "در حال امتحان دوباره…">
+<!ENTITY torConnect.noInternet "مرورگر Tor به اینترنت دسترسی پیدا نکرد">
+<!ENTITY torConnect.couldNotConnect "مرورگر تور نمی‌تواند به تور متصل شود">
+<!ENTITY torConnect.assistDescriptionConfigure "اتصال خود را پیکربندی کنید"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "اگر تور در موقعیت مکانی شما مسدود شده است، امتحان کردن یک پل می‌تواند است کمک‌کننده باشد. کمک اتصال می‌تواند با استفاده از موقعیت مکانی شما یک پل را برای شما انتخاب کند، و یا به جای آن می‌توانید به صورت دستی #1."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "در حال امتحان یک پل…">
+<!ENTITY torConnect.tryingBridgeAgain "در حال تلاش برای یک بار دیگر…">
+<!ENTITY torConnect.errorLocation "مرورگر تور قادر به مکان‌یابی شما نیست">
+<!ENTITY torConnect.errorLocationDescription "مرورگر تور باید مکان شما را بداند تا پل مناسب شما را انتخاب کند. اگر ترجیح می‌دهید موقعیت مکانی خود را به اشتراک نگذارید، به جای آن به صورت دستی #1."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "آیا این تنظیمات مکانی درست هستند؟">
+<!ENTITY torConnect.isLocationCorrectDescription "مرورگر Tor هنوز نمی‌تواند به Tor متصل شود. لطفا درستی تنظیمات موقعیت مکانی خود را بررسی کنید و دوباره امتحان کنید، یا به جای آن #1."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "کمک اتصال">
+<!ENTITY torConnect.breadcrumbLocation "تنظیمات مکانی">
+<!ENTITY torConnect.breadcrumbTryBridge "یک پل انتخاب کنید">
+<!ENTITY torConnect.automatic "خودکار">
+<!ENTITY torConnect.selectCountryRegion "کشور یا منطقه را انتخاب کنید">
+<!ENTITY torConnect.frequentLocations "مکان‌های متداول">
+<!ENTITY torConnect.otherLocations "سایر مکان‌ها">
+<!ENTITY torConnect.restartTorBrowser "مرورگر تور را دوباره راه‌اندازی کنید">
+<!ENTITY torConnect.configureConnection "پیکربندی اتصال...">
+<!ENTITY torConnect.viewLog "مشاهده وقایع…">
+<!ENTITY torConnect.tryAgain "دوباره سعی کنید">
+<!ENTITY torConnect.offline "اینترنت در دسترس نیست">
 <!ENTITY torConnect.connectMessage "تغییرات انجام شده در تنظیمات تور، تا زمان اتصال شما اعمال نخواهند شد">
 <!ENTITY torConnect.tryAgainMessage "مرورگر Tor موفق به برقراری ارتباط با شبکه Tor نشده است">
-<!ENTITY torConnect.connectingConcise "در حال اتصال...">
-<!ENTITY torConnect.connectedConcise "متصل">
-<!ENTITY torConnect.notConnectedConcise "عدم اتصال">
-<!ENTITY torConnect.copyLog "کپی گزارش‌های تور">
+<!ENTITY torConnect.yourLocation "موقعیت مکانی شما">
+<!ENTITY torConnect.tryBridge "یک پل را امتحان کنید">
+<!ENTITY torConnect.autoBootstrappingFailed "پیکربندی خودکار انجام نشد">
+<!ENTITY torConnect.autoBootstrappingFailed "پیکربندی خودکار انجام نشد">
+<!ENTITY torConnect.cannotDetermineCountry "تعیین کشور کاربر ممکن نیست">
+<!ENTITY torConnect.noSettingsForCountry "هیچ تنظیماتی برای مکان شما موجود نیست">
diff --git a/src/chrome/locale/fi/network-settings.dtd b/src/chrome/locale/fi/network-settings.dtd
index 8e05ec5..876b11e 100644
--- a/src/chrome/locale/fi/network-settings.dtd
+++ b/src/chrome/locale/fi/network-settings.dtd
@@ -62,36 +62,116 @@
 <!ENTITY torprogress.pleaseWait "Odota pieni hetki, kun yhteys TOR-verkostoon luodaan. 
 Tässä saattaa kestää muutama minuutti.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Yhteys">
 <!ENTITY torPreferences.torSettings "Tor-asetukset">
 <!ENTITY torPreferences.torSettingsDescription "Tor-selain reitittää liikenteesi Tor-verkon kautta, joka toimii tuhansien ympäri maailmaa olevien vapaaehtoisten ansiosta." >
-<!ENTITY torPreferences.learnMore "Opi lisää">
+<!ENTITY torPreferences.learnMore "Lue lisää">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Testaa">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Poissa verkosta">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Yhdistetty">
+<!ENTITY torPreferences.statusTorNotConnected "Ei yhdistetty">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Lue lisää">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "pika-aloitus">
-<!ENTITY torPreferences.quickstartDescription "pika-aloitus mahdollistaa Tor-selaimen yhdistämisen automaattisesti">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Yhdistä aina automaattisesti">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Sillat">
 <!ENTITY torPreferences.bridgesDescription "Sillat auttavat pääsemään Tor-verkkoon siellä, missä Tor on estetty. Siltojen toimivuudessa voi olla eroja riippuen siitä, missä olet.">
-<!ENTITY torPreferences.useBridge "Käytä siltaa">
-<!ENTITY torPreferences.requestNewBridge "Pyydä uusi silta...">
-<!ENTITY torPreferences.provideBridge "Tarjoa silta">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automaattinen">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Poista">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Kopioitu!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Pyydä siltaa...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Lisätietoja">
-<!ENTITY torPreferences.advancedDescription "Määritä kuinka Tor-selain yhdistää internetiin.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Pilkulla erotetut arvot">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Näytä lokit…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Peru">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Pyydä siltaa">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Yhdistetään BridgeDB:hen. Odota hetki.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Ratkaise CAPTCHA jotta voit pyytää sillan.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Ratkaisu ei ollut oikein. Yritä uudelleen.">
-<!ENTITY torPreferences.viewTorLogs "Katsele Tor-lokeja.">
-<!ENTITY torPreferences.viewLogs "Näytä lokit…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Syötä luotettavasta lähteestä saatu siltatieto">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor-lokit">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Yritä yhdistää uudelleen">
-<!ENTITY torConnect.offline "Poissa verkosta">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Tor-selain ei pystynyt muodostamaan yhteyttä Tor-verkkoon">
+<!ENTITY torConnect.notConnectedConcise "Ei yhdistetty">
 <!ENTITY torConnect.connectingConcise "Yhdistetään...">
-<!ENTITY torConnect.connectedConcise "Yhdistetty">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Kopioi Tor-lokit">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automaattinen">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Yritä uudelleen">
+<!ENTITY torConnect.offline "Internet not reachable">
+<!ENTITY torConnect.connectMessage "Torin asetuksiin tekemäsi muutokset tulevat voimaan vasta kun muodostat yhteyden">
+<!ENTITY torConnect.tryAgainMessage "Tor-selain ei pystynyt muodostamaan yhteyttä Tor-verkkoon">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/fr/network-settings.dtd b/src/chrome/locale/fr/network-settings.dtd
index d385d4d..f944b20 100644
--- a/src/chrome/locale/fr/network-settings.dtd
+++ b/src/chrome/locale/fr/network-settings.dtd
@@ -61,38 +61,118 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Veuillez patienter pendant que nous établissons une connexion vers le réseau Tor. Cela pourrait prendre plusieurs minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connexion">
 <!ENTITY torPreferences.torSettings "Paramètres de Tor">
 <!ENTITY torPreferences.torSettingsDescription "Le Navigateur Tor achemine votre trafic par le réseau Tor, exploité par des milliers de bénévoles partout dans le monde.
 " >
 <!ENTITY torPreferences.learnMore "En apprendre davantage">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet :">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "En ligne">
+<!ENTITY torPreferences.statusInternetOffline "Hors ligne">
+<!ENTITY torPreferences.statusTorLabel "Réseau Tor :">
+<!ENTITY torPreferences.statusTorConnected "Connecté">
+<!ENTITY torPreferences.statusTorNotConnected "Non Connecté">
+<!ENTITY torPreferences.statusTorBlocked "Possiblement bloqué">
+<!ENTITY torPreferences.learnMore "En apprendre davantage">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Démarrage rapide">
-<!ENTITY torPreferences.quickstartDescription "Le démarrage rapide permet au Navigateur Tor de se connecter automatiquement.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Lors du lancement, le démarrage rapide connecte automatiquement le Navigateur Tor au réseau Tor d’après les dernières options de connexion que vous avez utilisées.">
 <!ENTITY torPreferences.quickstartCheckbox "Toujours se connecter automatiquement">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Ponts">
 <!ENTITY torPreferences.bridgesDescription "Les ponts vous aident à accéder au réseau Tor où il est bloqué. 
 Selon votre position géographique, un pont pourrait fonctionner mieux qu’un autre.">
-<!ENTITY torPreferences.useBridge "Utiliser un pont">
-<!ENTITY torPreferences.requestNewBridge "Demander un nouveau pont…">
-<!ENTITY torPreferences.provideBridge "Fournir un pont">
+<!ENTITY torPreferences.bridgeLocation "Votre position">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatique">
+<!ENTITY torPreferences.bridgeLocationFrequent "Emplacements sélectionnés fréquemment">
+<!ENTITY torPreferences.bridgeLocationOther "Autre emplacements">
+<!ENTITY torPreferences.bridgeChooseForMe "Choisir un pont pour moi…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Vos ponts actuels">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Vous pouvez enregistrer un ou plusieurs ponts et Tor choisira lequel utiliser lors de la connexion. Si besoin est, Tor basculera automatiquement vers un autre pont.">
+<!ENTITY torPreferences.bridgeId "Pont #1 : #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Supprimer">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Désactiver les ponts intégrés">
+<!ENTITY torPreferences.bridgeShare "Partagez ce pont grâce au code QR ou en copiant son adresse :">
+<!ENTITY torPreferences.bridgeCopy "Copier l’adresse du pont">
+<!ENTITY torPreferences.copied "A été copié">
+<!ENTITY torPreferences.bridgeShowAll "Afficher tous les ponts">
+<!ENTITY torPreferences.bridgeRemoveAll "Supprimer tous les ponts">
+<!ENTITY torPreferences.bridgeAdd "Ajouter un nouveau pont">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choisir l’un des ponts intégrés du Navigateur Tor">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Sélectionner un pont intégré…">
+<!ENTITY torPreferences.bridgeRequest "Demander un pont…">
+<!ENTITY torPreferences.bridgeEnterKnown "Saisir une adresse de pont que vous connaissez déjà">
+<!ENTITY torPreferences.bridgeAddManually "Ajouter un pont manuellement…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avancé">
-<!ENTITY torPreferences.advancedDescription "Configurer la façon dont le Navigateur Tor se connecte à Internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Valeurs séparées par des virgules">
+<!ENTITY torPreferences.advancedDescription "Configurer la façon dont le Navigateur Tor se connecte à Internet">
+<!ENTITY torPreferences.advancedButton "Paramètres…">
+<!ENTITY torPreferences.viewTorLogs "Visualiser les journaux de Tor">
+<!ENTITY torPreferences.viewLogs "Visualiser les journaux…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Supprimer tous les ponts ?">
+<!ENTITY torPreferences.removeBridgesWarning "Cette action ne peut pas être annulée.">
+<!ENTITY torPreferences.cancel "Annuler">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Balayer le code QR">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Ponts intégrés">
+<!ENTITY torPreferences.builtinBridgeDescription "Le Navigateur Tor comprend des types particuliers de ponts appelés « transports enfichables ».">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 est un type de ponts intégrés qui donne au trafic de Tor une apparence aléatoire. Ils sont aussi moins susceptibles d’être bloqués que leurs prédécesseurs, les ponts obfs3.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake est un pont intégré qui déjoue la censure en acheminant votre connexion par des mandataires Snowflake, exploités par des bénévoles.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure est un pont intégré qui donne l’impression que vous utilisez un site Web de Microsoft au lieu de Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Demander un pont">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Connexion à BridgeDB. Veuillez patienter.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Résolvez le captcha pour demander un pont.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "La solution est erronée. Veuillez réessayer.">
-<!ENTITY torPreferences.viewTorLogs "Visualiser les journaux de Tor.">
-<!ENTITY torPreferences.viewLogs "Visualiser les journaux…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Fournir un pont">
+<!ENTITY torPreferences.provideBridgeHeader "Saisir des renseignements de pont provenant d’une source fiable">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Paramètres de connexion">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configurer la façon dont le Navigateur Tor se connecte à Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Valeurs séparées par des virgules">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Journaux de Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Essayez de vous reconnecter">
-<!ENTITY torConnect.offline "Hors ligne">
+<!ENTITY torConnect.notConnectedConcise "Non Connecté">
+<!ENTITY torConnect.connectingConcise "Connexion…">
+<!ENTITY torConnect.tryingAgain "Nouvel essai…">
+<!ENTITY torConnect.noInternet "Le Navigateur Tor n’a pu atteindre Internet">
+<!ENTITY torConnect.couldNotConnect "Le Navigateur Tor n’a pas réussi à se connecter à Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configurer votre connexion"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Si Tor est bloqué où vous vous trouvez, un pont pourrait aider. L’assistance à la connexion peut en choisir un pour vous d’après votre position géographique, ou vous pouvez plutôt en ajouter un manuellement."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Tentative avec un pont…">
+<!ENTITY torConnect.tryingBridgeAgain "Encore un autre essai…">
+<!ENTITY torConnect.errorLocation "Le Navigateur Tor n’a pas réussi à vous localiser">
+<!ENTITY torConnect.errorLocationDescription "Le Navigateur Tor a besoin de connaître votre position géographique afin de choisir le bon pont pour vous. Si vous préférez ne pas partager votre position, sélectionnez-en plutôt un manuellement."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Ces paramètres de localisation sont-ils bons ?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Assistance à la connexion">
+<!ENTITY torConnect.breadcrumbLocation "Paramètres de localisation">
+<!ENTITY torConnect.breadcrumbTryBridge "Essayer un pont">
+<!ENTITY torConnect.automatic "Automatique">
+<!ENTITY torConnect.selectCountryRegion "Sélectionner le pays ou la région">
+<!ENTITY torConnect.frequentLocations "Emplacements sélectionnés fréquemment">
+<!ENTITY torConnect.otherLocations "Autre emplacements">
+<!ENTITY torConnect.restartTorBrowser "Redémarrer le Navigateur Tor">
+<!ENTITY torConnect.configureConnection "Configurer la connexion…">
+<!ENTITY torConnect.viewLog "Visualiser les journaux…">
+<!ENTITY torConnect.tryAgain "Réessayer">
+<!ENTITY torConnect.offline "Internet est inaccessible">
 <!ENTITY torConnect.connectMessage "Les changements des paramètres de Tor ne seront appliqués qu’après connexion">
 <!ENTITY torConnect.tryAgainMessage "Le Navigateur Tor n’a pas réussi à établir une connexion au réseau Tor">
-<!ENTITY torConnect.connectingConcise "Connexion…">
-<!ENTITY torConnect.connectedConcise "Connecté">
-<!ENTITY torConnect.notConnectedConcise "Non Connecté">
-<!ENTITY torConnect.copyLog "Copier les journaux de Tor">
+<!ENTITY torConnect.yourLocation "Votre position">
+<!ENTITY torConnect.tryBridge "Essayer un pont">
+<!ENTITY torConnect.autoBootstrappingFailed "Échec de configuration automatique">
+<!ENTITY torConnect.autoBootstrappingFailed "Échec de configuration automatique">
+<!ENTITY torConnect.cannotDetermineCountry "Impossible de déterminer le pays de l’utilisateur">
+<!ENTITY torConnect.noSettingsForCountry "Aucun paramètre n’est proposé pour votre position">
diff --git a/src/chrome/locale/fy-NL/network-settings.dtd b/src/chrome/locale/fy-NL/network-settings.dtd
index c5844d2..49d9a4b 100644
--- a/src/chrome/locale/fy-NL/network-settings.dtd
+++ b/src/chrome/locale/fy-NL/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connection">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Remove">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Advanced">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Annulearje">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/ga-IE/network-settings.dtd b/src/chrome/locale/ga-IE/network-settings.dtd
index 82950f1..cdba14d 100644
--- a/src/chrome/locale/ga-IE/network-settings.dtd
+++ b/src/chrome/locale/ga-IE/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Fan tamall agus ceangal le líonra Tor á bhunú.  Seans go dtógfaidh seo cúpla nóiméad.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Ceangal">
 <!ENTITY torPreferences.torSettings "Socruithe Tor">
 <!ENTITY torPreferences.torSettingsDescription "Seolann Brabhsálaí Tor do chuid tráchta thar líonra Tor, líonra faoi stiúir na mílte oibrí deonach timpeall an domhain." >
-<!ENTITY torPreferences.learnMore "Tuilleadh Eolais">
+<!ENTITY torPreferences.learnMore "Tuilleadh eolais">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "As líne">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Tuilleadh eolais">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Droichid">
 <!ENTITY torPreferences.bridgesDescription "Cabhraíonn droichid leat teacht ar líonra Tor ó áiteanna ina bhfuil cosc ar Tor. Seans go bhfeidhmeodh droichead amháin níos fearr ná cinn eile, ag brath ar an áit ina bhfuil tú.">
-<!ENTITY torPreferences.useBridge "Úsáid droichead">
-<!ENTITY torPreferences.requestNewBridge "Iarr Droichead Nua...">
-<!ENTITY torPreferences.provideBridge "Soláthair droichead">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Bain">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Cóipeáilte!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Iarr Droichead...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Ardroghanna">
-<!ENTITY torPreferences.advancedDescription "Cumraigh an tslí a gceanglaíonn Brabhsálaí Tor leis an Idirlíon.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Luachanna camógdheighilte">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Féach ar na Logchomhaid...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Cealaigh">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Iarr Droichead">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Ag dul i dteagmháil le BridgeDB. Fan nóiméad.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Réitigh an CAPTCHA le droichead a iarraidh.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Níl an freagra sin ceart. Bain triail eile as.">
-<!ENTITY torPreferences.viewTorLogs "Féach ar logchomhaid Tor.">
-<!ENTITY torPreferences.viewLogs "Féach ar na Logchomhaid...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Logchomhaid Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "As líne">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/gl/network-settings.dtd b/src/chrome/locale/gl/network-settings.dtd
index 945d22a..361af30 100644
--- a/src/chrome/locale/gl/network-settings.dtd
+++ b/src/chrome/locale/gl/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Agarde mentres se estabelece unha conexión coa rede Tor.  Pode levar algúns minutos.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Conexión">
 <!ENTITY torPreferences.torSettings "Configuración do Tor">
 <!ENTITY torPreferences.torSettingsDescription "O navegador Tor enruta o seu tráfico sobre a rede Tor, xestionada por milleiros de voluntarios de todo o mundo." >
-<!ENTITY torPreferences.learnMore "Saber máis">
+<!ENTITY torPreferences.learnMore "Aprender máis">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Proba">
+<!ENTITY torPreferences.statusInternetOnline "Conectado">
+<!ENTITY torPreferences.statusInternetOffline "Desconectado">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Conectado">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Aprender máis">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Pontes">
 <!ENTITY torPreferences.bridgesDescription "As pontes axudan a acceder á rede Tor en lugares onde Tor está bloqueado. Dependendo de onde estea vostede, unha ponte pode funcionar mellor ca outra.">
-<!ENTITY torPreferences.useBridge "Utilizar unha ponte">
-<!ENTITY torPreferences.requestNewBridge "Solicitar unha nova ponte...">
-<!ENTITY torPreferences.provideBridge "Fornecer unha ponte">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automática">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Quitar">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copiado!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Solicitar unha ponte...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avanzados">
-<!ENTITY torPreferences.advancedDescription "Configurar como o navegador Tor se conecta á Internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por comas">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Ver rexistros...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Cancelar">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Pedir unha ponte">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactando con BridgeDB. Agarde.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para pedir unha ponte.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "A solución non é correcta. Ténteo de novo outra vez.">
-<!ENTITY torPreferences.viewTorLogs "Ver os rexistros do Tor">
-<!ENTITY torPreferences.viewLogs "Ver rexistros...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Escriba información dunha orixe fiábel">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Rexistros do Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Desconectado">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Conectando...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automática">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Inténtao de novo">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Conectando...">
-<!ENTITY torConnect.connectedConcise "Conectado">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/gu-IN/network-settings.dtd b/src/chrome/locale/gu-IN/network-settings.dtd
index d75510f..dea3360 100644
--- a/src/chrome/locale/gu-IN/network-settings.dtd
+++ b/src/chrome/locale/gu-IN/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "ટોર">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connection">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "ઑફલાઇન">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "દૂર કરો">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "અદ્યતન">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "રદ કરો">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "ઑફલાઇન">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/he/network-settings.dtd b/src/chrome/locale/he/network-settings.dtd
index 9394853..b668d03 100644
--- a/src/chrome/locale/he/network-settings.dtd
+++ b/src/chrome/locale/he/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "אנא המתן בזמן שאנחנו מקימים חיבור אל רשת Tor.  זה עשוי לקחת מספר דקות.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "חיבור">
 <!ENTITY torPreferences.torSettings "הגדרות Tor">
 <!ENTITY torPreferences.torSettingsDescription "דפדפן Tor מנתב את התעבורה שלך על רשת Tor, המופעלת ע״י אלפי מתנדבים ברחבי העולם." >
 <!ENTITY torPreferences.learnMore "למד עוד">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "אינטרנט:">
+<!ENTITY torPreferences.statusInternetTest "בחן">
+<!ENTITY torPreferences.statusInternetOnline "מחובר">
+<!ENTITY torPreferences.statusInternetOffline "לא מקוון">
+<!ENTITY torPreferences.statusTorLabel "רשת Tor:">
+<!ENTITY torPreferences.statusTorConnected "מחובר">
+<!ENTITY torPreferences.statusTorNotConnected "לא מחובר">
+<!ENTITY torPreferences.statusTorBlocked "חסום פוטנציאלית">
+<!ENTITY torPreferences.learnMore "למד עוד">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "התחלה זריזה">
-<!ENTITY torPreferences.quickstartDescription " התחלה זריזה מאפשרת אל דפדפן Tor להתחבר באופן אוטומטי.">
+<!ENTITY torPreferences.quickstartDescriptionLong "התחלה זריזה מחברת את דפדפן Tor אל רשת Tor באופן אוטומטי כאשר הוא מופעל, על סמך הגדרות החיבור האחרונות שהיו בשימוש.">
 <!ENTITY torPreferences.quickstartCheckbox "התחבר תמיד באופן אוטומטי">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "גשרים">
 <!ENTITY torPreferences.bridgesDescription "גשרים עוזרים לך להשיג גישה אל רשת Tor במקומות בהם Tor חסום. על סמך המקום שאתה נמצא בו, גשר אחד עשוי לעבוד בצורה טובה יותר מאחד אחר.">
-<!ENTITY torPreferences.useBridge "השתמש בגשר">
-<!ENTITY torPreferences.requestNewBridge "בקש גשר חדש…">
-<!ENTITY torPreferences.provideBridge "סַפֵּק גשר">
+<!ENTITY torPreferences.bridgeLocation "המיקום שלך">
+<!ENTITY torPreferences.bridgeLocationAutomatic "אוטומטי">
+<!ENTITY torPreferences.bridgeLocationFrequent "מיקומים נבחרים שכיחים">
+<!ENTITY torPreferences.bridgeLocationOther "מיקומים אחרים">
+<!ENTITY torPreferences.bridgeChooseForMe "בחר גשר עבורי…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "הגשרים הנוכחיים שלך">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "אתה יכול להשאיר גשר אחד או יותר שמורים, ו־Tor יבחר באיזה אחד להשתמש כשתתחבר. Tor יחליף באופן אוטומטי אל גשר אחר בעת הצורך.">
+<!ENTITY torPreferences.bridgeId "גשר #1: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "הסר">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "השבת גשרים מובנים">
+<!ENTITY torPreferences.bridgeShare "שתף את הגשר הזה ע״י שימוש בקוד QR או ע״י העתקת הכתובת שלו:">
+<!ENTITY torPreferences.bridgeCopy "העתק כתובת גשר">
+<!ENTITY torPreferences.copied "הועתק!">
+<!ENTITY torPreferences.bridgeShowAll "הראה את כל הגשרים">
+<!ENTITY torPreferences.bridgeRemoveAll "הסר את כל הגשרים">
+<!ENTITY torPreferences.bridgeAdd "הוסף גשר חדש">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "בחר באחד מהגשרים המובנים של דפדפן Tor">
+<!ENTITY torPreferences.bridgeSelectBuiltin "בחר גשר מובנה…">
+<!ENTITY torPreferences.bridgeRequest "בקש גשר…">
+<!ENTITY torPreferences.bridgeEnterKnown "הכנס כתובת גשר שאתה כבר מכיר">
+<!ENTITY torPreferences.bridgeAddManually "הוסף גשר באופן ידני…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "מתקדם">
-<!ENTITY torPreferences.advancedDescription "תצר כיצד דפדפן Tor מתחבר אל האינטרנט.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "ערכים מופרדי־פסיק">
+<!ENTITY torPreferences.advancedDescription "תצר כיצד דפדפן Tor מתחבר אל האינטרנט">
+<!ENTITY torPreferences.advancedButton "הגדרות…">
+<!ENTITY torPreferences.viewTorLogs "הצג את יומני Tor">
+<!ENTITY torPreferences.viewLogs "הצג יומנים…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "להסיר את כל הגשרים?">
+<!ENTITY torPreferences.removeBridgesWarning "פעולה זו אינה ניתנת לביטול.">
+<!ENTITY torPreferences.cancel "בטל">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "סרוק קוד QR">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "גשרים מובנים">
+<!ENTITY torPreferences.builtinBridgeDescription "דפדפן Tor כולל כמה סוגים מסוימים של גשרים שידועים בתור "תחבורות נתיקות".">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 הוא סוג של גשה מובנה שגורם אל תעבורת Tor להיראות אקראית. הוא גם פחות סביר להיחסם מאשר קודמיו, גשרי obfs3.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake הוא גשר מובנה שמביס צנזורה על ידי ניתוב החיבור שלך דרך ייפויי כוח של Snowflake שמורצים על ידי מתנדבים.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure הוא גשר מובנה שגורם להיראות כאילו אתה משתמש באתר Microsoft במקום ב־Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "בקש גשר">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "יוצר קשר עם BridgeDB. אנא המתן.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "פתור את ה־CAPTCHA כדי לבקש גשר.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "הפתרון אינו נכון. אנא נסה שוב.">
-<!ENTITY torPreferences.viewTorLogs "הצג את יומני Tor.">
-<!ENTITY torPreferences.viewLogs "הצג יומנים…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "ספק גשר">
+<!ENTITY torPreferences.provideBridgeHeader "הכנס מידע גשר ממקור מהימן">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "הגדרות חיבור">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "תצר כיצד דפדפן Tor מתחבר אל האינטרנט">
+<!ENTITY torPreferences.firewallPortsPlaceholder "ערכים מופרדים בפסיק">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "יומני Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "נסה להתחבר שוב">
-<!ENTITY torConnect.offline "לא מקוון">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "דפדפן Tor נכשל בהקמת חיבור אל רשת Tor">
-<!ENTITY torConnect.connectingConcise "מתחבר…">
-<!ENTITY torConnect.connectedConcise "מחובר">
 <!ENTITY torConnect.notConnectedConcise "לא מחובר">
-<!ENTITY torConnect.copyLog "העתק יומני Tor">
+<!ENTITY torConnect.connectingConcise "מתחבר…">
+<!ENTITY torConnect.tryingAgain "מנסה שוב…">
+<!ENTITY torConnect.noInternet "דפדפן Tor לא היה יכול להשיג את האינטרנט">
+<!ENTITY torConnect.couldNotConnect "דפדפן Tor לא היה יכול להתחבר אל Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "תצר את החיבור שלך"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "אם Tor חסום במיקום שלך, ניסיון גשר עשוי לעזור. סיוע בחיבור יכול לבחור אחד עבורך ע״י שימוש במיקום שלך, או שאתה יכול #1 באופן ידני במקום."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "מנסה גשר…">
+<!ENTITY torConnect.tryingBridgeAgain "מנסה עוד פעם…">
+<!ENTITY torConnect.errorLocation "דפדפן Tor לא היה יכול לאתר אותך">
+<!ENTITY torConnect.errorLocationDescription "דפדפן Tor צריך לדעת את המיקום שלך על מנת לבחור את הגשר הנכון עבורך. אם אתה מעדיף לא לשתף את המיקום שלך, #1 באופן ידני במקום."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "האם הגדרות המיקום האלו נכונות?">
+<!ENTITY torConnect.isLocationCorrectDescription "דפדפן Tor עדין לא יכול להתחבר אל Tor. אנא בדוק שהגדרות המיקום שלך נכונות ונסה שוב, או #1 במקום."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "סיוע בחיבור">
+<!ENTITY torConnect.breadcrumbLocation "הגדרות מיקום">
+<!ENTITY torConnect.breadcrumbTryBridge "נסה גשר">
+<!ENTITY torConnect.automatic "אוטומטי">
+<!ENTITY torConnect.selectCountryRegion "בחר מדינה או אזור">
+<!ENTITY torConnect.frequentLocations "מיקומים נבחרים שכיחים">
+<!ENTITY torConnect.otherLocations "מיקומים אחרים">
+<!ENTITY torConnect.restartTorBrowser "הפעל מחדש את דפדפן Tor">
+<!ENTITY torConnect.configureConnection "תצר חיבור…">
+<!ENTITY torConnect.viewLog "הצג יומנים…">
+<!ENTITY torConnect.tryAgain "ניסיון חוזר">
+<!ENTITY torConnect.offline "אינטרנט בלתי נגיש">
+<!ENTITY torConnect.connectMessage "שינויים אל הגדרות Tor לא ייכנסו לתוקף עד שתתחבר">
+<!ENTITY torConnect.tryAgainMessage "דפדפן Tor נכשל בהקמת חיבור אל רשת Tor">
+<!ENTITY torConnect.yourLocation "המיקום שלך">
+<!ENTITY torConnect.tryBridge "נסה גשר">
+<!ENTITY torConnect.autoBootstrappingFailed "תצורה אוטומטית נכשלה">
+<!ENTITY torConnect.autoBootstrappingFailed "תצורה אוטומטית נכשלה">
+<!ENTITY torConnect.cannotDetermineCountry "לא היה ניתן לקבוע מדינת משתמש">
+<!ENTITY torConnect.noSettingsForCountry "אין הגדרות זמינות עבור המיקום שלך">
diff --git a/src/chrome/locale/he/torlauncher.properties b/src/chrome/locale/he/torlauncher.properties
index acfb764..ef99da9 100644
--- a/src/chrome/locale/he/torlauncher.properties
+++ b/src/chrome/locale/he/torlauncher.properties
@@ -26,9 +26,9 @@ torlauncher.ensure_tor_is_running=אנא וודא כי Tor פועל.
 torlauncher.error_proxy_addr_missing=אתה חייב לציין כתובת IP או שם מארח וגם מספר פתחה כדי לתצר את Tor להשתמש בייפוי־כוח כדי לגשת לאינטרנט.
 torlauncher.error_proxy_type_missing=אתה חייב לבחור את סוג ייפוי־הכוח.
 torlauncher.error_bridges_missing=אתה חייב לציין גשר אחד או יותר.
-torlauncher.error_default_bridges_type_missing=אתה חייב לבחור סוג תעבורה עבור הגשרים המסופקים.
+torlauncher.error_default_bridges_type_missing=אתה חייב לבחור סוג תחבורה עבור הגשרים המסופקים.
 torlauncher.error_bridgedb_bridges_missing=אנא בקש גשר.
-torlauncher.error_bridge_bad_default_type=אין גשרים מסופקים זמינים שיש להם את סוג התעבורה %S. אנא התאם את הגדרותיך.
+torlauncher.error_bridge_bad_default_type=אין גשרים מסופקים זמינים שיש להם את סוג התחבורה %S. אנא התאם את הגדרותיך.
 
 torlauncher.bridge_suffix.meek-amazon=(עובד בסין)
 torlauncher.bridge_suffix.meek-azure=(עובד בסין)
@@ -88,7 +88,7 @@ torlauncher.bootstrapWarning.identity=זהות אינה תואמת
 torlauncher.bootstrapWarning.timeout=החיבור פקע
 torlauncher.bootstrapWarning.noroute=אין נתיב למארח
 torlauncher.bootstrapWarning.ioerror=שגיאה של קריאה/כתיבה
-torlauncher.bootstrapWarning.pt_missing=תעבורה נתיקה חסרה
+torlauncher.bootstrapWarning.pt_missing=תחבורה נתיקה חסרה
 
 torlauncher.nsresult.NS_ERROR_NET_RESET=החיבור אל השרת אבד.
 torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=לא היה ניתן להתחבר אל השרת.
diff --git a/src/chrome/locale/hi-IN/network-settings.dtd b/src/chrome/locale/hi-IN/network-settings.dtd
index 30e031a..1e89ccd 100644
--- a/src/chrome/locale/hi-IN/network-settings.dtd
+++ b/src/chrome/locale/hi-IN/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "कुछ देर रुकिए। हम टोर की संजाल से जुड़ रहे हैं। कुछ मिनट लग सकते हैं।">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "टो">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "संबध">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "टोर ब्राउजर आपके इंटरनेट यातायात को टोर नेटवर्क के द्वारा भेजता है जो कि हजारों स्वयंसेवकों के द्वारा चलाया जाता है।" >
 <!ENTITY torPreferences.learnMore "और अधिक जानें">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "ऑनलाइन">
+<!ENTITY torPreferences.statusInternetOffline "ऑफलाइन">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "जुड़े हुए">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "और अधिक जानें">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "पुल">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "एक नए पुल का अनुरोध करें ...">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "हटाना">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "एक पुल का अनुरोध करें ...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "उन्नत">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "रद्द करना">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "ओबीएफएस4 ">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "पुल का अनुरोध करने के लिए कैप्चा को हल करें।">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "समाधान सही नहीं है। कृपया पुन: प्रयास करें।">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "एक विश्वसनीय स्रोत से पुल जानकारी दर्ज करें">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "ऑफलाइन">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "कनेक्ट हो रहा है ...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "पुनः प्रयास करें">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "कनेक्ट हो रहा है ...">
-<!ENTITY torConnect.connectedConcise "जुड़े हुए">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "आपकी स्थिति">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/hr/network-settings.dtd b/src/chrome/locale/hr/network-settings.dtd
index b274986..0ce9805 100644
--- a/src/chrome/locale/hr/network-settings.dtd
+++ b/src/chrome/locale/hr/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Pričekaj dok uspostavljamo vezu s Tor mrežom.   Ovo može potrajati nekoliko minuta.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Veza">
 <!ENTITY torPreferences.torSettings "Tor postavke">
 <!ENTITY torPreferences.torSettingsDescription "Tor preglednik usmjerava tvoj promet na Tor mrežu, koju pokreću tisuće volontera širom svijeta." >
 <!ENTITY torPreferences.learnMore "Saznaj više">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Izvanmrežno">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Spojeno">
+<!ENTITY torPreferences.statusTorNotConnected "Nepovezano">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Saznaj više">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Brzo pokretanje">
-<!ENTITY torPreferences.quickstartDescription "Brzo pokretanje omogućuje Tor pregledniku automatsko povezivanje">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Uvijek poveži automatski">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Mostovi">
 <!ENTITY torPreferences.bridgesDescription "Mostovi pomažu pristupiti Tor-mreži na mjestima gdje je Tor blokiran. Ovisno o tome gdje se nalaziš, neki mostovi rade bolje od drugih.">
-<!ENTITY torPreferences.useBridge "Koristi most">
-<!ENTITY torPreferences.requestNewBridge "Zatraži novi most …">
-<!ENTITY torPreferences.provideBridge "Pruži most">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatski">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Ukloni">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Kopirano!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Zatraži most …">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Napredno">
-<!ENTITY torPreferences.advancedDescription "Podesi način povezivanja Tor preglednika na internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Zarezom odvojene vrijednosti">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Pogledaj log-zapise …">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "Ova radnja ne može biti opozvana.">
+<!ENTITY torPreferences.cancel "Odustani">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Zatraži most">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktiranje baze podataka BridgeDB. Pričekaj.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Riješi CAPTCHA za traženje mosta.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Rješenje nije ispravno. Pokušaj ponovo.">
-<!ENTITY torPreferences.viewTorLogs "Pogledaj log-zapise Tora.">
-<!ENTITY torPreferences.viewLogs "Pogledaj log-zapise …">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Upiši podatke mosta od pouzdanog izvora">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Log-zapisi Tora">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Pokušaj ponovo povezati">
-<!ENTITY torConnect.offline "Izvanmrežno">
+<!ENTITY torConnect.notConnectedConcise "Nepovezano">
+<!ENTITY torConnect.connectingConcise "Spajanje …">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatski">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Pokušaj ponovno">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor preglednik nije uspio uspostaviti vezu s Tor mrežom">
-<!ENTITY torConnect.connectingConcise "Spajanje …">
-<!ENTITY torConnect.connectedConcise "Spojeno">
-<!ENTITY torConnect.notConnectedConcise "Nepovezano">
-<!ENTITY torConnect.copyLog "Kopiraj Tor zapise">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/hu/network-settings.dtd b/src/chrome/locale/hu/network-settings.dtd
index 4448eeb..eb58a9d 100644
--- a/src/chrome/locale/hu/network-settings.dtd
+++ b/src/chrome/locale/hu/network-settings.dtd
@@ -27,7 +27,7 @@
 
 <!ENTITY torsettings.useProxy.checkbox "Proxy-t használok az Internetre való kapcsolódáshoz">
 <!ENTITY torsettings.useProxy.type "Proxy típus">
-<!ENTITY torsettings.useProxy.type.placeholder " válaszon ki egy proxy típust">
+<!ENTITY torsettings.useProxy.type.placeholder "válasszon ki egy proxy típust">
 <!ENTITY torsettings.useProxy.address "Cím">
 <!ENTITY torsettings.useProxy.address.placeholder "IP cím vagy gépnév">
 <!ENTITY torsettings.useProxy.port "Port">
@@ -36,13 +36,13 @@
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "A számítógép egy tűzfalon keresztül kommunikál, ami csak adott portokon keresztül engedélyezi a kapcsolatotokat.">
+<!ENTITY torsettings.firewall.checkbox "A számítógép egy tűzfalon keresztül kommunikál, ami csak adott portokon keresztül engedélyezi a kapcsolatokat.">
 <!ENTITY torsettings.firewall.allowedPorts "Engedélyezett portok">
 <!ENTITY torsettings.useBridges.checkbox "A Tor cenzúrázva van az országomban">
 <!ENTITY torsettings.useBridges.default "Válasszon ki egy beépített hidat">
 <!ENTITY torsettings.useBridges.default.placeholder "Válasszon ki egy hidat">
 <!ENTITY torsettings.useBridges.bridgeDB "Híd kérése a torproject.org-tól">
-<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Adja meg a karaktereket amik a fenti képen láthatóak">
+<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Írja be a képen látható karaktereket">
 <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Új rejtvény kérése">
 <!ENTITY torsettings.useBridges.captchaSubmit "Elküld">
 <!ENTITY torsettings.useBridges.custom "Általam ismert híd megadása">
@@ -55,42 +55,122 @@
 <!ENTITY torsettings.proxyHelp1 "Egy helyi proxy lehet szükséges amennyiben olyan hálózaton keresztül csatlakozik amely, cégen, iskolán, vagy egyetemi hálózaton megy keresztül.  Ha nem biztos benne, hogy szükséges-e proxyt beállítani, akkor nézze meg egy másik böngésző vagy a rendszer hálózati beállításait.">
 
 <!ENTITY torsettings.bridgeHelpTitle "Híd csomópont súgó">
-<!ENTITY torsettings.bridgeHelp1 "A hidak olyan nem listázott csomópontok, amik megnehezítik a Tor kapcsolatok blokkolását.  Minden hídtípus más módszert használ a cezúra elhárítására.  Az obfs fajták a hálózati forgalmat zajnak álcázzák, a meek fajták pedig egy  adott szolgáltatáshoz kapcsolódásnak látszanak a Tor szolgáltatás helyett.">
-<!ENTITY torsettings.bridgeHelp2 "Annak a módja alapján, hogy egyes országok hogyan blokkolják a Tor-t, bizonyos hidak bizonyos országokban működnek, de másokban nem.  Ha nem bztos abban, hogy mely hidak működnek az Ön országában, látogassa meg a torproject.org/about/contact.html#support oldalt.">
+<!ENTITY torsettings.bridgeHelp1 "A hidak olyan nem listázott csomópontok, amik megnehezítik a Tor kapcsolatok blokkolását.  Minden hídtípus más módszert használ a cenzúra elhárítására.  Az obfs fajták a hálózati forgalmat zajnak álcázzák, a meek fajták pedig egy adott szolgáltatáshoz kapcsolódásnak látszanak a Tor szolgáltatás helyett.">
+<!ENTITY torsettings.bridgeHelp2 "Annak a módja alapján, hogy egyes országok hogyan blokkolják a Tor-t, bizonyos hidak bizonyos országokban működnek, de másokban nem.  Ha nem biztos abban, hogy mely hidak működnek az Ön országában, látogassa meg a torproject.org/about/contact.html#support oldalt.">
 
 <!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Kérlek várj, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.  Ez eltarthat néhány percig.">
+<!ENTITY torprogress.pleaseWait "Kérjük várjon, amíg létrehozunk egy kapcsolatot a Tor hálózathoz.  Ez eltarthat néhány percig.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Kapcsolat">
 <!ENTITY torPreferences.torSettings "Tor beállítások">
 <!ENTITY torPreferences.torSettingsDescription "A Tor Böngésző átroutolja forgalmát a Tor hálózaton, amit több ezer önkéntes tart fenn, szerte a világon." >
-<!ENTITY torPreferences.learnMore "Tudjon meg többet">
+<!ENTITY torPreferences.learnMore "További információ">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Teszt">
+<!ENTITY torPreferences.statusInternetOnline "Csatlakozva">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Hálózat:">
+<!ENTITY torPreferences.statusTorConnected "Csatlakozva">
+<!ENTITY torPreferences.statusTorNotConnected "Nincs csatlakozva">
+<!ENTITY torPreferences.statusTorBlocked "Feltehetőleg blokkolt">
+<!ENTITY torPreferences.learnMore "További információ">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Gyorsindítás">
-<!ENTITY torPreferences.quickstartDescription "A Gyorsindítás lehetővé teszi a Tor Böngésző számára az automatikus csatlakozást.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Gyorsindítás automatikusan csatlakoztatja a Tor Böngészőt a Tor Hálózathoz minden indításkor, a legutóbb használt beállítások szerint.">
 <!ENTITY torPreferences.quickstartCheckbox "Mindig csatlakozzon automatikusan">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Hidak">
 <!ENTITY torPreferences.bridgesDescription "A hidak segíthetik a Tor hálózatok elérését olyan helyeken, ahol a Tor blokkolt. Attól függően, hogy hol van egyik híd jobban működhet, mint egy másik.">
-<!ENTITY torPreferences.useBridge "Híd használata">
-<!ENTITY torPreferences.requestNewBridge "Új híd kérése...">
-<!ENTITY torPreferences.provideBridge "Híd megadása">
+<!ENTITY torPreferences.bridgeLocation "Tartózkodási helye">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatikus">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Ajánljon Nekem egy Hidat...">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Jelenlegi Hídjai">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 híd: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Eltávolít">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Beépített hidak letiltása">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Híd Címének Másolása">
+<!ENTITY torPreferences.copied "Másolva!">
+<!ENTITY torPreferences.bridgeShowAll "Összes Híd Mutatása">
+<!ENTITY torPreferences.bridgeRemoveAll "Összes Híd Eltávolítása">
+<!ENTITY torPreferences.bridgeAdd "Új Híd Hozzáadása">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Válasszon egyet a Tor Böngésző beépített hídjai közül">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Beépített Híd Kiválasztása...">
+<!ENTITY torPreferences.bridgeRequest "Híd kérése...">
+<!ENTITY torPreferences.bridgeEnterKnown "Írja be a már ismert híd címét">
+<!ENTITY torPreferences.bridgeAddManually "Híd Hozzáadása Kézzel...">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Speciális">
 <!ENTITY torPreferences.advancedDescription "Állítsa be a Tor Böngésző hogyan csatlakozzon az internethez.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Vesszővel elválasztott értékek">
+<!ENTITY torPreferences.advancedButton "Beállítások...">
+<!ENTITY torPreferences.viewTorLogs "Tor napló megtekintése.">
+<!ENTITY torPreferences.viewLogs "Napló megtekintése...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "Ezt a műveletet nem lehet visszavonni.">
+<!ENTITY torPreferences.cancel "Mégsem">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "QR kód beolvasása">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Beépített Hidak">
+<!ENTITY torPreferences.builtinBridgeDescription "A Tor Böngésző tartalmaz néhány speciális hidat amiket "cserélhető átvitelnek" hívnak.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "Az obfs4 híd a beépített hidak egy típusa, amivel a Tor adatforgalom véletlenszerűnek látszik. Ezen kívül kisebb eséllyel van blokkolva az elődjéhez, az obfs3-hoz képest.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "A Snowflake a beépített hidak egy típusa, amely segít megkerülni a cenzúrát úgy, hogy a kapcsolatot átirányítja további önkéntesek által üzemeltetett Snowflake proxy-k csoportján.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "A meek-azure olyan beépített híd amely a Tor kapcsolatot Microsoft weboldalak látogatásának álcázza.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Híd kérése">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kapcsolódás a hídadatbázishoz. Kérjük várjon.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Oldjon meg egy CAPTCHA-t a híd kéréséhez.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "A megoldás nem helyes. Kérjük próbálja újra.">
-<!ENTITY torPreferences.viewTorLogs "Tor napló megtekintése.">
-<!ENTITY torPreferences.viewLogs "Napló megtekintése...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Híd Megadása">
+<!ENTITY torPreferences.provideBridgeHeader "Adja meg a megbízható helyről származó híd adatokat">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Kapcsolat Beállításai">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Állítsa be a Tor Böngésző hogyan csatlakozzon az internethez.">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Vesszővel elválasztott értékek">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Napló">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Próbáljon újra csatlakozni">
-<!ENTITY torConnect.offline "Offline">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "A Tor Böngészőnek nem sikerül létrehoznia a kapcsolatot a Tor hálózathoz">
-<!ENTITY torConnect.connectingConcise "Csatlakozás...">
-<!ENTITY torConnect.connectedConcise "Csatlakozva">
 <!ENTITY torConnect.notConnectedConcise "Nincs csatlakozva">
-<!ENTITY torConnect.copyLog "Tor logok másolása">
+<!ENTITY torConnect.connectingConcise "Csatlakozás...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "A Tor Böngésző nem tudott csatlakozni a Tor-hoz">
+<!ENTITY torConnect.assistDescriptionConfigure "állítsa be kapcsolatát"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Ha A Tor blokkolva van az ön tartózkodási helyén, híd próbálása segíthet. A csatlakozási segéd képes választani egyet a tartózkodási helye alapján, vagy #1 kézzel."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Próbálkozás híddal">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "A Tor Böngésző nem tudta meghatározni az Ön tartózkodási helyét">
+<!ENTITY torConnect.errorLocationDescription "A Tor Böngészőnek szüksége van az Ön tartózkodási helyére, hogy annak megfelelő hidat tudjon választani. Ha azt inkább nem adná meg, akkor #1 kézzel."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Csatlakozási segéd">
+<!ENTITY torConnect.breadcrumbLocation "Helyi beállítások">
+<!ENTITY torConnect.breadcrumbTryBridge "Próbálkozás Híddal">
+<!ENTITY torConnect.automatic "Automatikus">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Tor Böngésző Újraindítása">
+<!ENTITY torConnect.configureConnection "Kapcsolat beállítása...">
+<!ENTITY torConnect.viewLog "Naplók megtekintése...">
+<!ENTITY torConnect.tryAgain "Újrapróbálkozás">
+<!ENTITY torConnect.offline "Nem érhető el az Internet">
+<!ENTITY torConnect.connectMessage "A Tor beállítások módosításai csatlakozás után lépnek életbe.">
+<!ENTITY torConnect.tryAgainMessage "A Tor Böngészőnek nem sikerül létrehoznia a kapcsolatot a Tor hálózathoz">
+<!ENTITY torConnect.yourLocation "Tartózkodási helye">
+<!ENTITY torConnect.tryBridge "Próbálkozás híddal">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatikus beállítás sikertelen">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatikus beállítás sikertelen">
+<!ENTITY torConnect.cannotDetermineCountry "Nem sikerült a felhasználó országát meghatározni">
+<!ENTITY torConnect.noSettingsForCountry "Nincs elérhető beállítás az Ön tartózkodási helyéhez">
diff --git a/src/chrome/locale/hy-AM/network-settings.dtd b/src/chrome/locale/hy-AM/network-settings.dtd
index 65cd402..092fa35 100644
--- a/src/chrome/locale/hy-AM/network-settings.dtd
+++ b/src/chrome/locale/hy-AM/network-settings.dtd
@@ -10,7 +10,7 @@
 <!-- For "first run" wizard: -->
 
 <!ENTITY torSettings.connectPrompt "Սեղմեք «Միացնել» Tor-ին միանալու համար։">
-<!ENTITY torSettings.configurePrompt "Սեղմեք «Կարգավորել» ցանցի կարգավորումները հարմարեցնելու համար՝ եթե դուք գտնվում եք Tor-ը գրաքննող երկրում (ինչպիսիք են՝ Եգիպտոսը, Չինաստանը, Թուրքիան) կամ միանում եք միջնացանց պահանջող մասնավոր ցանցից:">
+<!ENTITY torSettings.configurePrompt "Սեղմեք «Կարգավորել» ցանցի կարգավորումները հարմարեցնելու համար՝ եթե դուք գտնվում եք Tor-ը գրաքննող երկրում (ինչպիսիք են՝ Եգիպտոսը, Չինաստանը, Թուրքիան) կամ միանում եք փոխանորդ պահանջող մասնավոր ցանցից:">
 <!ENTITY torSettings.configure "Կարգավորել">
 <!ENTITY torSettings.connect "Միացնել">
 
@@ -20,14 +20,14 @@
 <!ENTITY torsettings.restartTor "Վերսկսել Tor-ը">
 <!ENTITY torsettings.reconfigTor "Վերակարգավորել">
 
-<!ENTITY torsettings.discardSettings.prompt "Դուք կարգավորել եք Tor կամուրջները կամ տեղական միջնացանը:  Tor ցանցին անմիջական միանալու համար, այդ կարգավորումները պետք է հեռացվեն:">
+<!ENTITY torsettings.discardSettings.prompt "Դուք կարգավորել եք Tor կամուրջները կամ տեղական փոխանորդը:  Tor ցանցին անմիջական միանալու համար այդ կարգավորումները պետք է հեռացվեն:">
 <!ENTITY torsettings.discardSettings.proceed "Հեռացնել կարգավորումները և միանալ">
 
 <!ENTITY torsettings.optional "Կամընտրական">
 
-<!ENTITY torsettings.useProxy.checkbox "Համացանցին միանալու համար ես օգտվում եմ միջնացանցից">
-<!ENTITY torsettings.useProxy.type "Միջնացանցի տեսակ">
-<!ENTITY torsettings.useProxy.type.placeholder "ընտրեք միջնացանցի տեսակը">
+<!ENTITY torsettings.useProxy.checkbox "Համացանցին միանալու համար օգտվում եմ փոխանորդից">
+<!ENTITY torsettings.useProxy.type "Փոխանորդի տեսակ">
+<!ENTITY torsettings.useProxy.type.placeholder "ընտրեք փոխանորդի տեսակը">
 <!ENTITY torsettings.useProxy.address "Հասցե">
 <!ENTITY torsettings.useProxy.address.placeholder "IP հասցե կամ հյուրընկալի անուն">
 <!ENTITY torsettings.useProxy.port "Մատույց">
@@ -39,8 +39,8 @@
 <!ENTITY torsettings.firewall.checkbox "Այս համակարգիչը անցնում է միայն որոշ մատույցներ թույլատրող հրապատի միջով">
 <!ENTITY torsettings.firewall.allowedPorts "Թույլտատրված մատույցներ">
 <!ENTITY torsettings.useBridges.checkbox "Tor-ը գրաքննվում է իմ երկրում">
-<!ENTITY torsettings.useBridges.default "Ընտրեք ներկառուցված կամուրջ">
-<!ENTITY torsettings.useBridges.default.placeholder "ընտրել կամուրջը">
+<!ENTITY torsettings.useBridges.default "Ընտրել ներկառուցված կամուրջ">
+<!ENTITY torsettings.useBridges.default.placeholder "ընտրեք կամուրջը">
 <!ENTITY torsettings.useBridges.bridgeDB "Պահանջել կամուրջ torproject.org-ից">
 <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Մուտքագրեք նկարում պատկերված խորհրդանիշները">
 <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
@@ -51,46 +51,126 @@
 
 <!ENTITY torsettings.copyLog "Պատճենել Tor-ի մատյանը սեղանակատախտակի վրա">
 
-<!ENTITY torsettings.proxyHelpTitle "Միջնացանցի օգնություն">
+<!ENTITY torsettings.proxyHelpTitle "Փոխանորդի օգնություն">
 <!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
 
-<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
+<!ENTITY torsettings.bridgeHelpTitle "Կամուրջի հերթափոխի վերաբերյալ օգնություն">
 <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">
 <!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">
 
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Խնդրում ենք սպասել մինչև Tor ցանցի հետ միացման հիմնումը:  Այն կարող է տևել մի քանի րոպե:">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Կապ">
 <!ENTITY torPreferences.torSettings "Tor կարգավորումներ">
 <!ENTITY torPreferences.torSettingsDescription "Tor դիտարկիչը ուղղորդում է Ձեր երթևեկը Tor ցանցի միջոցով, որը գործարկում են հազարավոր կամավորներ ամբողջ աշխարհում: " >
 <!ENTITY torPreferences.learnMore "Իմանալ ավելին">
-<!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
-<!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Համացանցը՝">
+<!ENTITY torPreferences.statusInternetTest "Փորձարկել">
+<!ENTITY torPreferences.statusInternetOnline "Առցանց">
+<!ENTITY torPreferences.statusInternetOffline "Անցանց">
+<!ENTITY torPreferences.statusTorLabel "Tor ցանցը՝">
+<!ENTITY torPreferences.statusTorConnected "Միացվեց">
+<!ENTITY torPreferences.statusTorNotConnected "Չի միացվել">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Իմանալ ավելին">
+<!-- Quickstart -->
+<!ENTITY torPreferences.quickstart "«Quickstart»">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart-ը միացնում է Tor դիտարիչը Tor ցանցին ինքնաբերաբար, երբ մեկնարկում է, օգտագործողի վերջին կարգավորումների հիման վրա։">
+<!ENTITY torPreferences.quickstartCheckbox "Միշտ միանալ ինքնաբերաբար">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Կամուրջներ">
-<!ENTITY torPreferences.bridgesDescription "Կամուրջներն օգնում են Ձեզ Tor-ը արգելափակված տեղերում Tor ցանցի մատչելիություն ունենսլ: Կախված նրանից թե որտեղ եք, մի կամուրջ կարող է ավելի լավ աշխատել քան մյուսը:">
-<!ENTITY torPreferences.useBridge "Օգտագործել կամուրջը">
-<!ENTITY torPreferences.requestNewBridge "Պահանջել նոր կամուրջ…">
-<!ENTITY torPreferences.provideBridge "Տրամադրել կամուրջ">
-<!ENTITY torPreferences.advanced "Advanced">
-<!ENTITY torPreferences.advancedDescription "Կարգավորել թե ինչպես Tor դիտարկիչը միանա համացանցին:">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.bridgesDescription "Կամուրջներն օգնում են Ձեզ Tor-ը արգելափակված տեղերում Tor ցանցի մատչելիություն ունենալ: Կախված նրանից թե որտեղ եք, մի կամուրջ կարող է ավելի լավ աշխատել քան մյուսը:">
+<!ENTITY torPreferences.bridgeLocation "Ձեր գտնվելու վայրը">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Ինքնաբերաբար">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Ընտրել կամուրջ ինձ համար...">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Ձեր ներկայիս կամուրջները">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 կամուրջ՝ #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Հեռացնել">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Կարողազրկել ներկառուցված կամուրջները">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Պատճենել կամուրջի հասցեն">
+<!ENTITY torPreferences.copied "Պատճենվե՜ց:">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Ավելացնել նոր կամուրջ">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Ընտրել Tor Browser-ի ներկառուցված կամուրջներից մեկը">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Ընտրել ներկառուցված կամուրջ...">
+<!ENTITY torPreferences.bridgeRequest "Պահանջել կամուրջ...">
+<!ENTITY torPreferences.bridgeEnterKnown "Մուտքագրել Ձեր իմացած կամուրջը">
+<!ENTITY torPreferences.bridgeAddManually "Ավելացնել կամուրջ ձեռքով...">
+<!-- Advanced settings -->
+<!ENTITY torPreferences.advanced "Ընդլայնված">
+<!ENTITY torPreferences.advancedDescription "Կարգավորել թե ինչպես Tor դիտարկիչը միանա համացանցին">
+<!ENTITY torPreferences.advancedButton "Կարգավորումներ...">
+<!ENTITY torPreferences.viewTorLogs "Տեսնել Tor-ի մատյանները">
+<!ENTITY torPreferences.viewLogs "Տեսնել մատյանները...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Չեղարկել">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Ներկառուցված կամուրջներ">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Պահանջել կամուրջ">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Միացում BridgeDB-ին։ Խնդրում ենք սպասել։">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Լուծեք «CAPTCHA»-ն կամուրջ պահանջելու համար:">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Լուծումը ճիշտ չէ: Խնդրում ենք փորձել կրկին:">
-<!ENTITY torPreferences.viewTorLogs "Տեսնել Tor-ի մատյանները:">
-<!ENTITY torPreferences.viewLogs "Տեսնել մատյանները...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Տրամադրել կամուրջ">
+<!ENTITY torPreferences.provideBridgeHeader "Մուտքագրել թույլատված աղբյուրից կամուջի տեղեկությունը">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Միացման կարգավորումներ">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Կարգավորել թե ինչպես Tor դիտարկիչը միանա համացանցին">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor-ի մատյաններ">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Անցանց">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Միացվեց">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.notConnectedConcise "Չի միացվել">
+<!ENTITY torConnect.connectingConcise "Միացում…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor դիտարկիչը չկապվեց Tor-ին">
+<!ENTITY torConnect.assistDescriptionConfigure "կարգավորեք Ձեր միացումը"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Եթե Tor-ն արգելափակված է Ձեր գտնվելու վայրում, կամուրջ փորձելը կարող է օգնել։ Միացման օգնականը կարող է ընտրել դա Ձեզ համար գտնվելու վայրի հիման վրա, կամ կարեղ եք փոխարենը #1 ձեռքով։"> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Փորձվում է կամուրջ...">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser-ը չկարողացավ տեղորոշել Ձեզ">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser-ը ցանկանում է իմանալ Ձեր գտնվելու վայրը ճիշտ կամուրջ ընտրելու համար: Եթե չեք ցանկանում կիսվել Ձեր տեղագրությամբ, #1 դրա փոխարեն ձեռքով:"> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Միացման օգնական">
+<!ENTITY torConnect.breadcrumbLocation "Գտնվելու վայրի կարգավորումներ">
+<!ENTITY torConnect.breadcrumbTryBridge "Փորձել կամուրջը">
+<!ENTITY torConnect.automatic "Ինքնաբերաբար">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Վերսկսել Tor դիտարկիչը">
+<!ENTITY torConnect.configureConnection "Կարգավորել միացումը...">
+<!ENTITY torConnect.viewLog "Տեսնել մատյանները...">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
+<!ENTITY torConnect.connectMessage "Tor-ի կարգավորումներում փոփոխությունները ուժի մեջ կմտնեն միանալուց հետո">
+<!ENTITY torConnect.tryAgainMessage "Tor դիտարկիչին չհաջողվեց կազմավորել միացում Tor ցանցին">
+<!ENTITY torConnect.yourLocation "Ձեր գտնվելու վայրը">
+<!ENTITY torConnect.tryBridge "Փորձել կամուրջ">
+<!ENTITY torConnect.autoBootstrappingFailed "Ինքնաբերաբար կարգավորումը ձախողվեց">
+<!ENTITY torConnect.autoBootstrappingFailed "Ինքնաբերաբար կարգավորումը ձախողվեց">
+<!ENTITY torConnect.cannotDetermineCountry "Անկարող է որոշել օգտագործողի երկիրը">
+<!ENTITY torConnect.noSettingsForCountry "Ձեր գտնվելու վայրի համար կարգավորումներ չկան">
diff --git a/src/chrome/locale/hy-AM/torlauncher.properties b/src/chrome/locale/hy-AM/torlauncher.properties
index 338f8fd..a548e86 100644
--- a/src/chrome/locale/hy-AM/torlauncher.properties
+++ b/src/chrome/locale/hy-AM/torlauncher.properties
@@ -1,46 +1,46 @@
 ### Copyright (c) 2020, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-torlauncher.error_title=Tor Launcher
+torlauncher.error_title=Tor գործարկիչ
 
-torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start.
+torlauncher.tor_exited_during_startup=Tor-ը ելել է սկսման ժամանակ: Դա կարող էր տեղի ունենալ Ձեր «torrc» ֆայլում սխալմունքի, Tor-ում խոտանի կամ Ձեր համակարգում մեկ այլ ծրագրի, ինչպես նաև խափանված սարքավորման պատճառով: Մինչև չշտկեք հիմքում ընկած խնդիրը և չվերսկսեք Tor-ը, Tor Browser-ը չի մեկնակի:
 torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
-torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
-torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-torlauncher.tor_failed_to_start=Tor-ի վերսկսումը ձախողվեց։
+torlauncher.tor_exited2=Tor-ի վերսկսումը կփակի Ձեր դիտարկիչի ներդիրները։
+torlauncher.tor_controlconn_failed=Tor-ի վերահսկման մատույցին միանալ չստացվեց:
+torlauncher.tor_failed_to_start=Tor-ի մեկնարկը ձախողվեց։
 torlauncher.tor_control_failed=Failed to take control of Tor.
-torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
-torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
+torlauncher.tor_bootstrap_failed=Tor-ին չհաջողվեց Tor ցանցի միացում հիմնել:
+torlauncher.tor_bootstrap_failed_details=%1$S-ն ձախողվեց (%2$S)։
 
 torlauncher.unable_to_start_tor=Չստացվեց սկսել Tor-ը:\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.torrc_missing=«torrc» ֆալը կորչել է և չի կարող ստեղծվել։
 torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
 torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
-torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S
-torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
+torlauncher.failed_to_save_settings=Չստացվեց պահպանել Tor-ի կարգավորումները։\n\n%S
+torlauncher.ensure_tor_is_running=Խնդրում ենք հավաստիանալ որ Tor-ը գործարկվում է։
 
 torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
-torlauncher.error_proxy_type_missing=You must select the proxy type.
-torlauncher.error_bridges_missing=You must specify one or more bridges.
+torlauncher.error_proxy_type_missing=Դուք պարտավոր եք ընտրել փոխանորդի տեսակը։
+torlauncher.error_bridges_missing=Դուք պետք է կանխորոշեք մեկ կամ ավելի կամուրջներ:
 torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
 torlauncher.error_bridgedb_bridges_missing=Խնդրում ենք պահանջել կամուրջ:
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
 
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(աշխատում է Չինաստանում)
+torlauncher.bridge_suffix.meek-azure=(աշխատում է Չինաստանում)
 
 torlauncher.request_a_bridge=Պահանջել կամուրջ...
 torlauncher.request_a_new_bridge=Պահանջել նոր կամուրջ…
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
+torlauncher.contacting_bridgedb=Միացում BridgeDB-ին։ Խնդրում ենք սպասել։
 torlauncher.captcha_prompt=Լուծեք «CAPTCHA»-ն կամուրջ պահանջելու համար:
 torlauncher.bad_captcha_solution=Լուծումը ճիշտ չէ: Խնդրում ենք փորձել կրկին:
 torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
 torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+torlauncher.no_bridges_available=Տվյալ պահին կամուրջներ չկան։ Ներողություն։
 
 torlauncher.connect=Միացնել
 torlauncher.restart_tor=Վերսկսել Tor-ը
@@ -56,42 +56,42 @@ torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to b
 torlauncher.bootstrapStatus.starting=Սկսում
 torlauncher.bootstrapStatus.conn_pt=Միացվում է կամուրջին
 torlauncher.bootstrapStatus.conn_done_pt=Միացվեց կամուրջին
-torlauncher.bootstrapStatus.conn_proxy=Միացվում է միջնացանցին
-torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy
-torlauncher.bootstrapStatus.conn=Connecting to a Tor relay
-torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay
+torlauncher.bootstrapStatus.conn_proxy=Միացվում է փոխանորդին
+torlauncher.bootstrapStatus.conn_done_proxy=Միացվեց փոխանորդին
+torlauncher.bootstrapStatus.conn=Միանում է Tor-ի հերթափոխությանը
+torlauncher.bootstrapStatus.conn_done=Միացվեց Tor-ի հերթափոխությանը
 torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay
 torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay
 torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
 torlauncher.bootstrapStatus.requesting_status=Retrieving network status
-torlauncher.bootstrapStatus.loading_status=Loading network status
+torlauncher.bootstrapStatus.loading_status=Բեռնվում է ցանցի կարգավիճակը
 torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
-torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
-torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information
-torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge
-torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge
-torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy
-torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy
-torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay
-torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay
+torlauncher.bootstrapStatus.requesting_descriptors=Հերթափոխության տեղեկատվության պահանջում
+torlauncher.bootstrapStatus.loading_descriptors=Հերթափոխության տեղեկատվության բեռնում
+torlauncher.bootstrapStatus.enough_dirinfo=Հերթափոխության տեղեկատվության բեռնման ավարտ
+torlauncher.bootstrapStatus.ap_conn_pt=Շղթաների հավաքում. Միացում կամուրջին
+torlauncher.bootstrapStatus.ap_conn_done_pt=Շղթաների հավաքում. Միացված է կամուրջին
+torlauncher.bootstrapStatus.ap_conn_proxy=Շղթաների հավաքում. Միացում փոխանորդին
+torlauncher.bootstrapStatus.ap_conn_done_proxy=Շղթաների հավաքում. Միացված է փոխանորդին
+torlauncher.bootstrapStatus.ap_conn=Շղթաների հավաքում. Միացում Tor հերթափոխին
+torlauncher.bootstrapStatus.ap_conn_done=Շղթաների հավաքում. Միացված է Tor հերթափոխին
 torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay
 torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay
-torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit
+torlauncher.bootstrapStatus.circuit_create=Շղթաների հավաքում. Tor շղթայի հիմնում
 torlauncher.bootstrapStatus.done=Միացվա՜ծ է Tor ցանցին։
 
 torlauncher.bootstrapWarning.done=պատրաստ է
-torlauncher.bootstrapWarning.connectrefused=connection refused
-torlauncher.bootstrapWarning.misc=miscellaneous
+torlauncher.bootstrapWarning.connectrefused=միացումը ժխտվեց
+torlauncher.bootstrapWarning.misc=տարբեր
 torlauncher.bootstrapWarning.resourcelimit=insufficient resources
 torlauncher.bootstrapWarning.identity=identity mismatch
 torlauncher.bootstrapWarning.timeout=connection timeout
 torlauncher.bootstrapWarning.noroute=no route to host
-torlauncher.bootstrapWarning.ioerror=read/write error
+torlauncher.bootstrapWarning.ioerror=կարդացման/գրման սխալ
 torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
 
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+torlauncher.nsresult.NS_ERROR_NET_RESET=Դեպի սպասարկիչ միացումը կորչեց։
+torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Սպասարկիչին միանալ չստացվեց։
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Փոխանորդին միանալ չստացվեց։
 
-torlauncher.copiedNLogMessagesShort=Copied %S Logs
+torlauncher.copiedNLogMessagesShort=Պատճենվեց %S մատյանները
diff --git a/src/chrome/locale/id/network-settings.dtd b/src/chrome/locale/id/network-settings.dtd
index 154fcdb..79f55fd 100644
--- a/src/chrome/locale/id/network-settings.dtd
+++ b/src/chrome/locale/id/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Mohon menunggu sambil kami membuat sambungan ke jaringan Tor.  Ini akan memakan waktu beberapa menit">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Koneksi">
 <!ENTITY torPreferences.torSettings "Pengaturan Tor">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser mengalihkan lalulintas kamu melalui Jaringan Tor, di jalankan oleh ribuan sukarelawan di seluruh dunia." >
-<!ENTITY torPreferences.learnMore "Pelajari lebih lanjut">
+<!ENTITY torPreferences.learnMore "Pelajari Selengkapnya">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Tes">
+<!ENTITY torPreferences.statusInternetOnline "Daring">
+<!ENTITY torPreferences.statusInternetOffline "Luring">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Terhubung">
+<!ENTITY torPreferences.statusTorNotConnected "Tidak terhubung">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Pelajari Selengkapnya">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart memungkinkan Tor Browser untuk terhubung secara otomatis.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Selalu terhubung secara otomatis">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Jembatan-jembatan">
 <!ENTITY torPreferences.bridgesDescription "Jembatan membantu Anda mengakses Jaringan Tor dimana Tor diblokir. Tergantung pada dimana Anda tinggal, satu jembatan mungkin dapat bekerja lebih baik daripada yang lainnya.">
-<!ENTITY torPreferences.useBridge "Gunakan bridge">
-<!ENTITY torPreferences.requestNewBridge "Meminta bridge baru...">
-<!ENTITY torPreferences.provideBridge "Sediakan Bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Otomatis">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Hapus">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Disalin!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Meminta sebuah bridge...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Advanced ">
-<!ENTITY torPreferences.advancedDescription "Konfigurasikan bagaimana Tor Browser terhubung ke internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Nilai yang dipisahkan dengan tanda koma.">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Lihat Catatan....">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Cancel">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Minta Jembatan">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Menghubungi BridgeDB. Mohon tunggu.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Selesaikan CAPTCHA untuk meminta sebuah bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Solusinya tidak tepat. Silakan coba lagi.">
-<!ENTITY torPreferences.viewTorLogs "Lihat Catatan Tor">
-<!ENTITY torPreferences.viewLogs "Lihat Catatan....">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Masukkan informasi bridge dari sumber yang terpercaya">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Catatan Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Coba Sambungkan Kembali">
-<!ENTITY torConnect.offline "Luring">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Tor Browser telah gagal membuat  koneksi ke Jaringan Tor">
-<!ENTITY torConnect.connectingConcise "Menyambung...">
-<!ENTITY torConnect.connectedConcise "Terhubung">
 <!ENTITY torConnect.notConnectedConcise "Tidak terhubung">
-<!ENTITY torConnect.copyLog "Salin Log Tor">
+<!ENTITY torConnect.connectingConcise "Menyambung...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Otomatis">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Konfigurasi Koneksi...">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Coba Lagi">
+<!ENTITY torConnect.offline "Internet not reachable">
+<!ENTITY torConnect.connectMessage "Perubahan pada Pengaturan Tor tidak akan berlaku sampai Anda terhubung">
+<!ENTITY torConnect.tryAgainMessage "Tor Browser telah gagal membuat  koneksi ke Jaringan Tor">
+<!ENTITY torConnect.yourLocation "Lokasi Anda">
+<!ENTITY torConnect.tryBridge "Coba Sebuah Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/is/network-settings.dtd b/src/chrome/locale/is/network-settings.dtd
index dd86b99..4b94766 100644
--- a/src/chrome/locale/is/network-settings.dtd
+++ b/src/chrome/locale/is/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Bíddu aðeins á meðan tengingu er komið á við Tor-netið.  Það getur tekið nokkrar mínútur.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Tenging">
 <!ENTITY torPreferences.torSettings "Stillingar Tor">
 <!ENTITY torPreferences.torSettingsDescription "Tor-vafrinn beinir umferðinni þinni um Tor-netið, sem rekið er af þúsundum sjálfboðaliða um víða veröld." >
 <!ENTITY torPreferences.learnMore "Fræðast frekar">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Nettengt">
+<!ENTITY torPreferences.statusInternetOffline "Ónettengt">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Tengt">
+<!ENTITY torPreferences.statusTorNotConnected "Ótengt">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Fræðast frekar">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Flýtiræsing">
-<!ENTITY torPreferences.quickstartDescription "Flýtiræsing (Quickstart) gerir Tor-vafranum kleift að tengjast sjálfkrafa.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Alltaf tengjast sjálfkrafa">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Brýr">
 <!ENTITY torPreferences.bridgesDescription "Brýr hjálpa þér við að fá aðgang að Tor-netkerfinu á stöðum þar sem lokað er á Tor. Það fer eftir því hvar þú ert hvaða brú virkar betur en einhver önnur.">
-<!ENTITY torPreferences.useBridge "Nota brú">
-<!ENTITY torPreferences.requestNewBridge "Biðja um nýja brú…">
-<!ENTITY torPreferences.provideBridge "Útvega brú">
-<!ENTITY torPreferences.advanced "Ítarlegra">
-<!ENTITY torPreferences.advancedDescription "Stilltu hvernig Tor-vafrinn tengist við internetið.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Gildi aðgreind með kommum">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Sjálfvirkt">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Fjarlægja">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Afritað!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Biðja um brú…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
+<!ENTITY torPreferences.advanced "Nánar">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Skoða atvikaskrár…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "Þessa aðgerð er ekki hægt að afturkalla.">
+<!ENTITY torPreferences.cancel "Hætta við">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Biðja um brú">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Tengist BridgeDB. Bíddu aðeins.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Leystu CAPTCHA-þrautina til að biðja um brú.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Þessi lausn er ekki rétt. Reyndu aftur.">
-<!ENTITY torPreferences.viewTorLogs "Skoða atvikaskrár Tor.">
-<!ENTITY torPreferences.viewLogs "Skoða atvikaskrár…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Settu inn upplýsingar um brúna sem þú fékkst frá áreiðanlegum aðila">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor atvikaskrá (log)">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Prófaðu að tengjast aftur">
-<!ENTITY torConnect.offline "Ónettengt">
+<!ENTITY torConnect.notConnectedConcise "Ótengt">
+<!ENTITY torConnect.connectingConcise "Tengist…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Sjálfvirkt">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Stilla tengingu…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Reyndu aftur">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor-vafranum mistókst að koma á tengingu við Tor-netið">
-<!ENTITY torConnect.connectingConcise "Tengist…">
-<!ENTITY torConnect.connectedConcise "Tengt">
-<!ENTITY torConnect.notConnectedConcise "Ótengt">
-<!ENTITY torConnect.copyLog "Afrita Tor-atvikaskrár">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Prófa brú">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/it/network-settings.dtd b/src/chrome/locale/it/network-settings.dtd
index e727689..0ef86a9 100644
--- a/src/chrome/locale/it/network-settings.dtd
+++ b/src/chrome/locale/it/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Attendi mentre stabiliamo una connessione alla rete Tor.  Potrebbe richiedere qualche minuto.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connessione">
 <!ENTITY torPreferences.torSettings "Impostazioni di Tor">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser indirizza il tuo traffico nella rete Tor, gestita da migliaia di volontari in tutto il mondo." >
-<!ENTITY torPreferences.learnMore "Maggiori informazioni">
+<!ENTITY torPreferences.learnMore "Per saperne di più">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connesso">
+<!ENTITY torPreferences.statusTorNotConnected "Non Connesso">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Per saperne di più">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart permette a Tor Browser di connettersi automaticamente.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Connetti sempre automaticamente">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "I bridge ti aiutano ad accedere alla rete Tor in luoghi dove Tor viene bloccato. A seconda di dove ti trovi, un bridge può funzionare meglio di un altro.">
-<!ENTITY torPreferences.useBridge "Usa un bridge">
-<!ENTITY torPreferences.requestNewBridge "Richiedi un Nuovo Bridge...">
-<!ENTITY torPreferences.provideBridge "Fornisci un bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatica">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Rimuovi">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copiato!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Richiedi un bridge...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avanzate">
-<!ENTITY torPreferences.advancedDescription "Configura come Tor Browser si connette a internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Valori separati da una virgola">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Visualizza Log...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Annulla">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Richiedi Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contattando BridgeDB. Attendere, prego.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Risolvi il CAPTCHA per richiedere un bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "La soluzione è sbagliata. Riprova.">
-<!ENTITY torPreferences.viewTorLogs "Visualizza i log di Tor.">
-<!ENTITY torPreferences.viewLogs "Visualizza Log...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Inserisci le informazioni del bridge da una fonte fidata">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Log di Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Prova a riconnettere">
-<!ENTITY torConnect.offline "Offline">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Tor Browser non è riuscito a stabilire una connessione alla rete Tor">
-<!ENTITY torConnect.connectingConcise "Connessione in corso...">
-<!ENTITY torConnect.connectedConcise "Connesso">
 <!ENTITY torConnect.notConnectedConcise "Non Connesso">
-<!ENTITY torConnect.copyLog "Copia i log di Tor">
+<!ENTITY torConnect.connectingConcise "Connessione in corso...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatica">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configura connessione…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Riprova">
+<!ENTITY torConnect.offline "Internet not reachable">
+<!ENTITY torConnect.connectMessage "Le modifiche alle impostazioni di Tor non verranno applicate finché non ti connetti">
+<!ENTITY torConnect.tryAgainMessage "Tor Browser non è riuscito a stabilire una connessione alla rete Tor">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Prova un bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/ja/network-settings.dtd b/src/chrome/locale/ja/network-settings.dtd
index 7ae2d1c..ade052e 100644
--- a/src/chrome/locale/ja/network-settings.dtd
+++ b/src/chrome/locale/ja/network-settings.dtd
@@ -9,7 +9,7 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torSettings.connectPrompt "「接続」をクリックすると Tor に接続します。">
+<!ENTITY torSettings.connectPrompt "“接続” をクリックすると Tor に接続します。">
 <!ENTITY torSettings.configurePrompt "Tor による通信を検閲する国（エジプト、中国、トルコ等）にいる場合やプロキシを要求するプライベートネットワークから接続する場合、「設定」をクリックしてネットワーク設定を調整します。">
 <!ENTITY torSettings.configure "設定">
 <!ENTITY torSettings.connect "接続">
@@ -17,7 +17,7 @@
 <!-- Other: -->
 
 <!ENTITY torsettings.startingTor "Torの開始を待っています...">
-<!ENTITY torsettings.restartTor "Torを再起動する">
+<!ENTITY torsettings.restartTor "Tor を再起動">
 <!ENTITY torsettings.reconfigTor "再設定">
 
 <!ENTITY torsettings.discardSettings.prompt "Tor Bridge が設定されるか、ローカルプロキシ設定が入力されるかしました。  Tor ネットワークに直接接続するためには、これらの設定は削除する必要があります。">
@@ -25,7 +25,7 @@
 
 <!ENTITY torsettings.optional "オプション">
 
-<!ENTITY torsettings.useProxy.checkbox "インターネットに接続するのにプロキシを使用します">
+<!ENTITY torsettings.useProxy.checkbox "インターネット接続にプロキシを使用する">
 <!ENTITY torsettings.useProxy.type "プロキシの種類">
 <!ENTITY torsettings.useProxy.type.placeholder "プロキシの種類を選択">
 <!ENTITY torsettings.useProxy.address "アドレス">
@@ -39,58 +39,139 @@
 <!ENTITY torsettings.firewall.checkbox "このコンピューターは特定のポートへの接続のみ許可するファイアーウォールを通します。">
 <!ENTITY torsettings.firewall.allowedPorts "許可されたポート">
 <!ENTITY torsettings.useBridges.checkbox "Tor は私の国では検閲されています">
-<!ENTITY torsettings.useBridges.default "内蔵 Bridge を選択する">
-<!ENTITY torsettings.useBridges.default.placeholder "Bridge を選択">
+<!ENTITY torsettings.useBridges.default "内蔵ブリッジを選択">
+<!ENTITY torsettings.useBridges.default.placeholder "ブリッジを選択">
 <!ENTITY torsettings.useBridges.bridgeDB "torproject.org に Bridge をリクエストする">
 <!ENTITY torsettings.useBridges.captchaSolution.placeholder "画像の文字を入力してください">
 <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "チャレンジを更新する">
 <!ENTITY torsettings.useBridges.captchaSubmit "送信">
-<!ENTITY torsettings.useBridges.custom "知っている Bridge を使う">
-<!ENTITY torsettings.useBridges.label "信頼できる情報源から入手した Bridge 情報を入力してください。">
-<!ENTITY torsettings.useBridges.placeholder "アドレス:ポート の形式で入力 (1 行ずつ)">
+<!ENTITY torsettings.useBridges.custom "既知のブリッジを使用">
+<!ENTITY torsettings.useBridges.label "信頼できる情報源から入手したブリッジ情報を入力してください。">
+<!ENTITY torsettings.useBridges.placeholder "“アドレス:ポート” の形式で入力 (1 行ずつ)">
 
 <!ENTITY torsettings.copyLog "Tor のログをクリップボードにコピー">
 
 <!ENTITY torsettings.proxyHelpTitle "プロキシヘルプ">
 <!ENTITY torsettings.proxyHelp1 "会社、学校、大学等のネットワークを通して接続する場合、ローカルプロキシが必要になる場合があります。 プロキシが必要であるかどうかわからない場合は、他のブラウザのインターネット設定を見るか、システムのネットワーク設定を確認してください。">
 
-<!ENTITY torsettings.bridgeHelpTitle "Bridge リレーのヘルプ">
-<!ENTITY torsettings.bridgeHelp1 "Bridge とは Tor ネットワークへの接続を検閲することを困難するための非公開のリレーです。  各種類の Bridge は検閲を避けるための異なる手法を利用しています。  obfs はあなたのトラフィックをランダムなノイズのように見せかけ，meek はあなたのトラフィックを Tor ではない特定のサービスへの接続であるように見せかけます。">
-<!ENTITY torsettings.bridgeHelp2 "特定の国が Tor を検閲するしようと試みている場合、それがどのような手法で行われているかによって、ある Bridge がある国では機能しても他の国では動かないという場合があります。  もしどの Bridge があなたの国で機能するかわからない場合は  torproject.org/about/contact.html#support にアクセスしてください。">
+<!ENTITY torsettings.bridgeHelpTitle "ブリッジリレーのヘルプ">
+<!ENTITY torsettings.bridgeHelp1 "ブリッジとは Tor ネットワークへの接続を検閲することを困難するための非公開のリレーです。  各種類のブリッジは検閲を避けるための異なる手法を利用しています。  obfs はあなたのトラフィックをランダムなノイズのように見せかけ，meek はあなたのトラフィックを Tor ではない特定のサービスへの接続であるように見せかけます。">
+<!ENTITY torsettings.bridgeHelp2 "特定の国が Tor を検閲するしようと試みている場合、それがどのような手法で行われているかによって、ある Bridge がある国では機能しても他の国では動かないという場合があります。  もしどのブリッジがあなたの国で機能するかわからない場合は  torproject.org/about/contact.html#support にアクセスしてください。">
 
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Tor ネットワークへの接続が確立されるまでお待ちください。  これには数分間かかることがあります。">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "接続">
 <!ENTITY torPreferences.torSettings "Tor の設定">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser は通信トラフィックを Tor ネットワークを経由させて送信します。Tor ネットワークは世界中の何千ものボランティアによって運用されています。" >
 <!ENTITY torPreferences.learnMore "詳細情報">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "テスト">
+<!ENTITY torPreferences.statusInternetOnline "オンライン">
+<!ENTITY torPreferences.statusInternetOffline "オフライン">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "接続済み">
+<!ENTITY torPreferences.statusTorNotConnected "接続していません">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "詳細情報">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "クイックスタート">
-<!ENTITY torPreferences.quickstartDescription "クイックスタートを有効にすると、Tor Browser は自動的に接続を行います。">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "常に自動的に接続">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridge">
 <!ENTITY torPreferences.bridgesDescription "Bridge は Tor がブロックされる地域から Tor ネットワークにアクセスすることを手助けします。地域によって、ある Bridge が他のものよりうまく動作する可能性があります。">
-<!ENTITY torPreferences.useBridge "Bridge を使用する">
-<!ENTITY torPreferences.requestNewBridge "新しい Bridge をリクエスト…">
-<!ENTITY torPreferences.provideBridge "Bridge を指定する">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "自動">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "削除">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "コピーされました">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "ブリッジをリクエスト。
+">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "詳細">
-<!ENTITY torPreferences.advancedDescription "Tor Browser がインターネットに接続する方法を設定します。">
-<!ENTITY torPreferences.firewallPortsPlaceholder "コンマ区切りの値">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "ログを表示…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "この操作は元に戻すことはできません。">
+<!ENTITY torPreferences.cancel "キャンセル">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Bridge をリクエスト">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDB に接続しています。しばらくお待ちください。">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Bridge をリクエストするには CAPTCHA を解いて下さい。">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "その解答は正しくありません。再度実行してください。">
-<!ENTITY torPreferences.viewTorLogs "Tor のログを表示する。">
-<!ENTITY torPreferences.viewLogs "ログを表示…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "信頼できる情報源から入手したブリッジの情報を入力してください。">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor ログ">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "再度接続を試す">
-<!ENTITY torConnect.offline "オフライン">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Tor Browser は、Tor ネットワークへの接続を確立できませんでした">
-<!ENTITY torConnect.connectingConcise "接続中…">
-<!ENTITY torConnect.connectedConcise "接続済み">
 <!ENTITY torConnect.notConnectedConcise "接続していません">
-<!ENTITY torConnect.copyLog "Tor ログをコピー">
+<!ENTITY torConnect.connectingConcise "接続中…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "自動">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "接続を構成…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "もう一度やり直してください">
+<!ENTITY torConnect.offline "Internet not reachable">
+<!ENTITY torConnect.connectMessage "Tor 設定の変更は接続するまで反映されません">
+<!ENTITY torConnect.tryAgainMessage "Tor Browser は、Tor ネットワークへの接続を確立できませんでした">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "ブリッジを試す">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/ja/torlauncher.properties b/src/chrome/locale/ja/torlauncher.properties
index 64d57a6..c9822c5 100644
--- a/src/chrome/locale/ja/torlauncher.properties
+++ b/src/chrome/locale/ja/torlauncher.properties
@@ -5,27 +5,27 @@ torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited_during_startup=Tor が起動中に終了しました。これは、torrc ファイルの誤りや、Tor または他のプログラムのバグ、もしくはハードウェアの故障に起因しているかもしれません。問題を解決して Tor を再起動するまで、Tor Browser は起動されません。
 torlauncher.tor_exited=Tor が突然終了しました。原因はおそらく Tor 自体のバグか、他の常駐プログラムか、あるいはハードウェアが問題です。Tor を再起動するまで、 Tor Browser はウェブサイトに一切接続できません。再起動しても解決されない場合、Tor ログファイルをサポートチームに送信してください。
-torlauncher.tor_exited2=Tor を再起動しても、あなたのブラウザタブはそのまま残ります。
-torlauncher.tor_controlconn_failed=Torのコントロールポートに接続出来ませんでした。
-torlauncher.tor_failed_to_start=Torは開始出来ませんでした。
+torlauncher.tor_exited2=Tor を再起動しても、あなたのブラウザータブはそのまま残ります。
+torlauncher.tor_controlconn_failed=Tor コントロールポートに接続できませんでした。
+torlauncher.tor_failed_to_start=Tor の開始に失敗しました。
 torlauncher.tor_control_failed=Tor の制御に失敗しました。
 torlauncher.tor_bootstrap_failed=Tor は Tor ネットワーク接続の確立に失敗しました。
 torlauncher.tor_bootstrap_failed_details=%1$S 失敗 (%2$S)。
 
-torlauncher.unable_to_start_tor=Torを開始出来ません。\n\n%S
-torlauncher.tor_missing=Torの実行可能ファイルが見つかりません。
-torlauncher.torrc_missing=torrcファイルが見つからず、作成もできませんでした。
-torlauncher.datadir_missing=Torのデータディレクトリが存在せず、作成もできませんでした。
+torlauncher.unable_to_start_tor=Tor を開始できません。\n\n%S
+torlauncher.tor_missing=Tor の実行可能ファイルが見つかりません。
+torlauncher.torrc_missing=torrc ファイルが見つからず、作成もできませんでした。
+torlauncher.datadir_missing=Tor のデータディレクトリが存在せず、作成もできませんでした。
 torlauncher.onionauthdir_missing=Tor Onion 認証ディレクトリが存在せず、また作成することもできませんでした。
-torlauncher.password_hash_missing=ハッシュ化されたパスワードの入手に失敗しました
+torlauncher.password_hash_missing=ハッシュ化されたパスワードの入手に失敗しました。
 
-torlauncher.failed_to_get_settings=Torの設定を回復出来ません。\n\n%S
-torlauncher.failed_to_save_settings=Torの設定を保存出来ません。\n\n%S
-torlauncher.ensure_tor_is_running=Torが起動しているかご確認ください。
+torlauncher.failed_to_get_settings=Tor の設定を回復できません。\n\n%S
+torlauncher.failed_to_save_settings=Tor の設定を保存できません。\n\n%S
+torlauncher.ensure_tor_is_running=Tor が起動しているかご確認ください。
 
 torlauncher.error_proxy_addr_missing=インターネットのアクセスにプロキシを使用するには Tor の構成へ IP アドレスまたはホスト名とポート番号を両方指定する必要があります。
 torlauncher.error_proxy_type_missing=プロキシの種類を選択する必要があります。
-torlauncher.error_bridges_missing=一つ以上のブリッジを記述する必要があります。
+torlauncher.error_bridges_missing=1 つ以上のブリッジを記述する必要があります。
 torlauncher.error_default_bridges_type_missing=提供されたブリッジ用のトランスポートタイプを選択する必要があります。
 torlauncher.error_bridgedb_bridges_missing=ブリッジをリクエストしてください。
 torlauncher.error_bridge_bad_default_type=トランスポートタイプ %S がある提供されたブリッジに利用できるものがありません。設定を調整してください。
@@ -43,15 +43,15 @@ torlauncher.no_meek= このブラウザはmeekを使用するように設定さ
 torlauncher.no_bridges_available=今回利用可能なブリッジがありません。
 
 torlauncher.connect=接続
-torlauncher.restart_tor=Torを再起動する
+torlauncher.restart_tor=Tor を再起動
 torlauncher.quit=終了
 torlauncher.quit_win=終了
 torlauncher.done=完了
 
-torlauncher.forAssistance=サポートについては、%Sにお問い合わせください
+torlauncher.forAssistance=サポートについては、%S にお問い合わせください
 torlauncher.forAssistance2=サポートについては、%Sをご覧ください。
 
-torlauncher.copiedNLogMessages=コピー成功。 %S個のTorログファイルがテキストエディターやEメールにペーストする準備ができました。
+torlauncher.copiedNLogMessages=コピーが成功しました。 %S 個の Tor ログファイルがテキストエディターやメールにペーストする準備ができました。
 
 torlauncher.bootstrapStatus.starting=起動中
 torlauncher.bootstrapStatus.conn_pt=ブリッジと接続中
diff --git a/src/chrome/locale/ka/network-settings.dtd b/src/chrome/locale/ka/network-settings.dtd
index eeafb87..deb0706 100644
--- a/src/chrome/locale/ka/network-settings.dtd
+++ b/src/chrome/locale/ka/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "გთხოვთ, მოითმინოთ სანამ დაუკავშირდება Tor-ქსელს.  რამდენიმე წუთს შეიძლება გასტანოს.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "კავშირი">
 <!ENTITY torPreferences.torSettings "Tor-ის პარამეტრები">
 <!ENTITY torPreferences.torSettingsDescription "Tor-ბრაუზერი თქვენს კავშირს ატარებს Tor-ქსელის გავლით, რომლის მუშაობასაც უზრუნველყოფს ათასობით მოხალისე მთელი მსოფლიოდან." >
 <!ENTITY torPreferences.learnMore "იხილეთ ვრცლად">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "ინტერნეტი:">
+<!ENTITY torPreferences.statusInternetTest "ტესტი">
+<!ENTITY torPreferences.statusInternetOnline "ხაზზეა">
+<!ENTITY torPreferences.statusInternetOffline "კავშირგარეშე">
+<!ENTITY torPreferences.statusTorLabel "Tor-ქსელი:">
+<!ENTITY torPreferences.statusTorConnected "მიერთებული">
+<!ENTITY torPreferences.statusTorNotConnected "არაა დაკავშირებული">
+<!ENTITY torPreferences.statusTorBlocked "სავარაუდოდ იზღუდება">
+<!ENTITY torPreferences.learnMore "იხილეთ ვრცლად">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "სწაფგაშვება">
-<!ENTITY torPreferences.quickstartDescription "სწრაფგაშვების მეშვეობით, Tor-ბრაუზერი ავტომატურად დაუკავშირდება.">
+<!ENTITY torPreferences.quickstartDescriptionLong "სწრაფგაშვებით Tor-ბრაუზერი თავადვე დაუკავშირდება Tor-ქსელს გაშვებისას, ბოლოს გამოყენებული პარამეტრებით.">
 <!ENTITY torPreferences.quickstartCheckbox "ყოველთვის თვითდაკავშირება">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "გადამცემი ხიდები">
 <!ENTITY torPreferences.bridgesDescription "გადამცემი ხიდების მეშვეობით შეგიძლიათ დაუკავშირდეთ Tor-ქსელს იქ, სადაც Tor-ს ზღუდავენ. იმისდა მიხედვით, თუ სად იმყოფებით, ზოგმა ხიდმა უკეთ შეიძლება იმუშაოს, ვიდრე სხვამ.">
-<!ENTITY torPreferences.useBridge "ხიდის გამოყენება">
-<!ENTITY torPreferences.requestNewBridge "ახალი გადამცემი ხიდის მოთხოვნა...">
-<!ENTITY torPreferences.provideBridge "გადამცემი ხიდის მითითება">
+<!ENTITY torPreferences.bridgeLocation "თქვენი მდებარეობა">
+<!ENTITY torPreferences.bridgeLocationAutomatic "თვითშერჩევა">
+<!ENTITY torPreferences.bridgeLocationFrequent "ხშირად მითითებული მდებარეობა">
+<!ENTITY torPreferences.bridgeLocationOther "სხვა მდებარეობა">
+<!ENTITY torPreferences.bridgeChooseForMe "ხიდის შერჩევა...">
+<!ENTITY torPreferences.bridgeBadgeCurrent "თქვენი მიმდინარე ხიდები">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "შეგიძლიათ დაამახსოვროთ ერთი ან რამდენიმე ხიდი და Tor თავადვე აირჩევს დაკავშირებისას. საჭიროების შემთხვევაშიც, Tor თავადვე შეძლებს სხვა ხიდზე გადართვას.">
+<!ENTITY torPreferences.bridgeId "#1 ხიდი: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "წაშლა">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "ჩაშენებული ხიდების გათიშვა">
+<!ENTITY torPreferences.bridgeShare "გააზიარეთ ხიდი QR-კოდით ან მისი მისამართის ასლით.">
+<!ENTITY torPreferences.bridgeCopy "ხიდის მისამართის ასლი">
+<!ENTITY torPreferences.copied "ასლი აღებულია!">
+<!ENTITY torPreferences.bridgeShowAll "ყველა ხიდის გამოჩენა">
+<!ENTITY torPreferences.bridgeRemoveAll "ყველა ხიდის მოცილება">
+<!ENTITY torPreferences.bridgeAdd "ახალი ხიდის დამატება">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "ამორჩევა Tor-ბრაუზერის ჩაშენებული ხიდებიდან">
+<!ENTITY torPreferences.bridgeSelectBuiltin "ჩაშენებული ხიდის მითითება...">
+<!ENTITY torPreferences.bridgeRequest "გადამცემი ხიდის მოთხოვნა...">
+<!ENTITY torPreferences.bridgeEnterKnown "თქვენთვის ცნობილი ხიდის გამოყენება">
+<!ENTITY torPreferences.bridgeAddManually "ხიდის ხელით მითითება...">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "დამატებით">
-<!ENTITY torPreferences.advancedDescription "მიუთითეთ, თუ როგორ დაუკავშირდეს Tor-ბრაუზერი ინტერნეტს.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "მძიმით გამოყოფილი მნიშვნელობები">
+<!ENTITY torPreferences.advancedDescription "მიუთითეთ, თუ როგორ დაუკავშირდეს Tor-ბრაუზერი ინტერნეტს">
+<!ENTITY torPreferences.advancedButton "პარამეტრები...">
+<!ENTITY torPreferences.viewTorLogs "იხილეთ Tor-ის ჩანაწერები">
+<!ENTITY torPreferences.viewLogs "ჩანაწერების ნახვა...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "მოცილდეს ყველა ხიდი?">
+<!ENTITY torPreferences.removeBridgesWarning "ეს ქმედება შეუქცევადია.">
+<!ENTITY torPreferences.cancel "გაუქმება">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "QR-კოდის წაკითხვა">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "ჩაშენებული ხიდები">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor-ბრაუზერი შეიცავს გარკვეული სახის ხიდებს, ე.წ. „მისაერთებელ გადამყვანებს“.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 სახეობის ჩაშენებული ხიდი Tor-ში გადაცემულ მონაცემებს წარმოადგენს შემთხვევითი ხმაურის სახით. უფრო ნაკლებია მისი შეზღუდვის ალბათობა, ვიდრე წინა თაობის obfs3-ხიდებისა.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake ჩაშენებული ხიდია, რომელიც გვერდს უვლის ცენზურას კავშირების გატარებით მოხალისეების მიერ გამართული Snowflake-პროქსის მეშვეობით.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure სახეობის ჩაშენებული ხიდი ისე წარმოაჩენს, თითქოს Microsoft-ის საიტს უკავშირდებოდეთ, ნაცვლად Tor-ისა.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "ხიდის მოთხოვნა">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "უკავშირდება BridgeDB-ს. გთხოვთ, მოითმინოთ.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "გაიარეთ CAPTCHA, გადამცემი ხიდის მოთხოვნისთვის.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "გადაწყვეტა არასწორია. გთხოვთ სცადოთ ხელახლა.">
-<!ENTITY torPreferences.viewTorLogs "იხილეთ Tor-ის ჩანაწერები.">
-<!ENTITY torPreferences.viewLogs "ჩანაწერების ნახვა...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "ხიდის მიწოდება">
+<!ENTITY torPreferences.provideBridgeHeader "შეიყვანეთ ხიდის მონაცემები სანდო წყაროდან">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "კავშირის პარამეტრები">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "მიუთითეთ, თუ როგორ დაუკავშირდეს Tor-ბრაუზერი ინტერნეტს">
+<!ENTITY torPreferences.firewallPortsPlaceholder "მძიმით გამოყოფილი მნიშვნელობები">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor-ის ჩანაწერები">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "კვლავ სცადეთ დაკავშირება">
-<!ENTITY torConnect.offline "კავშირგარეშე">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Tor-ბრაუზერმა ვერ მოახერხა კავშირის დამყარება Tor-ქსელთან">
-<!ENTITY torConnect.connectingConcise "უკავშირდება...">
-<!ENTITY torConnect.connectedConcise "მიერთებული">
 <!ENTITY torConnect.notConnectedConcise "არაა დაკავშირებული">
-<!ENTITY torConnect.copyLog "Tor-ის ჩანაწერების ასლი">
+<!ENTITY torConnect.connectingConcise "უკავშირდება...">
+<!ENTITY torConnect.tryingAgain "ცდილობს ხელახლა...">
+<!ENTITY torConnect.noInternet "Tor-ბრაუზერი ვერ უკავშირდება ქსელს">
+<!ENTITY torConnect.couldNotConnect "Tor-ბრაუზერი ვერ უკავშირდება Tor-ს">
+<!ENTITY torConnect.assistDescriptionConfigure "კავშირის გამართვა"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "თუ Tor იზღუდება თქვენს ადგილსამყოფელზე, ხიდი გამოგადგებათ. კავშირის მეგზური აგირჩევთ რომელიმეს მდებარეობის მიხედვით, ანდაც შეგიძლიათ #1 ხელით მიუთითოთ"> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "ხიდის მოსინჯვა...">
+<!ENTITY torConnect.tryingBridgeAgain "კიდევ ერთი მცდელობა...">
+<!ENTITY torConnect.errorLocation "Tor-ბრაუზერი ვერ ადგენს მდებარეობას">
+<!ENTITY torConnect.errorLocationDescription "Tor-ბრაუზერი საჭიროებს თქვენ მდებარეობას, რომ შესაფერისი ხიდი შეგირჩიოთ. თუ არ გსურთ გამჟღავნება, #1 მიუთითეთ ხელით."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "მდებარეობის პარამეტრები სწორია?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor-ბრაუზერი კვლავ ვერ უკავშირდება Tor-ქსელს. გთხოვთ, შეამოწმოთ თქვენი მდებარეობის სისწორე და სცადოთ ხელახლა ან #1."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "კავშირის მეგზური">
+<!ENTITY torConnect.breadcrumbLocation "მდებარეობის პარამეტრები">
+<!ENTITY torConnect.breadcrumbTryBridge "ხიდის მოსინჯვა">
+<!ENTITY torConnect.automatic "თვითშერჩევა">
+<!ENTITY torConnect.selectCountryRegion "აირჩიეთ ქვეყანა ან მხარე">
+<!ENTITY torConnect.frequentLocations "ხშირად მითითებული მდებარეობა">
+<!ENTITY torConnect.otherLocations "სხვა მდებარეობა">
+<!ENTITY torConnect.restartTorBrowser "Tor-ბრაუზერის ხელახლა გაშვება">
+<!ENTITY torConnect.configureConnection "კავშირის გამართვა...">
+<!ENTITY torConnect.viewLog "ჩანაწერების ნახვა...">
+<!ENTITY torConnect.tryAgain "სცადეთ ხელახლა">
+<!ENTITY torConnect.offline "ქსელი მიუწვდომელია">
+<!ENTITY torConnect.connectMessage "ცვლილებები Tor-ის პარამეტრებში არ აისახება, სანამ არ დაუკავშირდებით">
+<!ENTITY torConnect.tryAgainMessage "Tor-ბრაუზერმა ვერ მოახერხა კავშირის დამყარება Tor-ქსელთან">
+<!ENTITY torConnect.yourLocation "თქვენი მდებარეობა">
+<!ENTITY torConnect.tryBridge "მოსინჯეთ ხიდი">
+<!ENTITY torConnect.autoBootstrappingFailed "თვითგამართვა ვერ მოხერხდა">
+<!ENTITY torConnect.autoBootstrappingFailed "თვითგამართვა ვერ მოხერხდა">
+<!ENTITY torConnect.cannotDetermineCountry "ვერ დგინდება მომხმარებლის ქვეყანა">
+<!ENTITY torConnect.noSettingsForCountry "პარამეტრები არაა თქვენი მდებარეობისთვის">
diff --git a/src/chrome/locale/kk/network-settings.dtd b/src/chrome/locale/kk/network-settings.dtd
index dc875be..d23e5b9 100644
--- a/src/chrome/locale/kk/network-settings.dtd
+++ b/src/chrome/locale/kk/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Байланыс">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Толығырақ оқу">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Қосылулы">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Толығырақ оқу">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Жаңа көпірді сұраңыз...">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Жою">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Көшірілді!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Көпірді сұрау ...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Кеңейтілген">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Бас тарту">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Көпірді сұрату үшін CAPTCHA-ны дұрыс жазыңыз">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Шешім дұрыс емес. Әрекетті қайталап көріңіз.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Қосылым орнатылуда…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Қосылым орнатылуда…">
-<!ENTITY torConnect.connectedConcise "Қосылулы">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/km/network-settings.dtd b/src/chrome/locale/km/network-settings.dtd
index 9ce1eed..40b8c4a 100644
--- a/src/chrome/locale/km/network-settings.dtd
+++ b/src/chrome/locale/km/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "ការតភ្ជាប់">
 <!ENTITY torPreferences.torSettings "Tor Settings">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
+<!ENTITY torPreferences.torSettingsDescription "កម្មវិធីរុកក Tor បញ្ជូនចរាចរណ៍របស់អ្នកនៅលើបណ្ដាញ Tor ដែលដំណើរការដោយអ្នកស្ម័គ្រចិត្តរាប់ពាន់នាក់នៅជុំវិញពិភពលោក។" >
 <!ENTITY torPreferences.learnMore "ស្វែងយល់បន្ថែម">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "ក្រៅបណ្តាញ">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "បានភ្ជាប់">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "ស្វែងយល់បន្ថែម">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
-<!ENTITY torPreferences.bridges "Bridges">
+<!-- Bridge settings -->
+<!ENTITY torPreferences.bridges "បណ្តាញ">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "ដកចេញ">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "កម្រិតខ្ពស់">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "លុបចេញ">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "បញ្ចូលព័ត៌មាន Bridge ពីប្រភពទុកចិត្ត">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "ក្រៅបណ្តាញ">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "កំពុងតភ្ជាប់...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "កំពុងតភ្ជាប់...">
-<!ENTITY torConnect.connectedConcise "បានភ្ជាប់">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/ko/network-settings.dtd b/src/chrome/locale/ko/network-settings.dtd
index cf21754..e13cb2d 100644
--- a/src/chrome/locale/ko/network-settings.dtd
+++ b/src/chrome/locale/ko/network-settings.dtd
@@ -39,58 +39,138 @@
 <!ENTITY torsettings.firewall.checkbox "이 컴퓨터는 특정 포트만 허용하는 방화벽을 통해서 연결됩니다.">
 <!ENTITY torsettings.firewall.allowedPorts "허용된 포트">
 <!ENTITY torsettings.useBridges.checkbox "우리나라에서는 Tor를 검열합니다.">
-<!ENTITY torsettings.useBridges.default "제공된 브릿지를 선택하기">
-<!ENTITY torsettings.useBridges.default.placeholder "브릿지를 선택하세요.">
-<!ENTITY torsettings.useBridges.bridgeDB "torproject.org에서 브릿지 요청하기">
+<!ENTITY torsettings.useBridges.default "제공된 브리지를 선택하기">
+<!ENTITY torsettings.useBridges.default.placeholder "브리지를 선택하세요.">
+<!ENTITY torsettings.useBridges.bridgeDB "torproject.org에서 브리지 요청하기">
 <!ENTITY torsettings.useBridges.captchaSolution.placeholder "이미지에 나온 글자를 입력하세요.">
 <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "새로운 캡차 시도값을 구합니다.">
 <!ENTITY torsettings.useBridges.captchaSubmit "제출확인">
-<!ENTITY torsettings.useBridges.custom "내가 아는 브릿지를 제공">
-<!ENTITY torsettings.useBridges.label "신뢰할 수있는 정보로부터 전달받은 브릿지 정보를 입력하세요.">
+<!ENTITY torsettings.useBridges.custom "내가 아는 브리지를 제공">
+<!ENTITY torsettings.useBridges.label "신뢰 가능한 출처에서 받은 브리지 정보를 입력하세요">
 <!ENTITY torsettings.useBridges.placeholder "주소:포트번호 입력하세요.(한줄에 하나씩)">
 
 <!ENTITY torsettings.copyLog "Tor log를 클립보드에 복사하기">
 
 <!ENTITY torsettings.proxyHelpTitle "프록시 도움말">
-<!ENTITY torsettings.proxyHelp1 "회사나 학교, 혹인 대학 네트워크를 통해 연결하는 경우에 로컬 프록시가 필요할 수 있습니다. 프록시가 필요한지 모르는 경우에는 다른 브라우저에서 인터넷 설정을 확인하거나 시스템의 네트워크 설정을 확인하세요.">
+<!ENTITY torsettings.proxyHelp1 "회사나 학교 혹은 대학 네트워크를 통해 연결하는 경우에 로컬 프록시가 필요할 수 있습니다. 프록시가 필요한지 모르는 경우에는 다른 브라우저에서 인터넷 설정을 확인하거나 시스템의 네트워크 설정을 확인하세요.">
 
-<!ENTITY torsettings.bridgeHelpTitle "브릿지 중계서버 도움말">
-<!ENTITY torsettings.bridgeHelp1 "브릿지는 Tor 네트워크에 대한 연결을 차단하는 것을 더 어렵게 해주는 비공개 중계서버입니다.  각 유형의 브릿는 검열을 피하기 위해 각기 다른 방법을 사용합니다.   obfs 인것은 당신의 트래픽이 임의의 잡음형태인 것처럼 보이게 해줍니다. 그리고 meek 인것은 Tor 대신에 당신이 서비스에 연결되어있는 것처럼 보이게 해줍니다.">
-<!ENTITY torsettings.bridgeHelp2 "일부 국가에서 어떻게든 Tor 를 차단하려고 하기 때문에, 어떤 브릿지는 특정 국가에서는 동작하지만 다른 곳에서는 그렇지 않습니다.  당신의 나라에서 어떤 브릿지가 동작하고 있는지 모르는 경우 torproject.org/about/contact.html#support 를 방문하세요.">
+<!ENTITY torsettings.bridgeHelpTitle "브리지 중계서버 도움말">
+<!ENTITY torsettings.bridgeHelp1 "브리지는 Tor 네트워크에 대한 연결을 차단하는 것을 더 어렵게 해주는 비공개 중계서버입니다.  각 유형의 브리지는 검열을 피하기 위해 각기 다른 방법을 사용합니다.   obfs는 트래픽을 임의의 노이즈처럼 보이게 해줍니다. 그리고 meek은 Tor 대신에 meek 서비스에 연결되어있는 것처럼 보이게 해줍니다.">
+<!ENTITY torsettings.bridgeHelp2 "일부 국가에서 어떤 방식으로든 Tor를 차단하려고 하기 때문에, 어떤 브리지는 특정 국가에서는 동작하지만 다른 곳에서는 그렇지 않습니다.  당신의 나라에서 어떤 브리지가 동작하고 있는지 모르는 경우 torproject.org/about/contact.html#support를 방문하세요.">
 
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Tor 네트워크에 연결할 때까지 기다려주십시오.  몇 분 정도 소요될 수 있습니다.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "바위 산">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Tor 연결">
 <!ENTITY torPreferences.torSettings "Tor 설정">
 <!ENTITY torPreferences.torSettingsDescription "Tor 브라우저는 전세계 수천명의 자원 봉사자에 의해 운영되는 Tor 네트워크와 당신을 연결합니다." >
 <!ENTITY torPreferences.learnMore "더 알아보기">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "인터넷:">
+<!ENTITY torPreferences.statusInternetTest "테스트">
+<!ENTITY torPreferences.statusInternetOnline "온라인">
+<!ENTITY torPreferences.statusInternetOffline "오프라인">
+<!ENTITY torPreferences.statusTorLabel "Tor 네트워크:">
+<!ENTITY torPreferences.statusTorConnected "접속됨">
+<!ENTITY torPreferences.statusTorNotConnected "연결되지 않음">
+<!ENTITY torPreferences.statusTorBlocked "차단됐을 가능성이 있습니다">
+<!ENTITY torPreferences.learnMore "더 알아보기">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "빠른 시작">
-<!ENTITY torPreferences.quickstartDescription "빠른 시작을 사용하면 Tor 브라우저가 자동으로 연결됩니다.">
-<!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
-<!ENTITY torPreferences.bridges "브릿지 (중계서버)">
-<!ENTITY torPreferences.bridgesDescription "브릿지는 Tor가 차단된 위치에서 Tor 네트워크에 액세스하는 데 도움이 됩니다. 위치에 따라 브릿지 하나가 다른 중계서버보다 더 잘 작동할 수 있습니다.">
-<!ENTITY torPreferences.useBridge "브릿지 사용">
-<!ENTITY torPreferences.requestNewBridge "새로운 브릿지 요청하기">
-<!ENTITY torPreferences.provideBridge "브릿지를 제공하세요">
-<!ENTITY torPreferences.advanced "고급">
-<!ENTITY torPreferences.advancedDescription "Tor 브라우저가 인터넷에 연결하는 방법을 구성하십시오.">
+<!ENTITY torPreferences.quickstartDescriptionLong "'빠른시작'을 선택하면 Tor 브라우저가 실행될 때 Tor 네트워크에 자동으로 접속됩니다.  이때 설정 방식은 직전의 연결 설정을 따릅니다.">
+<!ENTITY torPreferences.quickstartCheckbox "항상 자동으로 연결">
+<!-- Bridge settings -->
+<!ENTITY torPreferences.bridges "브리지">
+<!ENTITY torPreferences.bridgesDescription "'브리지'는 Tor가 차단된 환경에서 Tor 네트워크에 접속하려 할 때 유용합니다. 환경에 따라 브리지 하나가 다른 중계서버보다 더 잘 작동할 수 있습니다.">
+<!ENTITY torPreferences.bridgeLocation "귀하의 위치">
+<!ENTITY torPreferences.bridgeLocationAutomatic "자동">
+<!ENTITY torPreferences.bridgeLocationFrequent "자주 선택하는 위치">
+<!ENTITY torPreferences.bridgeLocationOther "다른 위치">
+<!ENTITY torPreferences.bridgeChooseForMe "Tor 브라우저에서 귀하에게 맞는 브리지를 자동으로 선택하도록 설정…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "귀하의 현재 브리지">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "추가한 브리지를 저장해두면, 귀하가 연결할 때 사용할 브리지 중 하나로 Tor가 고르게 될 겁니다. 필요한 때에 맞춰 Tor에서 자동으로 브리지를 바꾸는 작업을 진행합니다.">
+<!ENTITY torPreferences.bridgeId "#1 브리지: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "제거하기">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "내장 브리지를 비활성화">
+<!ENTITY torPreferences.bridgeShare "QR 코드를 활용하거나, 다음 주소를 복사해 이 브리지를 공유할 수 있습니다:">
+<!ENTITY torPreferences.bridgeCopy "브리지 주소 복사">
+<!ENTITY torPreferences.copied "복사됨!">
+<!ENTITY torPreferences.bridgeShowAll "모든 브리지 조회">
+<!ENTITY torPreferences.bridgeRemoveAll "모든 브리지 삭제">
+<!ENTITY torPreferences.bridgeAdd "새로운 브리지 추가">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Tor 브라우저 기본 내장 브리지 중에서 선택하기">
+<!ENTITY torPreferences.bridgeSelectBuiltin "내장 브리지를 선택하기">
+<!ENTITY torPreferences.bridgeRequest "브리지 요청하기">
+<!ENTITY torPreferences.bridgeEnterKnown "기존에 알고 있던 브리지 주소를 입력하기">
+<!ENTITY torPreferences.bridgeAddManually "브리지를 수동으로 추가하기…">
+<!-- Advanced settings -->
+<!ENTITY torPreferences.advanced "고급설정">
+<!ENTITY torPreferences.advancedDescription "Tor 브라우저에서 인터넷에 연결하는 방식을 설정하세요">
+<!ENTITY torPreferences.advancedButton "설정…">
+<!ENTITY torPreferences.viewTorLogs "Tor 로그 조회">
+<!ENTITY torPreferences.viewLogs "로그 조회">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "모든 브리지를 삭제할까요?">
+<!ENTITY torPreferences.removeBridgesWarning "이 작업이 이루어진 후 되돌릴 수 없습니다.">
+<!ENTITY torPreferences.cancel "취소">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "QR 코드 스캔">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "내장 브리지">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor 브라우저엔 '장착형 전송수단'이라는 특수 유형의 브리지가 있습니다.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4는 내장 브리지의 일종입니다. Tor 트래픽이 랜덤하게 보이도록 만드는 역할을 담당합니다. obfs4는 obfs3 브리지와 같은 기존의 내장 브리지와 달리 차단 가능성도 적습니다.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake는 검열을 타파할 수 있는 내장 브리지입니다. 자원 봉사자 분들이 운영하는 Snowflake 프록시에 귀하의 연결이 거쳐 전송되도록 설정함으로써 이를 실현합니다. ">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure는 Tor를 사용하는 걸 감추고, Microsoft 웹 사이트를 이용중인 것처럼 만들어주는 내장 브리지입니다.">
+<!-- Request bridges dialog -->
+<!ENTITY torPreferences.requestBridgeDialogTitle "브리지 요청하기">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "브리지DB에 연결하고 있으니, 잠시 기다려주세요.">
+<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "브리지를 요청하기 위해 CAPCHA를 풀어주세요.">
+<!ENTITY torPreferences.requestBridgeErrorBadSolution "제출한 답이 맞지 않습니다. 다시 시도해주세요.">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "브리지 제공">
+<!ENTITY torPreferences.provideBridgeHeader "신뢰 가능한 출처에서 받은 브리지 정보를 입력하세요">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "연결 설정">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Tor 브라우저에서 인터넷에 연결하는 방식을 설정하세요">
 <!ENTITY torPreferences.firewallPortsPlaceholder "쉼표로 구분 된 값">
-<!ENTITY torPreferences.requestBridgeDialogTitle "브릿지 요청하기">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "브릿지DB에 연결하고 있으니, 잠시 기다려주세요.">
-<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "브릿지를 요청하기 위해 CAPCHA를 풀어주세요.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "풀이가 맞지 않습니다. 다시 시도해주세요.">
-<!ENTITY torPreferences.viewTorLogs "Tor 로그를 봅니다.">
-<!ENTITY torPreferences.viewLogs "로그보기 ...">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor 로그">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "연결 재시도">
-<!ENTITY torConnect.offline "오프라인">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Tor 브라우저가 Tor 네트워크에 대한 연결을 설정하지 못했음">
+<!ENTITY torConnect.notConnectedConcise "연결되지 않음">
 <!ENTITY torConnect.connectingConcise "접속중...">
-<!ENTITY torConnect.connectedConcise "접속됨">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Tor 로그 복사하기">
+<!ENTITY torConnect.tryingAgain "다시 시도하는 중입니다…">
+<!ENTITY torConnect.noInternet "Tor 브라우저에서 인터넷에 연결할 수 없습니다">
+<!ENTITY torConnect.couldNotConnect "Tor 브라우저에서 Tor에 연결할 수 없습니다">
+<!ENTITY torConnect.assistDescriptionConfigure "연결 세부 설정"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "귀하의 지역에서 Tor가 차단됐다면, 브리지를 사용하는 게 도움이 될 수 있습니다. '연결 도우미'로 귀하의 위치에 기반한 적합한 브리지를 제공받을 수 있습니다. 아니면 #1 수동으로 브리지를 선택할 수도 있습니다."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "브리지 사용…">
+<!ENTITY torConnect.tryingBridgeAgain "한 번 더 해보고 있습니다…">
+<!ENTITY torConnect.errorLocation "Tor 브라우저에서 귀하의 위치를 파악할 수 없습니다.">
+<!ENTITY torConnect.errorLocationDescription "Tor 브라우저에서 귀하의 환경에 맞는 브리지를 선택할 수 있도록, 귀하의 위치 정보가 필요합니다. 귀하의 위치를 공유하는 게 꺼려진다면, 자동으로 하지 마시고 #1 수동으로 설정하세요."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "위치가 제대로 설정된 게 맞나요?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor 브라우저에서 Tor에 여전히 연결할 수 없는 상태입니다. 귀하의 '위치 설정'이 올바르게 돼있는지 점검해본 후 다시 시도해주세요. 혹은 #1의 방식을 대신 써보세요."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "연결 도우미">
+<!ENTITY torConnect.breadcrumbLocation "위치 설정">
+<!ENTITY torConnect.breadcrumbTryBridge "브리지 사용하기">
+<!ENTITY torConnect.automatic "자동">
+<!ENTITY torConnect.selectCountryRegion "국가 혹은 지역을 선택하세요">
+<!ENTITY torConnect.frequentLocations "자주 선택하는 지역">
+<!ENTITY torConnect.otherLocations "다른 위치">
+<!ENTITY torConnect.restartTorBrowser "Tor 브라우저 재시작">
+<!ENTITY torConnect.configureConnection "연결 구성중...">
+<!ENTITY torConnect.viewLog "로그 조회…">
+<!ENTITY torConnect.tryAgain "다시 시도하기">
+<!ENTITY torConnect.offline "인터넷에 연결할 수 없습니다">
+<!ENTITY torConnect.connectMessage "Tor 설정의 변경사항은 Tor에 연결하기 전까지 적용되지 않습니다">
+<!ENTITY torConnect.tryAgainMessage "Tor 브라우저에서 Tor 네트워크에 연결하는 데 실패했습니다">
+<!ENTITY torConnect.yourLocation "귀하의 위치">
+<!ENTITY torConnect.tryBridge "브리지 사용하기">
+<!ENTITY torConnect.autoBootstrappingFailed "자동 구성 실패">
+<!ENTITY torConnect.autoBootstrappingFailed "자동 구성 실패">
+<!ENTITY torConnect.cannotDetermineCountry "사용자의 국가를 파악할 수 없습니다">
+<!ENTITY torConnect.noSettingsForCountry "귀하의 위치에서 이용할 수 있는 설정이 없습니다">
diff --git a/src/chrome/locale/ko/torlauncher.properties b/src/chrome/locale/ko/torlauncher.properties
index 01c84c3..105ebfd 100644
--- a/src/chrome/locale/ko/torlauncher.properties
+++ b/src/chrome/locale/ko/torlauncher.properties
@@ -4,7 +4,7 @@
 torlauncher.error_title=Tor 런처
 
 torlauncher.tor_exited_during_startup=시작하는 동안 Tor가 종료되었습니다. 이것은 torrc 파일의 오류, Tor 나 PC의 다른 프로그램의 버그, 혹은 하드웨어 결함으로 인한 것일 수 있습니다. 기본 문제를 해결하고 Tor를 다시 시작할 때까지 Tor 브라우저는 시작되지 않습니다.
-torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다. 이것은 Tor 자체의 오류, 사용자 시스템의 타 프로그램 또는 하드웨어의 오류 때문일 수 있습니다. 사용자가 Tor를 재시작 하기 전까진, Tor 브라우저는 어떠한 웹사이트에 접속하지 않습니다. 문제가 계속된다면, 지원팀에게 당신의 Tor 로그를 보내주십시오.
+torlauncher.tor_exited=Tor가 예기치 않게 종료되었습니다. 이것은 Tor 자체의 오류, 사용자 시스템의 타 프로그램 또는 하드웨어의 오류 때문일 수 있습니다. 사용자가 Tor를 재시작 하기 전까진, Tor 브라우저는 어떠한 웹사이트에 접속하지 않습니다. 문제가 계속된다면, 지원팀에게 당신의 Tor 로그를 보내주세요.
 torlauncher.tor_exited2=Tor를 재시작해도 브라우저 탭은 닫히지 않습니다.
 torlauncher.tor_controlconn_failed=Tor 제어 포트에 연결할 수 없습니다.
 torlauncher.tor_failed_to_start=Tor 시작에 실패했습니다.
@@ -17,30 +17,30 @@ torlauncher.tor_missing=Tor 실행 파일이 없습니다.
 torlauncher.torrc_missing=torrc 파일이 사라졌으며 생성 할 수 없습니다.
 torlauncher.datadir_missing=Tor 데이터 디렉토리가 존재하지 않으며 생성할 수 없습니다.
 torlauncher.onionauthdir_missing=Tor onion 인증 디렉토리가 존재하지 않으며 생성 할 수 없습니다.
-torlauncher.password_hash_missing=해쉬 암호을 얻어오지 못 하였습니다.
+torlauncher.password_hash_missing=해싱된 패스워드을 가져오지 못했습니다
 
 torlauncher.failed_to_get_settings=Tor 설정을 찾을 수 없습니다.\n\n%S
 torlauncher.failed_to_save_settings=Tor 설정을 저장할 수 없습니다.\n\n%S
-torlauncher.ensure_tor_is_running=Tor가 실행중인지 확인하여 주십시오.
+torlauncher.ensure_tor_is_running=Tor가 실행 중인지 확인해주세요.
 
 torlauncher.error_proxy_addr_missing=인터넷에 접속하기 위해 프록시를 사용한다면, IP주소나 호스트 이름, 그리고 포트 번호를 입력해야 합니다.
-torlauncher.error_proxy_type_missing=프록시 유형을 선택해 주십시오.
-torlauncher.error_bridges_missing=하나 이상의 브릿지를 지정해야 합니다.
-torlauncher.error_default_bridges_type_missing=제공된 브릿지의 전송 유형을 선택해야 합니다.
-torlauncher.error_bridgedb_bridges_missing=브릿지를 요청해주세요.
-torlauncher.error_bridge_bad_default_type=전송 유형 %S가 제공한 브릿지는 유효하지 않습니다. 설정을 조정하십시오.
+torlauncher.error_proxy_type_missing=프록시 유형을 선택해 주세요.
+torlauncher.error_bridges_missing=하나 이상의 브리지를 지정해야 합니다.
+torlauncher.error_default_bridges_type_missing=제공된 브리지의 전송수단 유형을 선택해야 합니다.
+torlauncher.error_bridgedb_bridges_missing=브리지를 요청해주세요.
+torlauncher.error_bridge_bad_default_type=전송수단 유형 %S가 제공한 브리지는 유효하지 않습니다. 설정을 조정하세요.
 
-torlauncher.bridge_suffix.meek-amazon=(중국에서 일하기)
-torlauncher.bridge_suffix.meek-azure=(중국에서 일하기)
+torlauncher.bridge_suffix.meek-amazon=(중국에서 작동합니다.)
+torlauncher.bridge_suffix.meek-azure=(중국에서 작동합니다.)
 
-torlauncher.request_a_bridge=브릿지 요청하기
-torlauncher.request_a_new_bridge=새로운 브릿지 요청하기
-torlauncher.contacting_bridgedb=브릿지DB에 연결하고 있으니, 잠시 기다려주세요.
-torlauncher.captcha_prompt=브릿지를 요청하기 위해 CAPCHA를 풀어주세요.
-torlauncher.bad_captcha_solution=풀이가 맞지 않습니다. 다시 시도해주세요.
-torlauncher.unable_to_get_bridge=브릿지DB로터 브릿지를 얻어오지 못 하였습니다.\n\n%S
-torlauncher.no_meek=이 브라우저는 브릿지 확보에 필요한 온전한 기능을 위해 설정되어 있지 않습니다.
-torlauncher.no_bridges_available=지금은 사용할 수 있는 브릿지가 없습니다. 죄송합니다.
+torlauncher.request_a_bridge=브리지 요청하기
+torlauncher.request_a_new_bridge=새로운 브리지 요청하기
+torlauncher.contacting_bridgedb=브리지DB에 연결 중입니다. 잠시 기다려주세요.
+torlauncher.captcha_prompt=브리지 요청을 위해 CAPTCHA를 풀어주세요.
+torlauncher.bad_captcha_solution=제출한 답이 맞지 않습니다. 다시 시도해주세요.
+torlauncher.unable_to_get_bridge=브리지DB에서 브리지를 얻을 수 없습니다.\n\n%S
+torlauncher.no_meek=이 브라우저는 브리지 확보를 위해 필요한 meek에 맞게 설정되지 않았습니다.
+torlauncher.no_bridges_available=지금은 사용할 수 있는 브리지가 없습니다. 죄송합니다.
 
 torlauncher.connect=연결
 torlauncher.restart_tor=Tor 재시작
@@ -48,20 +48,20 @@ torlauncher.quit=끝내기
 torlauncher.quit_win=종료
 torlauncher.done=완료
 
-torlauncher.forAssistance=도움이 필요하면, %S에 연락하십시오.
+torlauncher.forAssistance=도움이 필요하면, %S에 연락하세요.
 torlauncher.forAssistance2=도움이 필요하면 %S를 방문하십시오.
 
 torlauncher.copiedNLogMessages=복사 완료. %S Tor 로그 메시지는 텍스트 편집기나 이메일 메시지에 붙여넣을 수 있는 상태가 됩니다.
 
 torlauncher.bootstrapStatus.starting=시작중
-torlauncher.bootstrapStatus.conn_pt=브릿지에 연결하고 있습니다.
-torlauncher.bootstrapStatus.conn_done_pt=브릿지에 연결되었습니다.
+torlauncher.bootstrapStatus.conn_pt=브리지에 연결하고 있습니다.
+torlauncher.bootstrapStatus.conn_done_pt=브리지에 연결되었습니다.
 torlauncher.bootstrapStatus.conn_proxy=프록시에 연결하고 있습니다.
 torlauncher.bootstrapStatus.conn_done_proxy=프록시에 연결되었습니다.
-torlauncher.bootstrapStatus.conn=Tor 중계서버에 연결하고 있습니다.
+torlauncher.bootstrapStatus.conn=Tor 중계서버에 연결 중입니다
 torlauncher.bootstrapStatus.conn_done=Tor 중계서버에 연결되었습니다.
-torlauncher.bootstrapStatus.handshake=Tor 중계서버와 네고하고 있습니다.
-torlauncher.bootstrapStatus.handshake_done=Tor 중계서버와의 네고를 완료하였습니다.
+torlauncher.bootstrapStatus.handshake=Tor 중계서버와 교섭 중입니다
+torlauncher.bootstrapStatus.handshake_done=Tor 중계서버와의 교섭이 완료됐습니다
 torlauncher.bootstrapStatus.onehop_create=경로와의 연결을 암호화해서 만들고 있어요
 torlauncher.bootstrapStatus.requesting_status=네트워크의 상태를 가져오고 있습니다.
 torlauncher.bootstrapStatus.loading_status=네트워크의 상태를 불러오고 있습니다.
@@ -69,15 +69,15 @@ torlauncher.bootstrapStatus.loading_keys=인증서를 로딩하고 있습니다.
 torlauncher.bootstrapStatus.requesting_descriptors=중계서버 정보를 요청하고 있습니다.
 torlauncher.bootstrapStatus.loading_descriptors=중계서버 정보를 불러오고 있습니다.
 torlauncher.bootstrapStatus.enough_dirinfo=중계서버 정보 불러오기에 완료하였습니다.
-torlauncher.bootstrapStatus.ap_conn_pt=우회로 연결: 브릿지에 연결하고 있습니다.
-torlauncher.bootstrapStatus.ap_conn_done_pt=우회로 연결: 브릿지에 연결되었습니다.
-torlauncher.bootstrapStatus.ap_conn_proxy=우회로 연결: 프록시에 연결하고 있습니다.
-torlauncher.bootstrapStatus.ap_conn_done_proxy=우회로 연결: 프록시에 연결되었습니다.
-torlauncher.bootstrapStatus.ap_conn=우회로 연결: Tor 중계서버에 연결하고 있습니다.
-torlauncher.bootstrapStatus.ap_conn_done=우회로 연결: Tor 중계서버에 연결되었습니다.
-torlauncher.bootstrapStatus.ap_handshake=우회로 연결: Tor 중계서버와 네고하고 있습니다.
-torlauncher.bootstrapStatus.ap_handshake_done=우회로 연결: Tor 중계서버와의 네고가 끝났습니다.
-torlauncher.bootstrapStatus.circuit_create=우회로 연결: Tor 우회로가 연결되었습니다.
+torlauncher.bootstrapStatus.ap_conn_pt=우회로 구성: 브리지에 연결 중입니다
+torlauncher.bootstrapStatus.ap_conn_done_pt=우회로 구성: 브리지에 연결되었습니다.
+torlauncher.bootstrapStatus.ap_conn_proxy=우회로 구성: 프록시에 연결 중입니다
+torlauncher.bootstrapStatus.ap_conn_done_proxy=우회로 구성: 프록시에 연결되었습니다.
+torlauncher.bootstrapStatus.ap_conn=우회로 구성: Tor 중계서버에 연결 중입니다
+torlauncher.bootstrapStatus.ap_conn_done=우회로 구성: Tor 중계서버에 연결되었습니다.
+torlauncher.bootstrapStatus.ap_handshake=우회로 구성: Tor 중계서버와 교섭 중입니다
+torlauncher.bootstrapStatus.ap_handshake_done=우회로 구성: Tor 중계서버와의 교섭이 완료됐습니다
+torlauncher.bootstrapStatus.circuit_create=우회로 구성 : Tor 우회로 설정 중입니다
 torlauncher.bootstrapStatus.done=Tor 네트워크에 연결되었습니다.
 
 torlauncher.bootstrapWarning.done=완료
@@ -88,7 +88,7 @@ torlauncher.bootstrapWarning.identity=계정 불일치
 torlauncher.bootstrapWarning.timeout=연결 타임아웃
 torlauncher.bootstrapWarning.noroute=호스트로의 연결 경로가 없음
 torlauncher.bootstrapWarning.ioerror=읽기 / 쓰기 오류
-torlauncher.bootstrapWarning.pt_missing=플러그가 가능한 전송을 찾을 수 없습니다
+torlauncher.bootstrapWarning.pt_missing=장착형 전송수단이 없습니다.
 
 torlauncher.nsresult.NS_ERROR_NET_RESET=서버와의 연결이 끊어졌습니다.
 torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=서버와 연결할 수 없습니다.
diff --git a/src/chrome/locale/lt/network-settings.dtd b/src/chrome/locale/lt/network-settings.dtd
index 1901bf4..dec4ad3 100644
--- a/src/chrome/locale/lt/network-settings.dtd
+++ b/src/chrome/locale/lt/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Palaukite, kol mes užmegsime ryšį su Tor tinklu.  Tai gali užtrukti kelias minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Ryšys">
 <!ENTITY torPreferences.torSettings "Tor nustatymai">
 <!ENTITY torPreferences.torSettingsDescription "Tor Naršyklė nukreipia jūsų srautą per Tor tinklą, veikiantį po visą pasaulį išsidėsčiusių tūkstančių savanorių dėka." >
-<!ENTITY torPreferences.learnMore "Sužinokite daugiau">
+<!ENTITY torPreferences.learnMore "Sužinoti daugiau">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Pasiekiama(-s)">
+<!ENTITY torPreferences.statusInternetOffline "Nepasiekiama">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Prisijungta">
+<!ENTITY torPreferences.statusTorNotConnected "Neprisijungta">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Sužinoti daugiau">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Greita pradžia">
-<!ENTITY torPreferences.quickstartDescription "Greita pradžia, leidžia Tor Naršyklei jungtis automatiškai.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Visuomet jungtis automatiškai">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Tinklų tiltai">
 <!ENTITY torPreferences.bridgesDescription "Tinklo tiltai padeda jums pasiekti Tor tinklą, vietose kur Tor užblokuotas. Priklausomai nuo to kur esate, vienas tiltas gali veikti geriau nei kitas.">
-<!ENTITY torPreferences.useBridge "Naudoti tinklų tiltą">
-<!ENTITY torPreferences.requestNewBridge "Užklausti naują tinklų tiltą…">
-<!ENTITY torPreferences.provideBridge "Pateikite tinklų tiltą">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Ištrinti">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Nukopijuota!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Užklausti tinklų tiltą…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Išplėstiniai">
-<!ENTITY torPreferences.advancedDescription "Sukonfigūruokite kaip Tor Naršyklė jungsis prie interneto.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Kableliais atskirtos reikšmės">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Rodyti žurnalus…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "Šis veiksmas negalės būti atšauktas.">
+<!ENTITY torPreferences.cancel "Atsisakyti">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Užklausti tinklų tiltą…">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Susisiekiama su BridgeDB. Palaukite.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Norėdami užklausti tinklų tiltą, išspręskite saugos kodą.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Sprendimas neteisingas. Bandykite dar kartą.">
-<!ENTITY torPreferences.viewTorLogs "Rodyti Tor žurnalus.">
-<!ENTITY torPreferences.viewLogs "Rodyti žurnalus…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Įveskite tinklų tilto informaciją iš patikimo šaltinio">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor žurnalai">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Bandykite jungtis dar kartą">
-<!ENTITY torConnect.offline "Nepasiekiama">
+<!ENTITY torConnect.notConnectedConcise "Neprisijungta">
+<!ENTITY torConnect.connectingConcise "Jungiamasi…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatiškai">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Bandyti dar kartą">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Naršyklei nepavyko užmegzti ryšio su Tor tinklu">
-<!ENTITY torConnect.connectingConcise "Jungiamasi…">
-<!ENTITY torConnect.connectedConcise "Prisijungta">
-<!ENTITY torConnect.notConnectedConcise "Neprisijungta">
-<!ENTITY torConnect.copyLog "Kopijuoti Tor Žurnalus">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/lv/network-settings.dtd b/src/chrome/locale/lv/network-settings.dtd
index 6b7174f..d0593fa 100644
--- a/src/chrome/locale/lv/network-settings.dtd
+++ b/src/chrome/locale/lv/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Lūdzu pagaidiet kamēr mēs izveidojam savienojumu ar tīklu Tor. Tam var būt nepieciešamas vairākas minūtes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Savienojums">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Uzzināt vairāk">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Pārbaude">
+<!ENTITY torPreferences.statusInternetOnline "Tiešsaiste">
+<!ENTITY torPreferences.statusInternetOffline "Bezsaistē">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Uzzināt vairāk">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Tilti">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Noņemt">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Lietpratīgs">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Atcelt">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Bezsaistē">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/mk/network-settings.dtd b/src/chrome/locale/mk/network-settings.dtd
index 26ef0bf..913604e 100644
--- a/src/chrome/locale/mk/network-settings.dtd
+++ b/src/chrome/locale/mk/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Ве молиме почекајте додека се воспостави поврзувањето со Тор мрежата.  Ова може да потрае неколку минути.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Поврзување">
 <!ENTITY torPreferences.torSettings "Tor Поставки">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser го рутира вашиот сообраќај преку Tor мрежата, водена од илјадници волонтери ширум светот." >
 <!ENTITY torPreferences.learnMore "Научете повеќе">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Интернет:">
+<!ENTITY torPreferences.statusInternetTest "Тест">
+<!ENTITY torPreferences.statusInternetOnline "Вклучен">
+<!ENTITY torPreferences.statusInternetOffline "Исклучен">
+<!ENTITY torPreferences.statusTorLabel "Tor Мрежа:">
+<!ENTITY torPreferences.statusTorConnected "Поврзано">
+<!ENTITY torPreferences.statusTorNotConnected "Неповрзано">
+<!ENTITY torPreferences.statusTorBlocked "Потенцијално блокирано">
+<!ENTITY torPreferences.learnMore "Научете повеќе">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Брз почеток">
-<!ENTITY torPreferences.quickstartDescription "Брз почеток овозможува Tor Browser да се поврзува автоматски.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Брз почеток го поврзува Tor Browser на Tor Мрежата автоматски при стартување, врз основа на вашите последни користени мрежни поставки.">
 <!ENTITY torPreferences.quickstartCheckbox "Секогаш поврзи автоматски">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Мостови">
 <!ENTITY torPreferences.bridgesDescription "Мостовите ви помагаат да пристапите на Tor мрежата на места каде Tor е блокиран. Зависно од тоа каде сте, еден мост може да работи подобро од друг.">
-<!ENTITY torPreferences.useBridge "Користи мост">
-<!ENTITY torPreferences.requestNewBridge "Барање за нов мост...">
-<!ENTITY torPreferences.provideBridge "Овозможи мост">
+<!ENTITY torPreferences.bridgeLocation "Ваша локација">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Автоматски">
+<!ENTITY torPreferences.bridgeLocationFrequent "Често избрани локации">
+<!ENTITY torPreferences.bridgeLocationOther "Останати локации">
+<!ENTITY torPreferences.bridgeChooseForMe "Одбери Мост за мене...">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Ваши моментални мостови">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Можете да задржите еден или повеќе мостови зачувани, и Tor ќе избере кој да го користи при поврзување. Tor автоматски ќе го замени мостот со друг кога ќе биде потребно.">
+<!ENTITY torPreferences.bridgeId "#1 мост: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Избриши">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Оневозможи вградени мостови">
+<!ENTITY torPreferences.bridgeShare "Споделете го овој мост користејќи го QR кодот или со копирање на оваа адреса:">
+<!ENTITY torPreferences.bridgeCopy "Копирај ја Мост адресата">
+<!ENTITY torPreferences.copied "Копирано!">
+<!ENTITY torPreferences.bridgeShowAll "Покажи ги сите мостови">
+<!ENTITY torPreferences.bridgeRemoveAll "Избриши ги сите мостови">
+<!ENTITY torPreferences.bridgeAdd "Додади нов Мост">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Одберете еден од вградените мостови во Tor Browser">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Селектирајте вграден Мост...">
+<!ENTITY torPreferences.bridgeRequest "Барање за мост...">
+<!ENTITY torPreferences.bridgeEnterKnown "Внесете адреса на мост која ја знаете">
+<!ENTITY torPreferences.bridgeAddManually "Додадете Мост рачно...">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Напредно">
-<!ENTITY torPreferences.advancedDescription "Конфигурирајте како Tor Browser да се поврзува на Интернет.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Разделени-со-запирка вредности">
+<!ENTITY torPreferences.advancedDescription "Конфигурирајте како Tor Browser да се поврзува на Интернет">
+<!ENTITY torPreferences.advancedButton "Поставки...">
+<!ENTITY torPreferences.viewTorLogs "Види ги Tor логовите">
+<!ENTITY torPreferences.viewLogs "Види логови...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Избриши ги сите мостови?">
+<!ENTITY torPreferences.removeBridgesWarning "Оваа акција е неповратна.">
+<!ENTITY torPreferences.cancel "Откажи">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Скенирајте го QR кодот">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Вградени Мостови">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser вклучува некои специфични типови на мостови познати како “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 е тип на вграден мост кој прави вашиот Tor сообраќај да изгледа случајно. Исто така тие се помалку веројатни да бидат блокирани отколку нивните претходници, obfs3 мостовите.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake е вграден мост кој ја победува цензурата преку рутирање на вашето поврзување преку Snowflake проксија, управувани од волонтери.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure е вграден мост кој прави да изгледа дека користите веб страна на Microsoft наместо дека го користите Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Побарај Мост">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Контактирај BridgeDB. Ве молиме почекајте.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Решете ја ЗАДАЧАТА за да побарате мост.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Решението е погрешно. Ве молиме обидете се повторно.">
-<!ENTITY torPreferences.viewTorLogs "Види ги Tor логовите.">
-<!ENTITY torPreferences.viewLogs "Види логови...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Обезбеди Мост">
+<!ENTITY torPreferences.provideBridgeHeader "Внесете информации за мост од доверлив извор">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Поставки на поврзување">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Конфигурирајте како Tor Browser да се поврзува на Интернет">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Разделени-со-запирка вредности">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Логови">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Повторен обид за поврзување">
-<!ENTITY torConnect.offline "Офлајн / Исклучен">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Tor Browser не успеа да воспостави поврзување со Tor мрежата.">
-<!ENTITY torConnect.connectingConcise "Се поврзува...">
-<!ENTITY torConnect.connectedConcise "Поврзано">
 <!ENTITY torConnect.notConnectedConcise "Неповрзано.">
-<!ENTITY torConnect.copyLog "Копирај Tor логови">
+<!ENTITY torConnect.connectingConcise "Се поврзува...">
+<!ENTITY torConnect.tryingAgain "Обидете се повторно...">
+<!ENTITY torConnect.noInternet "Tor Browser не може да се поврзе на Интернет">
+<!ENTITY torConnect.couldNotConnect "Tor Browser не може да се поврзе на Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "Прилагодете го вашето поврзување"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Ако Tor е блокиран на вашата локација, обидувањето со користење на мост може да помогне. Поврзувањето може да ви помогне да одберете еден за користење на вашата локација, или наместо тоа можете #1 рачно."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Пробај мост...">
+<!ENTITY torConnect.tryingBridgeAgain "Обидетете се уште еднаш...">
+<!ENTITY torConnect.errorLocation "Tor Browser не може да ве лоцира">
+<!ENTITY torConnect.errorLocationDescription "На Tor Browser му треба да ја знае вашата локација за да може да одбере правилен мост за вас. Доколку преферирате да не ја споделите вашата локација, наместо тоа можете рачно #1."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Дали овие поставки за локација се точни?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser сеуште не може да се поврзе на Tor. Ве молиме проверете дали вашите поставки на локација се точни и обидете се повторно, или #1."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Помош за поврзување">
+<!ENTITY torConnect.breadcrumbLocation "Поставки за локација">
+<!ENTITY torConnect.breadcrumbTryBridge "Пробај мост">
+<!ENTITY torConnect.automatic "Автоматски">
+<!ENTITY torConnect.selectCountryRegion "Одберете Држава или Регион">
+<!ENTITY torConnect.frequentLocations "Често избрани локации">
+<!ENTITY torConnect.otherLocations "Останати локации">
+<!ENTITY torConnect.restartTorBrowser "Рестартирај го Tor Browser">
+<!ENTITY torConnect.configureConnection "Прилагодување на Поврзувањето...">
+<!ENTITY torConnect.viewLog "Види логови...">
+<!ENTITY torConnect.tryAgain "Обиди се повторно">
+<!ENTITY torConnect.offline "Интернетот не е достапен.">
+<!ENTITY torConnect.connectMessage "Промените во Tor Поставки нема да имаат ефект се додека не се поврзете">
+<!ENTITY torConnect.tryAgainMessage "Tor Browser не успеа да воспостави поврзување со Tor мрежата.">
+<!ENTITY torConnect.yourLocation "Ваша локација">
+<!ENTITY torConnect.tryBridge "Пробај мост">
+<!ENTITY torConnect.autoBootstrappingFailed "Автоматското прилагодување не успеа">
+<!ENTITY torConnect.autoBootstrappingFailed "Автоматското прилагодување не успеа">
+<!ENTITY torConnect.cannotDetermineCountry "Не беше возможно утврдување на државата на корисникот">
+<!ENTITY torConnect.noSettingsForCountry "Нема достапни поставки за вашата локација">
diff --git a/src/chrome/locale/ml/network-settings.dtd b/src/chrome/locale/ml/network-settings.dtd
index eb8f822..5bc64b5 100644
--- a/src/chrome/locale/ml/network-settings.dtd
+++ b/src/chrome/locale/ml/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "റ്റോറിലേക്കു ബന്ധപ്പെടുത്തുന്നത് വരെ ദയവായി ക്ഷെമിക്കുക &#160. ഇത് നിരവധി സമയം എടുക്കും ">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connection">
 <!ENTITY torPreferences.torSettings "ടോർ  ക്രമീകരണങ്ങൾ ">
 <!ENTITY torPreferences.torSettingsDescription "സ്വയം സഹായിക്കുന്ന ഒരു പറ്റം ആളുകളുടെ സഹായത്തോടെ ടോർ ബ്രൌസർ ടോർ നെറ്വർക്കിലേക്കു നിങ്ങളെ ബന്ധിപ്പിക്കുന്നതാണ് ." >
-<!ENTITY torPreferences.learnMore "കൂടുതൽ അറിയു">
+<!ENTITY torPreferences.learnMore "കൂടുതൽ അറിയാൻ ">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "ഓഫ്‌ലൈൻ">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "ബന്ധിപ്പിച്ചു">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "കൂടുതൽ അറിയാൻ ">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "ബ്രിഡ്ജുകൾ  ">
 <!ENTITY torPreferences.bridgesDescription "ബ്രിഡ്ജുകൾ ടോർ തടഞ്ഞിട്ടുള്ള സ്ഥലങ്ങളിൽ ടോർ നെറ്റർക് ഉപയോഗിക്കാൻ സഹായിക്കുന്നു . ഒരു ബ്രിഡ്ജ് മറ്റ്റൊന്നിനേക്കാൾ നന്നായി പ്രേവര്തിക്കുന്നത് നിങ്ങൾ എവിടെയാണെന്നതിനെ ആശ്രയിച്ചിരിക്കും .">
-<!ENTITY torPreferences.useBridge "ഒരു ബ്രിഡ്ജ് ഉപയോഗിക്കുക  ">
-<!ENTITY torPreferences.requestNewBridge "ഒരു പുതിയ ബ്രിഡ്ജിനെ ചോദിക്കുക ...">
-<!ENTITY torPreferences.provideBridge "ഒരു ബ്രിഡ്ജ് നല്‍കുക">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "ഒഴിവാക്കുക">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "ഒരു ബ്രിഡ്ജിനെ ചോദിക്കുക ">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "പുരോഗമിച്ച">
-<!ENTITY torPreferences.advancedDescription "ടോർ ബ്രൗസർ എങ്ങനെയാണ് ഇന്റർനെറ്റിലേക്കു ബന്ധപ്പെടുന്നത് എന്ന് കോൺഫിഗർ ചെയ്യുക .">
-<!ENTITY torPreferences.firewallPortsPlaceholder "കോമ വേര്തിരിച്ചിരിക്കുന്ന വാൽയൂ">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "ലോഗുകൾ കാണുക…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "റദ്ദാക്കുക ">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "സ്നോഫ്ളൈക് ">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "ബ്രിഡ്ജിനെ ചോദിക്കുക ">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "ബ്രിഡ്ജ് ഡി ബിയെ ബന്ധപ്പെടുന്നു , ദയവായി കാത്തിരിക്കുക .">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "ബ്രിഡ്ജിനെ കിട്ടാൻ തന്നിരിക്കുന്ന കാപ്ച പരിഹരിക്കുക ">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "പരിഹാരം ശെരിയല്ല . ദയവായി ഒന്നുകൂടെ ശ്രെമിക്കുക ">
-<!ENTITY torPreferences.viewTorLogs "ടോർ ലോഗ്സ് കാണുക .">
-<!ENTITY torPreferences.viewLogs "ലോഗുകൾ കാണുക…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "ടോർ ലോഗ്സ് ">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "ഓഫ്‌ലൈൻ">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "കണ്ണെക്റ്റിംഗ് / ബന്ധിപ്പിക്കുന്നു ..">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "ഒന്ന് കൂടി ശ്രമിക്കൂ ">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "കണ്ണെക്റ്റിംഗ് / ബന്ധിപ്പിക്കുന്നു ..">
-<!ENTITY torConnect.connectedConcise "ബന്ധിപ്പിച്ചു">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/mr/network-settings.dtd b/src/chrome/locale/mr/network-settings.dtd
index 7f65bc8..4e6eca9 100644
--- a/src/chrome/locale/mr/network-settings.dtd
+++ b/src/chrome/locale/mr/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connection">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "अधिक जाणून घ्या">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "अधिक जाणून घ्या">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "पूल ">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "नवीन ब्रिजची विनंती करा ...">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "हटवा">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "ब्रिज विनंती ...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "प्रगत">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "रद्द">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "स्नोफ्लेक">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "मिक-आझुर (meek-azure)">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "पुलाची विनंती करण्यासाठी कॅप्चाचे निरसन करा.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "उपाय बरोबर नाही. कृपया पुन्हा प्रयत्न करा.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "कनेक्ट करीत आहे...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "कनेक्ट करीत आहे...">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/ms/network-settings.dtd b/src/chrome/locale/ms/network-settings.dtd
index af5ba02..bf8a1b8 100644
--- a/src/chrome/locale/ms/network-settings.dtd
+++ b/src/chrome/locale/ms/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Tunggu sebentar sementara kami menjalinkan sambungan dengan rangkaian Tor.  Ia mengambil masa beberapa minit.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Sambungan">
 <!ENTITY torPreferences.torSettings "Tetapan Tor">
 <!ENTITY torPreferences.torSettingsDescription "Pelayar Tor menghala trafik anda ke dalam Rangkaian Tor, yang dioperasikan oleh beribu-ribu para sukarelawan di serata dunia." >
-<!ENTITY torPreferences.learnMore "Ketahui Lebih Lanjut">
+<!ENTITY torPreferences.learnMore "Ketahui lebih lanjut">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Luar Talian">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Ketahui lebih lanjut">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Jambatan, ataupun Bridges">
 <!ENTITY torPreferences.bridgesDescription "Titi membantu anda capai Rangkaian Tor di kawasan yang mana Tor telah disekat. Bergantung pada kedudukan atau lokasi anda, titi ini mungkin berfungsi lebih baik berbanding titi-titi yang lain.">
-<!ENTITY torPreferences.useBridge "Guna satu titi">
-<!ENTITY torPreferences.requestNewBridge "Pinta satu Titi Baharu...">
-<!ENTITY torPreferences.provideBridge "Sediakan satu titi">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Buang">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Pinta satu Titi...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Lanjutan">
-<!ENTITY torPreferences.advancedDescription "Konfigur bagaimana Pelayar Tor bersambung dengan internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Nilai dipisah-tanda-koma">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Lihat Log...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Batal">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Pohon Titi">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Menghubungi BridgeDB. Tunggu Sebentar.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Selesaikan CAPTCHA untuk meminta satu titi.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Jawapan salah. Cuba sekali lagi.">
-<!ENTITY torPreferences.viewTorLogs "Lihat log Tor.">
-<!ENTITY torPreferences.viewLogs "Lihat Log...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Log Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Luar Talian">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/my/network-settings.dtd b/src/chrome/locale/my/network-settings.dtd
index fddfc74..decc024 100644
--- a/src/chrome/locale/my/network-settings.dtd
+++ b/src/chrome/locale/my/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "ကျွန်ုပ်တို့မှ Tor ကွန်ယက်နှင့် ချိတ်ဆက်မှု ထူထောင်နေတုန်း ခေတ္တစောင့်ပေးပါ။   ဤလုပ်ဆောင်မှုသည် မိနစ်အနည်းအငယ်ကြာနိုင်လိမ့်မည်။">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "ချိတ်ဆက်ခြင်း">
 <!ENTITY torPreferences.torSettings "Tor အပြင်အဆင်များ">
 <!ENTITY torPreferences.torSettingsDescription "ကမ္ဘာအနှံ့ရှိ လုပ်အားပေးများ လုပ်ဆောင်သော Tor ကွန်ယက်ပေါ်တွင် သင့်အသွားအလာများကို Tor ဘရောင်ဇာမှ လမ်းကြောင်းပေးပါသည်။" >
-<!ENTITY torPreferences.learnMore "ထပ်မံလေ့လာမယ်">
+<!ENTITY torPreferences.learnMore "ထပ်မံလေ့လာမည်">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "စမ်းသပ်ရန်">
+<!ENTITY torPreferences.statusInternetOnline "လိုင်းတက်နေသည်">
+<!ENTITY torPreferences.statusInternetOffline "အော့ဖ်လိုင်း">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "ချိတ်ဆက်ပြီးပါပြီ">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "ထပ်မံလေ့လာမည်">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "ချိတ်ဆက်တံတားများသည် Tor ကို ပိတ်ပယ်ထားသော နေရာများတွင် Tor ကွန်ယက်နှင့် ချိတ်ဆက်ရန် ကူညီပေးပါသည်။ သင့် တည်နေရာပေါ်မူတည်၍ ချိတ်ဆက်တံတားတစ်ခုသည် နောက်တစ်ခုထက် ပိုကောင်းနိုင်ပါလိမ့်မည်။">
-<!ENTITY torPreferences.useBridge "ချိတ်ဆက်တံတား အသုံးပြုမယ်">
-<!ENTITY torPreferences.requestNewBridge "ချိတ်ဆက်တံတားအသစ် တောင်းဆိုပါ...">
-<!ENTITY torPreferences.provideBridge "ချိတ်ဆက်တံတားတစ်ခု ပံ့ပိုးမယ်">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "ဖယ်ရှားမည်">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "ကော်ပီကူးပြီး!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "ချိတ်ဆက်တံတား တောင်းဆိုပါ...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "အဆင့်မြင့်">
-<!ENTITY torPreferences.advancedDescription "Tor ဘရောင်ဇာမှ အင်တာနက်နှင့် မည်သို့ချိတ်ရန်ကို ချိန်ညှိပါရန်">
-<!ENTITY torPreferences.firewallPortsPlaceholder "ကော်မာခြားထားသော တန်ဖိုးများ">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "မှတ်တမ်းများ ကြည့်ရှုမယ်...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "ပယ်ဖျက်မည်">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "ချိတ်ဆက်တံတား တောင်းဆိုမယ်">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "BridgeDB နှင့် ဆက်သွယ်နေသည်။ ခေတ္တစောင့်ပေးပါ။">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "လူဟုတ်မဟုတ်စစ်ဆေးမှုကို ဖြေ၍ bridge အား တောင်းဆိုပါ">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "ဖြေရှင်းမှုသည် မမှန်ကန်ပါ။ ပြန်စမ်းကြည့်ပေးပါ။">
-<!ENTITY torPreferences.viewTorLogs "Tor မှတ်တမ်းများ ကိုကြည့်ရှုမယ်">
-<!ENTITY torPreferences.viewLogs "မှတ်တမ်းများ ကြည့်ရှုမယ်...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor မှတ်တမ်းများ">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "လိုင်းတက်မနေပါ">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "ချိတ်ဆက်နေသည်…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "ထပ်မံလုပ်ဆောင်ပါ။">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "ချိတ်ဆက်နေသည်…">
-<!ENTITY torConnect.connectedConcise "ချိတ်ဆက်ပြီးပါပြီ">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/nb-NO/network-settings.dtd b/src/chrome/locale/nb-NO/network-settings.dtd
index 83021f2..56c5571 100644
--- a/src/chrome/locale/nb-NO/network-settings.dtd
+++ b/src/chrome/locale/nb-NO/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Vent mens tilkobling til Tor-nettverket opprettes.  Dette kan ta flere minutter.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Tilkobling">
 <!ENTITY torPreferences.torSettings "Tor-innstillinger">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser dirigerer trafikken din over Tor-nettverket, drevet av tusenvis av frivillige rundt om i verden." >
 <!ENTITY torPreferences.learnMore "Lær mer">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Tilkoblet">
+<!ENTITY torPreferences.statusInternetOffline "Frakoblet">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Tilkoblet">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Lær mer">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Broer">
 <!ENTITY torPreferences.bridgesDescription "Broer hjelper deg med å få tilgang til Tor-nettverket på steder der Tor er blokkert. Avhengig av hvor du er, kan det hende at en bro fungerer bedre enn en annen.">
-<!ENTITY torPreferences.useBridge "Bruk en bro">
-<!ENTITY torPreferences.requestNewBridge "Forespør ny bro…">
-<!ENTITY torPreferences.provideBridge "Gi en bro">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatisk">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Fjern">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Kopiert!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Forespør en bro…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avansert">
-<!ENTITY torPreferences.advancedDescription "Konfigurer hvordan Tor-nettleseren kobles til internett.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Komma-separerte verdier">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Vis logger...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Avbryt">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Forespør en bro">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontakter BridgeDB. Vennligst vent.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Løs CAPTCHA-en for å forespørre en bro.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Løsningen er ikke riktig. Vær så snill, prøv på nytt.">
-<!ENTITY torPreferences.viewTorLogs "Se Tor-loggene.">
-<!ENTITY torPreferences.viewLogs "Vis logger...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor-logger">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Frakoblet">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Kobler til...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatisk">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Prøv igjen">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Kobler til...">
-<!ENTITY torConnect.connectedConcise "Tilkoblet">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/ne/network-settings.dtd b/src/chrome/locale/ne/network-settings.dtd
index 8b37d1d..c2f9412 100644
--- a/src/chrome/locale/ne/network-settings.dtd
+++ b/src/chrome/locale/ne/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connection">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Remove">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Advanced">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "रद्द गर्नुहोस्">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/nl-BE/network-settings.dtd b/src/chrome/locale/nl-BE/network-settings.dtd
index c2628c2..adb4568 100644
--- a/src/chrome/locale/nl-BE/network-settings.dtd
+++ b/src/chrome/locale/nl-BE/network-settings.dtd
@@ -62,36 +62,116 @@
 <!ENTITY torprogress.pleaseWait "Even geduld terwijl we verbinding maken met het Tor netwerk. 
 Dit kan enkele minuten duren.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connection">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Verbonden">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatisch">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Verwijderen">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Geavanceerd">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "Deze actie kan niet ongedaan gemaakt worden.">
+<!ENTITY torPreferences.cancel "Annuleren?">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Verbinden…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatisch">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Opnieuw proberen">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Verbinden…">
-<!ENTITY torConnect.connectedConcise "Verbonden">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/nl/network-settings.dtd b/src/chrome/locale/nl/network-settings.dtd
index 31d7e05..b575614 100644
--- a/src/chrome/locale/nl/network-settings.dtd
+++ b/src/chrome/locale/nl/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Even geduld; er wordt verbinding gemaakt met het Tor-netwerk.  Dit kan enkele minuten duren.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Verbinding">
 <!ENTITY torPreferences.torSettings "Tor-instellingen">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routeert uw verkeer over het Tor-netwerk, mogelijk gemaakt door duizenden vrijwilligers over de hele wereld." >
 <!ENTITY torPreferences.learnMore "Meer info">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Testen">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Verbonden">
+<!ENTITY torPreferences.statusTorNotConnected "Niet verbonden">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Meer info">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Snelstart">
-<!ENTITY torPreferences.quickstartDescription "Snelstart laat Tor Browser automatisch verbinding maken.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Altijd automatisch verbinding maken">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges helpen u toegang te krijgen tot het Tor-netwerk op plaatsen waar Tor is geblokkeerd. Afhankelijke van waar u zich bevindt, werkt de ene bridge mogelijk beter dan de andere.">
-<!ENTITY torPreferences.useBridge "Een bridge gebruiken">
-<!ENTITY torPreferences.requestNewBridge "Een nieuwe bridge aanvragen…">
-<!ENTITY torPreferences.provideBridge "Een bridge opgeven">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatisch">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Verwijderen">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Gekopieerd!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Een bridge aanvragen…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Geavanceerd">
-<!ENTITY torPreferences.advancedDescription "Configureren hoe Tor Browser verbinding maakt met het internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Kommagescheiden waarden">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Logboeken weergeven…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Annuleren">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Een bridge aanvragen">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contact maken met BridgeDB. Even geduld.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Los de CAPTCHA op om een bridge aan te vragen.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "De oplossing is niet juist. Probeer het opnieuw.">
-<!ENTITY torPreferences.viewTorLogs "De Tor-logboeken weergeven">
-<!ENTITY torPreferences.viewLogs "Logboeken weergeven…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Bridge-informatie van een vertrouwde bron invoeren">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor-logboeken">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Probeer Opnieuw te Verbinden">
-<!ENTITY torConnect.offline "Offline">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Tor Browser kon geen verbinding maken met het Tor Netwerk">
-<!ENTITY torConnect.connectingConcise "Bezig met verbinden...">
-<!ENTITY torConnect.connectedConcise "Verbonden">
 <!ENTITY torConnect.notConnectedConcise "Niet verbonden">
-<!ENTITY torConnect.copyLog "Kopieer Tor Logboeken">
+<!ENTITY torConnect.connectingConcise "Bezig met verbinden...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatisch">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Opnieuw proberen">
+<!ENTITY torConnect.offline "Internet not reachable">
+<!ENTITY torConnect.connectMessage "Wijzigingen aan Tor-instellingen zullen geen effect hebben totdat je verbind maakt">
+<!ENTITY torConnect.tryAgainMessage "Tor Browser kon geen verbinding maken met het Tor Netwerk">
+<!ENTITY torConnect.yourLocation "Uw locatie">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/nn-NO/network-settings.dtd b/src/chrome/locale/nn-NO/network-settings.dtd
index 7235e42..992e518 100644
--- a/src/chrome/locale/nn-NO/network-settings.dtd
+++ b/src/chrome/locale/nn-NO/network-settings.dtd
@@ -36,9 +36,9 @@
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP/HTTPS">
-<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports">
-<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports">
-<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country">
+<!ENTITY torsettings.firewall.checkbox "Denne datamaskina går gjennom einbrannmur som berre tillèt koplingar til visse portar.">
+<!ENTITY torsettings.firewall.allowedPorts "Tillatne portar">
+<!ENTITY torsettings.useBridges.checkbox "Tor er sensurert i mitt land">
 <!ENTITY torsettings.useBridges.default "Select a built-in bridge">
 <!ENTITY torsettings.useBridges.default.placeholder "select a bridge">
 <!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org">
@@ -46,51 +46,131 @@
 <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge">
 <!ENTITY torsettings.useBridges.captchaSubmit "Submit">
 <!ENTITY torsettings.useBridges.custom "Provide a bridge I know">
-<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source.">
+<!ENTITY torsettings.useBridges.label "Skriv inn bruinformasjon frå ei klarert kjelde.">
 <!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)">
 
-<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard">
+<!ENTITY torsettings.copyLog "Kopier Tor-logg til utklippstavla">
 
 <!ENTITY torsettings.proxyHelpTitle "Proxy-hjelp">
 <!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings.">
 
-<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help">
+<!ENTITY torsettings.bridgeHelpTitle "Bru-relé-hjelp">
 <!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor.">
 <!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support">
 
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Tilkopling">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Les meir">
+<!ENTITY torPreferences.learnMore "Lær meir">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Fråkopla">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Lær meir">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bruer">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Bruk ei bru">
-<!ENTITY torPreferences.requestNewBridge "Be om ei ny bru…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Fjern">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Kopiert!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avansert">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Komma-åtskilde verdiar">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Avbryt">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Be om bru">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Fråkopla">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/oc/network-settings.dtd b/src/chrome/locale/oc/network-settings.dtd
index 3b005cd..75655a8 100644
--- a/src/chrome/locale/oc/network-settings.dtd
+++ b/src/chrome/locale/oc/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connection">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "En linha">
+<!ENTITY torPreferences.statusInternetOffline "Fòra linha">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Suprimir">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Advanced">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Anullar">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Fòra linha">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connexion…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Tornar ensajar">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connexion…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/pa-IN/network-settings.dtd b/src/chrome/locale/pa-IN/network-settings.dtd
index 6fcf2f0..c4cd951 100644
--- a/src/chrome/locale/pa-IN/network-settings.dtd
+++ b/src/chrome/locale/pa-IN/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "ਟੌਰ">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connection">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "ਵਧੇਰੇ ਪੜੋ ">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "ਵਧੇਰੇ ਪੜੋ ">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "ਪੁੱਲ ਬਨ੍ਹਨਾ">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Remove">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "ਉੱਨਤ">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "ਰੱਦ ਕਰੋ">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "ਬਰਫੀਲਾ ਤਿਣਕਾ">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/pl/network-settings.dtd b/src/chrome/locale/pl/network-settings.dtd
index 77737c3..9eca8a9 100644
--- a/src/chrome/locale/pl/network-settings.dtd
+++ b/src/chrome/locale/pl/network-settings.dtd
@@ -4,7 +4,7 @@
 <!ENTITY torsettings.wizard.title.connecting "Nawiązywanie połączenia">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "Język przeglądarki Tor">
+<!ENTITY torlauncher.localePicker.title "Język Tor Browser">
 <!ENTITY torlauncher.localePicker.prompt "Wybierz język.">
 
 <!-- For "first run" wizard: -->
@@ -39,13 +39,13 @@
 <!ENTITY torsettings.firewall.checkbox "Ten komputer pozwala na połączenie z ustalonymi portami">
 <!ENTITY torsettings.firewall.allowedPorts "Dozwolone porty">
 <!ENTITY torsettings.useBridges.checkbox "Tor jest ocenzurowany w moim kraju">
-<!ENTITY torsettings.useBridges.default "Wybierz wbudowany most">
+<!ENTITY torsettings.useBridges.default "Wybierz wbudowany mostek">
 <!ENTITY torsettings.useBridges.default.placeholder "wybierz mostek">
 <!ENTITY torsettings.useBridges.bridgeDB "Uzyskaj mostek od torproject.org">
 <!ENTITY torsettings.useBridges.captchaSolution.placeholder "Wprowadź znaki z obrazka">
 <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Poproś o inne zadanie">
 <!ENTITY torsettings.useBridges.captchaSubmit "Podsumowując">
-<!ENTITY torsettings.useBridges.custom "Dostarcz most, który znam">
+<!ENTITY torsettings.useBridges.custom "Dostarcz mostek, który znam">
 <!ENTITY torsettings.useBridges.label "Wprowadź informacje o mostku z zaufanego źródła.">
 <!ENTITY torsettings.useBridges.placeholder "wpisz adres:port (po jednym w każdej linii)">
 
@@ -55,42 +55,122 @@
 <!ENTITY torsettings.proxyHelp1 "Lokalny serwer proxy może być potrzebny podczas łączenia się przez sieć firmową, szkolną lub uniwersytecką. Jeśli nie masz pewności, czy serwer proxy jest potrzebny, sprawdź ustawienia internetowe w innej przeglądarce lub sprawdź ustawienia sieciowe systemu.">
 
 <!ENTITY torsettings.bridgeHelpTitle "Pomoc Przekaźników Mostkowych">
-<!ENTITY torsettings.bridgeHelp1 "Mosty są specjalnymi rodzajami przekaźników, które utrudniają blokowanie połączeń z siecią Tor. Każdy rodzaj mostku wykorzystuje inną metodę unikania cenzury.  Mostki "obfs" sprawiają, że Twój ruch wygląda jak losowy szum, a "meek-azure" sprawiają, że Twój ruch wygląda jakbyś łączył się z tą usługą zamiast z Torem.">
+<!ENTITY torsettings.bridgeHelp1 "Mostki są specjalnymi rodzajami przekaźników, które utrudniają blokowanie połączeń z siecią Tor. Każdy rodzaj mostku wykorzystuje inną metodę unikania cenzury.  Mostki "obfs" sprawiają, że Twój ruch wygląda jak losowy szum, a "meek-azure" sprawiają, że Twój ruch wygląda jakbyś łączył się z tą usługą zamiast z Torem.">
 <!ENTITY torsettings.bridgeHelp2 "Ze względu na różny sposób, w jaki kraje próbują blokować Tora, niektóre mostki działają tylko w niektórych krajach.  Jeśli nie masz pewności, które mostki działają w Twoim kraju, odwiedź torproject.org/about/contact.html#support">
 
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Proszę zaczekać, aż ustanowimy połączenie do sieci Tor.  Może to potrwać kilka minut.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Połączenie">
 <!ENTITY torPreferences.torSettings "Ustawienia Tor">
-<!ENTITY torPreferences.torSettingsDescription "Przeglądarka Tor kieruje Twój ruch przez sieć Tor, utrzymywaną przez tysiące wolontariuszy na całym świecie." >
+<!ENTITY torPreferences.torSettingsDescription "Tor Browser kieruje Twój ruch przez sieć Tor, utrzymywaną przez tysiące wolontariuszy na całym świecie." >
 <!ENTITY torPreferences.learnMore "Dowiedz się więcej">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Testuj">
+<!ENTITY torPreferences.statusInternetOnline "Aktywny">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Sieć Tor:">
+<!ENTITY torPreferences.statusTorConnected "Połączony">
+<!ENTITY torPreferences.statusTorNotConnected "Niepołączony">
+<!ENTITY torPreferences.statusTorBlocked "Potencjalnie zablokowany">
+<!ENTITY torPreferences.learnMore "Dowiedz się więcej">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Szybki start">
-<!ENTITY torPreferences.quickstartDescription "Szybki start pozwala przeglądarce Tor na automatyczne łączenie.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Szybki start łączy Tor Browser z siecią Tor automatycznie po uruchomieniu, w oparciu o ustawienia ostatnio używanego połączenia.">
 <!ENTITY torPreferences.quickstartCheckbox "Zawsze łącz automatycznie">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Mostki">
 <!ENTITY torPreferences.bridgesDescription "Mostki ułatwiają dostęp do sieci Tor w miejscach, w których Tor jest zablokowany. W zależności od tego, gdzie jesteś, niektóre mostki mogą działać lepiej niż inne.">
-<!ENTITY torPreferences.useBridge "Użyj mostku">
-<!ENTITY torPreferences.requestNewBridge "Poproś o nowy mostek...">
-<!ENTITY torPreferences.provideBridge "Dodaj most">
+<!ENTITY torPreferences.bridgeLocation "Twoja lokalizacja">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatycznie">
+<!ENTITY torPreferences.bridgeLocationFrequent "Często wybierane lokalizacje">
+<!ENTITY torPreferences.bridgeLocationOther "Inne lokalizacje">
+<!ENTITY torPreferences.bridgeChooseForMe "Wybierz mostek dla mnie…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Twoje obecne mostki">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Możesz zachować jeden lub więcej zapisanych mostków, a Tor wybierze, którego z nich użyć podczas połączenia. W razie potrzeby Tor automatycznie przełączy się na korzystanie z innego mostku.">
+<!ENTITY torPreferences.bridgeId "#1 mostek: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Usuń">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Wyłącz wbudowane mostki">
+<!ENTITY torPreferences.bridgeShare "Udostępnij ten mostek za pomocą kodu QR lub kopiując jego adres:">
+<!ENTITY torPreferences.bridgeCopy "Skopiuj adres mostka">
+<!ENTITY torPreferences.copied "Skopiowano!">
+<!ENTITY torPreferences.bridgeShowAll "Pokaż wszystkie mostki">
+<!ENTITY torPreferences.bridgeRemoveAll "Usuń wszystkie mostki">
+<!ENTITY torPreferences.bridgeAdd "Dodaj nowy mostek">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Wybierz jeden z wbudowanych mostków Tor Browser">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Wybierz wbudowany mostek…">
+<!ENTITY torPreferences.bridgeRequest "Poproś o mostek...">
+<!ENTITY torPreferences.bridgeEnterKnown "Wpisz adres mostka, który już znasz">
+<!ENTITY torPreferences.bridgeAddManually "Dodaj mostek ręcznie…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Zaawansowane">
-<!ENTITY torPreferences.advancedDescription "Skonfiguruj w jaki sposób Przeglądarka Tor łączy się z Internetem.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Wartości oddzielone przecinkiem">
+<!ENTITY torPreferences.advancedDescription "Skonfiguruj sposób, w jaki Tor Browser łączy się z Internetem">
+<!ENTITY torPreferences.advancedButton "Ustawienia…">
+<!ENTITY torPreferences.viewTorLogs "Zobacz dziennik zdarzeń Tor">
+<!ENTITY torPreferences.viewLogs "Wyświetl dziennik...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Usunąć wszystkie mostki?">
+<!ENTITY torPreferences.removeBridgesWarning "To działanie nie może zostać cofnięte.">
+<!ENTITY torPreferences.cancel "Anuluj">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Skanuj kod QR">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Wbudowane mostki">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser zawiera określone typy mostków znane jako „podłączane transporty”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 to rodzaj wbudowanego mostka, który sprawia, że ruch w sieci Tor wygląda losowo. Są one też mniej podatne na zablokowanie niż ich poprzednicy, mostki obfs3.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake to wbudowany mostek, który omija cenzurę, kierując połączenie przez serwery proxy Snowflake, które są obsługiwane przez wolontariuszy.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure to wbudowany mostek, który sprawia, że wygląda na to, że korzystasz ze strony internetowej Microsoftu zamiast Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Poproś o mostek">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Nawiązywanie połączenia z BridgeDB. Proszę czekać.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Rozwiąż CAPTCHA, aby poprosić o mostek.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Rozwiązanie nie jest poprawne. Proszę spróbuj ponownie.">
-<!ENTITY torPreferences.viewTorLogs "Zobacz dziennik zdarzeń Tor.">
-<!ENTITY torPreferences.viewLogs "Wyświetl dziennik...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Dostarcz mostek ">
+<!ENTITY torPreferences.provideBridgeHeader "Wprowadź informacje o mostku z zaufanego źródła">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Ustawienia połączenia">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Skonfiguruj sposób, w jaki Tor Browser łączy się z Internetem">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Wartości oddzielone przecinkiem">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Dziennik zdarzeń Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Spróbuj połączyć się ponownie">
-<!ENTITY torConnect.offline "Offline">
-<!ENTITY torConnect.connectMessage "Zmiany w ustawieniach Tor nie zaczną obowiązywać, dopóki się nie połączysz">
-<!ENTITY torConnect.tryAgainMessage "Przeglądarka Tor nie może nawiązać połączenia z siecią Tor">
-<!ENTITY torConnect.connectingConcise "Trwa łączenie...">
-<!ENTITY torConnect.connectedConcise "Połączony">
 <!ENTITY torConnect.notConnectedConcise "Niepołączony">
-<!ENTITY torConnect.copyLog "Skopiuj dziennik zdarzeń Tor">
+<!ENTITY torConnect.connectingConcise "Trwa łączenie...">
+<!ENTITY torConnect.tryingAgain "Próbuję ponownie…">
+<!ENTITY torConnect.noInternet "Tor Browser nie może połączyć się z Internetem">
+<!ENTITY torConnect.couldNotConnect "Tor Browser nie może połączyć się z siecią Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "skonfiguruj połączenie"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Jeśli sieć Tor jest zablokowana w Twojej lokalizacji, może pomóc wypróbowanie mostka. Asystent połączenia może wybrać jeden dla Ciebie na podstawie Twojej lokalizacji lub zamiast tego możesz #1 ręcznie."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Próbuję mostka…">
+<!ENTITY torConnect.tryingBridgeAgain "Próbuję jeszcze raz…">
+<!ENTITY torConnect.errorLocation "Tor Browser nie może Cię zlokalizować">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser musi znać Twoją lokalizację, aby wybrać dla Ciebie odpowiedni mostek. Jeśli wolisz nie udostępniać swojej lokalizacji, zamiast tego #1 ręcznie."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Czy te ustawienia lokalizacji są prawidłowe?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser nadal nie może połączyć się z siecią Tor. Sprawdź, czy ustawienia lokalizacji są prawidłowe i spróbuj ponownie lub zamiast tego #1."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Asystent połączenia">
+<!ENTITY torConnect.breadcrumbLocation "Ustawienia lokalizacji">
+<!ENTITY torConnect.breadcrumbTryBridge "Wypróbuj mostek">
+<!ENTITY torConnect.automatic "Automatycznie">
+<!ENTITY torConnect.selectCountryRegion "Wybierz kraj lub region">
+<!ENTITY torConnect.frequentLocations "Często wybierane lokalizacje">
+<!ENTITY torConnect.otherLocations "Inne lokalizacje">
+<!ENTITY torConnect.restartTorBrowser "Uruchom ponownie Tor Browser">
+<!ENTITY torConnect.configureConnection "Skonfiguruj połączenie…">
+<!ENTITY torConnect.viewLog "Wyświetl dziennik…">
+<!ENTITY torConnect.tryAgain "Spróbuj ponownie">
+<!ENTITY torConnect.offline "Internet nieosiągalny">
+<!ENTITY torConnect.connectMessage "Zmiany w ustawieniach Tor nie zaczną obowiązywać, dopóki się nie połączysz">
+<!ENTITY torConnect.tryAgainMessage "Tor Browser nie może nawiązać połączenia z siecią Tor">
+<!ENTITY torConnect.yourLocation "Twoja lokalizacja">
+<!ENTITY torConnect.tryBridge "Wypróbuj mostek">
+<!ENTITY torConnect.autoBootstrappingFailed "Konfiguracja automatyczna nie powiodła się">
+<!ENTITY torConnect.autoBootstrappingFailed "Konfiguracja automatyczna nie powiodła się">
+<!ENTITY torConnect.cannotDetermineCountry "Nie można określić kraju użytkownika">
+<!ENTITY torConnect.noSettingsForCountry "Brak dostępnych ustawień dla Twojej lokalizacji">
diff --git a/src/chrome/locale/pt-BR/network-settings.dtd b/src/chrome/locale/pt-BR/network-settings.dtd
index 746ad69..b27efe5 100644
--- a/src/chrome/locale/pt-BR/network-settings.dtd
+++ b/src/chrome/locale/pt-BR/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Por favor, aguarde enquanto estabelecemos uma conexão com a rede Tor.  Isso pode demorar alguns minutos.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Conexão">
 <!ENTITY torPreferences.torSettings "Configurações do Tor">
 <!ENTITY torPreferences.torSettingsDescription "O Navegador Tor direciona seu tráfego pela Rede Tor, administrada por milhares de voluntários em todo o mundo." >
 <!ENTITY torPreferences.learnMore "Saiba Mais">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Testar">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Rede Tor:">
+<!ENTITY torPreferences.statusTorConnected "Conectado">
+<!ENTITY torPreferences.statusTorNotConnected "Não conectado">
+<!ENTITY torPreferences.statusTorBlocked "Potencialmente bloqueado">
+<!ENTITY torPreferences.learnMore "Saiba Mais">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Inicio rápido">
-<!ENTITY torPreferences.quickstartDescription "O início rápido permite que o navegador Tor se conecte automaticamente.">
+<!ENTITY torPreferences.quickstartDescriptionLong "O começo rápido conecta o Navegador Tor à Rede Tor automaticamente quando iniciado, com base em suas últimas configurações de conexão usadas.">
 <!ENTITY torPreferences.quickstartCheckbox "Sempre conectar automaticamente">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Pontes">
 <!ENTITY torPreferences.bridgesDescription "As pontes ajudam você a acessar a rede Tor em locais onde o Tor está bloqueado. Dependendo de onde você estiver, uma ponte pode funcionar melhor que outra.">
-<!ENTITY torPreferences.useBridge "Use uma ponte">
-<!ENTITY torPreferences.requestNewBridge "Solicitar uma nova ponte">
-<!ENTITY torPreferences.provideBridge "Fornecer uma ponte">
+<!ENTITY torPreferences.bridgeLocation "Sua localização">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automático">
+<!ENTITY torPreferences.bridgeLocationFrequent "Locais selecionados com frequência">
+<!ENTITY torPreferences.bridgeLocationOther "Outros locais">
+<!ENTITY torPreferences.bridgeChooseForMe "Escolha uma ponte para mim…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Suas pontes atuais">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Você pode manter uma ou mais pontes salvas, e o Tor escolherá qual usar quando você se conectar. O Tor mudará automaticamente para usar outra ponte quando necessário.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Remover">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Compartilhe esta ponte usando o código QR ou copiando seu endereço:">
+<!ENTITY torPreferences.bridgeCopy "Copiar endereço da ponte">
+<!ENTITY torPreferences.copied "Copiado!">
+<!ENTITY torPreferences.bridgeShowAll "Mostrar todas as pontes">
+<!ENTITY torPreferences.bridgeRemoveAll "Remover todas as pontes">
+<!ENTITY torPreferences.bridgeAdd "Adicionar nova ponte">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Solicitar uma ponte...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Adicionar ponte manualmente">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avançado">
-<!ENTITY torPreferences.advancedDescription "Configure como o Navegador Tor se conecta à Internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Valores Separados Por Virgula">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Configurações...">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Ver registros…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remover todas as pontes?">
+<!ENTITY torPreferences.removeBridgesWarning "Essa ação não pode ser desfeita.">
+<!ENTITY torPreferences.cancel "Cancelar">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Ponte de solicitação">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Entrando em contato com o BridgeDB. Por favor, espere.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "A solução não está correta. Por favor, tente novamente.">
-<!ENTITY torPreferences.viewTorLogs "Veja os logs do Tor.">
-<!ENTITY torPreferences.viewLogs "Ver registros…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Insira informações sobre a ponte a partir de uma fonte confiável">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Tente conectar novamente">
-<!ENTITY torConnect.offline "Offline">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "O navegador Tor não conseguiu estabelecer uma conexão com a rede Tor">
-<!ENTITY torConnect.connectingConcise "Conectando...">
-<!ENTITY torConnect.connectedConcise "Conectado">
 <!ENTITY torConnect.notConnectedConcise "Não conectado">
-<!ENTITY torConnect.copyLog "Copiar registros Tor">
+<!ENTITY torConnect.connectingConcise "Conectando...">
+<!ENTITY torConnect.tryingAgain "Tentando novamente...">
+<!ENTITY torConnect.noInternet "O navegador Tor não conseguiu acessar a Internet">
+<!ENTITY torConnect.couldNotConnect "O navegador Tor não pôde se conectar ao Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure sua conexão"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Tentando a ponte...">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "O navegador Tor não conseguiu localizar você">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Essas configurações de local estão corretas?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Assistência de localização">
+<!ENTITY torConnect.breadcrumbLocation "Configurações de localização">
+<!ENTITY torConnect.breadcrumbTryBridge "Testar ponte">
+<!ENTITY torConnect.automatic "Automático">
+<!ENTITY torConnect.selectCountryRegion "Selecione país ou região">
+<!ENTITY torConnect.frequentLocations "Locais selecionados com frequência">
+<!ENTITY torConnect.otherLocations "Outros locais">
+<!ENTITY torConnect.restartTorBrowser "Reiniciar navegador Tor">
+<!ENTITY torConnect.configureConnection "Configure a Conexão...">
+<!ENTITY torConnect.viewLog "Ver registros...">
+<!ENTITY torConnect.tryAgain "Tentar Novamente">
+<!ENTITY torConnect.offline "Internet não acessível">
+<!ENTITY torConnect.connectMessage "Alterações nas configurações do Tor não terão efeito até que você se conecte à rede Tor.">
+<!ENTITY torConnect.tryAgainMessage "O navegador Tor não conseguiu estabelecer uma conexão com a rede Tor">
+<!ENTITY torConnect.yourLocation "Sua localização">
+<!ENTITY torConnect.tryBridge "Tente uma Ponte">
+<!ENTITY torConnect.autoBootstrappingFailed "Falha na configuração automática">
+<!ENTITY torConnect.autoBootstrappingFailed "Falha na configuração automática">
+<!ENTITY torConnect.cannotDetermineCountry "Não foi possível determinar o país do usuário">
+<!ENTITY torConnect.noSettingsForCountry "Nenhuma configuração disponível para seu local">
diff --git a/src/chrome/locale/pt-PT/network-settings.dtd b/src/chrome/locale/pt-PT/network-settings.dtd
index aefc9fe..b703422 100644
--- a/src/chrome/locale/pt-PT/network-settings.dtd
+++ b/src/chrome/locale/pt-PT/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Por favor, aguarde, enquanto nós estabelecemos uma ligação à rede Tor.  Isto pode demorar alguns minutos.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Ligação">
 <!ENTITY torPreferences.torSettings "Definições do Tor">
 <!ENTITY torPreferences.torSettingsDescription "O Tor Browse envia o seu tráfego pela Tor Network, operada por milhares de voluntários em todo o mundo." >
-<!ENTITY torPreferences.learnMore "Saber Mais">
+<!ENTITY torPreferences.learnMore "Saber mais">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Desligado">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Conectado">
+<!ENTITY torPreferences.statusTorNotConnected "Não ligado">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Saber mais">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Início rápido">
-<!ENTITY torPreferences.quickstartDescription "Início rápido permite que o navegador Tor ligue automaticamente.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Ligar sempre automáticamente">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Pontes">
 <!ENTITY torPreferences.bridgesDescription "Pontes ajudam-no a aceder à Tor Network em sítios onde o Tor está bloqueado. Dependendo de onde estiver, uma ponte pode funcionar melhor que outra.">
-<!ENTITY torPreferences.useBridge "Use uma ponte">
-<!ENTITY torPreferences.requestNewBridge "Solicitar uma Nova Ponte...">
-<!ENTITY torPreferences.provideBridge "Fornecer uma ponte">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automático">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Remover">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copiado!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Solicitar uma Ponte...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avançado">
-<!ENTITY torPreferences.advancedDescription "Configure como o Tor Browser se contecta à internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por vírgula">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Ver os registos...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "Esta ação não pode ser desfeita.">
+<!ENTITY torPreferences.cancel "Cancelar">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Solicitar uma ponte">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "A contactar a BridgeDB. Por favor, aguarde.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Resolva o CAPTCHA para solicitar uma ponte.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "A solução não está correta. Por favor, tente novamente.">
-<!ENTITY torPreferences.viewTorLogs "Ver os registos do Tor.">
-<!ENTITY torPreferences.viewLogs "Ver os registos...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Inserir a informação da ponte de uma fonte confiável">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Registos do Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Tentar nova ligação">
-<!ENTITY torConnect.offline "Desligado">
+<!ENTITY torConnect.notConnectedConcise "Não ligado">
+<!ENTITY torConnect.connectingConcise "A conectar…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automático">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Tentar novamente">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "O navegador Tor não conseguiu estabelecer uma ligação com a rede Tor">
-<!ENTITY torConnect.connectingConcise "A conectar…">
-<!ENTITY torConnect.connectedConcise "Conectado">
-<!ENTITY torConnect.notConnectedConcise "Não ligado">
-<!ENTITY torConnect.copyLog "Copiar entradas de protocolo Tor">
+<!ENTITY torConnect.yourLocation "A Sua Localização">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/ro/network-settings.dtd b/src/chrome/locale/ro/network-settings.dtd
index 914071c..9c8fdaa 100644
--- a/src/chrome/locale/ro/network-settings.dtd
+++ b/src/chrome/locale/ro/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Te rugăm să aștepți până ce stabilim o conexiune cu rețeaua Tor.   Aceasta poate dura mai multe minute.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Conexiune">
 <!ENTITY torPreferences.torSettings "Setări Tor">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser vă orientează traficul prin rețeaua Tor, condusă de mii de voluntari din întreaga lume." >
-<!ENTITY torPreferences.learnMore "Află mai multe">
+<!ENTITY torPreferences.learnMore "Află mai mult">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Conectat">
+<!ENTITY torPreferences.statusInternetOffline "Deconectat">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Conectat">
+<!ENTITY torPreferences.statusTorNotConnected "Neconectat">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Află mai mult">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Pornire rapidă">
-<!ENTITY torPreferences.quickstartDescription "Pornirea Rapidă permite browser-ului Tor să se conecteze automat.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Conectați-vă automat întotdeauna">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Punți">
 <!ENTITY torPreferences.bridgesDescription "Podurile vă ajută să accesați rețeaua Tor în locurile în care Tor este blocat. În funcție de locul în care vă aflați, un pod poate funcționa mai bine decât altul.">
-<!ENTITY torPreferences.useBridge "Folosiți un pod">
-<!ENTITY torPreferences.requestNewBridge "Cerere Punte Nouă">
-<!ENTITY torPreferences.provideBridge "Furnizați un pod">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Eliminare">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copiat!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Cerere Punte...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avansat">
-<!ENTITY torPreferences.advancedDescription "Configurați modul în care Tor Browser se conectează la internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Valori separate prin virgulă">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Vizualizați jurnalele ...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Anulare">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Cere podul">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactarea BridgeDB. Te rog asteapta.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Rezolvă acest CAPTCHA pentru a cere o punte.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Soluția nu este corectă. Încearcă din nou.">
-<!ENTITY torPreferences.viewTorLogs "Vizualizați jurnalele Tor.">
-<!ENTITY torPreferences.viewLogs "Vizualizați jurnalele ...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Introduceți informații despre punte dintr-o sursă de încredere">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Jurnalele Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Încercați să vă conectați din nou">
-<!ENTITY torConnect.offline "Deconectat">
+<!ENTITY torConnect.notConnectedConcise "Neconectat">
+<!ENTITY torConnect.connectingConcise "Se conectează...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Încearcă din nou">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Schimbările la setările Tor nu vor fi aplicate până când vă conectați la Tor Network">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser a eșuat să stabilească o conexiune la Tor Network">
-<!ENTITY torConnect.connectingConcise "Se conectează...">
-<!ENTITY torConnect.connectedConcise "Conectat">
-<!ENTITY torConnect.notConnectedConcise "Neconectat">
-<!ENTITY torConnect.copyLog "Copiați jurnalele Tor">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/ru/network-settings.dtd b/src/chrome/locale/ru/network-settings.dtd
index 5a5eb42..ca3ee08 100644
--- a/src/chrome/locale/ru/network-settings.dtd
+++ b/src/chrome/locale/ru/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Пожалуйста, подождите, пока мы установим подключение к сети Tor. Это может занять несколько минут.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Подключение">
 <!ENTITY torPreferences.torSettings "Настройки Tor">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser перенаправляет ваш трафик через сеть Tor. Ее поддерживают тысячи добровольцев по всему миру." >
-<!ENTITY torPreferences.learnMore "Подробнее">
+<!ENTITY torPreferences.learnMore "Узнать больше">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Интернет:">
+<!ENTITY torPreferences.statusInternetTest "Тест">
+<!ENTITY torPreferences.statusInternetOnline "В сети">
+<!ENTITY torPreferences.statusInternetOffline "Не в сети">
+<!ENTITY torPreferences.statusTorLabel "Сеть Tor:">
+<!ENTITY torPreferences.statusTorConnected "Подключено">
+<!ENTITY torPreferences.statusTorNotConnected "Не подключен">
+<!ENTITY torPreferences.statusTorBlocked "Потенциально заблокирован">
+<!ENTITY torPreferences.learnMore "Узнать больше">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Быстрый старт">
-<!ENTITY torPreferences.quickstartDescription "Быстрый старт позволяет Tor Browser подключаться автоматически.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Быстрый запуск автоматически подключит Tor Browser к сети Tor при запуске, исходя из последних использованных настроек подключения.">
 <!ENTITY torPreferences.quickstartCheckbox "Всегда подключаться автоматически">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Мосты">
 <!ENTITY torPreferences.bridgesDescription "Мосты помогают получить доступ к сети Tor там, где он заблокирован. В зависимости от вашего местонахождения один мост может работать лучше другого.">
-<!ENTITY torPreferences.useBridge "Использовать мост">
-<!ENTITY torPreferences.requestNewBridge "Запросить новый мост…">
-<!ENTITY torPreferences.provideBridge "Указать свой мост">
+<!ENTITY torPreferences.bridgeLocation "Ваше местоположение">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Автоматически">
+<!ENTITY torPreferences.bridgeLocationFrequent "Часто выбираемое местоположение">
+<!ENTITY torPreferences.bridgeLocationOther "Другие места">
+<!ENTITY torPreferences.bridgeChooseForMe "Выбрать мост для меня...">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Ваши текущие мосты">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Вы можете сохранить один или несколько мостов, и Tor определит, какой из них использовать при подключении. Tor автоматически переключится на использование другого моста, когда это будет необходимо.">
+<!ENTITY torPreferences.bridgeId "#1 мост: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Удалить">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Отключить встроенные мосты">
+<!ENTITY torPreferences.bridgeShare "Поделитесь вашим мостом, показав QR-код или скопировав его адрес:">
+<!ENTITY torPreferences.bridgeCopy "Скопировать адрес моста">
+<!ENTITY torPreferences.copied "Скопировано!">
+<!ENTITY torPreferences.bridgeShowAll "Показать все мосты">
+<!ENTITY torPreferences.bridgeRemoveAll "Удалить все мосты">
+<!ENTITY torPreferences.bridgeAdd "Добавить новый мост">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Выберите один из встроенных мостов Tor Browser">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Выбрать встроенный мост…">
+<!ENTITY torPreferences.bridgeRequest "Запрос моста…">
+<!ENTITY torPreferences.bridgeEnterKnown "Введите адрес моста, который вам уже известен">
+<!ENTITY torPreferences.bridgeAddManually "Добавить мост вручную…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Дополнительно">
-<!ENTITY torPreferences.advancedDescription "Настройте подключение Tor Browser к интернету.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Значения, разделенные запятыми">
+<!ENTITY torPreferences.advancedDescription "Настройка подключения Tor Browser к интернету">
+<!ENTITY torPreferences.advancedButton "Настройки…">
+<!ENTITY torPreferences.viewTorLogs "Просмотр журналов Tor">
+<!ENTITY torPreferences.viewLogs "Смотреть журнал…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Удалить все мосты?">
+<!ENTITY torPreferences.removeBridgesWarning "Это действие не может быть отменено.">
+<!ENTITY torPreferences.cancel "Отмена">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Сканировать QR-код">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Встроенные мосты">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser включает в себя несколько специальных типов мостов, известных как "подключаемые транспорты".">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 - это тип встроенного моста, благодаря которому ваш трафик Tor выглядит случайным. Кроме того, вероятность его блокировки ниже, чем у его предшественника, моста obfs3.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake — это встроенный мост, который обходит цензуру, направляя ваше соединение через прокси-серверы Snowflake, которыми управляют добровольцы">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure — это встроенный мост, который делает ваш трафик неотличимым от трафика в направлении Microsoft.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Запрос моста">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Обращение к BridgeDB. Пожалуйста, подождите.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Решите CAPTCHA для запроса моста">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Неправильно. Пожалуйста, попробуйте снова.">
-<!ENTITY torPreferences.viewTorLogs "Просмотр журнала Tor">
-<!ENTITY torPreferences.viewLogs "Смотреть журнал…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Предоставить мост">
+<!ENTITY torPreferences.provideBridgeHeader "Укажите данные моста из доверенного источника">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Настройки подключения">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Настройте способ подключения Tor Browser к интернету">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Значения, разделенные запятыми">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Журнал Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Переподключение">
-<!ENTITY torConnect.offline "Отключён">
-<!ENTITY torConnect.connectMessage "Изменения в настройках Tor не вступят в силу, пока вы не подключитесь">
-<!ENTITY torConnect.tryAgainMessage "Браузеру Tor не удалось установить соединение с сетью Tor">
-<!ENTITY torConnect.connectingConcise "Соединение...">
-<!ENTITY torConnect.connectedConcise "Подключено">
 <!ENTITY torConnect.notConnectedConcise "Не подключен">
-<!ENTITY torConnect.copyLog "Копирование журналов Tor">
+<!ENTITY torConnect.connectingConcise "Соединение...">
+<!ENTITY torConnect.tryingAgain "Повторная попытка...">
+<!ENTITY torConnect.noInternet "Tor Browser не может подключиться к Интернету">
+<!ENTITY torConnect.couldNotConnect "Tor Browser не может подключиться к Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "настроить подключение"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Если Tor заблокирован в месте вашего нахождения, попробуйте использовать мост. Помощник подключения поможет подобрать мост, используя ваше местоположение, или вы можете выбрать #1 вручную."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Пробуем мост...">
+<!ENTITY torConnect.tryingBridgeAgain "Пробуем еще раз…">
+<!ENTITY torConnect.errorLocation "Tor Browser не смог определить ваше местоположение">
+<!ENTITY torConnect.errorLocationDescription "Браузеру Tor необходимо знать ваше местоположение, чтобы подобрать для вас подходящий мост. Если вы предпочитаете не сообщать ваше местоположение, то выберите #1 вручную."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Эти настройки местоположения верны?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser все еще не может подключиться к Tor. Пожалуйста, проверьте правильность настроек местоположения и повторите попытку или #1 вместо этого."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Помощник подключения">
+<!ENTITY torConnect.breadcrumbLocation "Настройки местоположения">
+<!ENTITY torConnect.breadcrumbTryBridge "Попробовать мост">
+<!ENTITY torConnect.automatic "Автоматически">
+<!ENTITY torConnect.selectCountryRegion "Выбор страны или региона">
+<!ENTITY torConnect.frequentLocations "Часто выбираемые местоположения">
+<!ENTITY torConnect.otherLocations "Другие места">
+<!ENTITY torConnect.restartTorBrowser "Перезапустить Tor Browser">
+<!ENTITY torConnect.configureConnection "Настройка подключения…">
+<!ENTITY torConnect.viewLog "Просмотр журналов…">
+<!ENTITY torConnect.tryAgain "Попробовать снова">
+<!ENTITY torConnect.offline "Интернет недоступен">
+<!ENTITY torConnect.connectMessage "Изменения в настройках Tor не вступят в силу, пока вы не подключитесь">
+<!ENTITY torConnect.tryAgainMessage "Tor Browser не удалось установить соединение с сетью Tor">
+<!ENTITY torConnect.yourLocation "Ваше местоположение">
+<!ENTITY torConnect.tryBridge "Попробовать мост">
+<!ENTITY torConnect.autoBootstrappingFailed "Автоматическая настройка не удалась">
+<!ENTITY torConnect.autoBootstrappingFailed "Автоматическая настройка не удалась">
+<!ENTITY torConnect.cannotDetermineCountry "Невозможно определить страну пользователя">
+<!ENTITY torConnect.noSettingsForCountry "Нет доступных настроек для вашего местоположения">
diff --git a/src/chrome/locale/sk/network-settings.dtd b/src/chrome/locale/sk/network-settings.dtd
index 8fc92b2..7cef0e4 100644
--- a/src/chrome/locale/sk/network-settings.dtd
+++ b/src/chrome/locale/sk/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Prosím počkajte na vytvorenie pripojenia do siete Tor.  Môže to trvať niekoľko minút. ">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Pripojenie">
 <!ENTITY torPreferences.torSettings "Nastavenia Tor">
 <!ENTITY torPreferences.torSettingsDescription "Prehliadač Tor smeruje váš prenos cez sieť Tor, prevádzkovanú tisíckami dobrovoľníkov z celého sveta." >
-<!ENTITY torPreferences.learnMore "Zistite viac">
+<!ENTITY torPreferences.learnMore "Zisti viac">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Pripojený">
+<!ENTITY torPreferences.statusInternetOffline "Odpojený">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Pripojené">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Zisti viac">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Mosty">
 <!ENTITY torPreferences.bridgesDescription "Premostenia vám pomáhajú pripojiť sa k sieti Tor tam, kde je Tor blokovaný. V závislosti od toho, kde sa nachádzate niektoré premostenie môže fungovať lepšie ako iné.">
-<!ENTITY torPreferences.useBridge "Použiť premostenie">
-<!ENTITY torPreferences.requestNewBridge "Požiadať o nové premostenie.">
-<!ENTITY torPreferences.provideBridge "Poskytnúť premostenie">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Odstrániť">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Skopírované!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Požiadať o premostenie...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Pokročilé">
-<!ENTITY torPreferences.advancedDescription "Nastavte, akým spôsobom sa prehliadač Tor pripája na internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Hodnoty oddelené čiarkou">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Zobraziť záznamy...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Zrušiť">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Vyžiadať Premostenie">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Spájam sa s databázou Premostení. Prosím čakajte.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Vyrieš CAPTCHA na vyžiadanie premostenia.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Riešenie nie je správne. Prosím skúste znova.">
-<!ENTITY torPreferences.viewTorLogs "Zobraziť záznamy Tor.">
-<!ENTITY torPreferences.viewLogs "Zobraziť záznamy...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Záznamy Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Pripája sa…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automaticky">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Skúsiť znova">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Pripája sa…">
-<!ENTITY torConnect.connectedConcise "Pripojené">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/sl/network-settings.dtd b/src/chrome/locale/sl/network-settings.dtd
index 8fea575..f9615d7 100644
--- a/src/chrome/locale/sl/network-settings.dtd
+++ b/src/chrome/locale/sl/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Povezava">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Več o tem">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Povezan">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Več o tem">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Mostovi">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Remove">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Napredno">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Prekliči">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Avtomatsko">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Povezan">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/sl/torlauncher.properties b/src/chrome/locale/sl/torlauncher.properties
index e3ec6c8..424fbc4 100644
--- a/src/chrome/locale/sl/torlauncher.properties
+++ b/src/chrome/locale/sl/torlauncher.properties
@@ -53,7 +53,7 @@ torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Kopiranje končano. % S Tor poročila so pripravljena za lepljenje v urejevalnik besedil ali e-poštno sporočilo.
 
-torlauncher.bootstrapStatus.starting=Starting
+torlauncher.bootstrapStatus.starting=Zaganja
 torlauncher.bootstrapStatus.conn_pt=Connecting to bridge
 torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge
 torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy
diff --git a/src/chrome/locale/sq/network-settings.dtd b/src/chrome/locale/sq/network-settings.dtd
index 6f6abcf..1942c33 100644
--- a/src/chrome/locale/sq/network-settings.dtd
+++ b/src/chrome/locale/sq/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Ju lutemi, prisni, teksa vendosim një lidhje me rrjetin e Tor.  Kjo mund të kërkojë disa minuta.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Spojenie">
 <!ENTITY torPreferences.torSettings "Rregullime Tor">
 <!ENTITY torPreferences.torSettingsDescription "Shfletuesi Tor e kalon trafikun tuaj përmes Rrjetit Tor, i mbajtur në këmbë nga mijëra vullnetarë anembanë botës." >
-<!ENTITY torPreferences.learnMore "Mësoni Më Tepër">
+<!ENTITY torPreferences.learnMore "Mësoni më tepër">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Provë">
+<!ENTITY torPreferences.statusInternetOnline "I lidhur">
+<!ENTITY torPreferences.statusInternetOffline "Jo në linjë">
+<!ENTITY torPreferences.statusTorLabel "Rrjeti Tor:">
+<!ENTITY torPreferences.statusTorConnected "I lidhur">
+<!ENTITY torPreferences.statusTorNotConnected "Jo i Lidhur">
+<!ENTITY torPreferences.statusTorBlocked "Potencialisht e Bllokuar">
+<!ENTITY torPreferences.learnMore "Mësoni më tepër">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Nisje e shpejtë">
-<!ENTITY torPreferences.quickstartDescription "Quickstart-i i lejon Shfletuesit Tor të lidhet automatikisht.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart-i bën automatikisht lidhjen e Shfletuesit Tor me Rrjetin Tor, kur niset, bazuar në rregullimet e përdorura për lidhjen e fundit.">
 <!ENTITY torPreferences.quickstartCheckbox "Lidhu përherë automatikisht">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Ura">
 <!ENTITY torPreferences.bridgesDescription "Urat ju ndihmojnë të përdorni Rrjetin Tor në vende ku Tor-i është i bllokuar. Në varësi të vendit ku ndodheni, një urë mund të punojë më mirë se një tjetër.">
-<!ENTITY torPreferences.useBridge "Përdorni një urë">
-<!ENTITY torPreferences.requestNewBridge "Kërkoni një Urë të Re…">
-<!ENTITY torPreferences.provideBridge "Furnizoni një urë">
+<!ENTITY torPreferences.bridgeLocation "Vendndodhja juaj">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatike">
+<!ENTITY torPreferences.bridgeLocationFrequent "Vendndodhje të përzgjedhura rëndom">
+<!ENTITY torPreferences.bridgeLocationOther "Vendndodhje të tjera">
+<!ENTITY torPreferences.bridgeChooseForMe "Zgjidhni një Urë Për Mua…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Urat Tuaja të Tanishme">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Mund të mbani një ose më tepër ura të ruajtura dhe Tor-i do të zgjedhë një për ta përdorur kur lidheni. Tor-i do të kalojë automatikisht në përdorimin e një tjetër ure, kur kjo është e nevojshme.">
+<!ENTITY torPreferences.bridgeId "Ura #1: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Hiqe">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Çaktivizo ura të brendshme">
+<!ENTITY torPreferences.bridgeShare "Ndajeni me të tjerët këtë urë duke u dhënë kodin QR, ose duke kopjuar adresën e saj:">
+<!ENTITY torPreferences.bridgeCopy "Kopjo Adresë Ure">
+<!ENTITY torPreferences.copied "U kopjua!">
+<!ENTITY torPreferences.bridgeShowAll "Shfaqi Krejt Urat">
+<!ENTITY torPreferences.bridgeRemoveAll "Hiqi Krejt Urat">
+<!ENTITY torPreferences.bridgeAdd "Shtoni një Urë të Re">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Zgjidhni një nga urat e brendshme të Shfletuesit Tor">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Përzgjidhni një Urë të Brendshme…">
+<!ENTITY torPreferences.bridgeRequest "Kërkoni një Urë…">
+<!ENTITY torPreferences.bridgeEnterKnown "Jepni një adresë ure që njihni tashmë">
+<!ENTITY torPreferences.bridgeAddManually "Shtoni një Urë Dorazi…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Të mëtejshme">
-<!ENTITY torPreferences.advancedDescription "Formësoni se si lidhet në internet Shfletuesi Tor.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Vlera të ndara me presje">
+<!ENTITY torPreferences.advancedDescription "Formësoni se si lidhet në Internet Shfletuesi Tor">
+<!ENTITY torPreferences.advancedButton "Rregullime…">
+<!ENTITY torPreferences.viewTorLogs "Shihni regjistrat e Tor-it">
+<!ENTITY torPreferences.viewLogs "Shihni Regjistra…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Të hiqen krejt urat?">
+<!ENTITY torPreferences.removeBridgesWarning "Ky veprim s’mund të zhbëhet.">
+<!ENTITY torPreferences.cancel "Anuloje">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Skanoni kodin QR">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Ura të Brendshme">
+<!ENTITY torPreferences.builtinBridgeDescription "Shfletuesi Tor përfshin disa lloje specifike urash, të njohura si “transporte të shtueshëm”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 është një lloj urash të brendshme që e bëjnë trafikun tuaj Tor të duket si kuturu. Për to gjithashtu ka më pak gjasa të bllokohen, se sa pararendëset e tyre, urat obfs3.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake-u është një urë e brendshme që mposht censurimin duke e kaluar lidhjen tuaj përmes ndërmjetësish Snowflake, të mbajtura në punë nga vullnetarë.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure është një urë e brendshme që bën të duket sikur po përdorni një sajt Microsoft, në vend të Tor-it që po përdorni.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Kërkoni Urë">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Po lidhet me BridgeDB. Ju lutemi, Pritni.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Që të kërkoni një urë, zgjidhni CAPTCHA-n.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Zgjidhja s’është e saktë. Ju lutemi, riprovoni.">
-<!ENTITY torPreferences.viewTorLogs "Shihni regjistrat Tor.">
-<!ENTITY torPreferences.viewLogs "Shihni Regjistra…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Jepni një Urë">
+<!ENTITY torPreferences.provideBridgeHeader "Jepni të dhëna ure prej një burimi të besuar">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Rregullime Lidhjeje">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Formësoni se si lidhet në Internet Shfletuesi Tor">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Vlera të ndara me presje">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Regjistra Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Riprovo Lidhjen">
-<!ENTITY torConnect.offline "I shkëputur">
+<!ENTITY torConnect.notConnectedConcise "Jo i Lidhur">
+<!ENTITY torConnect.connectingConcise "Duke u kyqur...">
+<!ENTITY torConnect.tryingAgain "Po riprovohet…">
+<!ENTITY torConnect.noInternet "Shfletuesi Tor s’u lidh dot me Internetin">
+<!ENTITY torConnect.couldNotConnect "Shfletuesi Tor s’u lidh dot me Tor-in">
+<!ENTITY torConnect.assistDescriptionConfigure "formësoni lidhjen tuaj"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Nëse Tor-i është i bllokuar në vendndodhjen tuaj, provimi i një ure mund të ndihmonte. Ndihmësi i lidhjeve mund të zgjedhë një për ju duke përdorur vendndodhjen tuaj, ose mundeni të #1 dorazi."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Provoni një urë…">
+<!ENTITY torConnect.tryingBridgeAgain "Po provohet edhe një herë…">
+<!ENTITY torConnect.errorLocation "Shfletuesi Tor s’ju lokalizoi dot">
+<!ENTITY torConnect.errorLocationDescription "Shfletuesi Tor lypset të njohë vendndodhjen tuaj, që të mund të zgjedhë urën e duhur për ju. Nëse s’doni ta jepni vendndodhjen tuaj, #1 dorazi."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "A janë të sakta këto rregullime vendndodhjeje?">
+<!ENTITY torConnect.isLocationCorrectDescription "Shfletuesi Tor prapë s’u lidh dot me Tor-in. Ju lutemi, kontrolloni se rregullimet e vendndodhjes tuaj janë të sakta dhe riprovoni, ose #1."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Ndihmës lidhjeje">
+<!ENTITY torConnect.breadcrumbLocation "Rregullime vendndodhjeje">
+<!ENTITY torConnect.breadcrumbTryBridge "Provoni një urë">
+<!ENTITY torConnect.automatic "Automatike">
+<!ENTITY torConnect.selectCountryRegion "Përzgjidhni Vend ose Rajon">
+<!ENTITY torConnect.frequentLocations "Vendndodhje të përzgjedhura rëndom">
+<!ENTITY torConnect.otherLocations "Vendndodhje të tjera">
+<!ENTITY torConnect.restartTorBrowser "Rinisni Shfletuesin Tor">
+<!ENTITY torConnect.configureConnection "Formësoni Lidhje…">
+<!ENTITY torConnect.viewLog "Shihni regjistra…">
+<!ENTITY torConnect.tryAgain "Riprovoni">
+<!ENTITY torConnect.offline "S’kapet dot Interneti">
 <!ENTITY torConnect.connectMessage "Ndryshimet te Rregullimet e Tor-it s’do të hyjnë në fuqi para se të lidheni">
 <!ENTITY torConnect.tryAgainMessage "Shfletuesi Tor dështoi në vendosjen e një lidhjeje me Rrjetin Tor">
-<!ENTITY torConnect.connectingConcise "Duke u kyqur...">
-<!ENTITY torConnect.connectedConcise "I lidhur">
-<!ENTITY torConnect.notConnectedConcise "Jo i Lidhur">
-<!ENTITY torConnect.copyLog "Kopjo Regjistra Tor-i">
+<!ENTITY torConnect.yourLocation "Vendndodhja Juaj">
+<!ENTITY torConnect.tryBridge "Provoni një Urë">
+<!ENTITY torConnect.autoBootstrappingFailed "Formësimi i vetvetishëm dështoi">
+<!ENTITY torConnect.autoBootstrappingFailed "Formësimi i vetvetishëm dështoi">
+<!ENTITY torConnect.cannotDetermineCountry "S’arrihet të përcaktohet vend përdoruesi">
+<!ENTITY torConnect.noSettingsForCountry "S’ka rregullime për vendndodhjen tuaj">
diff --git a/src/chrome/locale/sr/network-settings.dtd b/src/chrome/locale/sr/network-settings.dtd
index 1a1480a..a15d3b9 100644
--- a/src/chrome/locale/sr/network-settings.dtd
+++ b/src/chrome/locale/sr/network-settings.dtd
@@ -31,7 +31,7 @@
 <!ENTITY torsettings.useProxy.address "Address">
 <!ENTITY torsettings.useProxy.address.placeholder "IP адреса или hostname">
 <!ENTITY torsettings.useProxy.port "Port">
-<!ENTITY torsettings.useProxy.username "Username">
+<!ENTITY torsettings.useProxy.username "Korisničko ime">
 <!ENTITY torsettings.useProxy.password "Lozinka">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Molimo sačekajte dok uspostavljamo vezu sa Tor mrežom.  Ovo može potrajati nekoliko minuta.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Веза">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Saznaj više">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Тест">
+<!ENTITY torPreferences.statusInternetOnline "Онлајн">
+<!ENTITY torPreferences.statusInternetOffline "Офлајн">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Connected">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Saznaj više">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Mostovi">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Zahtevanje novog mosta...">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Ukloni">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Zahtevanje mosta...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Напредно">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Otkaži">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Rešite CAPTCHA da biste zahtevali most.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Rešenje nije ispravno. Molimo pokušajte ponovo.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Офлајн">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Probajte opet">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "Connected">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/sv-SE/network-settings.dtd b/src/chrome/locale/sv-SE/network-settings.dtd
index 6e6fa3e..58a4083 100644
--- a/src/chrome/locale/sv-SE/network-settings.dtd
+++ b/src/chrome/locale/sv-SE/network-settings.dtd
@@ -5,7 +5,7 @@
 
 <!-- For locale picker: -->
 <!ENTITY torlauncher.localePicker.title "Språk för Tor Browser">
-<!ENTITY torlauncher.localePicker.prompt "Vänligen välj ett språk.">
+<!ENTITY torlauncher.localePicker.prompt "Välj ett språk.">
 
 <!-- For "first run" wizard: -->
 
@@ -59,38 +59,118 @@
 <!ENTITY torsettings.bridgeHelp2 "I och med att vissa länder försöker blockera Tor fungerar inte alla broar i alla länder.   Ifall du är osäker på vilka broar som fungerar i ditt land besök torproject.org/about/contact.html#support">
 
 <!-- Progress -->
-<!ENTITY torprogress.pleaseWait "Vänligen vänta medan vi etablerar en anslutning till Tor-nätverket.   Detta kan ta flera minuter.">
+<!ENTITY torprogress.pleaseWait "Vänta medan vi etablerar en anslutning till Tor-nätverket.   Detta kan ta flera minuter.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Anslutning">
 <!ENTITY torPreferences.torSettings "Tor-inställningar">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser dirigerar din trafik över Tor-nätverket, som drivs av tusentals volontärer runt om i världen." >
 <!ENTITY torPreferences.learnMore "Lär dig mer">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Testa">
+<!ENTITY torPreferences.statusInternetOnline "Uppkopplad">
+<!ENTITY torPreferences.statusInternetOffline "Nedkopplad">
+<!ENTITY torPreferences.statusTorLabel "Tor-nätverk:">
+<!ENTITY torPreferences.statusTorConnected "Ansluten">
+<!ENTITY torPreferences.statusTorNotConnected "Inte ansluten">
+<!ENTITY torPreferences.statusTorBlocked "Potentiellt blockerad">
+<!ENTITY torPreferences.learnMore "Lär dig mer">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Snabbstart">
-<!ENTITY torPreferences.quickstartDescription "Snabbstart låter Tor Browser ansluta automatiskt.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Snabbstart ansluter Tor Browser till Tor-nätverket automatiskt när den startas, baserat på dina senast använda anslutningsinställningar.">
 <!ENTITY torPreferences.quickstartCheckbox "Anslut alltid automatiskt">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Broar">
 <!ENTITY torPreferences.bridgesDescription "Broar hjälper dig att komma åt Tor-nätverket på platser där Tor är blockerat. Beroende på var du är, kan en bro fungera bättre än en annan.">
-<!ENTITY torPreferences.useBridge "Använd en bro">
-<!ENTITY torPreferences.requestNewBridge "Begär en ny bro...">
-<!ENTITY torPreferences.provideBridge "Ange en bro">
+<!ENTITY torPreferences.bridgeLocation "Din plats">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatiskt">
+<!ENTITY torPreferences.bridgeLocationFrequent "Ofta valda platser">
+<!ENTITY torPreferences.bridgeLocationOther "Andra platser">
+<!ENTITY torPreferences.bridgeChooseForMe "Välj en bro för mig...">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Dina nuvarande broar">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Du kan behålla en eller fler broar sparade, och Tor kommer att välja vilken som ska användas när du ansluter. Tor kommer att vid behov automatiskt byta till att använda en annan bro.">
+<!ENTITY torPreferences.bridgeId "#1 bro: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Ta bort">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Inaktivera inbyggda broar">
+<!ENTITY torPreferences.bridgeShare "Använd QR kod för att dela denna bro eller genom att kopiera dess adress: ">
+<!ENTITY torPreferences.bridgeCopy "Kopiera broadress">
+<!ENTITY torPreferences.copied "Kopierat!">
+<!ENTITY torPreferences.bridgeShowAll "Visa alla broar">
+<!ENTITY torPreferences.bridgeRemoveAll "Ta bort alla broar">
+<!ENTITY torPreferences.bridgeAdd "Lägg till en ny bro">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Välj från en av Tor Browsers inbyggda broar">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Välj en inbyggd bro...">
+<!ENTITY torPreferences.bridgeRequest "Begär en bro...">
+<!ENTITY torPreferences.bridgeEnterKnown "Ange en broadress som du redan känner till">
+<!ENTITY torPreferences.bridgeAddManually "Lägg till en bro manuellt...">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Avancerat">
-<!ENTITY torPreferences.advancedDescription "Konfigurera hur Tor Browser ansluter till internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Kommaseparerade värden">
+<!ENTITY torPreferences.advancedDescription "Konfigurera hur Tor Browser ansluter till internet">
+<!ENTITY torPreferences.advancedButton "Inställningar…">
+<!ENTITY torPreferences.viewTorLogs "Se Tor-loggarna">
+<!ENTITY torPreferences.viewLogs "Visa loggar…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Ta bort alla broar?">
+<!ENTITY torPreferences.removeBridgesWarning "Denna åtgärd kan inte ångras.">
+<!ENTITY torPreferences.cancel "Avbryt">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Skanna QR-koden">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Inbyggda broar">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser innehåller några specifika typer av broar som kallas "pluggbara transporter".">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 är en typ av inbyggd bro som får din Tor-trafik att se slumpmässig ut. De är också mindre benägna att blockeras än sina föregångare, obfs3-broar.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake är en inbyggd bro som besegrar censur genom att dirigera din anslutning genom Snowflake-proxyer, som drivs av frivilliga.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure är en inbyggd brygga som får det att se ut som att du använder en Microsoft-webbplats istället för att använda Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Begär bro">
-<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktar BridgeDB. Vänligen vänta.">
+<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kontaktar BridgeDB. Vänta.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Lös CAPTCHA:n för att begära en bro.">
-<!ENTITY torPreferences.requestBridgeErrorBadSolution "Lösningen är inte korrekt. Vänligen försök igen.">
-<!ENTITY torPreferences.viewTorLogs "Visa Tor-loggarna.">
-<!ENTITY torPreferences.viewLogs "Visa loggar…">
+<!ENTITY torPreferences.requestBridgeErrorBadSolution "Lösningen är inte korrekt. Försök igen.">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Tillhandahåll bro">
+<!ENTITY torPreferences.provideBridgeHeader "Ange broinformation från en betrodd källa">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Anslutningsinställningar">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Konfigurera hur Tor Browser ansluter till Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Kommaseparerade värden">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor-loggar">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Försök att ansluta igen">
-<!ENTITY torConnect.offline "Nedkopplad">
+<!ENTITY torConnect.notConnectedConcise "Inte ansluten">
+<!ENTITY torConnect.connectingConcise "Ansluter...">
+<!ENTITY torConnect.tryingAgain "Försök igen...">
+<!ENTITY torConnect.noInternet "Tor Browser kunde inte nå Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser kunde inte ansluta till Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "konfigurera din anslutning"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Om Tor är blockerad på din plats kan det hjälpa att pröva en bro. Anslutningshjälp kan välja en åt dig med din plats, eller så kan du #1 manuellt istället."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Prövar en bro...">
+<!ENTITY torConnect.tryingBridgeAgain "Försöker en gång till...">
+<!ENTITY torConnect.errorLocation "Tor Browser kunde inte hitta din plats">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser behöver veta din plats för att kunna välja rätt bro för dig. Om du hellre inte vill dela din plats, #1 manuellt istället."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Är dessa platsers inställningar korrekta? ">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser kunde fortfarande inte få kontakt med Tor. Vänligen kontrollera att dina platsinställningar är korrekta och försök igen, eller #1 istället."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Anslutningshjälp">
+<!ENTITY torConnect.breadcrumbLocation "Platsinställningar">
+<!ENTITY torConnect.breadcrumbTryBridge "Pröva en bro">
+<!ENTITY torConnect.automatic "Automatisk">
+<!ENTITY torConnect.selectCountryRegion "Välj Land eller Region">
+<!ENTITY torConnect.frequentLocations "Ofta valda platser">
+<!ENTITY torConnect.otherLocations "Andra platser">
+<!ENTITY torConnect.restartTorBrowser "Starta om Tor Browser">
+<!ENTITY torConnect.configureConnection "Konfigurera anslutning...">
+<!ENTITY torConnect.viewLog "Visa loggar...">
+<!ENTITY torConnect.tryAgain "Försök igen">
+<!ENTITY torConnect.offline "Internet kan inte nås">
 <!ENTITY torConnect.connectMessage "Ändringar av Tor-inställningar träder inte i kraft förrän du ansluter">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser har misslyckats med att upprätta en anslutning till Tor-nätverket">
-<!ENTITY torConnect.connectingConcise "Ansluter...">
-<!ENTITY torConnect.connectedConcise "Ansluten">
-<!ENTITY torConnect.notConnectedConcise "Inte ansluten">
-<!ENTITY torConnect.copyLog "Kopiera Tor-loggar">
+<!ENTITY torConnect.yourLocation "Din plats">
+<!ENTITY torConnect.tryBridge "Pröva en bro">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatisk konfiguration misslyckades">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatisk konfiguration misslyckades">
+<!ENTITY torConnect.cannotDetermineCountry "Det går inte att bestämma användarland">
+<!ENTITY torConnect.noSettingsForCountry "Inga inställningar tillgängliga för din plats">
diff --git a/src/chrome/locale/sv-SE/torlauncher.properties b/src/chrome/locale/sv-SE/torlauncher.properties
index 2f957dc..9a59744 100644
--- a/src/chrome/locale/sv-SE/torlauncher.properties
+++ b/src/chrome/locale/sv-SE/torlauncher.properties
@@ -21,23 +21,23 @@ torlauncher.password_hash_missing=Det gick inte att få hashat lösenord.
 
 torlauncher.failed_to_get_settings=Det går inte att hämta inställningarna för Tor.\n\n%S
 torlauncher.failed_to_save_settings=Det går inte att spara inställningarna för Tor.\n\n%S
-torlauncher.ensure_tor_is_running=Vänligen försäkra dig om att Tor är startad.
+torlauncher.ensure_tor_is_running=Försäkra dig om att Tor är startad.
 
 torlauncher.error_proxy_addr_missing=Du måste ange både en IP-adress eller värdnamn och ett portnummer för att konfigurera Tor till att använda en proxy för att komma åt internet.
 torlauncher.error_proxy_type_missing=Du måste välja proxytyp.
 torlauncher.error_bridges_missing=Du måste ange en eller flera broar.
 torlauncher.error_default_bridges_type_missing=Du måste välja en transporttyp för de angivna broarna.
-torlauncher.error_bridgedb_bridges_missing=Vänligen begär en bro.
-torlauncher.error_bridge_bad_default_type=Det finns inga angivna broar för transporttypen %S tillgängliga. Vänligen justera dina inställningar.
+torlauncher.error_bridgedb_bridges_missing=Begär en bro.
+torlauncher.error_bridge_bad_default_type=Det finns inga angivna broar för transporttypen %S tillgängliga. Justera dina inställningar.
 
 torlauncher.bridge_suffix.meek-amazon=(fungerar i Kina)
 torlauncher.bridge_suffix.meek-azure=(fungerar i Kina)
 
 torlauncher.request_a_bridge=Begär en bro...
 torlauncher.request_a_new_bridge=Begär en ny bro...
-torlauncher.contacting_bridgedb=Kontaktar BridgeDB. Vänligen vänta.
+torlauncher.contacting_bridgedb=Kontaktar BridgeDB. Vänta.
 torlauncher.captcha_prompt=Lös CAPTCHA:n för att begära en bro.
-torlauncher.bad_captcha_solution=Lösningen är inte korrekt. Vänligen försök igen.
+torlauncher.bad_captcha_solution=Lösningen är inte korrekt. Försök igen.
 torlauncher.unable_to_get_bridge=Det går inte att ta emot en bro från BridgeDB.\n\n%S
 torlauncher.no_meek=Den här webbläsaren är inte konfigurerad för meek, vilket krävs för att ta emot broar.
 torlauncher.no_bridges_available=Inga broar finns tillgängliga för tillfället, tyvärr.
@@ -88,7 +88,7 @@ torlauncher.bootstrapWarning.identity=identitet felmatchad
 torlauncher.bootstrapWarning.timeout=tidsgränsen överskreds
 torlauncher.bootstrapWarning.noroute=framkomlig väg till värddatorn saknas
 torlauncher.bootstrapWarning.ioerror=läs-/skrivfel
-torlauncher.bootstrapWarning.pt_missing=Pluggable Transport saknas
+torlauncher.bootstrapWarning.pt_missing=saknar pluggbar transport
 
 torlauncher.nsresult.NS_ERROR_NET_RESET=Anslutningen till servern förlorades.
 torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Det gick inte att ansluta till servern.
diff --git a/src/chrome/locale/sw/network-settings.dtd b/src/chrome/locale/sw/network-settings.dtd
index f36a2c0..d8e94e2 100644
--- a/src/chrome/locale/sw/network-settings.dtd
+++ b/src/chrome/locale/sw/network-settings.dtd
@@ -62,36 +62,116 @@ nenosiri">
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Tafadhali subiri ikiwa tutaanzisha kuunganisha kwenye mtandao wa Tor.  Hii inaweza inachukua dakika kadhaa.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Mwunganisho">
 <!ENTITY torPreferences.torSettings "Mpangilio wa Tor">
 <!ENTITY torPreferences.torSettingsDescription "Njia ya kivinjari cha Tor trafiki yako zaidi kwenye mtandao wa Tor, endesha kwa elfumoja kwa kujitolea ulimwenguni kote." >
-<!ENTITY torPreferences.learnMore "jifunze zaid">
+<!ENTITY torPreferences.learnMore "Kujifunza zaidi">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Mkondoni">
+<!ENTITY torPreferences.statusInternetOffline "Nje ya mkondo">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Kushikamana">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Kujifunza zaidi">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Madaraja">
 <!ENTITY torPreferences.bridgesDescription "Madaraja yanakusaidia kufikia mtandao wa Tor sehemu ambayo Tor imefungiwa. Inategemea kua wapi ulipo, daraja moja linaweza kufanya kazi vizuri kuliko lingine.">
-<!ENTITY torPreferences.useBridge "Tumia daraja">
-<!ENTITY torPreferences.requestNewBridge "Ombi la Daraja jipya...">
-<!ENTITY torPreferences.provideBridge "Kutoa daraja">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Ondoa">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Imenakili!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Ombi la daraja...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Iliyoboreshwa">
-<!ENTITY torPreferences.advancedDescription "Kusanidi vipi kivinjari cha Tor kitaunganisha kwenye mtandao.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Kupotea kwa dhamani ya komma">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Angalia Log...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "futa">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Ombi la Daraja">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Kuwasiliana na DarajaDB. Tafadhali subiri.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Tafuta CAPTCHA kwa maombi ya daraja.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Suluhisho sio sahihi. Tafadhali jaribu tena.">
-<!ENTITY torPreferences.viewTorLogs "Angalia log ya Tor.">
-<!ENTITY torPreferences.viewLogs "Angalia Log...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Weka taarifa za daraja kutoka kwenye chanzo cha ukweli">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Log ya Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Nje ya mkondo">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Kuunganishwa...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Jaribu tena ">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Kuunganishwa...">
-<!ENTITY torConnect.connectedConcise "Kushikamana">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/ta/network-settings.dtd b/src/chrome/locale/ta/network-settings.dtd
index ed330b9..b30c1a8 100644
--- a/src/chrome/locale/ta/network-settings.dtd
+++ b/src/chrome/locale/ta/network-settings.dtd
@@ -62,36 +62,116 @@
 <!ENTITY torprogress.pleaseWait "தயவுசெய்து நாங்கள் Tor வலையமைப்புடன் ஒரு இணைப்பு நிறுவும்வரை காத்திருங்கள். 
 இதற்கு பல நிமிடங்கள் ஆகலாம்.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "இணைப்பு">
 <!ENTITY torPreferences.torSettings "Tor அமைப்புகள்">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
 <!ENTITY torPreferences.learnMore "மேலும் அறிய">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "இணைப்பில்">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "இணைக்கப்பட்டது">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "மேலும் அறிய">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridgeகள்">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Bridge ஐப் பயன்படுத்துக">
-<!ENTITY torPreferences.requestNewBridge "புதிய Bridge ஐ வேண்டுக...">
-<!ENTITY torPreferences.provideBridge "Bridge ஐ வழங்குக">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "நீக்கு">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "மேம்பட்டது">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "காற்புள்ளியால் பிரிக்கப்பட்ட தகவுமதிப்புகள்">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "பதிகைகளைக் காண்க...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "நிராகரி">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake ">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Bridge ஐ வேண்டுக">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "உள்ளிட்ட தீர்வு சரியானதல்ல. தயவு செய்து மீண்டும் முயல்க">
-<!ENTITY torPreferences.viewTorLogs "Tor பதிகைகளைக் காண்க">
-<!ENTITY torPreferences.viewLogs "பதிகைகளைக் காண்க...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor பதிகைகள்">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "இணைக்கிறது...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "மீண்டும் முயற்சிக்கவும்">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "இணைக்கிறது...">
-<!ENTITY torConnect.connectedConcise "இணைக்கப்பட்டது">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/te/network-settings.dtd b/src/chrome/locale/te/network-settings.dtd
index 7712ec4..d2bc618 100644
--- a/src/chrome/locale/te/network-settings.dtd
+++ b/src/chrome/locale/te/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Connection">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "సంబంధిత">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Remove">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Advanced">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "రద్దు">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "సంబంధిత">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/th/network-settings.dtd b/src/chrome/locale/th/network-settings.dtd
index 4f0bb4a..0cbda4c 100644
--- a/src/chrome/locale/th/network-settings.dtd
+++ b/src/chrome/locale/th/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "กรุณรอระหว่างที่เรากำลังสร้างการเชื่อมต่อไปยังเครือข่าย Tor   ซึ่งอาจจะใช้เวลาหลายนาที">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "การเชื่อมต่อ">
 <!ENTITY torPreferences.torSettings "การตั้งค่า Tor">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser จะกำหนดเส้นทางการรับส่งข้อมูลของคุณเข้ากับเครือข่าย Tor ที่ทำงานโดยอาสาสมัครกว่าพันคนทั่วโลก" >
 <!ENTITY torPreferences.learnMore "เรียนรู้เพิ่มเติม">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "ทดสอบ">
+<!ENTITY torPreferences.statusInternetOnline "ออนไลน์">
+<!ENTITY torPreferences.statusInternetOffline "ออฟไลน์">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "เชื่อมต่อสำเร็จ">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "เรียนรู้เพิ่มเติม">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "เริ่มต้นโดยรวดเร็ว">
-<!ENTITY torPreferences.quickstartDescription "เริ่มต้นโดยรวดเร็ว คืออนุญาตให้ Tor Browser เชื่อมต่ออัตโนมัติ">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "เชื่อมต่อโดยอัตโนมัติตลอด">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "บริดจ์">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "ใช้บริดจ์">
-<!ENTITY torPreferences.requestNewBridge "ขอบริดจ์ใหม่…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "ลบ">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "ขอสะพาน…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "ขั้นสูง">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "ดูไฟล์บันทึก">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "ยกเลิก">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "เกล็ดหิมะ">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "ขอบริดจ์">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "แก้ปัญหา CAPTCHA เพื่อขอสะพาน">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "วิธีแก้ไขไม่ถูกต้อง กรุณาลองอีกครั้ง">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "ดูไฟล์บันทึก">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor ไฟล์บันทึก">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "กำลังเชื่อมต่อใหม่อีกครั้ง">
-<!ENTITY torConnect.offline "ออฟไลน์">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "กำลังเชื่อมต่อ...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "ลองอีกครั้ง">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "กำลังเชื่อมต่อ...">
-<!ENTITY torConnect.connectedConcise "เชื่อมต่อสำเร็จ">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/tr/network-settings.dtd b/src/chrome/locale/tr/network-settings.dtd
index 8fd7269..f9fa086 100644
--- a/src/chrome/locale/tr/network-settings.dtd
+++ b/src/chrome/locale/tr/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Lütfen Tor ağı ile bağlantı kurulurken bekleyin. Bu işlem birkaç dakika sürebilir.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Bağlantı">
 <!ENTITY torPreferences.torSettings "Tor ayarları">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser sizi dünyada binlerce gönüllü tarafından işletilen Tor ağına bağlar." >
 <!ENTITY torPreferences.learnMore "Ayrıntılı bilgi alın">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Sınama">
+<!ENTITY torPreferences.statusInternetOnline "Çevrimiçi">
+<!ENTITY torPreferences.statusInternetOffline "Çevrimdışı">
+<!ENTITY torPreferences.statusTorLabel "Tor ağı:">
+<!ENTITY torPreferences.statusTorConnected "Bağlantı kuruldu">
+<!ENTITY torPreferences.statusTorNotConnected "Bağlantı kurulmamış">
+<!ENTITY torPreferences.statusTorBlocked "Olası engelleme">
+<!ENTITY torPreferences.learnMore "Ayrıntılı bilgi alın">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Hızlı başlatma">
-<!ENTITY torPreferences.quickstartDescription "Hızlı başlatma ile Tor Browser otomatik olarak bağlantı kurar.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Hızlı başlatma Tor Browser uygulamasının başlatıldığında, son kullanılan bağlantı ayarları ile Tor ağına otomatik olarak bağlanmasını sağlar.">
 <!ENTITY torPreferences.quickstartCheckbox "Bağlantı her zaman otomatik olarak kurulsun">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Köprüler">
 <!ENTITY torPreferences.bridgesDescription "Köprüler Tor bağlantısının engellendiği yerlerden Tor ağına erişmek için kullanılır.. Bulunduğunuz konuma göre bir köprü türü diğerinden daha uygun olabilir.">
-<!ENTITY torPreferences.useBridge "Bir köprü kullanılsın">
-<!ENTITY torPreferences.requestNewBridge "Yeni köprü isteğinde bulun...">
-<!ENTITY torPreferences.provideBridge "Bir köprü adresi yazın">
+<!ENTITY torPreferences.bridgeLocation "Konumunuz">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Otomatik">
+<!ENTITY torPreferences.bridgeLocationFrequent "Sık seçilen konumlar">
+<!ENTITY torPreferences.bridgeLocationOther "Diğer konumlar">
+<!ENTITY torPreferences.bridgeChooseForMe "Benim için bir köprü seç…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Geçerli köprüleriniz">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Bir ya da daha fazla köprü kaydedebilirsiniz. Bağlantı kurduğunuzda Tor hangisini kullanacağını seçer ve gerektiğinde otomatik olarak bir başka köprüye geçebilir.">
+<!ENTITY torPreferences.bridgeId "#1 köprü: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Sil">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Hazır köprüler kullanılmasın">
+<!ENTITY torPreferences.bridgeShare "QR kodunu kullanarak ya da köprü satırını kopyalayarak bu köprüyü paylaşın.">
+<!ENTITY torPreferences.bridgeCopy "Köprü adresini kopyala">
+<!ENTITY torPreferences.copied "Kopyalandı!">
+<!ENTITY torPreferences.bridgeShowAll "Tüm köprüleri görüntüle">
+<!ENTITY torPreferences.bridgeRemoveAll "Tüm köprüleri sil">
+<!ENTITY torPreferences.bridgeAdd "Yeni köprü ekle">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Hazır Tor köprülerinden birini seçin">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Bir hazır köprü seçin…">
+<!ENTITY torPreferences.bridgeRequest "Köprü isteğinde bulun…">
+<!ENTITY torPreferences.bridgeEnterKnown "Bildiğim bir köprüyü yazacağım">
+<!ENTITY torPreferences.bridgeAddManually "El ile köprü ekle…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Gelişmiş">
-<!ENTITY torPreferences.advancedDescription "Tor Browser uygulamasının İnternet bağlantısını yapılandırın.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Virgül ile ayrılmış değerler">
+<!ENTITY torPreferences.advancedDescription "Tor Browser uygulamasının İnternet bağlantısını yapılandırın">
+<!ENTITY torPreferences.advancedButton "Ayarlar…">
+<!ENTITY torPreferences.viewTorLogs "Tor günlüğü kayıtlarına bakın">
+<!ENTITY torPreferences.viewLogs "Günlüğü görüntüle…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Tüm köprüler silinsin mi?">
+<!ENTITY torPreferences.removeBridgesWarning "Bu işlem geri alınamaz.">
+<!ENTITY torPreferences.cancel "İptal">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "QR kodunu tarayın">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Hazır köprüler">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser içinde "değiştirilebilir taşıyıcılar" olarak bilinen bazı özel köprü türleri bulunur.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 Tor trafiğinizi rastgele gibi gösteren bir hazır köprü türüdür. Önceki sürümü olan obfs3 köprülerine göre engellenme olasılıkları daha düşüktür.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake, sansürü aşmak için bağlantınızı gönüllüler tarafından işletilen Snowflake vekil sunucuları üzerinden yönelten bir hazır köprüdür.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure Tor yerine bir Microsoft web sitesi kullanıyormuşsunuz gibi gösteren bir hazır köprüdür.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Köprü isteğinde bulunun">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Köprü veritabanı ile bağlantı kuruluyor. Lütfen bekleyin.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Köprü isteğinde bulunmak için güvenlik denetimini geçin.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Çözüm doğru değil. Lütfen yeniden deneyin.">
-<!ENTITY torPreferences.viewTorLogs "Tor günlüğü kayıtlarına bakın.">
-<!ENTITY torPreferences.viewLogs "Günlüğü görüntüle…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Köprüyü yazın">
+<!ENTITY torPreferences.provideBridgeHeader "Güvenilir bir kaynaktan aldığınız köprü bilgilerini yazın">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Bağlantı ayarları">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Tor Browser için internet bağlantısını yapılandırın">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Virgül ile ayrılmış değerler">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor günlüğü kayıtları">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Yeniden bağlantı kurmayı dene">
-<!ENTITY torConnect.offline "Çevrimdışı">
+<!ENTITY torConnect.notConnectedConcise "Bağlantı kurulmamış">
+<!ENTITY torConnect.connectingConcise "Bağlantı kuruluyor…">
+<!ENTITY torConnect.tryingAgain "Yeniden deneniyor…">
+<!ENTITY torConnect.noInternet "Tor Browser İnternet bağlantısı kuramadı">
+<!ENTITY torConnect.couldNotConnect "Tor Browser Tor ağı ile bağlantı kuramadı">
+<!ENTITY torConnect.assistDescriptionConfigure "bağlantınızı yapılandırın"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Bulunduğunuz konumda Tor ağı engelleniyorsa, bir köprü kullanmak işe yarayabilir. Bağlantı yardımcısı ile konumunuzu kullanarak bir köprü belirleyebilir ya da birinciyi el ile seçebilirsiniz."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Bir köprü deneniyor...">
+<!ENTITY torConnect.tryingBridgeAgain "Bir kez daha deneniyor…">
+<!ENTITY torConnect.errorLocation "Tor Browser konumunuzu öğrenemedi">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser sizin için doğru köprüyü belirlemek amacıyla konumunuzu öğrenmek istiyor. Konumunuzu belirtmek istemiyorsanız birinciyi el ile seçin."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Bu konum bilgileri doğru mu?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser hala Tor ağı ile bağlantı kuramıyor. Lütfen konum ayarlarınızın doğru olduğunu denetleyip yeniden deneyin ya da #1. "> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Bağlantı yardımcısı">
+<!ENTITY torConnect.breadcrumbLocation "Konum ayarları">
+<!ENTITY torConnect.breadcrumbTryBridge "Bir köprü deneyin">
+<!ENTITY torConnect.automatic "Otomatik">
+<!ENTITY torConnect.selectCountryRegion "Ülke ya da bölgeyi seçin">
+<!ENTITY torConnect.frequentLocations "Sık seçilen konumlar">
+<!ENTITY torConnect.otherLocations "Diğer konumlar">
+<!ENTITY torConnect.restartTorBrowser "Tor Browser uygulamasını yeniden başlat">
+<!ENTITY torConnect.configureConnection "Bağlantıyı yapılandır…">
+<!ENTITY torConnect.viewLog "Günlüğü görüntüle...">
+<!ENTITY torConnect.tryAgain "Yeniden dene">
+<!ENTITY torConnect.offline "İnternet bağlantısı kurulamadı">
 <!ENTITY torConnect.connectMessage "Bağlantı kurulana kadar Tor ayarlarında yapılan değişiklikler etkili olmayacak">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser, Tor ağı ile bağlantı kuramadı">
-<!ENTITY torConnect.connectingConcise "Bağlantı kuruluyor…">
-<!ENTITY torConnect.connectedConcise "Bağlantı kuruldu">
-<!ENTITY torConnect.notConnectedConcise "Bağlantı kurulmamış">
-<!ENTITY torConnect.copyLog "Tor günlüklerini kopyala">
+<!ENTITY torConnect.yourLocation "Konumunuz">
+<!ENTITY torConnect.tryBridge "Bir köprü deneyin">
+<!ENTITY torConnect.autoBootstrappingFailed "Otomatik olarak yapılandırılamadı">
+<!ENTITY torConnect.autoBootstrappingFailed "Otomatik olarak yapılandırılamadı">
+<!ENTITY torConnect.cannotDetermineCountry "Kullanıcının ülkesi belirlenemedi">
+<!ENTITY torConnect.noSettingsForCountry "Konumunuz için kullanılabilecek bir ayar bulunamadı">
diff --git a/src/chrome/locale/uk/network-settings.dtd b/src/chrome/locale/uk/network-settings.dtd
index a32143d..e3cdaef 100644
--- a/src/chrome/locale/uk/network-settings.dtd
+++ b/src/chrome/locale/uk/network-settings.dtd
@@ -1,7 +1,7 @@
 <!ENTITY torsettings.dialog.title "Налаштування мережі Tor">
-<!ENTITY torsettings.wizard.title.default "З'єднатися з Tor ">
-<!ENTITY torsettings.wizard.title.configure "Параметри мережі Tor">
-<!ENTITY torsettings.wizard.title.connecting "Встановлення з'єднання">
+<!ENTITY torsettings.wizard.title.default "Зʼєднатися з Tor">
+<!ENTITY torsettings.wizard.title.configure "Налаштування мережі Tor">
+<!ENTITY torsettings.wizard.title.connecting "Встановлення зʼєднання">
 
 <!-- For locale picker: -->
 <!ENTITY torlauncher.localePicker.title "Мова вебоглядача Tor">
@@ -9,8 +9,8 @@
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torSettings.connectPrompt "Натисніть кнопку "З'єднати", щоб з'єднатися з Tor.">
-<!ENTITY torSettings.configurePrompt "Натисніть "Налаштувати", щоб налаштувати параметри мережі, якщо ви перебуваєте в країні, яка цензує Tor (наприклад, Єгипет, Китай, Туреччина) або якщо ви з'єднуєтесь з приватної мережі, для якої потрібен проксі-сервер.">
+<!ENTITY torSettings.connectPrompt "Натисніть кнопку «Зʼєднати», щоб зʼєднатися з Tor.">
+<!ENTITY torSettings.configurePrompt "Натисніть «Налаштувати», щоб налаштувати параметри мережі, якщо Ви перебуваєте в країні, яка цензурує Tor (наприклад, Єгипет, Китай, Туреччина) або якщо Ви підʼєднуєтеся з приватної мережі, для якої потрібен проксі-сервер.">
 <!ENTITY torSettings.configure "Налаштування">
 <!ENTITY torSettings.connect "З'єднатися">
 
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Будь ласка, зачекайте, поки ми встановимо з'єднання з мережею Tor.  Це може зайняти кілька хвилин.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Тор">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "З'єднання">
 <!ENTITY torPreferences.torSettings "Налаштування Tor">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser спрямовує ваш трафік через мережу Tor, яка підтримується тисячами добровольців по всьому світу." >
 <!ENTITY torPreferences.learnMore "Дізнатися більше">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Інтернет:">
+<!ENTITY torPreferences.statusInternetTest "Тест">
+<!ENTITY torPreferences.statusInternetOnline "У мережі">
+<!ENTITY torPreferences.statusInternetOffline "Поза мережею">
+<!ENTITY torPreferences.statusTorLabel "Мережа Tor:">
+<!ENTITY torPreferences.statusTorConnected "Зʼєднано">
+<!ENTITY torPreferences.statusTorNotConnected "Не під'єднано">
+<!ENTITY torPreferences.statusTorBlocked "Потенційно заблоковано">
+<!ENTITY torPreferences.learnMore "Дізнатися більше">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart дозволяє вебоглядачу Tor з'єднуватись автоматично.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Швидкий запуск автоматично підключає браузер Tor до мережі Tor під час запуску на основі останніх використаних налаштувань підключення.">
 <!ENTITY torPreferences.quickstartCheckbox "Завжди з'єднуватись автоматично">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Мости">
 <!ENTITY torPreferences.bridgesDescription "Мости допомагають отримати доступ до мережі Tor у місцях, де Tor заблоковано. Залежно від того, де ви знаходитесь, один міст може працювати краще, ніж інший.">
-<!ENTITY torPreferences.useBridge "Використати міст">
-<!ENTITY torPreferences.requestNewBridge "Надіслати запит на отримання нового мосту...">
-<!ENTITY torPreferences.provideBridge "Надати міст">
+<!ENTITY torPreferences.bridgeLocation "Ваше розташування">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Автоматично">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Обрати для мене міст…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Ваші поточні мости">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Ви можете зберегти один або кілька мостів, і Tor вибере, який з них використовувати під час підключення. Tor автоматично перемикається на використання іншого мосту, коли це необхідно.">
+<!ENTITY torPreferences.bridgeId "#1 міст: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Вилучити">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Вимкнути вбудовані мости">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Копіювати адресу мосту">
+<!ENTITY torPreferences.copied "Скопійовано!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Додати новий міст">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Обрати один із вбудованих мостів браузера Tor">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Обрати вбудований міст...">
+<!ENTITY torPreferences.bridgeRequest "Запросити міст...">
+<!ENTITY torPreferences.bridgeEnterKnown "Введіть адресу мосту, який вам вже відомий">
+<!ENTITY torPreferences.bridgeAddManually "Додати міст вручну…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Розширений">
-<!ENTITY torPreferences.advancedDescription "Налаштуйте спосіб підключення браузера Tor до Інтернету.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Значення, розділені комами">
+<!ENTITY torPreferences.advancedDescription "Налаштуйте спосіб підключення браузера Tor до Інтернету">
+<!ENTITY torPreferences.advancedButton "Налаштування...">
+<!ENTITY torPreferences.viewTorLogs "Переглянути журнали Tor">
+<!ENTITY torPreferences.viewLogs "Переглянути журнали...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "Цю дію не можна буде відмінити">
+<!ENTITY torPreferences.cancel "Відмінити">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Сканувати QR код">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Вбудовані мости">
+<!ENTITY torPreferences.builtinBridgeDescription "Браузер Tor включає деякі специфічні типи мостів, відомі як «транспорти, що підключаються».">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 є типом вбудованого моста, завдяки якому ваш трафік Tor виглядає випадковим. Вони рідше будуть заблоковані, ніж їхні попередники, мости obfs3.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake є вбудованим мостом, який долає цензуру, перенаправляючи ваше з’єднання через проксі-сервери Snowflake, якими керують волонтери.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure є вбудованим мостом, який створює враження, ніби ви використовуєте веб-сайт Microsoft замість Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Запросити міст">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Звернення до BridgeDB. Зачекайте, будь ласка.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Розв'яжіть CAPTCHA, щоб надіслати запит на отримання мосту.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Розв'язання невірне. Спробуйте знову.">
-<!ENTITY torPreferences.viewTorLogs "Переглянути журнали Tor.">
-<!ENTITY torPreferences.viewLogs "Переглянути журнали...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Надати міст">
+<!ENTITY torPreferences.provideBridgeHeader "Введіть інформацію про міст із надійного джерела">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Налаштування з'єднання">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Налаштуйте спосіб підключення браузера Tor до Інтернету">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Значення, розділені комами">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Журнали Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Спробувати з'єднатись знов">
-<!ENTITY torConnect.offline "Поза мережею">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Вебоглядачу Tor не вдалось з'єднатись з мережею Tor">
-<!ENTITY torConnect.connectingConcise "Під'єднання...">
-<!ENTITY torConnect.connectedConcise "Під'єднано">
 <!ENTITY torConnect.notConnectedConcise "Не під'єднано">
-<!ENTITY torConnect.copyLog "Копіювати журнали Tor">
+<!ENTITY torConnect.connectingConcise "Під'єднання...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Браузер Tor не може підключитися до Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "налаштуйте ваше з'єднання"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Якщо Tor заблоковано у вашому місцезнаходженні, випробовування мосту може допомогти. Помічник з'єднання допоможе обрати мост для вас, використовуючи ваше місцезнаходження, або ви можете натомість #1 вручну."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Випробовуємо мост…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Браузер Tor не зміг вас знайти">
+<!ENTITY torConnect.errorLocationDescription "Браузер Tor повинен знати ваше місцезнаходження, щоб обрати потрібний для вас міст. Якщо ви не хочете ділитися своїм місцезнаходженням, натомість #1 вручну."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Допомога з'єднання">
+<!ENTITY torConnect.breadcrumbLocation "Налаштування місцезнаходження">
+<!ENTITY torConnect.breadcrumbTryBridge "Випробувати мост">
+<!ENTITY torConnect.automatic "Автоматично">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Перезапустити Tor Browser">
+<!ENTITY torConnect.configureConnection "Налаштування з'єднання...">
+<!ENTITY torConnect.viewLog "Переглянути журнали...">
+<!ENTITY torConnect.tryAgain "Спробувати ще раз">
+<!ENTITY torConnect.offline "Internet not reachable">
+<!ENTITY torConnect.connectMessage "Зміни до налаштувань Tor не застосуються, доки ви з'єднані ">
+<!ENTITY torConnect.tryAgainMessage "Вебоглядачу Tor не вдалось з'єднатись з мережею Tor">
+<!ENTITY torConnect.yourLocation "Ваше розташування">
+<!ENTITY torConnect.tryBridge "Випробувати мост">
+<!ENTITY torConnect.autoBootstrappingFailed "Невдале автоматичне налаштування">
+<!ENTITY torConnect.autoBootstrappingFailed "Невдале автоматичне налаштування">
+<!ENTITY torConnect.cannotDetermineCountry "Не вдається визначити країну користувача">
+<!ENTITY torConnect.noSettingsForCountry "Немає доступних налаштувань для вашого місцезнаходження">
diff --git a/src/chrome/locale/ur/network-settings.dtd b/src/chrome/locale/ur/network-settings.dtd
index d00ebe2..37712a6 100644
--- a/src/chrome/locale/ur/network-settings.dtd
+++ b/src/chrome/locale/ur/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "تور">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "کنکشن">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "مزید جانئیے">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "آن لائن">
+<!ENTITY torPreferences.statusInternetOffline "آف لائن">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "منسلک ہو چکا ہے">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "مزید جانئیے">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "ایک نئے پل کی گزارش کریں۔۔۔">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "خارج کیجیے">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "ایک پل کی گزارش کریں۔۔۔">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "ترقی یافتہ">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "منسوخ کیجیے">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "پل کی گزارش کرنے کیلئے کیپچا کو حل کریں۔">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "آف لائن">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "مربوط ہو رہا ہے۔۔۔">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "مربوط ہو رہا ہے۔۔۔">
-<!ENTITY torConnect.connectedConcise "منسلک ہو چکا ہے">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/uz/network-settings.dtd b/src/chrome/locale/uz/network-settings.dtd
index 3ae2590..0b9aee2 100644
--- a/src/chrome/locale/uz/network-settings.dtd
+++ b/src/chrome/locale/uz/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Aloqa">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor brauzeri trafikni Tor tarmogʻiga yoʻnaltiradi. Bu tarmoqni butun dunyo boʻylab minglab koʻngillilar ishga tushirishgan." >
-<!ENTITY torPreferences.learnMore "Learn More">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Тест">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Ulandi">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Learn more">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Olib tashlash">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Nusxalandi!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Qo‘shimcha">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Bekor qilish">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Ishonchli manbadan koʻprik maʼlumotini kiriting">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Offline">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Ulanmoqda…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Ulanmoqda…">
-<!ENTITY torConnect.connectedConcise "Ulandi">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/vi/network-settings.dtd b/src/chrome/locale/vi/network-settings.dtd
index c4a86df..61d05a5 100644
--- a/src/chrome/locale/vi/network-settings.dtd
+++ b/src/chrome/locale/vi/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "Vui lòng chờ trong khi chúng tôi thiết lập kết nối tới mạng lưới Tor.  Việc này có thể mất một vài phút.">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "Kết nối">
 <!ENTITY torPreferences.torSettings "Cài đặt Tor">
 <!ENTITY torPreferences.torSettingsDescription "Trình duyệt Tor dẫn lưu lượng của bạn qua mạng Tor, vận hành bởi hàng ngàn tình nguyện viên khắp thế giới." >
-<!ENTITY torPreferences.learnMore "Tìm hiểu thêm">
+<!ENTITY torPreferences.learnMore "Biết thêm">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Kiểm tra">
+<!ENTITY torPreferences.statusInternetOnline "Trực tuyến">
+<!ENTITY torPreferences.statusInternetOffline "Ngoại tuyến">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "Đã kết nối">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "Biết thêm">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Cầu Nối">
 <!ENTITY torPreferences.bridgesDescription "Cầu nối giúp bạn truy cập mạng Tor ở những nơi mạng Tor bị chặn. Tùy vào vị trí của bạn mà một cầu nối có thể hoạt động tốt hơn cầu nối khác.">
-<!ENTITY torPreferences.useBridge "Dùng cầu nối">
-<!ENTITY torPreferences.requestNewBridge "Yêu cầu Cầu nối mới...">
-<!ENTITY torPreferences.provideBridge "Cung cấp cầu nối">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Tự động">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Gỡ bỏ">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Yêu cầu Cầu nối...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Nâng cao">
-<!ENTITY torPreferences.advancedDescription "Cài đặt cách trình duyệt Tor kết nối tới internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Giá trị ngăn cách bởi dấu phẩy">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "Xem nhật kí...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "Hủy bỏ">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Yêu cầu cầu nối">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Đang kết nối tới BridgeDB. Vui lòng đợi.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Giải mã CAPTCHA để yêu cầu cầu nối.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "Kết quả không đúng. Vui lòng thử lại.">
-<!ENTITY torPreferences.viewTorLogs "Xem nhật kí Tor.">
-<!ENTITY torPreferences.viewLogs "Xem nhật kí...">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Nhập thông tin cầu nối từ một nguồn tin cậy.">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Nhật kí Tor">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "Ngoại tuyến">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Đang kết nối...">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Tự động">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Đang kết nối...">
-<!ENTITY torConnect.connectedConcise "Đã kết nối">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/zh-CN/network-settings.dtd b/src/chrome/locale/zh-CN/network-settings.dtd
index b5bf7b9..e5c26e6 100644
--- a/src/chrome/locale/zh-CN/network-settings.dtd
+++ b/src/chrome/locale/zh-CN/network-settings.dtd
@@ -10,7 +10,7 @@
 <!-- For "first run" wizard: -->
 
 <!ENTITY torSettings.connectPrompt "点击“连接”，连接 Tor 网络。">
-<!ENTITY torSettings.configurePrompt "如您所在国家（如埃及、中国、土耳其）对 Tor 进行审查，或者您的私人网络需要代理，请点击“配置”，调整网络设置。">
+<!ENTITY torSettings.configurePrompt "如您所在的国家或地区（如埃及、中国大陆、土耳其）对 Tor 进行审查，或者您的私人网络需要代理，请点击“配置”，调整网络设置。">
 <!ENTITY torSettings.configure "配置">
 <!ENTITY torSettings.connect "连接">
 
@@ -38,7 +38,7 @@
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
 <!ENTITY torsettings.firewall.checkbox "该计算机的防火墙仅允许特定端口的互联网连接">
 <!ENTITY torsettings.firewall.allowedPorts "允许的端口">
-<!ENTITY torsettings.useBridges.checkbox "我所在的国家对 Tor 进行了审查">
+<!ENTITY torsettings.useBridges.checkbox "我所在的国家或地区对 Tor 进行了审查">
 <!ENTITY torsettings.useBridges.default "选择内置网桥">
 <!ENTITY torsettings.useBridges.default.placeholder "选择网桥">
 <!ENTITY torsettings.useBridges.bridgeDB "从 torproject.org 获取网桥">
@@ -47,7 +47,7 @@
 <!ENTITY torsettings.useBridges.captchaSubmit "提交">
 <!ENTITY torsettings.useBridges.custom "输入已获取网桥">
 <!ENTITY torsettings.useBridges.label "输入可信来源提供的网桥：">
-<!ENTITY torsettings.useBridges.placeholder "输入地址:端口（每行一个）">
+<!ENTITY torsettings.useBridges.placeholder "输入 地址:端口（每行一个）">
 
 <!ENTITY torsettings.copyLog "复制 Tor 日志">
 
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "正在连接 Tor 网络，可能需几分钟，请稍等。">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "连接">
 <!ENTITY torPreferences.torSettings "Tor 设置">
 <!ENTITY torPreferences.torSettingsDescription "Tor 浏览器将你和世界数千名志愿者支持的 Tor 网络相连" >
 <!ENTITY torPreferences.learnMore "了解更多">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "互联网：">
+<!ENTITY torPreferences.statusInternetTest "测试">
+<!ENTITY torPreferences.statusInternetOnline "联机">
+<!ENTITY torPreferences.statusInternetOffline "脱机">
+<!ENTITY torPreferences.statusTorLabel "Tor 网络：">
+<!ENTITY torPreferences.statusTorConnected "已连接">
+<!ENTITY torPreferences.statusTorNotConnected "未连接">
+<!ENTITY torPreferences.statusTorBlocked "可能已被阻止">
+<!ENTITY torPreferences.learnMore "了解更多">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "快速开始">
-<!ENTITY torPreferences.quickstartDescription "快速入门将使 Tor 浏览器进行自动连接。">
+<!ENTITY torPreferences.quickstartDescriptionLong "快速开始将在打开 Tor 浏览器时根据您上次使用的连接设置自动地将其连接到 Tor 网络。">
 <!ENTITY torPreferences.quickstartCheckbox "自动连接">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "网桥">
 <!ENTITY torPreferences.bridgesDescription "网桥帮助你在 Tor 被阻塞的地方连接 Tor 网络。取决于你在哪里，有的网桥的效果可能比另一个要好。">
-<!ENTITY torPreferences.useBridge "使用网桥">
-<!ENTITY torPreferences.requestNewBridge "正在请求新网桥……">
-<!ENTITY torPreferences.provideBridge "添加网桥">
+<!ENTITY torPreferences.bridgeLocation "你的位置">
+<!ENTITY torPreferences.bridgeLocationAutomatic "自动">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "为我选择一个网桥...">
+<!ENTITY torPreferences.bridgeBadgeCurrent "您当前的网桥">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "移除">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "禁用内置网桥">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "已复制！">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "正在请求网桥……">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "高级">
-<!ENTITY torPreferences.advancedDescription "配置 Tor 浏览器如何接入网络。">
-<!ENTITY torPreferences.firewallPortsPlaceholder "逗号分隔值">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "查看日志">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "此操作不可撤销。">
+<!ENTITY torPreferences.cancel "取消">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "正在请求网桥">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "正在连接到 BridgeDB，请等待。">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "请输入验证码以获取网桥。">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "输入错误，请重试。">
-<!ENTITY torPreferences.viewTorLogs "查看 Tor 日志。">
-<!ENTITY torPreferences.viewLogs "查看日志">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "输入可信来源提供的网桥">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor 日志">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "再次尝试连接">
-<!ENTITY torConnect.offline "脱机">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Tor 浏览器未能与 Tor 网络建立连接">
-<!ENTITY torConnect.connectingConcise "正在连接…">
-<!ENTITY torConnect.connectedConcise "已连接">
 <!ENTITY torConnect.notConnectedConcise "未连接">
-<!ENTITY torConnect.copyLog "复制 Tor 日志">
+<!ENTITY torConnect.connectingConcise "正在连接…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "自动">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "配置连接…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "重试">
+<!ENTITY torConnect.offline "Internet not reachable">
+<!ENTITY torConnect.connectMessage "在您连接之前对 Tor 设置的更改将不会生效">
+<!ENTITY torConnect.tryAgainMessage "Tor 浏览器未能与 Tor 网络建立连接">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "尝试网桥">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/zh-HK/network-settings.dtd b/src/chrome/locale/zh-HK/network-settings.dtd
index 8c8bc7e..23f84e4 100644
--- a/src/chrome/locale/zh-HK/network-settings.dtd
+++ b/src/chrome/locale/zh-HK/network-settings.dtd
@@ -61,36 +61,116 @@
 <!-- Progress -->
 <!ENTITY torprogress.pleaseWait "我哋正在建立通往Tor洋蔥路由網絡嘅連線，請稍候， 呢樣可能會需要幾分鐘時間。">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor工具">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "連接方式">
 <!ENTITY torPreferences.torSettings "Tor Settings">
 <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." >
-<!ENTITY torPreferences.learnMore "深入了解">
+<!ENTITY torPreferences.learnMore "更多">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "測試">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "離線">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "已連線">
+<!ENTITY torPreferences.statusTorNotConnected "Not Connected">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "更多">
+<!-- Quickstart -->
 <!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
 <!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
+<!-- Bridge settings -->
 <!ENTITY torPreferences.bridges "Bridges">
 <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.">
-<!ENTITY torPreferences.useBridge "Use a bridge">
-<!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">
-<!ENTITY torPreferences.provideBridge "Provide a bridge">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "移除">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "Copied!">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "Request a Bridge…">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "Advanced">
-<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-separated values">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "取消">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
 <!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait.">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge.">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again.">
-<!ENTITY torPreferences.viewTorLogs "View the Tor logs.">
-<!ENTITY torPreferences.viewLogs "View Logs…">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
 <!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "離線">
+<!ENTITY torConnect.notConnectedConcise "Not Connected">
+<!ENTITY torConnect.connectingConcise "Connecting…">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "Configure Connection…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "Try Again">
+<!ENTITY torConnect.offline "Internet not reachable">
 <!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
 <!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
-<!ENTITY torConnect.connectingConcise "Connecting…">
-<!ENTITY torConnect.connectedConcise "已連線">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "Try a Bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/zh-TW/network-settings.dtd b/src/chrome/locale/zh-TW/network-settings.dtd
index 63905aa..b421ca8 100644
--- a/src/chrome/locale/zh-TW/network-settings.dtd
+++ b/src/chrome/locale/zh-TW/network-settings.dtd
@@ -1,16 +1,16 @@
 <!ENTITY torsettings.dialog.title "洋蔥路由網路設定">
-<!ENTITY torsettings.wizard.title.default "連線到 Tor">
-<!ENTITY torsettings.wizard.title.configure "Tor 網路設定">
-<!ENTITY torsettings.wizard.title.connecting "建立 Tor 連線">
+<!ENTITY torsettings.wizard.title.default "連線到洋蔥路由網路">
+<!ENTITY torsettings.wizard.title.configure "洋蔥路由網路設定">
+<!ENTITY torsettings.wizard.title.connecting "正在建立連線">
 
 <!-- For locale picker: -->
-<!ENTITY torlauncher.localePicker.title "洋蔥路由瀏覽器之語言">
+<!ENTITY torlauncher.localePicker.title "洋蔥路由瀏覽器的語言">
 <!ENTITY torlauncher.localePicker.prompt "請選擇一種語言。">
 
 <!-- For "first run" wizard: -->
 
-<!ENTITY torSettings.connectPrompt "點擊"連接"來連上 Tor ">
-<!ENTITY torSettings.configurePrompt "如果您處於會監視 tor 網路的國家（例如埃及、中國、土耳其）或者您位於需要代理伺服器的私人網路中，請點擊「設定」來調整網路設定。">
+<!ENTITY torSettings.connectPrompt "點擊「連接」來連上洋蔥路由網路 ">
+<!ENTITY torSettings.configurePrompt "如果您身處於會封鎖洋蔥路由網路的國家(例如埃及、中國、土耳其)，或者您位於需要使用代理伺服器的私人網路中，請點擊「設定」來調整網路設定。">
 <!ENTITY torSettings.configure "設定">
 <!ENTITY torSettings.connect "連接">
 
@@ -20,77 +20,157 @@
 <!ENTITY torsettings.restartTor "重新啟動洋蔥路由">
 <!ENTITY torsettings.reconfigTor "重新設定">
 
-<!ENTITY torsettings.discardSettings.prompt "您已經有設定洋蔥路由的橋接器或本地端代理伺服器。  若想要直接連上洋蔥路由網路的話，必須要先移除這部份的設定。">
+<!ENTITY torsettings.discardSettings.prompt "您已經有設定洋蔥路由的橋接中繼站或本地端代理伺服器。  若想要直接連上洋蔥路由網路的話，必須要先移除這部份的設定。">
 <!ENTITY torsettings.discardSettings.proceed "移除設定值並且連線">
 
 <!ENTITY torsettings.optional "選用">
 
 <!ENTITY torsettings.useProxy.checkbox "使用代理服務連線到網際網路">
-<!ENTITY torsettings.useProxy.type "Proxy類型">
+<!ENTITY torsettings.useProxy.type "代理伺服器類型">
 <!ENTITY torsettings.useProxy.type.placeholder "選擇代理伺服器類型">
 <!ENTITY torsettings.useProxy.address "地址">
 <!ENTITY torsettings.useProxy.address.placeholder "IP 位址或主機名稱">
 <!ENTITY torsettings.useProxy.port "埠">
-<!ENTITY torsettings.useProxy.username "用戶名">
+<!ENTITY torsettings.useProxy.username "使用者名稱">
 <!ENTITY torsettings.useProxy.password "密碼">
 <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4">
 <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5">
 <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS">
-<!ENTITY torsettings.firewall.checkbox "這台電腦通過某個只允許連接至特定連接埠的防火牆">
+<!ENTITY torsettings.firewall.checkbox "這台電腦只允許通過特定的防火牆連接埠來建立連線">
 <!ENTITY torsettings.firewall.allowedPorts "允許的連接埠">
-<!ENTITY torsettings.useBridges.checkbox "我的國家中 Tor 受到審查">
-<!ENTITY torsettings.useBridges.default "選擇內建的橋接">
-<!ENTITY torsettings.useBridges.default.placeholder "選擇橋接">
-<!ENTITY torsettings.useBridges.bridgeDB "從 torproject.org 請求橋接">
+<!ENTITY torsettings.useBridges.checkbox "我所在的國家會封鎖洋蔥路由">
+<!ENTITY torsettings.useBridges.default "選擇內建的橋接中繼站">
+<!ENTITY torsettings.useBridges.default.placeholder "選擇橋接中繼站">
+<!ENTITY torsettings.useBridges.bridgeDB "從 torproject.org 索取一個橋接中繼站">
 <!ENTITY torsettings.useBridges.captchaSolution.placeholder "輸入圖片中的文字">
 <!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "獲得新的挑戰">
 <!ENTITY torsettings.useBridges.captchaSubmit "提交">
-<!ENTITY torsettings.useBridges.custom "提供一個認識的橋接 ">
-<!ENTITY torsettings.useBridges.label "從信任的來源輸入橋接資訊">
-<!ENTITY torsettings.useBridges.placeholder "輸入地址:連接埠 (一行一個)">
+<!ENTITY torsettings.useBridges.custom "手動輸入一個橋接中繼站">
+<!ENTITY torsettings.useBridges.label "從信任的來源輸入橋接中繼站資訊">
+<!ENTITY torsettings.useBridges.placeholder "中繼站地址：連接埠 (一行一個)">
 
-<!ENTITY torsettings.copyLog "將洋蔥路由的訊息記錄複製到剪貼簿">
+<!ENTITY torsettings.copyLog "將洋蔥路由的歷程記錄複製到剪貼簿">
 
 <!ENTITY torsettings.proxyHelpTitle "代理協助">
-<!ENTITY torsettings.proxyHelp1 "當您透過公司、學校或者大學網路進行連線時，您可能需要一個本地代理伺服器。如果您不確定是否需要代理伺服器，請參考其他瀏覽器的網路設定或者系統網路設定。">
+<!ENTITY torsettings.proxyHelp1 "當您透過公司、學校或者大學網路進行連線時，您可能需要一個本地代理伺服器，如果您不確定是否需要代理伺服器，請參考電腦中其他瀏覽器的網路設定或者系統網路設定。">
 
-<!ENTITY torsettings.bridgeHelpTitle "橋接中繼器之說明">
-<!ENTITY torsettings.bridgeHelp1 "橋接是未列出的中繼，可以使得 Tor 網路更難被封鎖。  不同類型的橋接使用不同方法規避審查。  obfs 使您的通訊類似隨機發出的雜音，meek 使您的通訊看起來是訪問他們的服務而不是 Tor。">
-<!ENTITY torsettings.bridgeHelp2 "因為某些國家嘗試封鎖 Tor，一些特定的橋接只能在特定的國家有效，在其他地區則會失效。  如果您不確定哪些橋接在您的國家有效，請訪問 torproject.org/about/contact.html#support">
+<!ENTITY torsettings.bridgeHelpTitle "橋接中繼站之說明">
+<!ENTITY torsettings.bridgeHelp1 "橋接中繼站是未被公開列出的中繼站，透過它們來連接洋蔥路由網路可以更容易突破封鎖。  不同類型的橋接中繼站會使用不同的方法來突破網路審查與封鎖。  obfs 使您的網路連線活動貌似隨機雜訊，而 meek 則會使您的網路連線活動看起來像是通往特定的網路服務而不是洋蔥路由。">
+<!ENTITY torsettings.bridgeHelp2 "因為某些國家會封鎖洋蔥路由網路的連線，某些橋接中繼站只能在特定的國家裡使用，到了其他地區則會失效。  如果您不確定哪些橋接中繼站可以在您的國家使用，請前往 torproject.org/about/contact.html#support">
 
 <!-- Progress -->
-<!ENTITY torprogress.pleaseWait "請耐心等候，我們正在建立 Tor 網路連線。  這個過程可能需要幾分鐘的時間。">
+<!ENTITY torprogress.pleaseWait "請耐心等候，我們正在建立洋蔥路由網路連線，  這個過程可能需要幾分鐘的時間。">
 
-<!-- #31286 about:preferences strings  -->
-<!ENTITY torPreferences.categoryTitle "Tor">
-<!ENTITY torPreferences.torSettings "Tor 設定">
-<!ENTITY torPreferences.torSettingsDescription "Tor Browser 透過 Tor 網路將您的流量進行路由，而 Tor 網路是由世界上數千名志願者所支持。" >
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "連線">
+<!ENTITY torPreferences.torSettings "洋蔥路由設定">
+<!ENTITY torPreferences.torSettingsDescription "洋蔥路由瀏覽器會透過洋蔥路由網路將您的網路連線資料進行繞徑，而洋蔥路由網路則是由全世界數千名志願者所自行架設維運的主機。" >
 <!ENTITY torPreferences.learnMore "了解更多">
-<!ENTITY torPreferences.quickstart "Quickstart">
-<!ENTITY torPreferences.quickstartDescription "Quickstart allows Tor Browser to connect automatically.">
-<!ENTITY torPreferences.quickstartCheckbox "Always connect automatically">
-<!ENTITY torPreferences.bridges "橋接器">
-<!ENTITY torPreferences.bridgesDescription "橋接能讓您在 Tor 被封鎖的地方正常存取 Tor 網路。取決於您的位置，某個橋接點可能比另一個還要好。">
-<!ENTITY torPreferences.useBridge "使用橋接">
-<!ENTITY torPreferences.requestNewBridge "請求一個新的橋接...">
-<!ENTITY torPreferences.provideBridge "提供橋接">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "測試">
+<!ENTITY torPreferences.statusInternetOnline "上線">
+<!ENTITY torPreferences.statusInternetOffline "離線">
+<!ENTITY torPreferences.statusTorLabel "Tor Network:">
+<!ENTITY torPreferences.statusTorConnected "已連缐">
+<!ENTITY torPreferences.statusTorNotConnected "未連線">
+<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked">
+<!ENTITY torPreferences.learnMore "了解更多">
+<!-- Quickstart -->
+<!ENTITY torPreferences.quickstart "快速啟動">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.">
+<!ENTITY torPreferences.quickstartCheckbox "總是自動建立連線">
+<!-- Bridge settings -->
+<!ENTITY torPreferences.bridges "橋接中繼站">
+<!ENTITY torPreferences.bridgesDescription "橋接中繼站能夠幫助您突破網路封鎖連上洋蔥路由網路，隨著您所身處的地區不同，每個橋接中繼站的效果也會有所差異。">
+<!ENTITY torPreferences.bridgeLocation "Your location">
+<!ENTITY torPreferences.bridgeLocationAutomatic "竹">
+<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations">
+<!ENTITY torPreferences.bridgeLocationOther "Other locations">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "移除">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges">
+<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:">
+<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address">
+<!ENTITY torPreferences.copied "已複製！">
+<!ENTITY torPreferences.bridgeShowAll "Show All Bridges">
+<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges">
+<!ENTITY torPreferences.bridgeAdd "Add a New Bridge">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…">
+<!ENTITY torPreferences.bridgeRequest "請求一個橋接中繼站...">
+<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know">
+<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…">
+<!-- Advanced settings -->
 <!ENTITY torPreferences.advanced "進階的">
-<!ENTITY torPreferences.advancedDescription "設定 Tor Browser 如何連線到網際網路。">
-<!ENTITY torPreferences.firewallPortsPlaceholder "逗點分隔值">
-<!ENTITY torPreferences.requestBridgeDialogTitle "請求橋接">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "View the Tor logs">
+<!ENTITY torPreferences.viewLogs "查看歷程紀錄…">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?">
+<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone.">
+<!ENTITY torPreferences.cancel "取消">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scan the QR code">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.">
+<!-- Request bridges dialog -->
+<!ENTITY torPreferences.requestBridgeDialogTitle "請求橋接中繼站">
 <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "正在連接到 BridgeDB，請稍候。">
 <!ENTITY torPreferences.requestBridgeDialogSolvePrompt "解決驗證碼來請求橋接">
 <!ENTITY torPreferences.requestBridgeErrorBadSolution "解答不正確。請再試一次。">
-<!ENTITY torPreferences.viewTorLogs "查看 Tor 紀錄。">
-<!ENTITY torPreferences.viewLogs "查看日誌…">
-<!ENTITY torPreferences.torLogsDialogTitle "Tor 記錄">
+<!-- Provide bridge dialog -->
+<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "從一個可信任的來源輸入橋接中繼站資訊">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
+<!ENTITY torPreferences.torLogsDialogTitle "洋蔥路由歷程紀錄">
 
 <!-- #24746 about:torconnect strings -->
-<!ENTITY torConnect.tryAgain "Try Connecting Again">
-<!ENTITY torConnect.offline "離線">
-<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect">
-<!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network">
+<!ENTITY torConnect.notConnectedConcise "未連線">
 <!ENTITY torConnect.connectingConcise "連接中…">
-<!ENTITY torConnect.connectedConcise "已連缐">
-<!ENTITY torConnect.notConnectedConcise "Not Connected">
-<!ENTITY torConnect.copyLog "Copy Tor Logs">
+<!ENTITY torConnect.tryingAgain "Trying again…">
+<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configure your connection"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Trying a bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…">
+<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!ENTITY torConnect.breadcrumbLocation "Location settings">
+<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge">
+<!ENTITY torConnect.automatic "竹">
+<!ENTITY torConnect.selectCountryRegion "Select Country or Region">
+<!ENTITY torConnect.frequentLocations "Frequently selected locations">
+<!ENTITY torConnect.otherLocations "Other locations">
+<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser">
+<!ENTITY torConnect.configureConnection "調整連線設定…">
+<!ENTITY torConnect.viewLog "View logs…">
+<!ENTITY torConnect.tryAgain "再試一次">
+<!ENTITY torConnect.offline "Internet not reachable">
+<!ENTITY torConnect.connectMessage "對於洋蔥路由設定所作的變更要到開始連線時才會生效">
+<!ENTITY torConnect.tryAgainMessage "洋蔥路由瀏覽器通往洋蔥路由網路的連線建立失敗">
+<!ENTITY torConnect.yourLocation "Your Location">
+<!ENTITY torConnect.tryBridge "試用一個橋接中繼站">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed">
+<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country">
+<!ENTITY torConnect.noSettingsForCountry "No settings available for your location">
diff --git a/src/chrome/locale/zh-TW/torlauncher.properties b/src/chrome/locale/zh-TW/torlauncher.properties
index 39cf646..b220792 100644
--- a/src/chrome/locale/zh-TW/torlauncher.properties
+++ b/src/chrome/locale/zh-TW/torlauncher.properties
@@ -1,10 +1,10 @@
 ### Copyright (c) 2020, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-torlauncher.error_title=Tor啟動工具
+torlauncher.error_title=洋蔥路由啟動工具
 
-torlauncher.tor_exited_during_startup=洋蔥瀏覽器在啟動時意外終止。這可能是因為 torrc 設定檔的錯誤、洋蔥瀏覽器本身、您系統上其他程式的漏洞或是硬體故障所造成。必須先解決潛在的問題並重新啟動洋蔥瀏覽器，本程式才能正常運作。
-torlauncher.tor_exited=洋蔥瀏覽器意外終止了。這可能是因為洋蔥瀏覽器本身的程式錯誤、您系統上的其它程式或是硬體故障所造成。除非您重新啟動洋蔥瀏覽器，否則洋蔥瀏覽器將無法連線到任何網站。如果此問題持續發生，請寄送您的洋蔥瀏覽器錯誤報告給支援團隊。
+torlauncher.tor_exited_during_startup=洋蔥路由瀏覽器在啟動時意外終止。這可能是因為 torrc 設定檔的錯誤、洋蔥路由瀏覽器本身、您系統上其他程式的漏洞或是硬體故障所造成。必須先解決潛在的問題並重新啟動洋蔥路由瀏覽器，本程式才能正常運作。
+torlauncher.tor_exited=洋蔥路由瀏覽器意外終止了。這可能是因為洋蔥路由瀏覽器本身的程式錯誤、您系統上的其它程式或是硬體故障所造成。除非您重新啟動洋蔥路由瀏覽器，否則洋蔥路由瀏覽器將無法連線到任何網站。如果此問題持續發生，請寄送您的洋蔥路由瀏覽器錯誤報告給支援團隊。
 torlauncher.tor_exited2=重新啟動洋蔥路由將不會關閉您瀏覽器的分頁。
 torlauncher.tor_controlconn_failed=無法連接至洋蔥路由控制連接埠。
 torlauncher.tor_failed_to_start=洋蔥路由無法啟動。
@@ -25,22 +25,22 @@ torlauncher.ensure_tor_is_running=請確定洋蔥路由正在執行。
 
 torlauncher.error_proxy_addr_missing=您必須指定一個 IP 位址或主機名稱以及連接埠號碼，才能夠讓洋蔥路由使用代理伺服器來存取網路。
 torlauncher.error_proxy_type_missing=您必須選擇代理伺服器類型。
-torlauncher.error_bridges_missing=您必須指定一個或多個橋接。
-torlauncher.error_default_bridges_type_missing=您必須為該橋接器選擇一種傳輸類型。
-torlauncher.error_bridgedb_bridges_missing=請請求一個橋接
-torlauncher.error_bridge_bad_default_type=沒有提供傳輸類型為 %S 的橋接器。請調整您的設定。
+torlauncher.error_bridges_missing=您必須指定一個或多個橋接中繼站。
+torlauncher.error_default_bridges_type_missing=您必須為該橋接中繼站選擇一種傳輸類型。
+torlauncher.error_bridgedb_bridges_missing=索取一個橋接中繼站
+torlauncher.error_bridge_bad_default_type=沒有提供傳輸類型為 %S 的橋接中繼站，請調整您的設定。
 
 torlauncher.bridge_suffix.meek-amazon=（能在中國使用）
 torlauncher.bridge_suffix.meek-azure=（能在中國使用）
 
-torlauncher.request_a_bridge=請求一個橋接...
-torlauncher.request_a_new_bridge=請求一個新的橋接...
+torlauncher.request_a_bridge=請求一個橋接中繼站...
+torlauncher.request_a_new_bridge=請求一個新的橋接中繼站...
 torlauncher.contacting_bridgedb=正在連接到 BridgeDB，請稍等。
-torlauncher.captcha_prompt=解決驗證碼來請求橋接
+torlauncher.captcha_prompt=解決驗證碼來索取橋接中繼站。
 torlauncher.bad_captcha_solution=解答不正確。請再試一次。
-torlauncher.unable_to_get_bridge=無法從 BridgeDB 獲得橋接。\n\n%S
-torlauncher.no_meek=此瀏覽器沒有設定好 meek，獲得橋接需要使用它。
-torlauncher.no_bridges_available=抱歉，現在沒有可以使用的橋接。
+torlauncher.unable_to_get_bridge=無法從 BridgeDB 獲得橋接中繼站。\n\n%S
+torlauncher.no_meek=此瀏覽器沒有設定好 meek，需要它才能夠取得橋接中繼站。
+torlauncher.no_bridges_available=抱歉，現在沒有可以使用的橋接中繼站。
 
 torlauncher.connect=連線
 torlauncher.restart_tor=重新啟動洋蔥路由
@@ -54,44 +54,44 @@ torlauncher.forAssistance2=若需要協助的話，可以造訪 %S
 torlauncher.copiedNLogMessages=複製完成。%S 洋蔥路由紀錄訊息已準備好被貼到文字編輯器或是一封電子郵件訊息。
 
 torlauncher.bootstrapStatus.starting=啟動中
-torlauncher.bootstrapStatus.conn_pt=正在連線到橋接
-torlauncher.bootstrapStatus.conn_done_pt=已連線到橋接
+torlauncher.bootstrapStatus.conn_pt=正在連線到橋接中繼站
+torlauncher.bootstrapStatus.conn_done_pt=已連線到橋接中繼站
 torlauncher.bootstrapStatus.conn_proxy=正在連線到代理伺服器
 torlauncher.bootstrapStatus.conn_done_proxy=已連線到代理伺服器
-torlauncher.bootstrapStatus.conn=正在連線到 Tor 中繼
-torlauncher.bootstrapStatus.conn_done=已連線到 Tor 中繼
-torlauncher.bootstrapStatus.handshake=正在與 Tor 中繼協商
-torlauncher.bootstrapStatus.handshake_done=已完成與 Tor 中繼協商
+torlauncher.bootstrapStatus.conn=正在連線到洋蔥路由中繼站
+torlauncher.bootstrapStatus.conn_done=已連線到洋蔥路由中繼站
+torlauncher.bootstrapStatus.handshake=正在與洋蔥路由中繼站協商
+torlauncher.bootstrapStatus.handshake_done=已完成與洋蔥路由中繼站協商
 torlauncher.bootstrapStatus.onehop_create=正在建立加密的目錄連線
 torlauncher.bootstrapStatus.requesting_status=正在擷取網路狀態
 torlauncher.bootstrapStatus.loading_status=正在載入網路狀態
 torlauncher.bootstrapStatus.loading_keys=正在載入授權憑證
 torlauncher.bootstrapStatus.requesting_descriptors=正在索取中繼節點資訊
 torlauncher.bootstrapStatus.loading_descriptors=正在載入中繼節點資訊
-torlauncher.bootstrapStatus.enough_dirinfo=已完成載入中繼資訊
-torlauncher.bootstrapStatus.ap_conn_pt=正在建立迴路：正在連線到橋接
-torlauncher.bootstrapStatus.ap_conn_done_pt=正在建立迴路：已連線到橋接
+torlauncher.bootstrapStatus.enough_dirinfo=已完成載入中繼站資訊
+torlauncher.bootstrapStatus.ap_conn_pt=正在建立迴路：正在連線到橋接中繼站
+torlauncher.bootstrapStatus.ap_conn_done_pt=正在建立迴路：已連線到橋接中繼站
 torlauncher.bootstrapStatus.ap_conn_proxy=正在建立迴路：正在連線到代理伺服器
 torlauncher.bootstrapStatus.ap_conn_done_proxy=正在建立迴路：已連線到代理伺服器
-torlauncher.bootstrapStatus.ap_conn=正在建立迴路：正在連線到 Tor 中繼
-torlauncher.bootstrapStatus.ap_conn_done=正在建立迴路：已連線到 Tor 中繼
-torlauncher.bootstrapStatus.ap_handshake=正在建立迴路：正在與 Tor 中繼協商
-torlauncher.bootstrapStatus.ap_handshake_done=正在建立迴路：已完成與 Tor 中繼協商
-torlauncher.bootstrapStatus.circuit_create=正在建立迴路：已建立 Tor 迴路
-torlauncher.bootstrapStatus.done=已連接到洋蔥路由網路!
+torlauncher.bootstrapStatus.ap_conn=正在建立迴路：正在連線到洋蔥路由中繼站
+torlauncher.bootstrapStatus.ap_conn_done=正在建立迴路：已連線到洋蔥路由中繼站
+torlauncher.bootstrapStatus.ap_handshake=正在建立迴路：正在與洋蔥路由中繼站進行協商
+torlauncher.bootstrapStatus.ap_handshake_done=正在建立迴路：已完成與洋蔥路由中繼站協商
+torlauncher.bootstrapStatus.circuit_create=正在建立迴路：已建立洋蔥路由迴路
+torlauncher.bootstrapStatus.done=已連接到洋蔥路由網路！
 
 torlauncher.bootstrapWarning.done=完成
 torlauncher.bootstrapWarning.connectrefused=連線遭到拒絕
 torlauncher.bootstrapWarning.misc=雜項
 torlauncher.bootstrapWarning.resourcelimit=資源不足
-torlauncher.bootstrapWarning.identity=識別不符
+torlauncher.bootstrapWarning.identity=識別身份不符
 torlauncher.bootstrapWarning.timeout=連線逾時
-torlauncher.bootstrapWarning.noroute=沒有到主機的路由
+torlauncher.bootstrapWarning.noroute=沒有通往主機的路徑
 torlauncher.bootstrapWarning.ioerror=讀取/寫入錯誤
-torlauncher.bootstrapWarning.pt_missing=缺少可插式傳輸
+torlauncher.bootstrapWarning.pt_missing=缺少可插拔式傳輸工具
 
 torlauncher.nsresult.NS_ERROR_NET_RESET=與伺服器連線中斷
 torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=無法連接至伺服器
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=無法連接至代理
+torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=無法連接至代理伺服器
 
-torlauncher.copiedNLogMessagesShort=Copied %S Logs
+torlauncher.copiedNLogMessagesShort=已複製 %S 歷程紀錄

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
