[tor-browser] branch tor-browser-91.13.0esr-11.5-1 updated: fixup! Bug 10760: Integrate TorButton to TorBrowser core
by gitolite role 07 Oct '22
by gitolite role 07 Oct '22
07 Oct '22
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch tor-browser-91.13.0esr-11.5-1
in repository tor-browser.
The following commit(s) were added to refs/heads/tor-browser-91.13.0esr-11.5-1 by this push:
new e78377c82d2c fixup! Bug 10760: Integrate TorButton to TorBrowser core
e78377c82d2c is described below
commit e78377c82d2c7f32edd3789ff8b62e1c70a557b6
Author: Pier Angelo Vendrame <pierov(a)torproject.org>
AuthorDate: Fri Oct 7 18:57:09 2022 +0200
fixup! Bug 10760: Integrate TorButton to TorBrowser core
Updated translations.
---
toolkit/torproject/torbutton | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton
index 5d7e654bf71f..4c4fdce43730 160000
--- a/toolkit/torproject/torbutton
+++ b/toolkit/torproject/torbutton
@@ -1 +1 @@
-Subproject commit 5d7e654bf71f63be44cc38f1db26b82dda7907a7
+Subproject commit 4c4fdce43730d6555d13f432b52ee205625b02de
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
1
0
This is an automated email from the git hooks/post-receive script.
pierov pushed a change to branch maint-11.5
in repository torbutton.
from 5d7e654b Bug 41338: Correct direction of search arrow in right-to-left
new bc848d06 Translations update
new 4c4fdce4 Added placeholders for about:tor in vi.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
chrome/locale/ar/aboutTor.dtd | 21 ++++++++-
chrome/locale/bn-BD/aboutTor.dtd | 26 ++++++++++-
chrome/locale/ca/aboutTor.dtd | 26 ++++++++++-
chrome/locale/da/aboutTor.dtd | 26 ++++++++++-
chrome/locale/de/aboutTor.dtd | 21 ++++++++-
chrome/locale/el/aboutTor.dtd | 21 ++++++++-
chrome/locale/es-AR/aboutTor.dtd | 26 ++++++++++-
chrome/locale/es-ES/aboutTor.dtd | 21 ++++++++-
chrome/locale/eu/aboutTor.dtd | 26 ++++++++++-
chrome/locale/fa/aboutTor.dtd | 23 +++++++++-
chrome/locale/fr/aboutTor.dtd | 21 ++++++++-
chrome/locale/ga-IE/aboutTor.dtd | 28 +++++++++++-
chrome/locale/he/aboutTor.dtd | 21 ++++++++-
chrome/locale/hu/aboutTor.dtd | 21 ++++++++-
chrome/locale/id/aboutTor.dtd | 21 ++++++++-
chrome/locale/id/browserOnboarding.properties | 28 ++++++------
chrome/locale/is/aboutTor.dtd | 32 +++++++++++--
chrome/locale/is/torbutton.properties | 38 ++++++++--------
chrome/locale/it/aboutTor.dtd | 21 ++++++++-
chrome/locale/ja/aboutTor.dtd | 21 ++++++++-
chrome/locale/ka/aboutTor.dtd | 21 ++++++++-
chrome/locale/ko/aboutTor.dtd | 21 ++++++++-
chrome/locale/lt/aboutTor.dtd | 26 ++++++++++-
chrome/locale/mk/aboutTor.dtd | 23 +++++++++-
chrome/locale/mk/torbutton.properties | 38 ++++++++--------
chrome/locale/ms/aboutTor.dtd | 26 ++++++++++-
chrome/locale/my/aboutTor.dtd | 21 ++++++++-
chrome/locale/my/torbutton.dtd | 4 +-
chrome/locale/my/torbutton.properties | 58 ++++++++++++------------
chrome/locale/nb-NO/aboutTor.dtd | 26 ++++++++++-
chrome/locale/nl/aboutTor.dtd | 26 ++++++++++-
chrome/locale/pl/aboutTor.dtd | 23 +++++++++-
chrome/locale/pt-BR/aboutTor.dtd | 21 ++++++++-
chrome/locale/pt-BR/torbutton.properties | 18 ++++----
chrome/locale/ro/aboutTor.dtd | 21 ++++++++-
chrome/locale/ru/aboutTor.dtd | 21 ++++++++-
chrome/locale/sv-SE/aboutTor.dtd | 21 ++++++++-
chrome/locale/sv-SE/browserOnboarding.properties | 2 +-
chrome/locale/sv-SE/torbutton.properties | 12 ++---
chrome/locale/th/aboutTor.dtd | 26 ++++++++++-
chrome/locale/tr/aboutTor.dtd | 21 ++++++++-
chrome/locale/uk/aboutTor.dtd | 21 ++++++++-
chrome/locale/vi/aboutTor.dtd | 26 ++++++++++-
chrome/locale/zh-CN/aboutTor.dtd | 21 ++++++++-
chrome/locale/zh-TW/aboutTor.dtd | 21 ++++++++-
45 files changed, 911 insertions(+), 143 deletions(-)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
1
2
[builders/tor-browser-build] branch main updated: Bug 40634: Update projects/tor-browser -> projects/browser paths
by gitolite role 07 Oct '22
by gitolite role 07 Oct '22
07 Oct '22
This is an automated email from the git hooks/post-receive script.
boklm pushed a commit to branch main
in repository builders/tor-browser-build.
The following commit(s) were added to refs/heads/main by this push:
new 9fca0e0 Bug 40634: Update projects/tor-browser -> projects/browser paths
9fca0e0 is described below
commit 9fca0e09361e7a16f87dd08ab8699a55bbdc159a
Author: Nicolas Vigier <boklm(a)torproject.org>
AuthorDate: Thu Oct 6 11:57:26 2022 +0200
Bug 40634: Update projects/tor-browser -> projects/browser paths
With c52bc0e57555bcb0d49ead1f409eb679268a49a5, projects/tor-browser was
renamed to project/browser. However we forgot to update that path in a
few files:
- LICENSE
- tools/changelog-format-blog-post
- .gitlab/issue_templates/Release Prep - Alpha.md
This one will need to be updated after 12.0 stable is released:
- .gitlab/issue_templates/Release Prep - Stable.md
---
.gitlab/issue_templates/Release Prep - Alpha.md | 2 +-
LICENSE | 2 +-
tools/changelog-format-blog-post | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab/issue_templates/Release Prep - Alpha.md b/.gitlab/issue_templates/Release Prep - Alpha.md
index 10432e1..eb9a3f7 100644
--- a/.gitlab/issue_templates/Release Prep - Alpha.md
+++ b/.gitlab/issue_templates/Release Prep - Alpha.md
@@ -167,7 +167,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in
- [ ] `git_hash` : update the `$(BUILD_N)` section to match `fenix` tag
- [ ] ***(Optional)*** `var/fenix_version` : update to latest `$(ESR_VERSION)` if rebased
- [ ] Update allowed_addons.json by running (from `tor-browser-build` root):
- - `./tools/fetch_allowed_addons.py > projects/tor-browser/allowed_addons.json`
+ - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json`
- [ ] Check for NoScript updates here : https://addons.mozilla.org/en-US/firefox/addon/noscript
- [ ] ***(Optional)*** If new version available, update `noscript` section of `input_files` in `projects/browser/config`
- [ ] `URL`
diff --git a/LICENSE b/LICENSE
index ee29ae2..0343a48 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,7 +2,7 @@ This file contains the license for the build recipes and tools used in
the Tor Browser development process, that are included in this repository.
For the license of specific components included in Tor Browser, see
-directory projects/tor-browser/Bundle-Data/Docs/Licenses.
+directory projects/browser/Bundle-Data/Docs/Licenses.
===============================================================================
diff --git a/tools/changelog-format-blog-post b/tools/changelog-format-blog-post
index b34093e..84519bb 100755
--- a/tools/changelog-format-blog-post
+++ b/tools/changelog-format-blog-post
@@ -49,5 +49,5 @@ if (! ( $current_tbversion =~ m/a/ ) ) {
my @v = split(/\./, $current_tbversion);
$changelog_branch = "maint-$v[0].$v[1]";
}
-print "The full changelog since [Tor Browser $last_tbversion](https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=$changelog_branch) is:\n\n";
+print "The full changelog since [Tor Browser $last_tbversion](https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/browser/Bundle-Data/Docs/ChangeLog.txt?h=$changelog_branch) is:\n\n";
print $changelog;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
1
0
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch main
in repository torbutton.
The following commit(s) were added to refs/heads/main by this push:
new 829fab42 Translation updates
829fab42 is described below
commit 829fab428bac2d69ef34a40f40c22c8c7b6303eb
Author: Pier Angelo Vendrame <pierov(a)torproject.org>
AuthorDate: Fri Oct 7 11:05:18 2022 +0200
Translation updates
---
chrome/locale/ar/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/bn-BD/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/ca/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/cs/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/da/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/de/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/el/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/es-AR/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/es-ES/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/eu/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/fa/aboutTor.dtd | 2 +-
chrome/locale/fa/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/fr/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/ga-IE/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/he/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/hu/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/id/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/is/aboutTor.dtd | 24 +++----
chrome/locale/is/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/is/torbutton.properties | 38 +++++------
chrome/locale/it/aboutTor.dtd | 8 +--
chrome/locale/it/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/ja/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/ka/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/ko/network-settings.dtd | 109 ++++++++++++++++++++++++++---
chrome/locale/lt/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/mk/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/mk/torbutton.properties | 38 +++++------
chrome/locale/ms/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/my/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/nb-NO/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/nl/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/pl/network-settings.dtd | 109 ++++++++++++++++++++++++++---
chrome/locale/pt-BR/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/ro/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/ru/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
chrome/locale/sv-SE/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/sv-SE/torbutton.properties | 4 +-
chrome/locale/th/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/tr/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/uk/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/vi/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/zh-CN/aboutTor.dtd | 2 +-
chrome/locale/zh-CN/network-settings.dtd | 111 +++++++++++++++++++++++++++---
chrome/locale/zh-TW/network-settings.dtd | 113 ++++++++++++++++++++++++++++---
45 files changed, 3951 insertions(+), 417 deletions(-)
diff --git a/chrome/locale/ar/network-settings.dtd b/chrome/locale/ar/network-settings.dtd
index 27385c27..fb888da9 100644
--- a/chrome/locale/ar/network-settings.dtd
+++ b/chrome/locale/ar/network-settings.dtd
@@ -61,23 +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 "الإنترنت:">
+<!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.quickstartDescriptionLong "التشغيل السريع يجعل اتصال متصفح Tor بشبكة Tor يتم تلقائيًا عند التشغيل، اعتمادًا على إعداداتك لآخر عملية اتصال قمت بها.">
+<!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 "موقعك الجغرافي">
+<!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 "شارك جسرًا باستخدام رمز استجابة سريعة أو عبر نسخ عنوانه:">
+<!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 Browser بالانترنت">
-<!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 "افحص رمز الاستجابة السريعة">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "الجسور المدمجة">
+<!ENTITY torPreferences.builtinBridgeDescription "متصفح Tor يحتوي على أنواع معينة من الجسر معروفة باسم "النواقل القابلة للتوصيل".">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "هناك نوع من الجسور المدمجة يسمى obfs4 والذي يجعل حركة المرور الخاصّة بشبكة Tor تبدو عشوائية. هذا النوع من الجسور أيضًا أقل عُرضة للحجب مقارنةً بأسلافها، وهي جسور obfs3.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "ندفة الثلج">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "جسر Snowflake المدمج يُعد قاهرًا للرقابة من خلال إعادة توجيه اتصالك عبر خوادم وكيلة، والتي تُدار بواسطة متطوّعين.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "جسر meek-azure المدمج يجعل استخدامك للإنترنت يبدو وكأنك تقوم بتصفح موقع مايكروسوفت بدلًا من استخدام شبكة 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 بالاتصال بالإنترنت">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values">
+<!-- Log dialog -->
<!ENTITY torPreferences.torLogsDialogTitle "سجلات تور Tor">
+
+<!-- #24746 about:torconnect strings -->
+<!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 "المواقع الجغرافية المختارة بشكل متكرر:">
+<!ENTITY torConnect.otherLocations "مواقع جغرافية أخرى">
+<!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/chrome/locale/bn-BD/network-settings.dtd b/chrome/locale/bn-BD/network-settings.dtd
index 7abd3a80..d31da205 100644
--- a/chrome/locale/bn-BD/network-settings.dtd
+++ b/chrome/locale/bn-BD/network-settings.dtd
@@ -61,23 +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.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 "স্বয়ংক্রিয়">
+<!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 save one or more bridges, 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.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.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/chrome/locale/ca/network-settings.dtd b/chrome/locale/ca/network-settings.dtd
index f3c6f49c..dc7c3598 100644
--- a/chrome/locale/ca/network-settings.dtd
+++ b/chrome/locale/ca/network-settings.dtd
@@ -62,23 +62,116 @@
<!-- Progress -->
<!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.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 "Automàtic">
+<!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 save one or more bridges, 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">
+<!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 "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.notConnectedConcise "No connectat">
+<!ENTITY torConnect.connectingConcise "S'està connectant...">
+<!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/chrome/locale/cs/network-settings.dtd b/chrome/locale/cs/network-settings.dtd
index 7cd6cd95..7ab19656 100644
--- a/chrome/locale/cs/network-settings.dtd
+++ b/chrome/locale/cs/network-settings.dtd
@@ -61,23 +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.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 uložit jeden nebo více mostů a Tor vybere, který z nich bude použit při připojování. Tor automaticky přepne na jiný most pokud to bude potřeba.">
+<!ENTITY torPreferences.bridgeId "#1 most: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Smazat">
+<!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 “pluggable transports”.">
+<!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.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.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/chrome/locale/da/network-settings.dtd b/chrome/locale/da/network-settings.dtd
index 7c46734b..b459edb3 100644
--- a/chrome/locale/da/network-settings.dtd
+++ b/chrome/locale/da/network-settings.dtd
@@ -61,23 +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.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 save one or more bridges, 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.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.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/chrome/locale/de/network-settings.dtd b/chrome/locale/de/network-settings.dtd
index 47ba13d2..9fe9aa16 100644
--- a/chrome/locale/de/network-settings.dtd
+++ b/chrome/locale/de/network-settings.dtd
@@ -61,23 +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.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 "Häufig ausgewählte Standorte">
+<!ENTITY torPreferences.bridgeLocationOther "Andere Standorte">
+<!ENTITY torPreferences.bridgeChooseForMe "Wähle eine Brücke für mich …">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Deine aktuellen Brücken">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Du kannst eine oder mehrere Brücken speichern und Tor wählt diejenige aus, die verwendet werden soll, wenn du dich verbindest. Tor wechselt bei Bedarf automatisch zu einer anderen Brücke.">
+<!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 "Teile diese Brücke, indem du den QR-Code zeigst oder ihre Adresse kopierst.">
+<!ENTITY torPreferences.bridgeCopy "Kopiere die Brücken-Adresse">
+<!ENTITY torPreferences.copied "Kopiert!">
+<!ENTITY torPreferences.bridgeShowAll "Zeige alle Brücken">
+<!ENTITY torPreferences.bridgeRemoveAll "Entferne alle Brücken">
+<!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 "Alle Brücken entfernen?">
+<!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.notConnectedConcise "Nicht verbunden">
+<!ENTITY torConnect.connectingConcise "Verbinde…">
+<!ENTITY torConnect.tryingAgain "Erneuter Versuch ...">
+<!ENTITY torConnect.noInternet "Tor Browser konnte das Internet nicht erreichen">
+<!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 "Noch ein weiterer Versuch ...">
+<!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 "Sind diese Standorteinstellungen korrekt?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser konnte sich immer noch nicht mit Tor verbinden. Bitte überprüfe, ob deine Standorteinstellungen korrekt sind und versuche es erneut, oder stattdessen #1."> <!-- #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 "Land oder Region auswählen">
+<!ENTITY torConnect.frequentLocations "Häufig ausgewählte Standorte">
+<!ENTITY torConnect.otherLocations "Andere Standorte">
+<!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 nicht erreichbar">
+<!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.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/chrome/locale/el/network-settings.dtd b/chrome/locale/el/network-settings.dtd
index c606ec5b..fd1c4a77 100644
--- a/chrome/locale/el/network-settings.dtd
+++ b/chrome/locale/el/network-settings.dtd
@@ -61,23 +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 "Διαδίκτυο:">
+<!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.quickstartDescriptionLong "Η Γρήγορη Έναρξη συνδέει αυτόματα τον Περιηγητή Tor με το δίκτυο 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 "Επιλέξτε μία από τις ενσωματωμένες γέφυρες">
+<!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 συνδέεται στο διαδίκτυο.">
+<!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 "Λύστε το 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.notConnectedConcise "Αποσυνδεδεμένο">
+<!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 θα εφαρμοστούν όταν συνδεθείτε με το δίκτυο 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/chrome/locale/es-AR/network-settings.dtd b/chrome/locale/es-AR/network-settings.dtd
index 208046a5..5164012b 100644
--- a/chrome/locale/es-AR/network-settings.dtd
+++ b/chrome/locale/es-AR/network-settings.dtd
@@ -61,23 +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.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 save one or more bridges, 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.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.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/chrome/locale/es-ES/network-settings.dtd b/chrome/locale/es-ES/network-settings.dtd
index 5950dcaa..77f07896 100644
--- a/chrome/locale/es-ES/network-settings.dtd
+++ b/chrome/locale/es-ES/network-settings.dtd
@@ -61,23 +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.quickstartDescriptionLong "El inicio rápido conecta el Navegador Tor a la Red Tor automáticamente al iniciar, 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 elegirá cuál usar cuando te conectes. Cuando sea necesario Tor se cambiará automáticamente a otro puente, si es necesario.">
+<!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 Puente Nuevo">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Elige uno de los puentes incorporados al Navegador Tor">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Elige un puente incorporado...">
+<!ENTITY torPreferences.bridgeRequest "Solicita 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 "Configura 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.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 "El asistente de 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.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 del usuario">
+<!ENTITY torConnect.noSettingsForCountry "No hay ajustes disponibles para tu ubicación">
diff --git a/chrome/locale/eu/network-settings.dtd b/chrome/locale/eu/network-settings.dtd
index fb5d4183..fb32af46 100644
--- a/chrome/locale/eu/network-settings.dtd
+++ b/chrome/locale/eu/network-settings.dtd
@@ -61,23 +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.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 save one or more bridges, 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 "Ezabatu">
+<!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.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.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/chrome/locale/fa/aboutTor.dtd b/chrome/locale/fa/aboutTor.dtd
index 3449859f..e9b82d12 100644
--- a/chrome/locale/fa/aboutTor.dtd
+++ b/chrome/locale/fa/aboutTor.dtd
@@ -30,7 +30,7 @@
<!ENTITY aboutTor.donationBanner.freeToUse "Tor برای استفاده رایگان است، این به خاطر حمایت افرادی مانند شماست.">
<!ENTITY aboutTor.donationBanner.buttonA "اکنون حمایت کنید">
-<!ENTITY aboutTor.alpha.ready.label "آزمایش کنید. به طور کامل.">
+<!ENTITY aboutTor.alpha.ready.label "آزمایش کنید. به طور دقیق.">
<!ENTITY aboutTor.alpha.ready2.label "شما آماده آزمایش خصوصیترین تجربه مرورگر جهان هستید.">
<!ENTITY aboutTor.alpha.bannerDescription "مرورگر تور آلفا یک نسخه ناپایدار از مرورگر تور است که میتوانید از آن برای پیشنمایش ویژگیهای جدید، آزمایش عملکرد آنها و ارائه بازخورد قبل از انتشار استفاده کنید.">
<!ENTITY aboutTor.alpha.bannerLink "هرگونه اشکال را در تالار گفتگوی تور گزارش کنید">
diff --git a/chrome/locale/fa/network-settings.dtd b/chrome/locale/fa/network-settings.dtd
index 4b5b317d..f5ffa345 100644
--- a/chrome/locale/fa/network-settings.dtd
+++ b/chrome/locale/fa/network-settings.dtd
@@ -61,23 +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.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.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.yourLocation "موقعیت مکانی شما">
+<!ENTITY torConnect.tryBridge "یک پل را امتحان کنید">
+<!ENTITY torConnect.autoBootstrappingFailed "پیکربندی خودکار انجام نشد">
+<!ENTITY torConnect.autoBootstrappingFailed "پیکربندی خودکار انجام نشد">
+<!ENTITY torConnect.cannotDetermineCountry "تعیین کشور کاربر ممکن نیست">
+<!ENTITY torConnect.noSettingsForCountry "هیچ تنظیماتی برای مکان شما موجود نیست">
diff --git a/chrome/locale/fr/network-settings.dtd b/chrome/locale/fr/network-settings.dtd
index eaa69a57..e7e81fb4 100644
--- a/chrome/locale/fr/network-settings.dtd
+++ b/chrome/locale/fr/network-settings.dtd
@@ -61,25 +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.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.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 #1 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, #1 plutôt un manuellement."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Ces paramètres de localisation sont-ils bons ?">
+<!ENTITY torConnect.isLocationCorrectDescription "Le Navigateur Tor n’a toujours pas réussi à se connecter à Tor. Veuillez vérifier que vos paramètres de localisation sont correctes et réessayer, ou #1 à la place"> <!-- #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.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/chrome/locale/ga-IE/network-settings.dtd b/chrome/locale/ga-IE/network-settings.dtd
index 0250eb00..5ac7baa5 100644
--- a/chrome/locale/ga-IE/network-settings.dtd
+++ b/chrome/locale/ga-IE/network-settings.dtd
@@ -61,23 +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.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 save one or more bridges, 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.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.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/chrome/locale/he/network-settings.dtd b/chrome/locale/he/network-settings.dtd
index bdd60b4a..312f43eb 100644
--- a/chrome/locale/he/network-settings.dtd
+++ b/chrome/locale/he/network-settings.dtd
@@ -61,23 +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.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 "You can save one or more bridges, 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 "שתף את הגשר הזה ע״י שימוש בקוד 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.notConnectedConcise "לא מחובר">
+<!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/chrome/locale/hu/network-settings.dtd b/chrome/locale/hu/network-settings.dtd
index 9c755482..9962c885 100644
--- a/chrome/locale/hu/network-settings.dtd
+++ b/chrome/locale/hu/network-settings.dtd
@@ -61,23 +61,116 @@
<!-- Progress -->
<!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.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 "Gyakran választott helyszínek">
+<!ENTITY torPreferences.bridgeLocationOther "Más helyszínek">
+<!ENTITY torPreferences.bridgeChooseForMe "Ajánljon Nekem egy Hidat...">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Jelenlegi Hídjai">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can save one or more bridges, 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ás">
+<!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.notConnectedConcise "Nincs csatlakozva">
+<!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 "Gyakran választott helyszínek">
+<!ENTITY torConnect.otherLocations "Más helyszínek">
+<!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/chrome/locale/id/network-settings.dtd b/chrome/locale/id/network-settings.dtd
index 1b5af65e..882f85ba 100644
--- a/chrome/locale/id/network-settings.dtd
+++ b/chrome/locale/id/network-settings.dtd
@@ -61,23 +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">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Tes">
+<!ENTITY torPreferences.statusInternetOnline "Daring">
+<!ENTITY torPreferences.statusInternetOffline "Luring">
+<!ENTITY torPreferences.statusTorLabel "Jaringan Tor:">
+<!ENTITY torPreferences.statusTorConnected "Terhubung">
+<!ENTITY torPreferences.statusTorNotConnected "Tidak terhubung">
+<!ENTITY torPreferences.statusTorBlocked "Berpotensi diblokir">
+<!ENTITY torPreferences.learnMore "Pelajari lebih lanjut">
+<!-- Quickstart -->
+<!ENTITY torPreferences.quickstart "Quickstart">
+<!ENTITY torPreferences.quickstartDescriptionLong ""Quickstart" menghubungkan Tor Browser dengan jaringan Tor secara otomatis saat diluncurkan, berdasarkan pengaturan koneksi yang terakhir dipakai.">
+<!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 "Lokasi Anda">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Otomatis">
+<!ENTITY torPreferences.bridgeLocationFrequent "Lokasi yang sering terpilih">
+<!ENTITY torPreferences.bridgeLocationOther "Lokasi lainnya">
+<!ENTITY torPreferences.bridgeChooseForMe "Pilih Jembatan untuk Saya...">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Jembatan Anda saat ini">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Anda dapat menyimpan satu atau lebih jembatan, dan Tor akan memilih salah satu untuk digunakan saat Anda terhubung. Tor akan otomatis mengalihkan kepada jembatan lain saat dibutuhkan.">
+<!ENTITY torPreferences.bridgeId "#1 jembatan: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Hapus">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Nonaktifkan bridge bawaan">
+<!ENTITY torPreferences.bridgeShare "Bagikan bridge ini menggunakan kode QR atau dengan menyalin alamatnya:">
+<!ENTITY torPreferences.bridgeCopy "Salin Alamat Bridge">
+<!ENTITY torPreferences.copied "Disalin!">
+<!ENTITY torPreferences.bridgeShowAll "Perlihatkan Semua Bridge">
+<!ENTITY torPreferences.bridgeRemoveAll "Hapus Semua Bridge">
+<!ENTITY torPreferences.bridgeAdd "Tambahkan Bridge Baru">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Pilih dari salah satu bridge bawaan Tor Browser">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Pilih Bridge Bawaan...">
+<!ENTITY torPreferences.bridgeRequest "Meminta sebuah bridge...">
+<!ENTITY torPreferences.bridgeEnterKnown "Masukkan alamat bridge yang telah Anda ketahui">
+<!ENTITY torPreferences.bridgeAddManually "Tambahkan bridge secara manual...">
+<!-- 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 "Konfigurasi bagaimana Tor Browser terhubung ke internet">
+<!ENTITY torPreferences.advancedButton "Pengaturan...">
+<!ENTITY torPreferences.viewTorLogs "Tampilkan log Tor">
+<!ENTITY torPreferences.viewLogs "Lihat Catatan....">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Hapus semua bridge?">
+<!ENTITY torPreferences.removeBridgesWarning "Aksi ini tidak dapat dibatalkan.">
+<!ENTITY torPreferences.cancel "Cancel">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Pindai kode QR">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Bridge Bawaan">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser menyertakan beberapa tipe bridge spesifik yang dikenal sebagai "pluggable transports".">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 adalah tipe bridge bawaan yang membuat lalu lintas Tor Anda terlihat acak. Mereka juga memiliki kemungkinan yang lebih kecil untuk diblokir dibandingkan dengan pendahulunya, bridge obfs3.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake adalah bridge bawaan yang mengalahkan sensor dengan merouting koneksi Anda melalui proxy Snowflake, yang dijalankan oleh sukarelawan.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure adalah bridge bawaan yang membuat Anda terlihat sedang menggunakan sebuah situs web Microsoft alih-alih menggunakan 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 "Sediakan Bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Masukkan informasi bridge dari sumber yang terpercaya">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Pengaturan Koneksi">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Konfigurasi bagaimana Tor Browser tersambung ke Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Nilai yang dipisahkan koma">
+<!-- Log dialog -->
<!ENTITY torPreferences.torLogsDialogTitle "Catatan Tor">
+
+<!-- #24746 about:torconnect strings -->
+<!ENTITY torConnect.notConnectedConcise "Tidak terhubung">
+<!ENTITY torConnect.connectingConcise "Menyambung…">
+<!ENTITY torConnect.tryingAgain "Mencoba lagi...">
+<!ENTITY torConnect.noInternet "Tor Browser tidak dapat menjangkau Internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser tidak dapat menyambung ke Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "Konfigurasi koneksi Anda"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Jika Tor diblokir di lokasi Anda, mencoba bridge mungkin membantu. Pembantu koneksi bisa memilih satu untuk Anda menggunakan lokasi Anda, atau Anda bisa #1 secara manual sebagai gantinya."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Mencoba sebuah bridge...">
+<!ENTITY torConnect.tryingBridgeAgain "Mencoba sekali lagi...">
+<!ENTITY torConnect.errorLocation "Tor Browser tidak dapat menemukan Anda">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser perlu mengetahui lokasi Anda untuk memilih bridge yang benar untuk Anda. Jika Anda tidak ingin membagi lokasi Anda, #1 secara manual sebagai gantinya"> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Apakah pengaturan lokasi ini benar?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser tetap tidak dapat terhubung dengan Tor. Pastikan pengaturan lokasi Anda sudah benar dan coba kembali, atau #1 sebagai gantinya."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Pembantu Koneksi">
+<!ENTITY torConnect.breadcrumbLocation "Pengaturan lokasi">
+<!ENTITY torConnect.breadcrumbTryBridge "Mencoba sebuah bridge">
+<!ENTITY torConnect.automatic "Otomatis">
+<!ENTITY torConnect.selectCountryRegion "Pilih Negara atau Wilayah">
+<!ENTITY torConnect.frequentLocations "Lokasi yang sering terpilih">
+<!ENTITY torConnect.otherLocations "Lokasi lainnya">
+<!ENTITY torConnect.restartTorBrowser "Memulai ulang Tor Browser">
+<!ENTITY torConnect.configureConnection "Konfigurasi Koneksi...">
+<!ENTITY torConnect.viewLog "Tampilkan log...">
+<!ENTITY torConnect.tryAgain "Coba Lagi">
+<!ENTITY torConnect.offline "Internet tidak dapat dijangkau">
+<!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 "Konfigurasi otomatis gagal">
+<!ENTITY torConnect.autoBootstrappingFailed "Konfigurasi otomatis gagal">
+<!ENTITY torConnect.cannotDetermineCountry "Tidak dapat menentukan negara pengguna">
+<!ENTITY torConnect.noSettingsForCountry "Tidak ada pengaturan yang tersedia untuk lokasi Anda">
diff --git a/chrome/locale/is/aboutTor.dtd b/chrome/locale/is/aboutTor.dtd
index cde20aae..4369b524 100644
--- a/chrome/locale/is/aboutTor.dtd
+++ b/chrome/locale/is/aboutTor.dtd
@@ -30,25 +30,25 @@
<!ENTITY aboutTor.donationBanner.freeToUse "Öllum er frjálst að nota Tor vegna styrkja frá fólki eins og þér.">
<!ENTITY aboutTor.donationBanner.buttonA "Styrkja núna">
-<!ENTITY aboutTor.alpha.ready.label "Test. Thoroughly.">
-<!ENTITY aboutTor.alpha.ready2.label "You’re ready to test the world’s most private browsing experience.">
-<!ENTITY aboutTor.alpha.bannerDescription "Tor Browser Alpha is an unstable version of Tor Browser you can use to preview new features, test their performance and provide feedback before release.">
-<!ENTITY aboutTor.alpha.bannerLink "Report a bug on the Tor Forum">
+<!ENTITY aboutTor.alpha.ready.label "Prófa. Vandlega.">
+<!ENTITY aboutTor.alpha.ready2.label "Þú ert í standi til að prófa heimsins öruggasta netvafur.">
+<!ENTITY aboutTor.alpha.bannerDescription "Alfa-útgáfan Tor Browser Alpha er óstöðug útgáfa Tor-vafrans sem þú getur notað til að fá smjörþefinn af nýjum eiginleikum, prófa virkni þeirra og gefa umsögn um þá áður en að útgáfu þeirra kemur.">
+<!ENTITY aboutTor.alpha.bannerLink "Tilkynna um villu á spjallsvæði Tor">
-<!ENTITY aboutTor.nightly.ready.label "Test. Thoroughly.">
-<!ENTITY aboutTor.nightly.ready2.label "You’re ready to test the world’s most private browsing experience.">
-<!ENTITY aboutTor.nightly.bannerDescription "Tor Browser Nightly is an unstable version of Tor Browser you can use to preview new features, test their performance and provide feedback before release.">
-<!ENTITY aboutTor.nightly.bannerLink "Report a bug on the Tor Forum">
+<!ENTITY aboutTor.nightly.ready.label "Prófa. Vandlega.">
+<!ENTITY aboutTor.nightly.ready2.label "Þú ert í standi til að prófa heimsins öruggasta netvafur.">
+<!ENTITY aboutTor.nightly.bannerDescription "Sólarhrings-útgáfan Tor Browser Nightly er óstöðug útgáfa Tor-vafrans sem þú getur notað til að fá smjörþefinn af nýjum eiginleikum, prófa virkni þeirra og gefa umsögn um þá áður en að útgáfu þeirra kemur.">
+<!ENTITY aboutTor.nightly.bannerLink "Tilkynna um villu á spjallsvæði Tor">
<!-- YEC 2022 campaign https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41303 -->
<!-- LOCALIZATION NOTE (aboutTor.yec2022.powered_by_privacy): a header for a list of things which are powered by/enabled by/possible due to privacy (each item should have positive connotations/associations in the translated languages) -->
-<!ENTITY aboutTor.yec2022.powered_by_privacy "POWERED BY PRIVACY:">
+<!ENTITY aboutTor.yec2022.powered_by_privacy "PERSÓNUVERND Í FYRSTA SÆTI:">
<!-- LOCALIZATION NOTE (aboutTor.yec2022.resistance): resistance as in social/political resistance to opression, injustice, etc -->
-<!ENTITY aboutTor.yec2022.resistance "RESISTANCE">
+<!ENTITY aboutTor.yec2022.resistance "MÓTSPYRNA">
<!-- LOCALIZATION NOTE (aboutTor.yec2022.change): change as in the process of social/political progress toward a better/more equitable society -->
-<!ENTITY aboutTor.yec2022.change "CHANGE">
+<!ENTITY aboutTor.yec2022.change "FRAMÞRÓUN">
<!-- LOCALIZATION NOTE (aboutTor.yec2022.freedom): freedom as in liberty, protection against exploition, imprisonment, etc -->
-<!ENTITY aboutTor.yec2022.freedom "FREEDOM">
+<!ENTITY aboutTor.yec2022.freedom "FRELSI">
<!-- LOCALIZATION NOTE (aboutTor.yec2022.donate_now): Label for a button directing user to donation page-->
<!ENTITY aboutTor.yec2022.donate_now "STYRKJA NÚNA">
<!-- LOCALIZATION NOTE (aboutTor.yec2022.donation_matching): Please translate the 'Friends of Tor' phrase, but
diff --git a/chrome/locale/is/network-settings.dtd b/chrome/locale/is/network-settings.dtd
index 2d064a5b..32a8401e 100644
--- a/chrome/locale/is/network-settings.dtd
+++ b/chrome/locale/is/network-settings.dtd
@@ -61,23 +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 "Kanna nánar">
+<!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.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.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 save one or more bridges, 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 "Stilltu hvernig Tor-vafrinn tengist við internetið.">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Gildi aðgreind með kommum">
+<!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.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.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/chrome/locale/is/torbutton.properties b/chrome/locale/is/torbutton.properties
index 09867c06..e14bdf06 100644
--- a/chrome/locale/is/torbutton.properties
+++ b/chrome/locale/is/torbutton.properties
@@ -156,32 +156,32 @@ cryptoSafetyPrompt.secondaryAction=Hunsa aðvörun
cryptoSafetyPrompt.secondaryActionAccessKey=B
# about:rulesets strings.
-rulesets.warningTitle=Proceed with Caution
-rulesets.warningDescription=Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing.
-rulesets.warningEnable=Warn me when I attempt to access these preferences
-rulesets.warningButton=Accept the Risk and Continue
+rulesets.warningTitle=Halda varlega áfram
+rulesets.warningDescription=Ef bætt er við reglum eða þeim breytt, gefast fleiri leiðir fyrir óþokka að ná völdum yfir vafranum þínum. Ekki halda áfram nema að þú vitir hvað þú sért að gera!
+rulesets.warningEnable=Aðvara mig þegar ég reyni að eiga við þessar kjörstillingar
+rulesets.warningButton=Samþykkja áhættuna og halda áfram
# Ruleset list
-rulesets.rulesets=Rulesets
-rulesets.noRulesets=No rulesets found
-rulesets.noRulesetsDescr=When you save a ruleset in Tor Browser, it will show up here.
+rulesets.rulesets=Reglusett
+rulesets.noRulesets=Engin reglusett fundust
+rulesets.noRulesetsDescr=Þegar þú vistar reglusett í Tor-vafranum, mun það birtast hér.
# LOCALIZATION NOTE: %S will be replaced by the update date (automatically formatted by Firefox's l10n component)
-rulesets.lastUpdated=Last updated %S
-rulesets.neverUpdated=Never updated, or last update failed
+rulesets.lastUpdated=Síðast uppfært %S
+rulesets.neverUpdated=Aldrei uppfært, eða síðasta uppfærsla mistókst
rulesets.enabled=Virkt
rulesets.disabled=Óvirkt
# Ruleset details/edit ruleset
rulesets.edit=Breyta
rulesets.name=Nafn
rulesets.jwk=JWK
-rulesets.pathPrefix=Path Prefix
-rulesets.scope=Scope
-rulesets.enable=Enable this ruleset
-rulesets.checkUpdates=Check for Updates
-rulesets.jwkPlaceholder=The key used to sign this ruleset in the JWK (JSON Web Key) format
-rulesets.jwkInvalid=The JWK could not be parsed, or it is not a valid key
-rulesets.pathPrefixPlaceholder=URL prefix that contains the files needed by the ruleset
-rulesets.pathPrefixInvalid=The path prefix is not a valid HTTP(S) URL
-rulesets.scopePlaceholder=Regular expression for the scope of the rules
-rulesets.scopeInvalid=The scope could not be parsed as a regular expression
+rulesets.pathPrefix=Forskeyti slóðar
+rulesets.scope=Gildissvið
+rulesets.enable=Virkja þetta reglusett
+rulesets.checkUpdates=Athuga með uppfærslur
+rulesets.jwkPlaceholder=Lykillinn sem notaður er til að undirrita þetta reglusett á JWK (JSON Web Key) sniði
+rulesets.jwkInvalid=Ekki var hægt að þátta þetta JWK, eða að þetta er ekki gildur lykill
+rulesets.pathPrefixPlaceholder=Forskeyti slóðar sem inniheldur skrárnar sem reglusettið þarfnast
+rulesets.pathPrefixInvalid=Forskeyti slóðarinnar er ekki gild HTTP(S) slóð
+rulesets.scopePlaceholder=Regluleg segð fyrir gildissvið reglnanna
+rulesets.scopeInvalid=Ekki var hægt að þátta gildissviðið sem reglulega segð
rulesets.save=Vista
rulesets.cancel=Hætta við
diff --git a/chrome/locale/it/aboutTor.dtd b/chrome/locale/it/aboutTor.dtd
index 66f215c2..63efe041 100644
--- a/chrome/locale/it/aboutTor.dtd
+++ b/chrome/locale/it/aboutTor.dtd
@@ -42,13 +42,13 @@
<!-- YEC 2022 campaign https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41303 -->
<!-- LOCALIZATION NOTE (aboutTor.yec2022.powered_by_privacy): a header for a list of things which are powered by/enabled by/possible due to privacy (each item should have positive connotations/associations in the translated languages) -->
-<!ENTITY aboutTor.yec2022.powered_by_privacy "POWERED BY PRIVACY:">
+<!ENTITY aboutTor.yec2022.powered_by_privacy "ALIMENTATO DALLA PRIVACY">
<!-- LOCALIZATION NOTE (aboutTor.yec2022.resistance): resistance as in social/political resistance to opression, injustice, etc -->
-<!ENTITY aboutTor.yec2022.resistance "RESISTANCE">
+<!ENTITY aboutTor.yec2022.resistance "RESISTENZA">
<!-- LOCALIZATION NOTE (aboutTor.yec2022.change): change as in the process of social/political progress toward a better/more equitable society -->
-<!ENTITY aboutTor.yec2022.change "CHANGE">
+<!ENTITY aboutTor.yec2022.change "CAMBIAMENTO">
<!-- LOCALIZATION NOTE (aboutTor.yec2022.freedom): freedom as in liberty, protection against exploition, imprisonment, etc -->
-<!ENTITY aboutTor.yec2022.freedom "FREEDOM">
+<!ENTITY aboutTor.yec2022.freedom "LIBERTÀ">
<!-- LOCALIZATION NOTE (aboutTor.yec2022.donate_now): Label for a button directing user to donation page-->
<!ENTITY aboutTor.yec2022.donate_now "DONA ORA">
<!-- LOCALIZATION NOTE (aboutTor.yec2022.donation_matching): Please translate the 'Friends of Tor' phrase, but
diff --git a/chrome/locale/it/network-settings.dtd b/chrome/locale/it/network-settings.dtd
index 67d5aff6..15207097 100644
--- a/chrome/locale/it/network-settings.dtd
+++ b/chrome/locale/it/network-settings.dtd
@@ -61,23 +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 "Rete Tor:">
+<!ENTITY torPreferences.statusTorConnected "Connesso">
+<!ENTITY torPreferences.statusTorNotConnected "Non Connesso">
+<!ENTITY torPreferences.statusTorBlocked "Potenzialmente bloccato">
+<!ENTITY torPreferences.learnMore "Per saperne di più">
+<!-- Quickstart -->
+<!ENTITY torPreferences.quickstart "Quickstart">
+<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connette automaticamente Tor Browser alla rete Tor quando si avvia, in base alle tue ultime impostazioni di connessione usate.">
+<!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 "La tua posizione">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatica">
+<!ENTITY torPreferences.bridgeLocationFrequent "Posizioni selezionate di frequente">
+<!ENTITY torPreferences.bridgeLocationOther "Altre posizioni">
+<!ENTITY torPreferences.bridgeChooseForMe "Scegli un bridge per me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "I tuoi bridge attuali">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Puoi salvare uno o più bridge e Tor sceglierà quale usare quando ti connetti.Tor scambierà automaticamente il bridge da usare quando necessario.">
+<!ENTITY torPreferences.bridgeId "#1 bridge: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Rimuovi">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Disattiva bridge integrati">
+<!ENTITY torPreferences.bridgeShare "Condividi questo bridge usando il codice QR o copiando il suo indirizzo:">
+<!ENTITY torPreferences.bridgeCopy "Copia indirizzo bridge">
+<!ENTITY torPreferences.copied "Copiato!">
+<!ENTITY torPreferences.bridgeShowAll "Mostra tutti i bridge">
+<!ENTITY torPreferences.bridgeRemoveAll "Rimuovi tutti i bridge">
+<!ENTITY torPreferences.bridgeAdd "Aggiungi un bridge nuovo">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Scegli da uno dei bridge di Tor Browser integrati">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Seleziona un bridge integrato…">
+<!ENTITY torPreferences.bridgeRequest "Richiedi un bridge...">
+<!ENTITY torPreferences.bridgeEnterKnown "Inserisci un indirizzo di bridge che conosci già">
+<!ENTITY torPreferences.bridgeAddManually "Aggiungi un bridge a mano…">
+<!-- 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 "Configura come Tor Browser si connette ad internet">
+<!ENTITY torPreferences.advancedButton "Impostazioni…">
+<!ENTITY torPreferences.viewTorLogs "Vedi i log di Tor">
+<!ENTITY torPreferences.viewLogs "Visualizza Log...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Rimuovere tutti i bridge?">
+<!ENTITY torPreferences.removeBridgesWarning "Questa azione non può essere annullata.">
+<!ENTITY torPreferences.cancel "Annulla">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scansiona il codice QR">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Bridge integrati">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser include alcuni tipi specifici di bridge denominati "pluggable transports".">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 è un tipo di bridge integrato che fa sembrare casuale il tuo traffico di Tor. È anche meno probabile che venga bloccato rispetto al predecessore, il bridge obfs3.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake è un bridge integrato che elude le censure instradando la tua connessione attraverso i proxy Snowflake, mantenuti da volontari.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure è un bridge integrato che fa sembrare che tu stia usando un sito web di Microsoft invece di 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 "Fornisci bridge">
+<!ENTITY torPreferences.provideBridgeHeader "Inserisci le informazioni del bridge da una fonte fidata">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Impostazioni di connessione">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configura come Tor Browser si connette ad internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Valori separati da una virgola">
+<!-- Log dialog -->
<!ENTITY torPreferences.torLogsDialogTitle "Log di Tor">
+
+<!-- #24746 about:torconnect strings -->
+<!ENTITY torConnect.notConnectedConcise "Non Connesso">
+<!ENTITY torConnect.connectingConcise "Connessione in corso...">
+<!ENTITY torConnect.tryingAgain "Sto riprovando…">
+<!ENTITY torConnect.noInternet "Tor Browser non è riuscito a raggiungere internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser non è riuscito a connettersi a Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "configura la tua connessione"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Se Tor è bloccato nel luogo in cui ti trovi, provare un bridge può aiutare. L'assistente di connessione può sceglierne uno per te usando la tua posizione, oppure puoi #1 a mano."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Sto provando un bridge…">
+<!ENTITY torConnect.tryingBridgeAgain "Sto provando un'altra volta…">
+<!ENTITY torConnect.errorLocation "Tor Browser non è riuscito a localizzarti">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser deve conoscere la tua posizione per poter scegliere il giusto bridge per te. Se preferisci non condividere la posizione, allora #1 a mano."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Queste impostazioni di posizione sono giuste?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser non è ancora riuscito a connettersi a Tor. Controlla che le tue impostazioni di posizione siano giuste e riprova, oppure #1."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Assistente di connessione">
+<!ENTITY torConnect.breadcrumbLocation "Impostazioni di posizione">
+<!ENTITY torConnect.breadcrumbTryBridge "Prova un bridge">
+<!ENTITY torConnect.automatic "Automatica">
+<!ENTITY torConnect.selectCountryRegion "Seleziona Stato o Regione">
+<!ENTITY torConnect.frequentLocations "Posizioni selezionate di frequente">
+<!ENTITY torConnect.otherLocations "Altre posizioni">
+<!ENTITY torConnect.restartTorBrowser "Riavvia Tor Browser">
+<!ENTITY torConnect.configureConnection "Configura connessione…">
+<!ENTITY torConnect.viewLog "Vedi i log…">
+<!ENTITY torConnect.tryAgain "Riprova">
+<!ENTITY torConnect.offline "Internet irraggiungibile">
+<!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 "La tua posizione">
+<!ENTITY torConnect.tryBridge "Prova un bridge">
+<!ENTITY torConnect.autoBootstrappingFailed "Configurazione automatica fallita">
+<!ENTITY torConnect.autoBootstrappingFailed "Configurazione automatica fallita">
+<!ENTITY torConnect.cannotDetermineCountry "Impossibile determinare la nazione dell'utente">
+<!ENTITY torConnect.noSettingsForCountry "Nessuna impostazione disponibile per la tua posizione">
diff --git a/chrome/locale/ja/network-settings.dtd b/chrome/locale/ja/network-settings.dtd
index 9e404fbe..6843b437 100644
--- a/chrome/locale/ja/network-settings.dtd
+++ b/chrome/locale/ja/network-settings.dtd
@@ -61,23 +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 ネットワークを経由させて送信します。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.quickstartDescriptionLong "クイックスタートは、最後に使用した接続設定に基づいて、起動時に Tor Browser を Tor ネットワークに自動的に接続します。">
+<!ENTITY torPreferences.quickstartCheckbox "常に自動的に接続">
+<!-- Bridge settings -->
<!ENTITY torPreferences.bridges "ブリッジ">
<!ENTITY torPreferences.bridgesDescription "Bridge は Tor がブロックされる地域から Tor ネットワークにアクセスすることを手助けします。地域によって、ある Bridge が他のものよりうまく動作する可能性があります。">
-<!ENTITY torPreferences.useBridge "Bridge を使用する">
-<!ENTITY torPreferences.requestNewBridge "新たなブリッジをリクエスト…">
-<!ENTITY torPreferences.provideBridge "Bridge を指定する">
+<!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 は内蔵ブリッジの一種で、Tor ではなく 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.notConnectedConcise "接続していません">
+<!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/chrome/locale/ka/network-settings.dtd b/chrome/locale/ka/network-settings.dtd
index 2636915c..ad9885b9 100644
--- a/chrome/locale/ka/network-settings.dtd
+++ b/chrome/locale/ka/network-settings.dtd
@@ -61,23 +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 "ინტერნეტი:">
+<!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.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.notConnectedConcise "არაა დაკავშირებული">
+<!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/chrome/locale/ko/network-settings.dtd b/chrome/locale/ko/network-settings.dtd
index de24133a..8b52b686 100644
--- a/chrome/locale/ko/network-settings.dtd
+++ b/chrome/locale/ko/network-settings.dtd
@@ -61,23 +61,116 @@
<!-- Progress -->
<!ENTITY torprogress.pleaseWait "Tor 네트워크에 연결할 때까지 기다려주십시오.  몇 분 정도 소요될 수 있습니다.">
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.categoryTitle "Tor">
+<!-- #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.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 "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.firewallPortsPlaceholder "쉼표로 구분 된 값">
+<!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 "제출한 답이 맞지 않습니다. 다시 시도해주세요.">
-<!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.notConnectedConcise "연결되지 않음">
+<!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 설정의 변경사항은 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/chrome/locale/lt/network-settings.dtd b/chrome/locale/lt/network-settings.dtd
index 6bac8f7f..92ba5717 100644
--- a/chrome/locale/lt/network-settings.dtd
+++ b/chrome/locale/lt/network-settings.dtd
@@ -61,23 +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.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 "Automatiškai">
+<!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 save one or more bridges, 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 "Šalinti">
+<!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.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.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/chrome/locale/mk/network-settings.dtd b/chrome/locale/mk/network-settings.dtd
index 5e2578f5..a9405450 100644
--- a/chrome/locale/mk/network-settings.dtd
+++ b/chrome/locale/mk/network-settings.dtd
@@ -61,23 +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 "Научи повеќе">
+<!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.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 "You can save one or more bridges, 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 "Споделете го овој мост користејќи го 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.notConnectedConcise "Неповрзано">
+<!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/chrome/locale/mk/torbutton.properties b/chrome/locale/mk/torbutton.properties
index 35a26978..0573ca70 100644
--- a/chrome/locale/mk/torbutton.properties
+++ b/chrome/locale/mk/torbutton.properties
@@ -156,32 +156,32 @@ cryptoSafetyPrompt.secondaryAction=Отфрли предупредување
cryptoSafetyPrompt.secondaryActionAccessKey=B
# about:rulesets strings.
-rulesets.warningTitle=Proceed with Caution
-rulesets.warningDescription=Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing.
-rulesets.warningEnable=Warn me when I attempt to access these preferences
-rulesets.warningButton=Accept the Risk and Continue
+rulesets.warningTitle=Продолжете внимателно
+rulesets.warningDescription=Додавањето или изменувањето на сетовите на правила може да предизвика напаѓачите да го преземат вашиот прелистувач. Продолжете само ако знаете што правите.
+rulesets.warningEnable=Предупреди ме кога ќе се обидам да им пристапам на овие поставки
+rulesets.warningButton=Прифати го Ризикот и Продолжи
# Ruleset list
-rulesets.rulesets=Rulesets
-rulesets.noRulesets=No rulesets found
-rulesets.noRulesetsDescr=When you save a ruleset in Tor Browser, it will show up here.
+rulesets.rulesets=Сетови на правила
+rulesets.noRulesets=Не се пронајдени сетови на правила
+rulesets.noRulesetsDescr=Кога ќе ги зачувате сетовите на правила во Tor Browser, ќе се појават овде.
# LOCALIZATION NOTE: %S will be replaced by the update date (automatically formatted by Firefox's l10n component)
-rulesets.lastUpdated=Last updated %S
-rulesets.neverUpdated=Never updated, or last update failed
+rulesets.lastUpdated=Последен пат ажуриран %S
+rulesets.neverUpdated=Никогаш не е ажуриран, или последното ажурирање било неуспешно
rulesets.enabled=Овозможено
rulesets.disabled=Оневозможено
# Ruleset details/edit ruleset
rulesets.edit=Уреди
rulesets.name=Име
rulesets.jwk=JWK
-rulesets.pathPrefix=Path Prefix
-rulesets.scope=Scope
-rulesets.enable=Enable this ruleset
-rulesets.checkUpdates=Check for Updates
-rulesets.jwkPlaceholder=The key used to sign this ruleset in the JWK (JSON Web Key) format
-rulesets.jwkInvalid=The JWK could not be parsed, or it is not a valid key
-rulesets.pathPrefixPlaceholder=URL prefix that contains the files needed by the ruleset
-rulesets.pathPrefixInvalid=The path prefix is not a valid HTTP(S) URL
-rulesets.scopePlaceholder=Regular expression for the scope of the rules
-rulesets.scopeInvalid=The scope could not be parsed as a regular expression
+rulesets.pathPrefix=Префикс на патека
+rulesets.scope=Опсег
+rulesets.enable=Овозможи сетови на правила
+rulesets.checkUpdates=Провери за Ажурирања
+rulesets.jwkPlaceholder=Клучот користен за потпишување на овие сетови на правила во JWK (JSON Web Key) формат
+rulesets.jwkInvalid=JWK не може да биде анализиран, или клучот не е валиден
+rulesets.pathPrefixPlaceholder=ULR префикс кој ги содржи датотеките потребни за сетот на правила
+rulesets.pathPrefixInvalid=Патеката на префиксот не е валидна HTTP(S) URL
+rulesets.scopePlaceholder=Регуларно изразување за опсегот на сетот на правила
+rulesets.scopeInvalid=Опсегот не може да биде анализаран како регуларно изразување
rulesets.save=Зачувај
rulesets.cancel=Откажи
diff --git a/chrome/locale/ms/network-settings.dtd b/chrome/locale/ms/network-settings.dtd
index 5984d7a5..cdc24eb6 100644
--- a/chrome/locale/ms/network-settings.dtd
+++ b/chrome/locale/ms/network-settings.dtd
@@ -61,23 +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.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 save one or more bridges, 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.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.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/chrome/locale/my/network-settings.dtd b/chrome/locale/my/network-settings.dtd
index f6c32902..941d7396 100644
--- a/chrome/locale/my/network-settings.dtd
+++ b/chrome/locale/my/network-settings.dtd
@@ -61,23 +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 "အင်တာနက်">
+<!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.quickstartDescriptionLong "လျင်မြန်စွာစတင်ခြင်းကို စတင်လိုက်သည်နှင့် သင်နောက်ဆုံးအသုံးပြုခဲ့သော ချိတ်ဆက်မှု အပြင်အဆင်မှုပေါ်မူတည်၍ ၎င်းမှ Tor ဘရောင်ဇာနှင့် Tor ကွန်ရက်သို့ အလိုအလျောက်ချိတ်ဆက်ပေးသည် ။ ">
+<!ENTITY torPreferences.quickstartCheckbox "အမြဲတမ်း အလိုအလျောက် ချိတ်ဆက်မည် ။ ">
+<!-- Bridge settings -->
<!ENTITY torPreferences.bridges "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 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 proxies များမှတစ်ဆင့် သင်၏ ချိတ်ဆက်မှုကို လမ်းကြောင်းပြခြင်းဖြင့် စီစစ်ဖြတ်တောက်မှုကို ချေဖျက်နိုင်သည့် နဂိုပါသည့် တံတားတစ်ခု ဖြစ်သည်။">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure ">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure သည် သင် Tor ကို အသုံးပြုသည့်အစား Microsoft ဝက်ဘ်ဆိုဒ်ကို အသုံးပြုနေသယောင် ဖြစ်သည့် နဂိုပါ တံတား ဖြစ်သည် ။ ">
+<!-- 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 "တံတား ကို ထောက်ပံ့ပေးပါ ">
+<!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.notConnectedConcise "ချိတ်ဆက်ထားခြင်း မရှိပါ။">
+<!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/chrome/locale/nb-NO/network-settings.dtd b/chrome/locale/nb-NO/network-settings.dtd
index 97ac494a..3c9e24a6 100644
--- a/chrome/locale/nb-NO/network-settings.dtd
+++ b/chrome/locale/nb-NO/network-settings.dtd
@@ -61,23 +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.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 save one or more bridges, 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.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.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/chrome/locale/nl/network-settings.dtd b/chrome/locale/nl/network-settings.dtd
index f00fee07..41d8133d 100644
--- a/chrome/locale/nl/network-settings.dtd
+++ b/chrome/locale/nl/network-settings.dtd
@@ -61,23 +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.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 save one or more bridges, 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 "Configureer hoe Tor Browser met het internet verbind.">
+<!ENTITY torPreferences.advancedButton "Settings…">
+<!ENTITY torPreferences.viewTorLogs "Toon de 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 "Komma-gescheide waarden">
+<!-- Log dialog -->
<!ENTITY torPreferences.torLogsDialogTitle "Tor-logboeken">
+
+<!-- #24746 about:torconnect strings -->
+<!ENTITY torConnect.notConnectedConcise "Niet verbonden">
+<!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 "Geen internetverbinding">
+<!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/chrome/locale/pl/network-settings.dtd b/chrome/locale/pl/network-settings.dtd
index f2da7efe..1ff594e9 100644
--- a/chrome/locale/pl/network-settings.dtd
+++ b/chrome/locale/pl/network-settings.dtd
@@ -61,23 +61,116 @@
<!-- 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 "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 "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Sieć Tor:">
+<!ENTITY torPreferences.statusTorConnected "Połączono">
+<!ENTITY torPreferences.statusTorNotConnected "Brak połączenia">
+<!ENTITY torPreferences.statusTorBlocked "Potencjalnie zablokowany">
+<!ENTITY torPreferences.learnMore "Dowiedz się więcej">
+<!-- Quickstart -->
+<!ENTITY torPreferences.quickstart "Szybki start">
+<!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 "Dostarcz mostek ">
+<!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 zapisać jeden lub więcej 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 sposób, w jaki Tor Browser łączy się z Internetem">
-<!ENTITY torPreferences.firewallPortsPlaceholder "Wartości oddzielone przecinkiem">
+<!ENTITY torPreferences.advancedButton "Ustawienia…">
+<!ENTITY torPreferences.viewTorLogs "Zobacz dziennik zdarzeń Tor">
+<!ENTITY torPreferences.viewLogs "Wyświetl dziennik zdarzeń...">
+<!-- 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 zdarzeń...">
+<!-- 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.notConnectedConcise "Niepołączony">
+<!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/chrome/locale/pt-BR/network-settings.dtd b/chrome/locale/pt-BR/network-settings.dtd
index 8fb7d141..61d70699 100644
--- a/chrome/locale/pt-BR/network-settings.dtd
+++ b/chrome/locale/pt-BR/network-settings.dtd
@@ -61,23 +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">
+<!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.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 salvar uma ou mais pontes, e o Tor escolherá quais você usar quando você se conectar. O Tor automaticamente trocará outra ponte quando necessário.">
+<!ENTITY torPreferences.bridgeId "#1 ponte: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Remover">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Desabilitar pontes integradas">
+<!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 "Escolha uma das pontes integradas do Navegador Tor">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Selecione uma ponte integrada…">
+<!ENTITY torPreferences.bridgeRequest "Solicitar uma ponte...">
+<!ENTITY torPreferences.bridgeEnterKnown "Digite um endereço de ponte que você já conhece">
+<!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 como o Navegador Tor se conecta à internet">
+<!ENTITY torPreferences.advancedButton "Configurações...">
+<!ENTITY torPreferences.viewTorLogs "Veja os registros do Tor">
+<!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 "Digitalize o código QR">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Pontes incorporadas">
+<!ENTITY torPreferences.builtinBridgeDescription "O Navegador Tor inclui alguns tipos específicos de pontes conhecidas como “transportes plugáveis”.">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 é um tipo de ponte incorporada que faz seu tráfego Tor parecer aleatório. Eles também são menos propensos a serem bloqueados do que seus predecessores, pontes obfs3.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "O Snowflake é uma ponte integrada que derrota a censura roteando sua conexão por meio de proxies Snowflake, executados por voluntários.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure é uma ponte integrada que faz parecer que você está usando um site da Microsoft em vez de usar o 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 "Fornecer Ponte.">
+<!ENTITY torPreferences.provideBridgeHeader "Insira a configuração de uma Ponte obtida a partir de uma fonte confiável">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Configurações de conexão">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure como o Navegador Tor se conecta à Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por vírgula">
+<!-- Log dialog -->
<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs">
+
+<!-- #24746 about:torconnect strings -->
+<!ENTITY torConnect.notConnectedConcise "Não conectado">
+<!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 "Se o Tor é bloqueado e seu local, tente uma ponte, talvez isso possa ajudar. A assistência de conexão pode escolher uma conexão para você usar seu local, ou você pode usar a assistente de conexão manualmente #1."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Tentando a ponte...">
+<!ENTITY torConnect.tryingBridgeAgain "Tente mais uma vez...">
+<!ENTITY torConnect.errorLocation "O navegador Tor não conseguiu localizar você">
+<!ENTITY torConnect.errorLocationDescription "O Navegador Tor precisa saber sua localização em ordem para escolher a ponte correta para você. Se você não quiser compartilhar sua localização, use a assistente de conexão #1 em vez disso."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Essas configurações de local estão corretas?">
+<!ENTITY torConnect.isLocationCorrectDescription "O Navegador Tor ainda não conseguiu conectar ao Tor. Por favor, verifique se as configurações de sua localização estão corretas e tente novamente, ou em vez disso, use a assistente de conexão #1."> <!-- #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/chrome/locale/ro/network-settings.dtd b/chrome/locale/ro/network-settings.dtd
index 4260ea0c..9066c6d8 100644
--- a/chrome/locale/ro/network-settings.dtd
+++ b/chrome/locale/ro/network-settings.dtd
@@ -61,23 +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 "Aflați mai multe">
+<!-- Status -->
+<!ENTITY torPreferences.statusInternetLabel "Internet:">
+<!ENTITY torPreferences.statusInternetTest "Test">
+<!ENTITY torPreferences.statusInternetOnline "Online">
+<!ENTITY torPreferences.statusInternetOffline "Offline">
+<!ENTITY torPreferences.statusTorLabel "Rețeaua Tor:">
+<!ENTITY torPreferences.statusTorConnected "Conectată">
+<!ENTITY torPreferences.statusTorNotConnected "Neconectat">
+<!ENTITY torPreferences.statusTorBlocked "Blocat potențial">
+<!ENTITY torPreferences.learnMore "Aflați mai multe">
+<!-- Quickstart -->
+<!ENTITY torPreferences.quickstart "Pornire rapidă">
+<!ENTITY torPreferences.quickstartDescriptionLong "QuickStart conectează Tor Browser la rețeaua Tor automat atunci când este lansată, pe baza ultimelor setări de conexiune utilizate.">
+<!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 "Locația dumneavoastră">
+<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic">
+<!ENTITY torPreferences.bridgeLocationFrequent "Locații selectate frecvent">
+<!ENTITY torPreferences.bridgeLocationOther "Alte locații">
+<!ENTITY torPreferences.bridgeChooseForMe "Alege un pod pentru mine...">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Podurile voastre actuale">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "Puteți salva unul sau mai multe poduri, iar Tor vă alege pe care să o utilizați atunci când vă conectați. Tor va comuta automat pentru a utiliza un alt pod atunci când este necesar.">
+<!ENTITY torPreferences.bridgeId "#1 pod: #2"> <!-- #1 = bridge type; #2 = bridge emoji id -->
+<!ENTITY torPreferences.remove "Eliminați">
+<!ENTITY torPreferences.bridgeDisableBuiltIn "Dezactivați podurile încorporate">
+<!ENTITY torPreferences.bridgeShare "Partajați această punte utilizând codul QR sau copiind adresa:">
+<!ENTITY torPreferences.bridgeCopy "Copiere adresă pod">
+<!ENTITY torPreferences.copied "Copiat!">
+<!ENTITY torPreferences.bridgeShowAll "Arată toate podurile">
+<!ENTITY torPreferences.bridgeRemoveAll "Stergeți toate podurile">
+<!ENTITY torPreferences.bridgeAdd "Adăugați un pod nou">
+<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Alegeți unul dintre podurile încorporate ale Tor Browser">
+<!ENTITY torPreferences.bridgeSelectBuiltin "Selectați un pod încorporat...">
+<!ENTITY torPreferences.bridgeRequest "Cerere Punte...">
+<!ENTITY torPreferences.bridgeEnterKnown "Introduceți o adresă de pod pe care o cunoașteți deja">
+<!ENTITY torPreferences.bridgeAddManually "Adăugați manual un pod…">
+<!-- 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 "Configurați modul în care Tor Browser se conectează la internet">
+<!ENTITY torPreferences.advancedButton "Setări...">
+<!ENTITY torPreferences.viewTorLogs "Vezi jurnalele Tor">
+<!ENTITY torPreferences.viewLogs "Vizualizați jurnalele ...">
+<!-- Remove all bridges dialog -->
+<!ENTITY torPreferences.removeBridgesQuestion "Stergeți toate podurile?">
+<!ENTITY torPreferences.removeBridgesWarning "Această acțiune nu poate fi ireversibilă.">
+<!ENTITY torPreferences.cancel "Anulați">
+<!-- Scan bridge QR dialog -->
+<!ENTITY torPreferences.scanQrTitle "Scanează codul QR">
+<!-- Builtin bridges dialog -->
+<!ENTITY torPreferences.builtinBridgeTitle "Poduri încorporate">
+<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser include unele tipuri specifice de poduri cunoscute sub numele de "transporturi conectabile".">
+<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4">
+<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 este un tip de pod încorporat care face ca traficul Tor să pară aleatoriu. De asemenea, este mai puțin probabil ca acestea să fie blocate decât predecesorii lor, podurile obfs3.">
+<!ENTITY torPreferences.builtinBridgeSnowflake "Transport conectabil, care asigură eludarea cenzurii și accesul la un internet liber și deschis.">
+<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake este un pod încorporat care învinge cenzura prin rutarea conexiunii prin proxy-uri Snowflake, rulate de voluntari.">
+<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure">
+<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure este un pod încorporat care face să pară că utilizați un website Microsoft în loc să utilizați 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 "Oferă pod">
+<!ENTITY torPreferences.provideBridgeHeader "Introduceți informații despre punte dintr-o sursă de încredere">
+<!-- Connection settings dialog -->
+<!ENTITY torPreferences.connectionSettingsDialogTitle "Setările de conexiune">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configurați modul în care Tor Browser se conectează la internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "Valori separate de virgulă">
+<!-- Log dialog -->
<!ENTITY torPreferences.torLogsDialogTitle "Jurnalele Tor">
+
+<!-- #24746 about:torconnect strings -->
+<!ENTITY torConnect.notConnectedConcise "Neconectat">
+<!ENTITY torConnect.connectingConcise "Se conectează...">
+<!ENTITY torConnect.tryingAgain "Încercăm din nou...">
+<!ENTITY torConnect.noInternet "Tor Browser nu s-a putut conecta la internet">
+<!ENTITY torConnect.couldNotConnect "Tor Browser nu s-a putut conecta la Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "Configurați conexiunea"> <!-- used as a text to insert as a link on several strings (#1) -->
+<!ENTITY torConnect.assistDescription "Dacă Tor este blocat în locația dumneavoastră, încercarea unui pod poate ajuta. Connection Assist poate alege unul pentru dumneavoastră utilizând locația dumneavoastră, sau puteți #1 manual în schimb."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.tryingBridge "Încearcă un pod...">
+<!ENTITY torConnect.tryingBridgeAgain "Încercăm încă o dată...">
+<!ENTITY torConnect.errorLocation "Tor Browser nu v-a putut localiza">
+<!ENTITY torConnect.errorLocationDescription "Tor Browser trebuie să știe locația dumneavoastră pentru a alege podul potrivit pentru dumneavoastră. Dacă preferați să nu partajați locația dumneavoastră, #1 în schimb manual."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.isLocationCorrect "Aceste setări de locație sunt corecte?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser încă nu s-a putut conecta la Tor. Verificați dacă setările de locație sunt corecte și încercați din nou, sau #1 în schimb."> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Asistență la conectare">
+<!ENTITY torConnect.breadcrumbLocation "Setările de locație">
+<!ENTITY torConnect.breadcrumbTryBridge "Încearcă un pod">
+<!ENTITY torConnect.automatic "Automatic">
+<!ENTITY torConnect.selectCountryRegion "Selectați țara sau regiunea">
+<!ENTITY torConnect.frequentLocations "Locații selectate frecvent">
+<!ENTITY torConnect.otherLocations "Alte locații">
+<!ENTITY torConnect.restartTorBrowser "Reporniți Tor Browser">
+<!ENTITY torConnect.configureConnection "Configurați conexiunea…">
+<!ENTITY torConnect.viewLog "Vizualizare jurnale…">
+<!ENTITY torConnect.tryAgain "Încercați din nou">
+<!ENTITY torConnect.offline "Internetul nu este accesibil">
+<!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.yourLocation "Locația dumneavoastră">
+<!ENTITY torConnect.tryBridge "Încearcă un pod">
+<!ENTITY torConnect.autoBootstrappingFailed "Configurarea automată a eșuat">
+<!ENTITY torConnect.autoBootstrappingFailed "Configurarea automată a eșuat">
+<!ENTITY torConnect.cannotDetermineCountry "Nu se poate determina țara utilizatorului">
+<!ENTITY torConnect.noSettingsForCountry "Nu sunt disponibile setări pentru locația dumneavoastră">
diff --git a/chrome/locale/ru/network-settings.dtd b/chrome/locale/ru/network-settings.dtd
index 980b887e..cb0d00cd 100644
--- a/chrome/locale/ru/network-settings.dtd
+++ b/chrome/locale/ru/network-settings.dtd
@@ -61,23 +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.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.notConnectedConcise "Не подключен">
+<!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/chrome/locale/sv-SE/network-settings.dtd b/chrome/locale/sv-SE/network-settings.dtd
index 848e5080..6887590c 100644
--- a/chrome/locale/sv-SE/network-settings.dtd
+++ b/chrome/locale/sv-SE/network-settings.dtd
@@ -61,23 +61,116 @@
<!-- Progress -->
<!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äs 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äs mer">
+<!-- Quickstart -->
+<!ENTITY torPreferences.quickstart "Snabbstart">
+<!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 "Automatisk">
+<!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 spara en eller flera broar och Tor väljer vilken som ska användas när du ansluter. Tor kommer automatiskt att byta till att använda en annan bro när det behövs.">
+<!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 "Dela den här bron med QR-koden 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 bro 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änta.">
<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Lös CAPTCHA för att begära en bro.">
<!ENTITY torPreferences.requestBridgeErrorBadSolution "Lösningen är inte korrekt. Försök igen.">
-<!ENTITY torPreferences.viewTorLogs "Visa Tor-loggarna.">
-<!ENTITY torPreferences.viewLogs "Visa loggar…">
+<!-- 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.notConnectedConcise "Inte ansluten">
+<!ENTITY torConnect.connectingConcise "Ansluter...">
+<!ENTITY torConnect.tryingAgain "Försöker 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 platsinställningar korrekta?">
+<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser kunde fortfarande inte ansluta till Tor. 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 är onåbart">
+<!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.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/chrome/locale/sv-SE/torbutton.properties b/chrome/locale/sv-SE/torbutton.properties
index 4e857ae0..98d96258 100644
--- a/chrome/locale/sv-SE/torbutton.properties
+++ b/chrome/locale/sv-SE/torbutton.properties
@@ -19,7 +19,7 @@ torbutton.popup.external.suggest = Det är säkrast att öppna filer du har häm
torbutton.popup.launch = Hämta fil
torbutton.popup.cancel = Avbryt
torbutton.popup.dontask = Hämta filer automatiskt i fortsättningen
-torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nKör du Tor Browser Bundle?
+torbutton.popup.no_newnym = Torbutton kan inte säkert ge dig en ny identitet. Det har inte tillgång till Tor Control Port.\n\nHar du startat du Tor Browser Bundle?
torbutton.security_settings.menu.title = Säkerhetsinställningar
torbutton.title.prompt_torbrowser = Viktig information om Torbutton
torbutton.popup.prompt_torbrowser = Torbutton fungerar annorlunda nu: du kan inte stänga av den längre.\n\nVi gjorde denna förändring eftersom det inte är säkert att använda Torbutton i en webbläsare som också används för surfning utan Tor. Det fanns för många fel som vi inte kunde åtgärda på något annat sätt.\n\nOm du vill fortsätta använda Firefox normalt bör du avinstallera Torbotton och hämta Tor Browser Bundle. Tor Browser skyddar din integritet bättre än vanliga Firefox, även när F [...]
@@ -79,7 +79,7 @@ onionServices.descInvalid.longDescription=Detaljer: %S — Den begärda beskrivn
onionServices.introFailed.pageTitle=Problem med att läsa in onion-webbplatsen
onionServices.introFailed.header=Onion-webbplats har kopplats från
onionServices.introFailed=Den mest troliga orsaken är att onion-webbplatsen är frånkopplad. Kontakta administratör för onion-webbplats.
-onionServices.introFailed.longDescription=Detaljer: %S — Introduktion misslyckades, vilket innebär att beskrivningen hittades men tjänsten är inte längre ansluten till introduktionspunkten. Det är troligt att tjänsten har ändrat sin beskrivning eller att den inte körs.
+onionServices.introFailed.longDescription=Detaljer: %S — Introduktion misslyckades, vilket innebär att beskrivningen hittades men tjänsten är inte längre ansluten till introduktionspunkten. Det är troligt att tjänsten har ändrat sin beskrivning eller att den inte är igång.
# Tor SOCKS error 0xF3:
onionServices.rendezvousFailed.pageTitle=Problem med att läsa in onion-webbplats
onionServices.rendezvousFailed.header=Det går inte att ansluta till onion-webbplats
diff --git a/chrome/locale/th/network-settings.dtd b/chrome/locale/th/network-settings.dtd
index d966c1cb..f967e33b 100644
--- a/chrome/locale/th/network-settings.dtd
+++ b/chrome/locale/th/network-settings.dtd
@@ -61,23 +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.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 "อัตโนมัติ">
+<!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 save one or more bridges, 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.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.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/chrome/locale/tr/network-settings.dtd b/chrome/locale/tr/network-settings.dtd
index 2628fa5a..a1ae5975 100644
--- a/chrome/locale/tr/network-settings.dtd
+++ b/chrome/locale/tr/network-settings.dtd
@@ -61,23 +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.quickstartDescriptionLong "Hızlı başlatma özelliği, 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 "Kaldır">
+<!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.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.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/chrome/locale/uk/network-settings.dtd b/chrome/locale/uk/network-settings.dtd
index 096a7ea8..fe3342a1 100644
--- a/chrome/locale/uk/network-settings.dtd
+++ b/chrome/locale/uk/network-settings.dtd
@@ -61,23 +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 "Інтернет:">
+<!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.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 "You can save one or more bridges, 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 "Поділіться цим мостом за допомогою 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.notConnectedConcise "Не під'єднано">
+<!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 "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 "Обрати країну чи регіон">
+<!ENTITY torConnect.frequentLocations "Локації які вибираються найчастіше">
+<!ENTITY torConnect.otherLocations "Інші локації">
+<!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/chrome/locale/vi/network-settings.dtd b/chrome/locale/vi/network-settings.dtd
index 51e79929..4149a152 100644
--- a/chrome/locale/vi/network-settings.dtd
+++ b/chrome/locale/vi/network-settings.dtd
@@ -61,23 +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">
+<!-- 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 "Tìm hiểu thêm">
+<!-- Quickstart -->
+<!ENTITY torPreferences.quickstart "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 "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 save one or more bridges, 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.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 "Thử lại">
+<!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.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/chrome/locale/zh-CN/aboutTor.dtd b/chrome/locale/zh-CN/aboutTor.dtd
index 11c1e959..7e172aa1 100644
--- a/chrome/locale/zh-CN/aboutTor.dtd
+++ b/chrome/locale/zh-CN/aboutTor.dtd
@@ -42,7 +42,7 @@
<!-- YEC 2022 campaign https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/41303 -->
<!-- LOCALIZATION NOTE (aboutTor.yec2022.powered_by_privacy): a header for a list of things which are powered by/enabled by/possible due to privacy (each item should have positive connotations/associations in the translated languages) -->
-<!ENTITY aboutTor.yec2022.powered_by_privacy "为隐私而生：">
+<!ENTITY aboutTor.yec2022.powered_by_privacy "隐私助力，如虎添翼：">
<!-- LOCALIZATION NOTE (aboutTor.yec2022.resistance): resistance as in social/political resistance to opression, injustice, etc -->
<!ENTITY aboutTor.yec2022.resistance "反抗">
<!-- LOCALIZATION NOTE (aboutTor.yec2022.change): change as in the process of social/political progress toward a better/more equitable society -->
diff --git a/chrome/locale/zh-CN/network-settings.dtd b/chrome/locale/zh-CN/network-settings.dtd
index 2ea2c1c0..8dc08783 100644
--- a/chrome/locale/zh-CN/network-settings.dtd
+++ b/chrome/locale/zh-CN/network-settings.dtd
@@ -61,23 +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.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 "用二维码或复制地址来分享网桥">
+<!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 "扫描二维码">
+<!-- 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 是一个内置的网桥，使您看起来像在使用微软的网站而不是使用 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 浏览器联网方式">
+<!ENTITY torPreferences.firewallPortsPlaceholder "逗号分隔值">
+<!-- Log dialog -->
<!ENTITY torPreferences.torLogsDialogTitle "Tor 日志">
+
+<!-- #24746 about:torconnect strings -->
+<!ENTITY torConnect.notConnectedConcise "未连接">
+<!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/chrome/locale/zh-TW/network-settings.dtd b/chrome/locale/zh-TW/network-settings.dtd
index 37c547bb..7bc6fba6 100644
--- a/chrome/locale/zh-TW/network-settings.dtd
+++ b/chrome/locale/zh-TW/network-settings.dtd
@@ -61,23 +61,116 @@
<!-- Progress -->
<!ENTITY torprogress.pleaseWait "請耐心等候，我們正在建立洋蔥路由網路連線，  這個過程可能需要幾分鐘的時間。">
-<!-- #31286 about:preferences strings -->
-<!ENTITY torPreferences.categoryTitle "洋蔥路由">
+<!-- #31286 about:preferences strings -->
+<!ENTITY torPreferences.categoryTitle "連線">
<!ENTITY torPreferences.torSettings "洋蔥路由設定">
<!ENTITY torPreferences.torSettingsDescription "洋蔥路由瀏覽器會透過洋蔥路由網路將您的網路連線資料進行繞徑，而洋蔥路由網路則是由全世界數千名志願者所自行架設維運的主機。" >
-<!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.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 "你的位置">
+<!ENTITY torPreferences.bridgeLocationAutomatic "竹">
+<!ENTITY torPreferences.bridgeLocationFrequent "常用位置">
+<!ENTITY torPreferences.bridgeLocationOther "其它位置">
+<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…">
+<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges">
+<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can save one or more bridges, 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 "設定洋蔥路由瀏覽器如何連接到網際網路。">
-<!ENTITY torPreferences.firewallPortsPlaceholder "逗點分隔值">
+<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet">
+<!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 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 "解決驗證碼來請求橋接">
<!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 "連線設定">
+<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet">
+<!ENTITY torPreferences.firewallPortsPlaceholder "逗號分隔值">
+<!-- Log dialog -->
<!ENTITY torPreferences.torLogsDialogTitle "洋蔥路由歷程紀錄">
+
+<!-- #24746 about:torconnect strings -->
+<!ENTITY torConnect.notConnectedConcise "未連線">
+<!ENTITY torConnect.connectingConcise "連線中…">
+<!ENTITY torConnect.tryingAgain "再試一次...">
+<!ENTITY torConnect.noInternet "洋蔥路由瀏覽器無法取得網際網路">
+<!ENTITY torConnect.couldNotConnect "洋蔥路由瀏覽器無法連線至 Tor">
+<!ENTITY torConnect.assistDescriptionConfigure "設定你的連線"> <!-- 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 "再試一次...">
+<!ENTITY torConnect.errorLocation "洋蔥路由瀏覽器無法定位你">
+<!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 "這些位置設定是否正確？">
+<!ENTITY torConnect.isLocationCorrectDescription "洋蔥路由瀏覽器依然無法連線至 Tor。請檢查你的位置設定是否正確並再試一次，或者#1。"> <!-- #1 = "configure your connection" link -->
+<!ENTITY torConnect.breadcrumbAssist "Connection assist">
+<!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 "洋蔥路由瀏覽器通往洋蔥路由網路的連線建立失敗">
+<!ENTITY torConnect.yourLocation "你的位置">
+<!ENTITY torConnect.tryBridge "試用一個橋接中繼站">
+<!ENTITY torConnect.autoBootstrappingFailed "自動設定失敗">
+<!ENTITY torConnect.autoBootstrappingFailed "自動設定失敗">
+<!ENTITY torConnect.cannotDetermineCountry "無法確定使用者國家">
+<!ENTITY torConnect.noSettingsForCountry "你的地區沒有可用的設定">
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
1
0
[builders/tor-browser-build] branch main updated: Bug 41308: Use the same branch for Desktop and GeckoView
by gitolite role 07 Oct '22
by gitolite role 07 Oct '22
07 Oct '22
This is an automated email from the git hooks/post-receive script.
pierov pushed a commit to branch main
in repository builders/tor-browser-build.
The following commit(s) were added to refs/heads/main by this push:
new 150f46f Bug 41308: Use the same branch for Desktop and GeckoView
150f46f is described below
commit 150f46ff1d46bea40318a9254027f089dab0483a
Author: Pier Angelo Vendrame <pierov(a)torproject.org>
AuthorDate: Mon Oct 3 18:18:23 2022 +0200
Bug 41308: Use the same branch for Desktop and GeckoView
---
projects/geckoview/config | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/projects/geckoview/config b/projects/geckoview/config
index eb259b0..a1c6244 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
+git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
tag_gpg_id: 1
git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git
git_submodule: 1
@@ -145,7 +145,7 @@ steps:
targets:
nightly:
- git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1'
+ git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-2'
tag_gpg_id: 0
input_files:
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
1
0
[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 07 Oct '22
by gitolite role 07 Oct '22
07 Oct '22
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-102.3.0esr-12.0-2
in repository tor-browser.
The following commit(s) were added to refs/heads/tor-browser-102.3.0esr-12.0-2 by this push:
new 36cc3d000b90 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
36cc3d000b90 is described below
commit 36cc3d000b9044a299b683bf115dff9c77569594
Author: Henry Wilkes <henry(a)torproject.org>
AuthorDate: Thu Oct 6 12:54:24 2022 +0100
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Make the connection settings button markup more consistent with each
other and the mozilla-central settings.
---
.../torpreferences/content/connectionPane.js | 20 ++++-----
.../torpreferences/content/connectionPane.xhtml | 48 +++++++++++-----------
.../torpreferences/content/torPreferences.css | 12 ------
3 files changed, 31 insertions(+), 49 deletions(-)
diff --git a/browser/components/torpreferences/content/connectionPane.js b/browser/components/torpreferences/content/connectionPane.js
index ff2593b57fb4..d89f42ca7613 100644
--- a/browser/components/torpreferences/content/connectionPane.js
+++ b/browser/components/torpreferences/content/connectionPane.js
@@ -821,9 +821,8 @@ const gConnectionPane = (function() {
// Add a new bridge
prefpane.querySelector(selectors.bridges.addHeader).textContent =
TorStrings.settings.bridgeAdd;
- prefpane
- .querySelector(selectors.bridges.addBuiltinLabel)
- .setAttribute("value", TorStrings.settings.bridgeSelectBrowserBuiltin);
+ prefpane.querySelector(selectors.bridges.addBuiltinLabel).textContent =
+ TorStrings.settings.bridgeSelectBrowserBuiltin;
{
const button = prefpane.querySelector(
selectors.bridges.addBuiltinButton
@@ -833,9 +832,8 @@ const gConnectionPane = (function() {
this.onAddBuiltinBridge();
});
}
- prefpane
- .querySelector(selectors.bridges.requestLabel)
- .setAttribute("value", TorStrings.settings.bridgeRequestFromTorProject);
+ prefpane.querySelector(selectors.bridges.requestLabel).textContent =
+ TorStrings.settings.bridgeRequestFromTorProject;
{
const button = prefpane.querySelector(selectors.bridges.requestButton);
button.setAttribute("label", TorStrings.settings.bridgeRequest);
@@ -843,9 +841,8 @@ const gConnectionPane = (function() {
this.onRequestBridge();
});
}
- prefpane
- .querySelector(selectors.bridges.enterLabel)
- .setAttribute("value", TorStrings.settings.bridgeEnterKnown);
+ prefpane.querySelector(selectors.bridges.enterLabel).textContent =
+ TorStrings.settings.bridgeEnterKnown;
{
const button = prefpane.querySelector(selectors.bridges.enterButton);
button.setAttribute("label", TorStrings.settings.bridgeAddManually);
@@ -905,9 +902,8 @@ const gConnectionPane = (function() {
}
// Tor logs
- prefpane
- .querySelector(selectors.advanced.torLogsLabel)
- .setAttribute("value", TorStrings.settings.showTorDaemonLogs);
+ prefpane.querySelector(selectors.advanced.torLogsLabel).textContent =
+ TorStrings.settings.showTorDaemonLogs;
const torLogsButton = prefpane.querySelector(
selectors.advanced.torLogsButton
);
diff --git a/browser/components/torpreferences/content/connectionPane.xhtml b/browser/components/torpreferences/content/connectionPane.xhtml
index 82738723ae21..dded590fe0e7 100644
--- a/browser/components/torpreferences/content/connectionPane.xhtml
+++ b/browser/components/torpreferences/content/connectionPane.xhtml
@@ -88,7 +88,7 @@
<menulist id="torPreferences-bridges-location">
<menupopup id="torPreferences-bridges-locationEntries"/>
</menulist>
- <button id="torPreferences-bridges-buttonChooseBridgeForMe" class="torMarginFix primary"/>
+ <button id="torPreferences-bridges-buttonChooseBridgeForMe" class="primary"/>
</hbox>
<html:h2 id="torPreferences-currentBridges-header">
<html:span id="torPreferences-currentBridges-headerText"/>
@@ -120,7 +120,7 @@
</box>
<description class="torPreferences-bridgeCard-share"></description>
<hbox class="torPreferences-bridgeCard-addrBox">
- <html:input class="torPreferences-bridgeCard-addr torMarginFix stop-click" type="text" readonly="readonly"/>
+ <html:input class="torPreferences-bridgeCard-addr stop-click" type="text" readonly="readonly"/>
</hbox>
<hbox class="torPreferences-bridgeCard-learnMoreBox" align="center">
<label class="torPreferences-bridgeCard-learnMore learnMore text-link stop-click" is="text-link"/>
@@ -137,19 +137,19 @@
</vbox>
<html:h2 id="torPreferences-addBridge-header"></html:h2>
<hbox align="center">
- <label id="torPreferences-addBridge-labelBuiltinBridge"/>
- <space flex="1"/>
- <button id="torPreferences-addBridge-buttonBuiltinBridge" class="torMarginFix"/>
+ <label id="torPreferences-addBridge-labelBuiltinBridge" flex="1"/>
+ <button id="torPreferences-addBridge-buttonBuiltinBridge"
+ class="accessory-button"/>
</hbox>
<hbox align="center">
- <label id="torPreferences-addBridge-labelRequestBridge"/>
- <space flex="1"/>
- <button id="torPreferences-addBridge-buttonRequestBridge" class="torMarginFix"/>
+ <label id="torPreferences-addBridge-labelRequestBridge" flex="1"/>
+ <button id="torPreferences-addBridge-buttonRequestBridge"
+ class="accessory-button"/>
</hbox>
<hbox align="center">
- <label id="torPreferences-addBridge-labelEnterBridge"/>
- <space flex="1"/>
- <button id="torPreferences-addBridge-buttonEnterBridge" class="torMarginFix"/>
+ <label id="torPreferences-addBridge-labelEnterBridge" flex="1"/>
+ <button id="torPreferences-addBridge-buttonEnterBridge"
+ class="accessory-button"/>
</hbox>
</groupbox>
@@ -162,20 +162,18 @@
<groupbox id="torPreferences-advanced-group"
data-category="paneConnection"
hidden="true">
- <box id="torPreferences-advanced-grid">
- <hbox id="torPreferences-advanced-hbox" align="center">
- <label id="torPreferences-advanced-label"/>
- </hbox>
- <hbox align="center">
- <button id="torPreferences-advanced-button"/>
- </hbox>
- <hbox id="torPreferences-torDaemon-hbox" align="center">
- <label id="torPreferences-torLogs"/>
- </hbox>
- <hbox align="center" data-subcategory="viewlogs">
- <button id="torPreferences-buttonTorLogs"/>
- </hbox>
- </box>
+ <hbox align="center">
+ <label id="torPreferences-advanced-label" flex="1"/>
+ <button id="torPreferences-advanced-button"
+ class="accessory-button"/>
+ </hbox>
+ <hbox align="center">
+ <label id="torPreferences-torLogs" flex="1"/>
+ <vbox data-subcategory="viewlogs">
+ <button id="torPreferences-buttonTorLogs"
+ class="accessory-button"/>
+ </vbox>
+ </hbox>
</groupbox>
<html:div id="bridge-remove-overlay" class="hidden">
diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css
index 388d8bb4c152..a9ab8543c01e 100644
--- a/browser/components/torpreferences/content/torPreferences.css
+++ b/browser/components/torpreferences/content/torPreferences.css
@@ -434,18 +434,6 @@ input.torPreferences-bridgeCard-addr {
}
/* Advanced Settings */
-#torPreferences-advanced-grid {
- display: grid;
- grid-template-columns: 1fr auto;
-}
-
-#torPreferences-advanced-group button {
- min-width: 150px;
-}
-
-#torPreferences-advanced-hbox, #torPreferences-torDaemon-hbox {
- padding-inline-end: 15px;
-}
h3#torPreferences-requestBridge-header {
margin: 0;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
1
0
[builders/tor-browser-build] branch main updated: Bug 40629: Bump snowflake version to 9ce1de4eee4e
by gitolite role 07 Oct '22
by gitolite role 07 Oct '22
07 Oct '22
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch main
in repository builders/tor-browser-build.
The following commit(s) were added to refs/heads/main by this push:
new d0cd03e Bug 40629: Bump snowflake version to 9ce1de4eee4e
d0cd03e is described below
commit d0cd03e90e3ef24ae21e73cdac0dac6f100c66bc
Author: Cecylia Bocovich <cohosh(a)torproject.org>
AuthorDate: Fri Sep 30 10:40:53 2022 -0400
Bug 40629: Bump snowflake version to 9ce1de4eee4e
Requires a new project for the refraction-networking branch of utls.
---
projects/goxtext/config | 3 +++
projects/{goxtext => refraction-utls}/config | 15 +++++++++------
projects/snowflake/build | 1 +
projects/snowflake/config | 4 +++-
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/projects/goxtext/config b/projects/goxtext/config
index 9563c87..900f999 100644
--- a/projects/goxtext/config
+++ b/projects/goxtext/config
@@ -11,6 +11,9 @@ build: '[% c("projects/go/var/build_go_lib") %]'
var:
go_lib: golang.org/x/text
+ go_lib_install:
+ - golang.org/x/text
+ - golang.org/x/text/secure/bidirule
input_files:
- project: container-image
diff --git a/projects/goxtext/config b/projects/refraction-utls/config
similarity index 50%
copy from projects/goxtext/config
copy to projects/refraction-utls/config
index 9563c87..e6974b4 100644
--- a/projects/goxtext/config
+++ b/projects/refraction-utls/config
@@ -1,18 +1,21 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
-git_url: https://github.com/golang/text
-# v0.3.3
-git_hash: 23ae387dee1f90d29a23c0e87ee0b46038fbed0e
+git_url: https://github.com/refraction-networking/utls
+git_hash: 0b2885c8c0d4467cfe98136748a9d011d0b8fff0 #v1.0.0
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-container:
- use_container: 1
build: '[% c("projects/go/var/build_go_lib") %]'
var:
- go_lib: golang.org/x/text
+ container:
+ use_container: 1
+ go_lib: github.com/refraction-networking/utls
+ go_lib_deps:
+ - goxcrypto
input_files:
- project: container-image
- name: go
project: go
+ - name: goxcrypto
+ project: goxcrypto
diff --git a/projects/snowflake/build b/projects/snowflake/build
index 55fb4be..ab266cb 100644
--- a/projects/snowflake/build
+++ b/projects/snowflake/build
@@ -16,6 +16,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/pion-webrtc') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/kcp-go') %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/smux') %]
+tar -C /var/tmp/dist -xf [% c('input_files_by_name/refraction-utls') %]
mkdir -p /var/tmp/build
tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
diff --git a/projects/snowflake/config b/projects/snowflake/config
index 3e93d3d..ee73aa7 100644
--- a/projects/snowflake/config
+++ b/projects/snowflake/config
@@ -1,7 +1,7 @@
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…
-git_hash: 01ae5b56e8399d29aa18605dc9add913d84dc553
+git_hash: 9ce1de4eee4e23c918c7c5e96666ff5c6ddc654e
filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
container:
@@ -21,6 +21,8 @@ input_files:
project: kcp-go
- name: smux
project: smux
+ - name: refraction-utls
+ project: refraction-utls
- name: '[% c("var/compiler") %]'
project: '[% c("var/compiler") %]'
enable: '[% c("var/android") %]'
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
1
0
[builders/tor-browser-build] branch main updated: Bug 40397: Create a new build target to package tor daemon, pluggable transports and dependencies
by gitolite role 07 Oct '22
by gitolite role 07 Oct '22
07 Oct '22
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch main
in repository builders/tor-browser-build.
The following commit(s) were added to refs/heads/main by this push:
new f3a7060 Bug 40397: Create a new build target to package tor daemon, pluggable transports and dependencies
f3a7060 is described below
commit f3a706078bb9efb061c18f1f8d77c072ee2edcf7
Author: Marco Simonelli <msimonelli(a)protonmail.com>
AuthorDate: Mon Jul 11 22:26:28 2022 +1000
Bug 40397: Create a new build target to package tor daemon, pluggable transports and dependencies
---
projects/browser/build | 43 +++++++++--
projects/browser/build.android | 4 ++
projects/browser/config | 18 +----
projects/obfs4/build | 5 +-
projects/release/build | 6 --
projects/release/config | 16 -----
projects/snowflake/build | 7 +-
projects/tor-android-service/build | 34 +++++++--
projects/tor-android-service/config | 19 +++--
projects/tor-expert-bundle/build | 30 ++++++++
projects/tor-expert-bundle/config | 18 +++++
projects/tor-onion-proxy-library/build | 28 ++++----
projects/tor-onion-proxy-library/config | 32 +++------
projects/tor/build | 123 +++++++++++++-------------------
projects/tor/config | 6 +-
rbm.conf | 6 --
16 files changed, 205 insertions(+), 190 deletions(-)
diff --git a/projects/browser/build b/projects/browser/build
index 908bc2a..6a7ef9a 100644
--- a/projects/browser/build
+++ b/projects/browser/build
@@ -34,6 +34,7 @@ touch "$GENERATEDPREFSPATH"
DOCSPATH=[% c('var/ProjectName') %]/Docs
EXTSPATH=[% c('var/ProjectName') %]/Data/Browser/profile.default/extensions
+ TORBINPATH=TorBrowser/Tor
TORCONFIGPATH=TorBrowser/Data/Tor
mkdir -p "$TBDIR/[% c('var/ProjectName') %]/Data/Browser/Caches"
@@ -48,8 +49,39 @@ MARTOOLS=$rootdir/mar-tools
mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
[% IF c("var/tor-browser") -%]
- tar -C "$TBDIR" -xf [% c('input_files_by_name/obfs4') %]
- tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%]
+ tar -xvf [% c('input_files_by_name/tor-expert-bundle') %]
+
+ # geoip(6) and anything else that belongs in the data dir from the expert bundle
+ mkdir -p "$TBDIR/$TORCONFIGPATH"
+ mv data/{geoip,geoip6} "$TBDIR/$TORCONFIGPATH"
+
+ # Bridge lists will be consumed later in `bridges_conf`
+ mv tor/pluggable_transports/bridges_list.*.txt $rootdir
+
+ # Snowflake's README is the only documentation shipped in tor-expert-bundle
+ mkdir -p "$TBDIR/$DOCSPATH/snowflake"
+ find tor
+ mv tor/pluggable_transports/README.SNOWFLAKE.md "$TBDIR/$DOCSPATH/snowflake/README.md"
+
+ # Move the PTs to where TB expects them
+ mkdir -p "$TBDIR/$TORBINPATH"
+ mv tor/pluggable_transports "$TBDIR/$TORBINPATH/PluggableTransports"
+
+ # Move tor and dependencies to where TB expects them
+ mv tor/* "$TBDIR/$TORBINPATH"
+
+ # on linux, libstdc++ lives in it's own directory
+ [% IF c("var/linux") %]
+ find $TBDIR/$TORBINPATH
+ mkdir -p "$TBDIR/$TORBINPATH/libstdc++"
+ mv "$TBDIR/$TORBINPATH"/libstdc++.so.* "$TBDIR/$TORBINPATH/libstdc++"
+ [% END %]
+
+ # the expert bundle includes tor-gencert, which isn't needed for browser releases
+ [% IF c("var/windows") %]
+ rm "$TBDIR/$TORBINPATH/tor-gencert.exe"
+ [% END %]
+
[% END -%]
tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %]
@@ -94,9 +126,6 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz
rm -rf $TMP_MANUAL_PATH
[% END -%]
-[% IF c("var/tor-browser") -%]
- tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -xf [% c('input_files_by_name/tor') %]/tor.tar.gz
-[% END -%]
[% IF c("var/namecoin") %]
# Extract Electrum-NMC
@@ -325,8 +354,8 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/
cp $rootdir/[% c('input_files_by_name/firefox') %]/geckodriver-linux64.tar.xz "$OUTDIR"/
[% END -%]
[% END -%]
-[% IF c("var/linux") && c("var/tor-browser") -%]
- cp $rootdir/[% c('input_files_by_name/tor') %]/tor-debug.tar.xz "$OUTDIR"/tor-[% c("var/mar_osname") %]-debug.tar.xz
+[%IF c("var/tor-browser") -%]
+ cp $rootdir/[% c("input_files_by_name/tor-expert-bundle") %] "$OUTDIR"/
[% END -%]
[% IF c("var/build_infos_json") -%]
cp $rootdir/[% c('input_files_by_name/firefox') %]/build-infos.json "$OUTDIR"/build-infos-[% c("var/mar_osname") %].json
diff --git a/projects/browser/build.android b/projects/browser/build.android
index 589d117..a8c5a08 100644
--- a/projects/browser/build.android
+++ b/projects/browser/build.android
@@ -40,3 +40,7 @@ zipalign -vp 4 $apk $aligned_apk
apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $qa_apk --in $aligned_apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android
apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $test_out_apk --in $test_in_apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android
+
+[%IF c("var/tor-browser") -%]
+ cp $rootdir/[% c("input_files_by_name/tor-expert-bundle") %] [% dest_dir %]/[% c('filename') %]/
+[% END -%]
diff --git a/projects/browser/config b/projects/browser/config
index 86086d0..03cde94 100644
--- a/projects/browser/config
+++ b/projects/browser/config
@@ -70,9 +70,9 @@ input_files:
- project: fenix
name: fenix
enable: '[% c("var/android") %]'
- - project: tor
- name: tor
- enable: '[% ! c("var/android") && c("var/tor-browser") %]'
+ - project: tor-expert-bundle
+ name: tor-expert-bundle
+ enable: '[% c("var/tor-browser") %]'
- project: firefox-langpacks
name: firefox-langpacks
enable: '[% ! c("var/testbuild") && ! c("var/android") %]'
@@ -82,12 +82,6 @@ input_files:
- project: fonts
name: fonts
enable: '[% ! c("var/android") %]'
- - project: obfs4
- name: obfs4
- enable: '[% ! c("var/android") && c("var/tor-browser") %]'
- - project: snowflake
- name: snowflake
- enable: '[% ! c("var/android") && c("var/tor-browser") %]'
- filename: Bundle-Data
enable: '[% ! c("var/android") %]'
- URL: https://addons.mozilla.org/firefox/downloads/file/4002416/noscript-11.4.11.…
@@ -126,12 +120,6 @@ input_files:
enable: '[% c("var/android") %]'
- filename: verify_allowed_addons.py
enable: '[% c("var/android") && c("var/verify_allowed_addons") %]'
- - filename: bridges_list.obfs4.txt
- enable: '[% ! c("var/android") && c("var/tor-browser") %]'
- - filename: bridges_list.meek-azure.txt
- enable: '[% ! c("var/android") && c("var/tor-browser") %]'
- - filename: bridges_list.snowflake.txt
- enable: '[% ! c("var/android") && c("var/tor-browser") %]'
- project: manual
name: manual
enable: '[% ! c("var/android") && c("var/tor-browser") %]'
diff --git a/projects/obfs4/build b/projects/obfs4/build
index 3aa2167..d063d4f 100644
--- a/projects/obfs4/build
+++ b/projects/obfs4/build
@@ -2,8 +2,7 @@
[% c("var/set_default_env") -%]
[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %]
distdir=/var/tmp/dist/[% project %]
-[% c("var/set_PTDIR_DOCSDIR") -%]
-mkdir -p $PTDIR
+mkdir -p $distdir
[% IF c("var/android") -%]
[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
@@ -30,7 +29,7 @@ ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git"
cd obfs4proxy
go build -ldflags '-s'
-cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR
+cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $distdir
cd $distdir
[% c('tar', {
diff --git a/projects/release/build b/projects/release/build
index f69f776..32fb375 100644
--- a/projects/release/build
+++ b/projects/release/build
@@ -18,15 +18,9 @@ mkdir -p "$destdir"
[% END -%]
[% IF c("var/browser-windows-i686") -%]
mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/
- [% IF c("var/tor-browser") -%]
- mv [% c('input_files_by_name/windows-expert-bundle') %]/* "$destdir"/
- [% END -%]
[% END -%]
[% IF c("var/browser-windows-x86_64") -%]
mv [% c('input_files_by_name/windows-x86_64') %]/* "$destdir"/
- [% IF c("var/tor-browser") -%]
- mv [% c('input_files_by_name/windows64-expert-bundle') %]/* "$destdir"/
- [% END -%]
[% END -%]
[% IF c("var/browser-osx-x86_64") -%]
mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/
diff --git a/projects/release/config b/projects/release/config
index 4d0948c..8a9803f 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -202,22 +202,6 @@ input_files:
- '[% c("var/build_target") %]'
- '[% c("var/browser_type") %]-osx-aarch64'
- - name: windows-expert-bundle
- project: tor
- enable: '[% c("var/browser-windows-i686") %]'
- target:
- - '[% c("var/build_target") %]'
- - '[% c("var/browser_type") %]-windows-i686'
- - expert-bundle
-
- - name: windows64-expert-bundle
- project: tor
- enable: '[% c("var/browser-windows-x86_64") && c("var/tor-browser") %]'
- target:
- - '[% c("var/build_target") %]'
- - '[% c("var/browser_type") %]-windows-x86_64'
- - expert-bundle
-
- name: src-firefox
project: firefox
enable: '[% c("var/browser-src") %]'
diff --git a/projects/snowflake/build b/projects/snowflake/build
index 6907a06..55fb4be 100644
--- a/projects/snowflake/build
+++ b/projects/snowflake/build
@@ -2,8 +2,7 @@
[% c("var/set_default_env") -%]
[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %]
distdir=/var/tmp/dist/[% project %]
-[% c("var/set_PTDIR_DOCSDIR") -%]
-mkdir -p $PTDIR $DOCSDIR
+mkdir -p $distdir
[% IF c("var/android") -%]
[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
@@ -32,10 +31,10 @@ ln -sf "$GOPATH/src/github.com/xtaci/kcp-go" "$GOPATH/src/github.com/xtaci/kcp-g
cd client
go build -ldflags '-s'
-cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %]
+cp -a client[% IF c("var/windows") %].exe[% END %] $distdir/snowflake-client[% IF c("var/windows") %].exe[% END %]
cd ..
-cp -a README.md $DOCSDIR
+cp -a README.md $distdir/README.SNOWFLAKE.md
cd $distdir
[% c('tar', {
diff --git a/projects/tor-android-service/build b/projects/tor-android-service/build
index 4ac5989..4bdab9c 100644
--- a/projects/tor-android-service/build
+++ b/projects/tor-android-service/build
@@ -18,17 +18,41 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
# Replace pre-packaged tor library with the latest build
rm -fR service/src/main/jniLibs/*
[% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%]
- tar -C service/src/main -xf $rootdir/[% c('input_files_by_name/tor-' _ arch) %]/tor.tar.gz
+ # Extract tor-expert-bundle
+ tebdir=$rootdir/tor-expert-bundle-[% arch %]
+ mkdir $tebdir
+ tar -C $tebdir -xf $rootdir/[% c('input_files_by_name/tor-expert-bundle-' _ arch) %]
+
+ # Figure out our android abi from our arch
+ [% IF arch == "armv7" -%]
+ abi=armeabi-v7a
+ [% ELSIF arch == "aarch64" -%]
+ abi=arm64-v8a
+ [% ELSE -%]
+ abi=[% arch %]
+ [% END -%]
+
+ # Deploy the tor bin
+ mkdir -p service/src/main/jniLibs/$abi
+ cp $tebdir/tor/libTor.so service/src/main/jniLibs/$abi/libTor.so
+
+ # Copy over data (all archs have thesame data, so we only need to do this once)
+ [% IF arch == "armv7" -%]
+ # Copy over geoip(6)
+ mkdir -p service/src/main/assets/common
+ mv $tebdir/data/{geoip,geoip6} service/src/main/assets/common
+
+ # Update bridges list
+ ptdir=$tebdir/tor/pluggable_transports
+ cat $ptdir/bridges_list.obfs4.txt $ptdir/bridges_list.meek-azure.txt \
+ $ptdir/bridges_list.snowflake.txt > service/src/main/assets/common/bridges.txt
+ [% END -%]
[% END -%]
# Replace libraries with the config dependencies
rm service/libs/*
cp $rootdir/[% c('input_files_by_name/topl') %]/*{.aar,.jar} service/libs/
-# Update bridges list
-cat $rootdir/bridges_list.obfs4.txt $rootdir/bridges_list.meek-azure.txt \
- $rootdir/bridges_list.snowflake.txt > service/src/main/assets/common/bridges.txt
-
# Build Android Libraries and Apps
gradle --offline --no-daemon -P androidplugin=3.6.0 -P appcompatVersion=28.0.0 -P compileVersion=29 -P targetVersion=29 -P minVersion=16 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint
diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config
index 5197f22..65fea8d 100644
--- a/projects/tor-android-service/config
+++ b/projects/tor-android-service/config
@@ -26,25 +26,22 @@ input_files:
exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
- project: tor-onion-proxy-library
name: topl
- - project: tor
- name: tor-armv7
+ - project: tor-expert-bundle
+ name: tor-expert-bundle-armv7
target_prepend:
- android-armv7
- - project: tor
- name: tor-aarch64
+ - project: tor-expert-bundle
+ name: tor-expert-bundle-aarch64
target_prepend:
- android-aarch64
- - project: tor
- name: tor-x86
+ - project: tor-expert-bundle
+ name: tor-expert-bundle-x86
target_prepend:
- android-x86
- - project: tor
- name: tor-x86_64
+ - project: tor-expert-bundle
+ name: tor-expert-bundle-x86_64
target_prepend:
- android-x86_64
- URL: 'https://dl.google.com/dl/android/studio/jetifier-zips/1.0.0-beta10/jetifier…'
name: jetifier
sha256sum: 38186db9c9d1b745890b3d35c0667da1cac146ceb3c26aae5bf0802119472c1b
- - filename: bridges_list.obfs4.txt
- - filename: bridges_list.meek-azure.txt
- - filename: bridges_list.snowflake.txt
diff --git a/projects/tor-expert-bundle/build b/projects/tor-expert-bundle/build
new file mode 100644
index 0000000..0a8957c
--- /dev/null
+++ b/projects/tor-expert-bundle/build
@@ -0,0 +1,30 @@
+#!/bin/bash
+[% c("var/set_default_env") -%]
+distdir=/var/tmp/dist/[% project %]
+mkdir -p $distdir
+cd $distdir
+
+tar -xkf $rootdir/[% c('input_files_by_name/tor') %]
+
+cd tor
+mkdir pluggable_transports && cd pluggable_transports
+
+tar -xkf $rootdir/[% c('input_files_by_name/obfs4') %]
+tar -xkf $rootdir/[% c('input_files_by_name/snowflake') %]
+
+# copy in bridge lines for each pluggable transport
+mv $rootdir/bridges_list.obfs4.txt .
+mv $rootdir/bridges_list.meek-azure.txt .
+mv $rootdir/bridges_list.snowflake.txt .
+
+cd $distdir
+[%
+ SET tar_src = [ "tor", "data" ];
+ IF c("var/linux");
+ tar_src.push("debug");
+ END;
+ c('tar', {
+ tar_src => tar_src,
+ tar_args => '-czvf' _ dest_dir _ '/' _ c('filename'),
+ });
+%]
diff --git a/projects/tor-expert-bundle/config b/projects/tor-expert-bundle/config
new file mode 100644
index 0000000..894539e
--- /dev/null
+++ b/projects/tor-expert-bundle/config
@@ -0,0 +1,18 @@
+# vim: filetype=yaml sw=2
+filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
+version: '[% c("var/torbrowser_version") %]'
+
+container:
+ use_container: 1
+
+input_files:
+ - project: container-image
+ - name: tor
+ project: tor
+ - name: obfs4
+ project: obfs4
+ - name: snowflake
+ project: snowflake
+ - filename: bridges_list.obfs4.txt
+ - filename: bridges_list.meek-azure.txt
+ - filename: bridges_list.snowflake.txt
diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build
index 452d7e4..5916fd5 100644
--- a/projects/tor-onion-proxy-library/build
+++ b/projects/tor-onion-proxy-library/build
@@ -24,27 +24,25 @@ patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch
patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch
[% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%]
- # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy
- tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4-' _ arch) %]
+ # Extract tor-expert-bundle
+ tebdir=$rootdir/tor-expert-bundle-[% arch %]
+ mkdir $tebdir
+ tar -C $tebdir -xf $rootdir/[% c('input_files_by_name/tor-expert-bundle-' _ arch) %]
+ ptdir=$tebdir/tor/pluggable_transports
- # Extract snowflake from TorBrowser/Tor/PluggableTransports/snowflake
- tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/snowflake-' _ arch) %]
# Overwrite the obfs4proxy binary provided by Pluto and add Snowflake
[% IF arch == "armv7" -%]
- cp obfs4proxy external/pluto/bin/armeabi-v7a/
- cp obfs4proxy external/pluto/bin/armeabi/
- cp snowflake-client external/pluto/bin/armeabi-v7a/
- cp snowflake-client external/pluto/bin/armeabi/
+ cp $ptdir/obfs4proxy external/pluto/bin/armeabi-v7a/
+ cp $ptdir/obfs4proxy external/pluto/bin/armeabi/
+ cp $ptdir/snowflake-client external/pluto/bin/armeabi-v7a/
+ cp $ptdir/snowflake-client external/pluto/bin/armeabi/
[% ELSIF arch == "aarch64" -%]
- cp obfs4proxy external/pluto/bin/arm64-v8a/
- cp snowflake-client external/pluto/bin/arm64-v8a/
+ cp $ptdir/obfs4proxy external/pluto/bin/arm64-v8a/
+ cp $ptdir/snowflake-client external/pluto/bin/arm64-v8a/
[% ELSE -%]
- cp obfs4proxy external/pluto/bin/[% arch %]/
- cp snowflake-client external/pluto/bin/[% arch %]/
+ cp $ptdir/obfs4proxy external/pluto/bin/[% arch %]/
+ cp $ptdir/snowflake-client external/pluto/bin/[% arch %]/
[% END -%]
-
- rm obfs4proxy
- rm snowflake-client
[% END -%]
# Build Android Libraries and Apps
diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config
index f9be0fd..6b76b41 100644
--- a/projects/tor-onion-proxy-library/config
+++ b/projects/tor-onion-proxy-library/config
@@ -22,36 +22,20 @@ input_files:
project: '[% c("var/compiler") %]'
- project: gradle
name: gradle
- - project: obfs4
- name: obfs4-armv7
+ - project: tor-expert-bundle
+ name: tor-expert-bundle-armv7
target_prepend:
- android-armv7
- - project: obfs4
- name: obfs4-aarch64
+ - project: tor-expert-bundle
+ name: tor-expert-bundle-aarch64
target_prepend:
- android-aarch64
- - project: obfs4
- name: obfs4-x86
+ - project: tor-expert-bundle
+ name: tor-expert-bundle-x86
target_prepend:
- android-x86
- - project: obfs4
- name: obfs4-x86_64
- target_prepend:
- - android-x86_64
- - project: snowflake
- name: snowflake-armv7
- target_prepend:
- - android-armv7
- - project: snowflake
- name: snowflake-aarch64
- target_prepend:
- - android-aarch64
- - project: snowflake
- name: snowflake-x86
- target_prepend:
- - android-x86
- - project: snowflake
- name: snowflake-x86_64
+ - project: tor-expert-bundle
+ name: tor-expert-bundle-x86_64
target_prepend:
- android-x86_64
- filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
diff --git a/projects/tor/build b/projects/tor/build
index 5c23e9b..8c11802 100644
--- a/projects/tor/build
+++ b/projects/tor/build
@@ -2,31 +2,21 @@
[% c("var/set_default_env") -%]
[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
distdir=/var/tmp/dist/[% project %]
+mkdir -p $distdir
mkdir -p /var/tmp/build
[% IF c("var/android") %]
- TORCONFIGDIR="$distdir/assets/common"
- libsdir=$distdir/jniLibs/[% c("var/abi") %]
- mkdir -p $libsdir $TORCONFIGDIR "$distdir/Tor"
# We need to make sure our ZSTD dependencey is properly picked up.
# --enable-zstd is not enough.
export ZSTD_CFLAGS=-I/var/tmp/dist/zstd/include
export ZSTD_LIBS=/var/tmp/dist/zstd/lib/libzstd.a
[% END %]
-[% IF c("var/linux") || c("var/windows") %]
- TORCONFIGDIR="$distdir/Data/Tor"
- mkdir -p $TORCONFIGDIR
- mkdir -p "$distdir/Tor"
-[% END %]
+TORDATADIR="$distdir/data"
+TORBINDIR="$distdir/tor"
-[% IF c("var/osx") %]
- TORBINDIR="$distdir/Contents/MacOS/Tor"
- TORCONFIGDIR="$distdir/Contents/Resources/TorBrowser/Tor"
- mkdir -p $distdir/bin
- mkdir -p $TORBINDIR
- mkdir -p $TORCONFIGDIR
-[% END %]
+mkdir $TORDATADIR
+mkdir $TORBINDIR
[% IF c("var/windows") || c("var/android") %]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/zlib') %]
@@ -42,32 +32,30 @@ libeventdir=/var/tmp/dist/libevent
openssldir=/var/tmp/dist/openssl/openssl
[% IF c("var/linux") %]
- mkdir -p "$distdir/Debug/Tor"
- cp $openssldir/lib/libssl.so.1.1 "$distdir/Tor/"
- cp $openssldir/lib/libcrypto.so.1.1 "$distdir/Tor/"
- cp $libeventdir/lib/libevent-2.1.so.7 "$distdir/Tor/"
+ TORDEBUGDIR="$distdir/debug"
+ mkdir "$TORDEBUGDIR"
+
+ cp $openssldir/lib/libssl.so.1.1 "$TORBINDIR"
+ cp $openssldir/lib/libcrypto.so.1.1 "$TORBINDIR"
+ cp $libeventdir/lib/libevent-2.1.so.7 "$TORBINDIR"
# We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros.
# Copying it into /Browser, which feels more natural, and amending
# LD_LIBRARY_PATH breaks updates from a Tor Browser with the old
# LD_LIBRARY_PATH value to the Tor Browser with the newer one. Thus, we copy
# the libstdc++ into the directory with the libs tor depends on, too. See bug
# 13359 for further details.
- libstdc_dir="$distdir/Tor/libstdc++"
- mkdir -p $libstdc_dir
- cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 $libstdc_dir/
+ cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libstdc++.so.6 "$TORBINDIR"
[% IF c("var/asan") -%]
- cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.6 "$distdir/Tor/"
- cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libubsan.so.1 "$distdir/Tor/"
+ cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libasan.so.6 "$TORBINDIR"
+ cp /var/tmp/dist/gcc/[% c("var/libdir") %]/libubsan.so.1 "$TORBINDIR"
[% END -%]
- chmod 700 "$distdir"/Tor/*.so*
- chmod 700 $libstdc_dir/libstdc++.so.6
- strip $libstdc_dir/libstdc++.so.6
+ chmod 700 "$TORBINDIR"/*.so*
# This is needed to make RPATH unavailable. See bug 9150.
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$distdir/Tor/"
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$TORBINDIR"
[% END %]
[% IF c("var/osx") %]
- cp $libeventdir/lib/libevent-*.dylib $TORBINDIR/
+ cp $libeventdir/lib/libevent-*.dylib "$TORBINDIR"
[% END %]
[% IF c("var/windows") %]
@@ -94,69 +82,58 @@ make install
[% IF c("var/osx") -%]
unset LD_PRELOAD
[% END -%]
-cp $distdir/share/tor/geoip $TORCONFIGDIR
-cp $distdir/share/tor/geoip6 $TORCONFIGDIR
+
+cp $distdir/share/tor/geoip "$TORDATADIR"
+cp $distdir/share/tor/geoip6 "$TORDATADIR"
[% IF c("var/osx") %]
LIBEVENT_FILE=`basename $libeventdir/lib/libevent-*.dylib`
cd $distdir
- cp bin/tor $TORBINDIR/
- cd $TORBINDIR/
- [% c("var/build_target") %]-install_name_tool -change $libeventdir/lib/$LIBEVENT_FILE @executable_path/$LIBEVENT_FILE tor
+ cp bin/tor "$TORBINDIR"
+ cd "$TORBINDIR"
+ [% c("var/build_target") %]-install_name_tool -change "$libeventdir/lib/$LIBEVENT_FILE" "@executable_path/$LIBEVENT_FILE" tor
[% END %]
cd $distdir
[% IF c("var/windows") %]
- install -s $distdir/bin/tor.exe $distdir/Tor/
-[% IF c("var/expert_bundle") %]
- install -s $distdir/bin/tor-gencert.exe $distdir/Tor/
-[% END %]
+ install -s $distdir/bin/tor.exe "$TORBINDIR"
+ install -s $distdir/bin/tor-gencert.exe "$TORBINDIR"
[% END %]
[% IF c("var/linux") %]
# Strip and generate debuginfo for libs
- objcopy --only-keep-debug $distdir/bin/tor $distdir/Debug/Tor/tor
- install -s $distdir/bin/tor $distdir/Tor/
- objcopy --add-gnu-debuglink=./Debug/Tor/tor $distdir/Tor/tor
- for i in $distdir/Tor/*so*
+ objcopy --only-keep-debug $distdir/bin/tor "$TORDEBUGDIR/tor"
+ install -s $distdir/bin/tor "$TORBINDIR"
+ objcopy --add-gnu-debuglink="$TORDEBUGDIR/tor" "$TORBINDIR/tor"
+ for i in "$TORBINDIR"/*so*
do
LIB=`basename $i`
- objcopy --only-keep-debug $distdir/Tor/$LIB $distdir/Debug/Tor/$LIB
- strip $distdir/Tor/$LIB
- objcopy --add-gnu-debuglink=./Debug/Tor/$LIB $distdir/Tor/$LIB
+
+ if [ $LIB == 'libstdc++.so.6' ]; then
+ # keeping this separate to maintain reproducibility; we can probably
+ # treat this the same as the rest (though it seems libstdc++ doesn't come with
+ # any useful debug symbols since we don't build it, so maybe we should figure
+ # out how to package them
+ strip "$TORBINDIR/$LIB"
+ else
+ objcopy --only-keep-debug "$TORBINDIR/$LIB" "$TORDEBUGDIR/$LIB"
+ strip "$TORBINDIR/$LIB"
+ objcopy --add-gnu-debuglink="$TORDEBUGDIR/$LIB" "$TORBINDIR/$LIB"
+ fi
done
[% END %]
[% IF c("var/android") %]
- install -s --strip-program=[% c("var/cross_prefix") %]-strip $distdir/bin/tor $libsdir/libTor.so
+ install -s --strip-program=[% c("var/cross_prefix") %]-strip "$distdir/bin/tor" "$TORBINDIR/libTor.so"
[% END %]
-mkdir -p [% dest_dir _ '/' _ c('filename') %]
[%
- IF c("var/expert_bundle");
- SET win_arch = c('var/windows-x86_64') ? 'win64' : 'win32';
- c('zip', {
- zip_src => [ 'Data', 'Tor', ],
- zip_args => dest_dir _ '/' _ c('filename') _ '/tor-' _ win_arch _ '-' _ c("version") _ '.zip',
- });
- ELSE;
- IF c("var/osx");
- SET tarsrcdir = [ 'Contents' ];
- ELSIF c("var/android");
- SET tarsrcdir = [ 'assets', 'jniLibs' ];
- ELSE;
- SET tarsrcdir = [ 'Data', 'Tor', ];
- END;
- c('tar', {
- tar_src => tarsrcdir,
- tar_args => '-czf ' _ dest_dir _ '/' _ c('filename') _ '/tor.tar.gz',
- });
- END;
+ SET tar_src = [ "tor", "data" ];
+ IF c("var/linux");
+ tar_src.push("debug");
+ END;
+ c('tar', {
+ tar_src => tar_src,
+ tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
+ });
%]
-
-[% IF c("var/linux") %]
-[% c('tar', {
- tar_src => [ 'Debug' ],
- tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename') _ '/tor-debug.tar.xz',
- }) %]
-[% END %]
diff --git a/projects/tor/config b/projects/tor/config
index 1145d57..00d9832 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,5 +1,5 @@
# vim: filetype=yaml sw=2
-filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
+filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
version: 0.4.7.10
git_hash: 'tor-[% c("version") %]'
git_url: https://gitlab.torproject.org/tpo/core/tor.git
@@ -41,10 +41,6 @@ targets:
var:
arch_deps:
- faketime
- expert-bundle:
- var:
- expert_bundle: 1
- flag_mwindows: ''
android:
var:
configure_opt_project: '--enable-android --enable-static-openssl --enable-static-libevent --enable-zstd --disable-tool-name-check --disable-system-torrc --disable-system-torrc'
diff --git a/rbm.conf b/rbm.conf
index 4ff3e92..97baa32 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -186,9 +186,6 @@ var:
[% END -%]
DOCSDIR_project: '[% project %]'
- set_PTDIR_DOCSDIR: |
- PTDIR="$distdir/TorBrowser/Tor/PluggableTransports"
- DOCSDIR="$distdir/TorBrowser/Docs/[% c("var/DOCSDIR_project") %]"
targets:
notarget: linux-x86_64
@@ -566,9 +563,6 @@ targets:
- zip
- unzip
faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1
- set_PTDIR_DOCSDIR: |
- PTDIR="$distdir/Contents/MacOS/Tor/PluggableTransports"
- DOCSDIR="$distdir/Contents/Resources/TorBrowser/Docs/[% c("var/DOCSDIR_project") %]"
# The no_build_id target can be useful if you want to quickly display
# a build template or other option but don't want to spend time to
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
1
0
[pluggable-transports/snowflake-webext] tag webext-0.6.3 created (now 37c58b7)
by gitolite role 06 Oct '22
by gitolite role 06 Oct '22
06 Oct '22
This is an automated email from the git hooks/post-receive script.
cohosh pushed a change to tag webext-0.6.3
in repository pluggable-transports/snowflake-webext.
at 37c58b7 (commit)
No new revisions were added by this update.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
1
0
[pluggable-transports/snowflake-webext] branch main updated: bump version to 0.6.3
by gitolite role 06 Oct '22
by gitolite role 06 Oct '22
06 Oct '22
This is an automated email from the git hooks/post-receive script.
cohosh pushed a commit to branch main
in repository pluggable-transports/snowflake-webext.
The following commit(s) were added to refs/heads/main by this push:
new 37c58b7 bump version to 0.6.3
37c58b7 is described below
commit 37c58b77d3bef17f6b100b054f5086c43e293a88
Author: Cecylia Bocovich <cohosh(a)torproject.org>
AuthorDate: Thu Oct 6 10:58:02 2022 -0400
bump version to 0.6.3
---
package.json | 2 +-
translation | 2 +-
webext/manifest.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package.json b/package.json
index 87c8f69..fda82f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "snowflake-pt",
- "version": "0.6.2",
+ "version": "0.6.3",
"description": "Allow users in censored countries to use your network connection to access the Tor network.",
"main": "build/snowflake.js",
"directories": {
diff --git a/translation b/translation
index 32af379..210820d 160000
--- a/translation
+++ b/translation
@@ -1 +1 @@
-Subproject commit 32af379b0df358bfcd6152a488b5b665f219c033
+Subproject commit 210820ddf36553c1edb14ac9746ee428e58ed8da
diff --git a/webext/manifest.json b/webext/manifest.json
index eaa50b6..6de42ab 100644
--- a/webext/manifest.json
+++ b/webext/manifest.json
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "Snowflake",
- "version": "0.6.2",
+ "version": "0.6.3",
"description": "__MSG_appDesc__",
"default_locale": "en_US",
"icons": {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
1
0