Skip to content
Snippets Groups Projects
Commit 8fee6e00 authored by henry's avatar henry
Browse files

fixup! Add TorStrings module for localization

Bug 42036: Remove old bridge cards.
parent 39bde3a7
Branches
Tags
1 merge request!890Replace bridge cards with new design, ready for Lox
......@@ -3,8 +3,6 @@
// 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/.
"use strict";
const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
const { AppConstants } = ChromeUtils.import(
"resource://gre/modules/AppConstants.jsm"
......@@ -86,7 +84,6 @@ const Loader = {
statusTorNotConnected: "Not Connected",
statusTorBlocked: "Potentially Blocked",
learnMore: "Learn more",
whatAreThese: "What are these?",
// Quickstart
quickstartHeading: "Quickstart",
quickstartDescription:
......@@ -101,22 +98,10 @@ const Loader = {
bridgeLocationFrequent: "Frequently selected locations",
bridgeLocationOther: "Other locations",
bridgeChooseForMe: "Choose a Bridge For Me…",
bridgeCurrent: "Your Current Bridges",
bridgeCurrentDescription:
"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: "%1$S bridge: %2$S",
currentBridge: "Current bridge",
connectedBridge: "Connected",
remove: "Remove",
bridgeDisableBuiltIn: "Disable built-in bridges",
bridgeShare:
"Share this bridge using the QR code or by copying its address:",
bridgeCopy: "Copy Bridge Address",
copied: "Copied!",
bridgeShowAll: "Show All Bridges",
bridgeShowFewer: "Show Fewer Bridges",
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",
......@@ -199,8 +184,6 @@ const Loader = {
...tsb.getStrings(strings),
learnMoreTorBrowserURL: "about:manual#about",
learnMoreBridgesURL: "about:manual#bridges",
learnMoreBridgesCardURL: "about:manual#bridges_bridge-moji",
learnMoreCircumventionURL: "about:manual#circumvention",
};
} /* Tor Network Settings Strings */,
......
......
......@@ -32,23 +32,11 @@ settings.bridgeLocationAutomatic=Automatic
settings.bridgeLocationFrequent=Frequently selected locations
settings.bridgeLocationOther=Other locations
settings.bridgeChooseForMe=Choose a Bridge For Me…
settings.bridgeCurrent=Your Current Bridges
settings.bridgeCurrentDescription=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.
# Translation note: %1$S = bridge type; %2$S = bridge emoji id
settings.bridgeId=%1$S bridge: %2$S
settings.connectedBridge=Connected
settings.currentBridge=Current bridge
settings.remove=Remove
settings.bridgeDisableBuiltIn=Disable built-in bridges
settings.bridgeShare=Share this bridge using the QR code or by copying its address:
settings.whatAreThese=What are these?
settings.bridgeCopy=Copy Bridge Address
settings.copied=Copied!
settings.bridgeShowAll=Show All Bridges
settings.bridgeShowFewer=Show Fewer Bridges
settings.allBridgesEnabled=Use current bridges
settings.bridgeRemoveAll=Remove All Bridges
settings.bridgeRemoveAllDialogTitle=Remove all bridges?
settings.bridgeRemoveAllDialogDescription=If these bridges were received from torproject.org or added manually, this action cannot be undone
settings.bridgeAdd=Add a New Bridge
......@@ -121,3 +109,19 @@ settings.allowedPortsPlaceholder=Comma-separated values
# Log dialog
settings.torLogDialogTitle=Tor Logs
settings.copyLog=Copy Tor Log to Clipboard
# TODO: Remove
settings.bridgeCurrent=Your Current Bridges
settings.bridgeCurrentDescription=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.
# Translation note: %1$S = bridge type; %2$S = bridge emoji id
settings.bridgeId=%1$S bridge: %2$S
settings.connectedBridge=Connected
settings.bridgeShare=Share this bridge using the QR code or by copying its address:
settings.whatAreThese=What are these?
settings.bridgeCopy=Copy Bridge Address
settings.bridgeShowAll=Show All Bridges
settings.bridgeShowFewer=Show Fewer Bridges
settings.allBridgesEnabled=Use current bridges
settings.bridgeRemoveAll=Remove All Bridges
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment