fixup! Add TorStrings module for localization

Bug 41608 - Add new connection status strings.

browser/modules/TorStrings.jsm

@@ -207,10 +207,6 @@ const Loader = {
 
       torConnecting: "Establishing a Connection",
 
-      torNotConnectedConcise: "Not Connected",
-
-      torConnectingConcise: "Connecting…",
-
       tryingAgain: "Trying again…",
 
       noInternet: "Tor Browser couldn’t reach the Internet",
@@ -250,8 +246,6 @@ const Loader = {
 
       torConnected: "Connected to the Tor network",
 
-      torConnectedConcise: "Connected",
-
       tryAgain: "Try Again",
 
       // tor connect strings for message box in about:preferences#connection
@@ -275,6 +269,13 @@ const Loader = {
       autoBootstrappingAllFailed: "None of the configurations we tried worked",
       cannotDetermineCountry: "Unable to determine user country",
       noSettingsForCountry: "No settings available for your location",
+
+      // Titlebar status.
+      titlebarStatusName: "Tor connection",
+      titlebarStatusNotConnected: "Not connected",
+      titlebarStatusConnecting: "Connecting…",
+      titlebarStatusPotentiallyBlocked: "Potentially blocked",
+      titlebarStatusConnected: "Connected",
     };
 
     const tsb = new TorPropertyStringBundle(

toolkit/torbutton/chrome/locale/en-US/torConnect.properties

@@ -3,10 +3,14 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+torConnect.titlebarStatusName=Tor connection
+torConnect.titlebarStatusNotConnected=Not connected
+torConnect.titlebarStatusConnecting=Connecting…
+torConnect.titlebarStatusPotentiallyBlocked=Potentially blocked
+torConnect.titlebarStatusConnected=Connected
+
 torConnect.torConnect=Connect to Tor
 torConnect.torConnecting=Establishing a Connection
-torConnect.torNotConnectedConcise=Not Connected
-torConnect.torConnectingConcise=Connecting…
 torConnect.tryingAgain=Trying again…
 torConnect.noInternet=Tor Browser couldn’t reach the Internet
 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.
@@ -35,7 +39,6 @@ torConnect.viewLog=View logs…
 torConnect.torConnectButton=Connect
 torConnect.cancel=Cancel
 torConnect.torConnected=Connected to the Tor network!
-torConnect.torConnectedConcise=Connected
 torConnect.tryAgain=Try Again
 torConnect.connectMessage=Changes to Tor Settings will not take effect until you connect
 torConnect.tryAgainMessage=Tor Browser has failed to establish a connection to the Tor Network
@@ -51,3 +54,8 @@ torConnect.autoBootstrappingFailed=Automatic configuration failed
 torConnect.autoBootstrappingAllFailed=None of the configurations we tried worked
 torConnect.cannotDetermineCountry=Unable to determine user country
 torConnect.noSettingsForCountry=No settings available for your location
+
+# Urlbar strings used up to 12.0 - TODO: remove when 12.5 becomes stable:
+torConnect.torNotConnectedConcise=Not Connected
+torConnect.torConnectingConcise=Connecting…
+torConnect.torConnectedConcise=Connected