fixup! Add TorStrings module for localization

Bug 41622: Move the onion net error strings to Fluent.

toolkit/modules/TorStrings.sys.mjs

@@ -231,124 +231,8 @@ const Loader = {
     );
     const getString = tsb.getString.bind(tsb);
 
-    const kProblemLoadingSiteFallback = "Problem Loading Onionsite";
-    const kLongDescFallback = "Details: %S";
-
     const retval = {
       learnMore: getString("learnMore", "Learn more"),
-      errorPage: {
-        browser: getString("errorPage.browser", "Browser"),
-        network: getString("errorPage.network", "Network"),
-        onionSite: getString("errorPage.onionSite", "Onionsite"),
-      },
-      descNotFound: {
-        // Tor SOCKS error 0xF0
-        pageTitle: getString(
-          "descNotFound.pageTitle",
-          kProblemLoadingSiteFallback
-        ),
-        header: getString("descNotFound.header", "Onionsite Not Found"),
-        longDescription: getString(
-          "descNotFound.longDescription",
-          kLongDescFallback
-        ),
-      },
-      descInvalid: {
-        // Tor SOCKS error 0xF1
-        pageTitle: getString(
-          "descInvalid.pageTitle",
-          kProblemLoadingSiteFallback
-        ),
-        header: getString("descInvalid.header", "Onionsite Cannot Be Reached"),
-        longDescription: getString(
-          "descInvalid.longDescription",
-          kLongDescFallback
-        ),
-      },
-      introFailed: {
-        // Tor SOCKS error 0xF2
-        pageTitle: getString(
-          "introFailed.pageTitle",
-          kProblemLoadingSiteFallback
-        ),
-        header: getString("introFailed.header", "Onionsite Has Disconnected"),
-        longDescription: getString(
-          "introFailed.longDescription",
-          kLongDescFallback
-        ),
-      },
-      rendezvousFailed: {
-        // Tor SOCKS error 0xF3
-        pageTitle: getString(
-          "rendezvousFailed.pageTitle",
-          kProblemLoadingSiteFallback
-        ),
-        header: getString(
-          "rendezvousFailed.header",
-          "Unable to Connect to Onionsite"
-        ),
-        longDescription: getString(
-          "rendezvousFailed.longDescription",
-          kLongDescFallback
-        ),
-      },
-      clientAuthMissing: {
-        // Tor SOCKS error 0xF4
-        pageTitle: getString(
-          "clientAuthMissing.pageTitle",
-          "Authorization Required"
-        ),
-        header: getString(
-          "clientAuthMissing.header",
-          "Onionsite Requires Authentication"
-        ),
-        longDescription: getString(
-          "clientAuthMissing.longDescription",
-          kLongDescFallback
-        ),
-      },
-      clientAuthIncorrect: {
-        // Tor SOCKS error 0xF5
-        pageTitle: getString(
-          "clientAuthIncorrect.pageTitle",
-          "Authorization Failed"
-        ),
-        header: getString(
-          "clientAuthIncorrect.header",
-          "Onionsite Authentication Failed"
-        ),
-        longDescription: getString(
-          "clientAuthIncorrect.longDescription",
-          kLongDescFallback
-        ),
-      },
-      badAddress: {
-        // Tor SOCKS error 0xF6
-        pageTitle: getString(
-          "badAddress.pageTitle",
-          kProblemLoadingSiteFallback
-        ),
-        header: getString("badAddress.header", "Invalid Onionsite Address"),
-        longDescription: getString(
-          "badAddress.longDescription",
-          kLongDescFallback
-        ),
-      },
-      introTimedOut: {
-        // Tor SOCKS error 0xF7
-        pageTitle: getString(
-          "introTimedOut.pageTitle",
-          kProblemLoadingSiteFallback
-        ),
-        header: getString(
-          "introTimedOut.header",
-          "Onionsite Circuit Creation Timed Out"
-        ),
-        longDescription: getString(
-          "introTimedOut.longDescription",
-          kLongDescFallback
-        ),
-      },
       authPrompt: {
         description: getString(
           "authPrompt.description2",

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

@@ -32,53 +32,6 @@ onionServices.authPreferences.removeAll=Remove All
 onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
 onionServices.authPreferences.failedToRemoveKey=Unable to remove key
 
-# Onion services error strings.
-onionServices.errorPage.browser=Browser
-onionServices.errorPage.network=Network
-onionServices.errorPage.onionSite=Onionsite
-# LOCALIZATION NOTE: In the longDescription strings, %S will be replaced with
-#                    an error code, e.g., 0xF3.
-# Tor SOCKS error 0xF0:
-onionServices.descNotFound.pageTitle=Problem Loading Onionsite
-onionServices.descNotFound.header=Onionsite Not Found
-onionServices.descNotFound=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
-onionServices.descNotFound.longDescription=Details: %S — The requested onion service descriptor can't be found on the hashring and therefore the service is not reachable by the client.
-# Tor SOCKS error 0xF1:
-onionServices.descInvalid.pageTitle=Problem Loading Onionsite
-onionServices.descInvalid.header=Onionsite Cannot Be Reached
-onionServices.descInvalid=The onionsite is unreachable due an internal error.
-onionServices.descInvalid.longDescription=Details: %S — The requested onion service descriptor can't be parsed or signature validation failed.
-# Tor SOCKS error 0xF2:
-onionServices.introFailed.pageTitle=Problem Loading Onionsite
-onionServices.introFailed.header=Onionsite Has Disconnected
-onionServices.introFailed=The most likely cause is that the onionsite is offline. Contact the onionsite administrator.
-onionServices.introFailed.longDescription=Details: %S — Introduction failed, which means that the descriptor was found but the service is no longer connected to the introduction point. It is likely that the service has changed its descriptor or that it is not running.
-# Tor SOCKS error 0xF3:
-onionServices.rendezvousFailed.pageTitle=Problem Loading Onionsite
-onionServices.rendezvousFailed.header=Unable to Connect to Onionsite
-onionServices.rendezvousFailed=The onionsite is busy or the Tor network is overloaded. Try again later.
-onionServices.rendezvousFailed.longDescription=Details: %S — The client failed to rendezvous with the service, which means that the client was unable to finalize the connection.
-# Tor SOCKS error 0xF4:
-onionServices.clientAuthMissing.pageTitle=Authorization Required
-onionServices.clientAuthMissing.header=Onionsite Requires Authentication
-onionServices.clientAuthMissing=Access to the onionsite requires a key but none was provided.
-onionServices.clientAuthMissing.longDescription=Details: %S — The client downloaded the requested onion service descriptor but was unable to decrypt its content because client authorization information is missing.
-# Tor SOCKS error 0xF5:
-onionServices.clientAuthIncorrect.pageTitle=Authorization Failed
-onionServices.clientAuthIncorrect.header=Onionsite Authentication Failed
-onionServices.clientAuthIncorrect=The provided key is incorrect or has been revoked. Contact the onionsite administrator.
-onionServices.clientAuthIncorrect.longDescription=Details: %S — The client was able to download the requested onion service descriptor but was unable to decrypt its content using the provided client authorization information. This may mean that access has been revoked.
-# Tor SOCKS error 0xF6:
-onionServices.badAddress.pageTitle=Problem Loading Onionsite
-onionServices.badAddress.header=Invalid Onionsite Address
-onionServices.badAddress=The provided onionsite address is invalid. Please check that you entered it correctly.
-onionServices.badAddress.longDescription=Details: %S — The provided .onion address is invalid. This error is returned due to one of the following reasons: the address checksum doesn't match, the ed25519 public key is invalid, or the encoding is invalid.
-# Tor SOCKS error 0xF7:
-onionServices.introTimedOut.pageTitle=Problem Loading Onionsite
-onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out
-onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection.
-onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit.
-
 # Profile/startup error messages.
 # LOCALIZATION NOTE: %S is the application name.
 profileProblemTitle=%S Profile Problem