Skip to content
Snippets Groups Projects
Commit 1a01c8c4 authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

fixup! Add TorStrings module for localization 

Bug 42207: Migrate preferences strings to Fluent.
parent 103247da
No related tags found
1 merge request!980Bug 42512: Rebased alpha onto Firefox 115.10.0esr
Show whitespace changes
Inline Side-by-side
toolkit/modules/TorStrings.sys.mjs
+ 1
− 85
View file @ 1a01c8c4
......@@ -67,107 +67,23 @@ const Loader = {
*/
settings() {
const strings = {
categoryTitle: "Connection",
// Message box
torPreferencesDescription:
"Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world.",
// Status
statusInternetLabel: "Internet:",
statusInternetTest: "Test",
statusInternetOnline: "Online",
statusInternetOffline: "Offline",
statusTorLabel: "Tor Network:",
statusTorConnected: "Connected",
statusTorNotConnected: "Not Connected",
statusTorBlocked: "Potentially Blocked",
learnMore: "Learn more",
// Quickstart
quickstartHeading: "Quickstart",
quickstartDescription:
"Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.",
quickstartCheckbox: "Always connect automatically",
// Bridge settings
bridgesHeading: "Bridges",
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",
bridgeLocationFrequent: "Frequently selected locations",
bridgeLocationOther: "Other locations",
bridgeChooseForMe: "Choose a Bridge For Me…",
remove: "Remove",
bridgeDisableBuiltIn: "Disable built-in bridges",
copied: "Copied!",
bridgeRemoveAllDialogTitle: "Remove all bridges?",
bridgeRemoveAllDialogDescription:
"If these bridges were received from torproject.org or added manually, this action cannot be undone",
// Advanced settings
advancedHeading: "Advanced",
advancedLabel: "Configure how Tor Browser connects to the internet",
advancedButton: "Settings…",
showTorDaemonLogs: "View the Tor logs",
showLogs: "View Logs…",
// Remove all bridges dialog
removeBridgesQuestion: "Remove all the bridges?",
removeBridgesWarning: "This action cannot be undone.",
cancel: "Cancel",
// Scan bridge QR dialog
scanQrTitle: "Scan the QR code",
// Builtin bridges dialog
builtinBridgeHeader: "Select a Built-In Bridge",
builtinBridgeDescription2:
"Tor Browser includes some specific types of bridges known as “pluggable transports”, which can help conceal the fact you’re using Tor.",
builtinBridgeObfs4Title: "obfs4 (Built-in)",
builtinBridgeObfs4Description2:
"Makes your Tor traffic look like random data. May not work in heavily censored regions.",
builtinBridgeSnowflake: "Snowflake",
builtinBridgeSnowflakeDescription2:
"Routes your connection through Snowflake proxies to make it look like you’re placing a video call, for example.",
builtinBridgeMeekAzure: "meek-azure",
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",
// Request bridges dialog
requestBridgeDialogTitle: "Request Bridge",
submitCaptcha: "Submit",
contactingBridgeDB: "Contacting BridgeDB. Please Wait.",
solveTheCaptcha: "Solve the CAPTCHA to request a bridge.",
captchaTextboxPlaceholder: "Enter the characters from the image",
incorrectCaptcha: "The solution is not correct. Please try again.",
// Connection settings dialog
connectionSettingsDialogTitle: "Connection Settings",
connectionSettingsDialogHeader:
"Configure how Tor Browser connects to the Internet",
useLocalProxy: "I use a proxy to connect to the Internet",
proxyType: "Proxy Type",
proxyTypeSOCKS4: "SOCKS4",
proxyTypeSOCKS5: "SOCKS5",
proxyTypeHTTP: "HTTP/HTTPS",
proxyAddress: "Address",
proxyAddressPlaceholder: "IP address or hostname",
proxyPort: "Port",
proxyUsername: "Username",
proxyPassword: "Password",
proxyUsernamePasswordPlaceholder: "Optional",
useFirewall:
"This computer goes through a firewall that only allows connections to certain ports",
allowedPorts: "Allowed Ports",
allowedPortsPlaceholder: "Comma-seperated values",
// Log dialog
torLogDialogTitle: "Tor Logs",
copyLog: "Copy Tor Log to Clipboard",
};
const tsb = new TorPropertyStringBundle(
"chrome://torbutton/locale/settings.properties",
"settings."
);
return {
...tsb.getStrings(strings),
learnMoreTorBrowserURL: "about:manual#about",
learnMoreBridgesURL: "about:manual#bridges",
};
return tsb.getStrings(strings);
} /* Tor Network Settings Strings */,
torConnect() {
......
toolkit/torbutton/chrome/locale/en-US/settings.properties
+ 3
− 81
View file @ 1a01c8c4
......@@ -3,95 +3,17 @@
# 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/.
settings.categoryTitle=Connection
# Still used in TorConnect.
# Message box
settings.torPreferencesDescription=Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world.
# Status
settings.statusInternetLabel=Internet:
settings.statusInternetTest=Test
settings.statusInternetOnline=Online
settings.statusInternetOffline=Offline
settings.statusTorLabel=Tor Network:
settings.statusTorConnected=Connected
settings.statusTorNotConnected=Not Connected
settings.statusTorBlocked=Potentially Blocked
settings.learnMore=Learn more
# Quickstart
settings.quickstartHeading=Quickstart
settings.quickstartDescription=Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.
settings.quickstartCheckbox=Always connect automatically
# Bridge settings
settings.bridgesHeading=Bridges
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.
# Might be removed in tor-browser#42477
settings.bridgeLocation=Your location
settings.bridgeLocationAutomatic=Automatic
settings.bridgeLocationFrequent=Frequently selected locations
settings.bridgeLocationOther=Other locations
settings.bridgeChooseForMe=Choose a Bridge For Me…
settings.remove=Remove
settings.bridgeDisableBuiltIn=Disable built-in bridges
settings.copied=Copied!
settings.bridgeRemoveAllDialogTitle=Remove all bridges?
settings.bridgeRemoveAllDialogDescription=If these bridges were received from torproject.org or added manually, this action cannot be undone
# Advanced settings
settings.advancedHeading=Advanced
settings.advancedLabel=Configure how Tor Browser connects to the internet
settings.advancedButton=Settings…
settings.showTorDaemonLogs=View the Tor logs
settings.showLogs=View Logs…
# Remove all bridges dialog
settings.removeBridgesQuestion=Remove all the bridges?
settings.removeBridgesWarning=This action cannot be undone.
settings.cancel=Cancel
# Scan bridge QR dialog
settings.scanQrTitle=Scan the QR code
# Builtin bridges dialog
settings.builtinBridgeHeader=Select a Built-In Bridge
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.builtinBridgeObfs4Description2=Makes your Tor traffic look like random data. May not work in heavily censored regions.
settings.builtinBridgeSnowflake=Snowflake
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.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
# Request bridges dialog
settings.requestBridgeDialogTitle=Request Bridge
settings.submitCaptcha=Submit
settings.contactingBridgeDB=Contacting BridgeDB. Please Wait.
settings.solveTheCaptcha=Solve the CAPTCHA to request a bridge.
settings.captchaTextboxPlaceholder=Enter the characters from the image
settings.incorrectCaptcha=The solution is not correct. Please try again.
# Connection settings dialog
settings.connectionSettingsDialogTitle=Connection Settings
settings.connectionSettingsDialogHeader=Configure how Tor Browser connects to the Internet
settings.useLocalProxy=I use a proxy to connect to the Internet
settings.proxyType=Proxy Type
settings.proxyTypeSOCKS4=SOCKS4
settings.proxyTypeSOCKS5=SOCKS5
settings.proxyTypeHTTP=HTTP/HTTPS
settings.proxyAddress=Address
settings.proxyAddressPlaceholder=IP address or hostname
settings.proxyPort=Port
settings.proxyUsername=Username
settings.proxyPassword=Password
settings.proxyUsernamePasswordPlaceholder=Optional
settings.useFirewall=This computer goes through a firewall that only allows connections to certain ports
settings.allowedPorts=Allowed Ports
settings.allowedPortsPlaceholder=Comma-separated values
# Log dialog
settings.torLogDialogTitle=Tor Logs
settings.copyLog=Copy Tor Log to Clipboard
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment