Skip to content
Snippets Groups Projects
Verified Commit 21e43b74 authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

fixup! Add TorStrings module for localization 

Bug 42212: Migrate onion service strings to Fluent.
parent 5621ebd5
Branches
Tags
2 merge requests!1202Bug_43099: 2024 YEC Strings,!1136Bug 43085: Rebased alpha onto 128.2.0esr
Show whitespace changes
Inline Side-by-side
browser/base/content/browser.xhtml
+ 0
− 5
View file @ 21e43b74
......@@ -6,11 +6,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/.
<!DOCTYPE window [
<!ENTITY % torbuttonDTD SYSTEM "chrome://torbutton/locale/torbutton.dtd">
%torbuttonDTD;
]>
<html id="main-window"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
......
toolkit/modules/TorStrings.sys.mjs
+ 0
− 72
View file @ 21e43b74
......@@ -221,71 +221,6 @@ const Loader = {
};
},
/*
Tor Onion Services Strings, e.g., for the authentication prompt.
*/
onionServices() {
const tsb = new TorPropertyStringBundle(
"chrome://torbutton/locale/torbutton.properties",
"onionServices."
);
const getString = tsb.getString.bind(tsb);
const retval = {
learnMore: getString("learnMore", "Learn more"),
authPrompt: {
description: getString(
"authPrompt.description2",
"%S is requesting that you authenticate."
),
keyPlaceholder: getString(
"authPrompt.keyPlaceholder",
"Enter your key"
),
done: getString("authPrompt.done", "Done"),
doneAccessKey: getString("authPrompt.doneAccessKey", "d"),
invalidKey: getString("authPrompt.invalidKey", "Invalid key"),
failedToSetKey: getString(
"authPrompt.failedToSetKey",
"Failed to set key"
),
},
authPreferences: {
header: getString(
"authPreferences.header",
"Onion Services Authentication"
),
overview: getString(
"authPreferences.overview",
"Some onion services require that you identify yourself with a key"
),
savedKeys: getString("authPreferences.savedKeys", "Saved Keys"),
dialogTitle: getString(
"authPreferences.dialogTitle",
"Onion Services Keys"
),
dialogIntro: getString(
"authPreferences.dialogIntro",
"Keys for the following onionsites are stored on your computer"
),
onionSite: getString("authPreferences.onionSite", "Onionsite"),
onionKey: getString("authPreferences.onionKey", "Key"),
remove: getString("authPreferences.remove", "Remove"),
removeAll: getString("authPreferences.removeAll", "Remove All"),
failedToGetKeys: getString(
"authPreferences.failedToGetKeys",
"Failed to get keys"
),
failedToRemoveKey: getString(
"authPreferences.failedToRemoveKey",
"Failed to remove key"
),
},
};
return retval;
} /* Tor Onion Services Strings */,
/*
OnionLocation
*/
......@@ -330,13 +265,6 @@ export const TorStrings = {
return this._torConnect;
},
get onionServices() {
if (!this._onionServices) {
this._onionServices = Loader.onionServices();
}
return this._onionServices;
},
get onionLocation() {
if (!this._onionLocation) {
this._onionLocation = Loader.onionLocation();
......
toolkit/torbutton/chrome/locale/en-US/torbutton.dtd deleted 100644 → 0
+ 0
− 8
View file @ 5621ebd5
<!-- Copyright (c) 2022, The Tor Project, Inc.
- This Source Code Form is subject to the terms of the Mozilla Public
- 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/. -->
<!-- Onion services strings. Strings are kept here for ease of translation. -->
<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt">
<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key">
toolkit/torbutton/chrome/locale/en-US/torbutton.properties
+ 0
− 29
View file @ 21e43b74
......@@ -3,35 +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/.
# .Onion Page Info prompt.
pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
# Shared between Onion Auth prompt and preferences
onionServices.learnMore=Learn more
# Onion Services Authentication prompt
# LOCALIZATION NOTE: %S will be replaced with the .onion address.
onionServices.authPrompt.description2=%S is requesting that you authenticate.
onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
onionServices.authPrompt.done=Done
onionServices.authPrompt.doneAccessKey=d
onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters)
onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key
# Onion Services Authentication preferences
onionServices.authPreferences.header=Onion Services Authentication
onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them.
onionServices.authPreferences.savedKeys=Saved Keys…
onionServices.authPreferences.dialogTitle=Onion Service Keys
onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer
onionServices.authPreferences.onionSite=Onionsite
onionServices.authPreferences.onionKey=Key
onionServices.authPreferences.remove=Remove
onionServices.authPreferences.removeAll=Remove All
onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
onionServices.authPreferences.failedToRemoveKey=Unable to remove key
# Profile/startup error messages.
# LOCALIZATION NOTE: %S is the application name.
profileProblemTitle=%S Profile Problem
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment