[tor-commits] [tor-browser] 57/85: fixup! Add TorStrings module for localization

[gitolite role]

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

pierov pushed a commit to branch tor-browser-91.9.0esr-11.5-2
in repository tor-browser.

commit b87b6a504ab80ed200d8d3987e5adce13fcdafe9
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Thu Apr 7 15:44:16 2022 +0200

    fixup! Add TorStrings module for localization
    
    Changes introduced by !275
---
 browser/modules/TorStrings.jsm | 64 ++++++++++++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 18 deletions(-)

diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm
index e4c9515daade1..a20d1a404f8ec 100644
--- a/browser/modules/TorStrings.jsm
+++ b/browser/modules/TorStrings.jsm
@@ -230,19 +230,22 @@ var TorStrings = {
       ),
       bridgeLocation: getString("torPreferences.bridgeLocation", "Your location"),
       bridgeLocationAutomatic: getString("torPreferences.bridgeLocationAutomatic", "Automatic"),
+      bridgeLocationFrequent: getString("torPreferences.bridgeLocationFrequent", "Frequently selected locations"),
+      bridgeLocationOther: getString("torPreferences.bridgeLocationOther", "Other locations"),
       bridgeChooseForMe: getString("torPreferences.bridgeChooseForMe", "Choose a Bridge For Me\u2026"),
       bridgeCurrent: getString("torPreferences.bridgeBadgeCurrent", "Your Current Bridges"),
+      bridgeCurrentDescription: getString("torPreferences.bridgeBadgeCurrentDescription", "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed."),
       bridgeId: getString("torPreferences.bridgeId", "#1 bridge: #2"),
       remove: getString("torPreferences.remove", "Remove"),
       bridgeDisableBuiltIn: getString("torPreferences.bridgeDisableBuiltIn", "Disable built-in bridges"),
       bridgeShare: getString(
         "torPreferences.bridgeShare",
-        "Share your bridge by presenting the QR code or copying its bridge line."
+        "Share this bridge using the QR code or by copying its address:"
       ),
       bridgeCopy: getString("torPreferences.bridgeCopy", "Copy Bridge Address"),
       copied: getString("torPreferences.copied", "Copied!"),
-      bridgeShowAll: getString("torPreferences.bridgeShowAll", "Show all bridges"),
-      bridgeRemoveAll: getString("torPreferences.bridgeRemoveAll", "Remove all bridges"),
+      bridgeShowAll: getString("torPreferences.bridgeShowAll", "Show All Bridges"),
+      bridgeRemoveAll: getString("torPreferences.bridgeRemoveAll", "Remove All Bridges"),
       bridgeAdd: getString("torPreferences.bridgeAdd", "Add a New Bridge"),
       bridgeSelectBrowserBuiltin: getString(
         "torPreferences.bridgeSelectBrowserBuiltin",
@@ -280,6 +283,10 @@ var TorStrings = {
         "View the Tor logs"
       ),
       showLogs: getString("torPreferences.viewLogs", "View Logs\u2026"),
+      // Remove all bridges dialog
+      removeBridgesQuestion: getString("torPreferences.removeBridgesQuestion", "Remove all the bridges?"),
+      removeBridgesWarning: getString("torPreferences.removeBridgesWarning", "This action cannot be undone."),
+      cancel: getString("torPreferences.cancel", "Cancel"),
       // Scan bridge QR dialog
       scanQrTitle: getString("torPreferences.scanQrTitle", "Scan the QR code"),
       // Builtin bridges dialog
@@ -448,6 +455,18 @@ var TorStrings = {
         "Connecting…"
       ),
 
+      tryingAgain: getStringNet("torConnect.tryingAgain", "Trying again…"),
+
+      noInternet: getStringNet(
+        "torConnect.noInternet",
+        "Tor Browser couldn’t reach the Internet"
+      ),
+
+      noInternetDescription: getStringNet(
+        "torConnect.noInternetDescription",
+        "This could be due to a connection issue rather than Tor being blocked. Check your Internet connection, proxy and firewall settings before trying again.",
+      ),
+
       torBootstrapFailed: getStringLauncher(
         "tor_bootstrap_failed",
         "Tor failed to establish a Tor network connection."
@@ -474,20 +493,10 @@ var TorStrings = {
       ),
 
       tryingBridgeAgain: getStringNet(
-        "torConnect.tryingBridge",
+        "torConnect.tryingBridgeAgain",
         "Trying one more time…"
       ),
 
-      addLocation: getStringNet(
-        "torConnect.addLocation",
-        "Add your location settings"
-      ),
-
-      addLocationDescription: getStringNet(
-        "torConnect.addLocationDescription",
-        "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."
-      ),
-
       errorLocation: getStringNet(
         "torConnect.errorLocation",
         "Tor Browser couldn’t locate you"
@@ -495,7 +504,17 @@ var TorStrings = {
 
       errorLocationDescription: getStringNet(
         "torConnect.errorLocationDescription",
-        "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again."
+        "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."
+      ),
+
+      isLocationCorrect: getStringNet(
+        "torConnect.isLocationCorrect",
+        "Are these location settings correct?"
+      ),
+
+      isLocationCorrectDescription: getStringNet(
+        "torConnect.isLocationCorrectDescription",
+        "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead."
       ),
 
       finalError: getStringNet(
@@ -552,8 +571,7 @@ var TorStrings = {
         "Connected"
       ),
 
-      tryAgain: getStringNet("torConnect.tryAgain", "Try connecting again"),
-      offline: getStringNet("torConnect.offline", "Offline"),
+      tryAgain: getStringNet("torConnect.tryAgain", "Try Again"),
 
       // tor connect strings for message box in about:preferences#connection
       connectMessage: getStringNet("torConnect.connectMessage", "Changes to Tor Settings will not take effect until you connect"),
@@ -563,12 +581,22 @@ var TorStrings = {
 
       tryBridge: getStringNet("torConnect.tryBridge", "Try a Bridge"),
 
+      automatic: getStringNet("torConnect.automatic", "Automatic"),
       selectCountryRegion: getStringNet(
         "torConnect.selectCountryRegion",
-        "Select Country or Region",
+        "Select Country or Region"
+      ),
+      frequentLocations: getStringNet(
+        "torConnect.frequentLocations",
+        "Frequently selected locations"
+      ),
+      otherLocations: getStringNet(
+        "torConnect.otherLocations",
+        "Other locations"
       ),
 
       // TorConnect.jsm error messages
+      offline: getStringNet("torConnect.offline", "Internet not reachable"),
       autoBootstrappingFailed: getStringNet(
         "torConnect.autoBootstrappingFailed",
         "Automatic configuration failed"

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