Commit 64ea04a6 authored by henry's avatar henry
Browse files

fixup! Add TorStrings module for localization 

Bug 41617 - Tidy up:

- Use new string ids for the new strings. Mark the old ones for removal.
- Use "website" rather than "web site".
parent d2c3dcac

browser/modules/TorStrings.jsm

+7 −8
Changes for browser/modules/TorStrings.jsm: 7 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ const Loader = { 
      quickstartCheckbox: "Always connect automatically",

      // Bridge settings

      bridgesHeading: "Bridges",

      bridgesDescription:

      bridgesDescription2:

        "Bridges help you securely access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.",

      bridgeLocation: "Your location",

      bridgeLocationAutomatic: "Automatic",
@@ -116,7 +116,8 @@ const Loader = { 
      allBridgesEnabled: "Use current bridges",

      bridgeRemoveAll: "Remove All Bridges",

      bridgeRemoveAllDialogTitle: "Remove all bridges?",

      bridgeRemoveAllDialogDescription: "If these bridges were received from torproject.org or added manually, this action cannot be undone",

      bridgeRemoveAllDialogDescription:

        "If these bridges were received from torproject.org or added manually, this action cannot be undone",

      bridgeAdd: "Add a New Bridge",

      bridgeSelectBrowserBuiltin:

        "Choose from one of Tor Browser’s built-in bridges",
@@ -138,19 +139,17 @@ const Loader = { 
      // Scan bridge QR dialog

      scanQrTitle: "Scan the QR code",

      // Builtin bridges dialog

      builtinBridgeTitle: "Built-In Bridges",

      builtinBridgeHeader: "Select a Built-In Bridge",

      builtinBridgeDescription:

      builtinBridgeDescription2:

        "Tor Browser includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor.",

      builtinBridgeObfs4: "obfs4",

      builtinBridgeObfs4Title: "obfs4 (Built-in)",

      builtinBridgeObfs4Description:

      builtinBridgeObfs4Description2:

        "Makes your Tor traffic look like random data. May not work in heavily censored regions.",

      builtinBridgeSnowflake: "Snowflake",

      builtinBridgeSnowflakeDescription:

      builtinBridgeSnowflakeDescription2:

        "Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example.",

      builtinBridgeMeekAzure: "meek-azure",

      builtinBridgeMeekAzureDescription:

      builtinBridgeMeekAzureDescription2:

        "Makes it look like you’re connected to a Microsoft website, instead of using Tor. May work in heavily censored regions, but is usually very slow.",

      bridgeButtonConnect: "Connect",

      bridgeButtonAccept: "OK",

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

+16 −8
Changes for toolkit/torbutton/chrome/locale/en-US/settings.properties: 16 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ settings.quickstartCheckbox=Always connect automatically 


# Bridge settings

settings.bridgesHeading=Bridges

settings.bridgesDescription=Bridges help you securely access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.

# Old description used up to 12.0 - TODO: remove when 12.5 becomes stable:

settings.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.

settings.bridgesDescription2=Bridges help you securely access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.

settings.bridgeLocation=Your location

settings.bridgeLocationAutomatic=Automatic

settings.bridgeLocationFrequent=Frequently selected locations
@@ -72,20 +74,26 @@ settings.cancel=Cancel 
settings.scanQrTitle=Scan the QR code



# Builtin bridges dialog

settings.builtinBridgeTitle=Built-In Bridges

# Bug 41617: Todo - delete builtinBridgeHeader, no longer user

settings.builtinBridgeHeader=Select a Built-In Bridge

settings.builtinBridgeDescription=Tor Browser includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor.

settings.builtinBridgeObfs4=obfs4

settings.builtinBridgeDescription2=Tor Browser includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor.

settings.builtinBridgeObfs4Title=obfs4 (Built-in)

settings.builtinBridgeObfs4Description=Makes your Tor traffic look like random data. May not work in heavily censored regions.

settings.builtinBridgeObfs4Description2=Makes your Tor traffic look like random data. May not work in heavily censored regions.

settings.builtinBridgeSnowflake=Snowflake

settings.builtinBridgeSnowflakeDescription=Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example.

settings.builtinBridgeSnowflakeDescription2=Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example.

settings.builtinBridgeMeekAzure=meek-azure

settings.builtinBridgeMeekAzureDescription=Makes it look like you’re connected to a Microsoft web site, instead of using Tor. May work in heavily censored regions, but is usually very slow.

settings.builtinBridgeMeekAzureDescription2=Makes it look like you’re connected to a Microsoft website, instead of using Tor. May work in heavily censored regions, but is usually very slow.

settings.bridgeButtonConnect=Connect

settings.bridgeButtonAccept=OK



# Old dialog strings used up to 12.0 - TODO: remove when 12.5 becomes stable:

settings.builtinBridgeTitle=Built-In Bridges

settings.builtinBridgeDescription=Tor Browser includes some specific types of bridges known as “pluggable transports”.

settings.builtinBridgeObfs4=obfs4

settings.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.

settings.builtinBridgeSnowflakeDescription=Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.

settings.builtinBridgeMeekAzureDescription=meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.

# end



# Request bridges dialog

settings.requestBridgeDialogTitle=Request Bridge

settings.submitCaptcha=Submit