Pier Angelo Vendrame pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
- 
085cb603
by Pier Angelo Vendrame at 2023-02-14T19:13:03+01:00
- 
ecc9d685
by Pier Angelo Vendrame at 2023-02-14T19:13:11+01:00
- 
33b90e5e
by Pier Angelo Vendrame at 2023-02-14T19:13:19+01:00
10 changed files:
- browser/actors/CryptoSafetyParent.jsm
- browser/components/newidentity/content/newidentity.js
- browser/components/newidentity/jar.mn
- browser/components/securitylevel/content/securityLevel.js
- browser/components/securitylevel/jar.mn
- browser/installer/package-manifest.in
- toolkit/torbutton/chrome/locale/en-US/cryptoSafetyPrompt.properties → browser/locales/en-US/chrome/browser/cryptoSafetyPrompt.properties
- browser/components/newidentity/locale/en-US/newIdentity.properties → browser/locales/en-US/chrome/browser/newIdentity.properties
- browser/components/securitylevel/locale/en-US/securityLevel.properties → browser/locales/en-US/chrome/browser/securityLevel.properties
- browser/locales/jar.mn
Changes:
| ... | ... | @@ -14,14 +14,14 @@ const { XPCOMUtils } = ChromeUtils.import( | 
| 14 | 14 | |
| 15 | 15 |  XPCOMUtils.defineLazyGetter(this, "cryptoSafetyBundle", () => {
 | 
| 16 | 16 |    return Services.strings.createBundle(
 | 
| 17 | -    "chrome://torbutton/locale/cryptoSafetyPrompt.properties"
 | |
| 17 | +    "chrome://browser/locale/cryptoSafetyPrompt.properties"
 | |
| 18 | 18 |    );
 | 
| 19 | 19 |  });
 | 
| 20 | 20 | |
| 21 | 21 |  // en-US fallback in case a locale is missing a string.
 | 
| 22 | 22 |  XPCOMUtils.defineLazyGetter(this, "fallbackCryptoSafetyBundle", () => {
 | 
| 23 | 23 |    return Services.strings.createBundle(
 | 
| 24 | -    "resource://gre/chrome/torbutton/locale/en-US/cryptoSafetyPrompt.properties"
 | |
| 24 | +    "resource:///chrome/en-US/locale/browser/cryptoSafetyPrompt.properties"
 | |
| 25 | 25 |    );
 | 
| 26 | 26 |  });
 | 
| 27 | 27 | 
| ... | ... | @@ -24,7 +24,7 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => { | 
| 24 | 24 |    let bundle = null;
 | 
| 25 | 25 |    try {
 | 
| 26 | 26 |      bundle = Services.strings.createBundle(
 | 
| 27 | -      "chrome://newidentity/locale/newIdentity.properties"
 | |
| 27 | +      "chrome://browser/locale/newIdentity.properties"
 | |
| 28 | 28 |      );
 | 
| 29 | 29 |    } catch (e) {
 | 
| 30 | 30 |      console.warn("Could not load the New Identity strings");
 | 
| ... | ... | @@ -3,14 +3,3 @@ browser.jar: | 
| 3 | 3 |      content/browser/newIdentityDialog.xhtml    (content/newIdentityDialog.xhtml)
 | 
| 4 | 4 |      content/browser/newIdentityDialog.css      (content/newIdentityDialog.css)
 | 
| 5 | 5 |      content/browser/newIdentityDialog.js       (content/newIdentityDialog.js) | 
| 6 | - | |
| 7 | -newidentity.jar:
 | |
| 8 | -# We need to list at least one locale here, to make Firefox load the localized
 | |
| 9 | -# copy of properties at chrome://newidentity/locale/newIdentity.properties.
 | |
| 10 | -# Ideally, we should use @AB_CD@.jar to automatically copy all the locales
 | |
| 11 | -# Firefox is built with. But we only provide English here, and injecting the
 | |
| 12 | -# translated files directly to the omni.ja works better for us, for the time
 | |
| 13 | -# being. In addition to inject the properties files, we also add the
 | |
| 14 | -# corresponding locale line to chrome/chrome.manifest.
 | |
| 15 | -% locale newidentity en-US %locale/en-US/
 | |
| 16 | -    locale/en-US/newIdentity.properties  (locale/en-US/newIdentity.properties) | 
| ... | ... | @@ -46,7 +46,7 @@ XPCOMUtils.defineLazyGetter(this, "SecurityLevelStrings", () => { | 
| 46 | 46 |    let bundle = null;
 | 
| 47 | 47 |    try {
 | 
| 48 | 48 |      bundle = Services.strings.createBundle(
 | 
| 49 | -      "chrome://securitylevel/locale/securityLevel.properties"
 | |
| 49 | +      "chrome://browser/locale/securityLevel.properties"
 | |
| 50 | 50 |      );
 | 
| 51 | 51 |    } catch (e) {
 | 
| 52 | 52 |      console.warn("Could not load the Security Level strings");
 | 
| ... | ... | @@ -4,8 +4,3 @@ browser.jar: | 
| 4 | 4 |      content/browser/securitylevel/securityLevelButton.css      (content/securityLevelButton.css)
 | 
| 5 | 5 |      content/browser/securitylevel/securityLevelPreferences.css (content/securityLevelPreferences.css)
 | 
| 6 | 6 |      content/browser/securitylevel/securityLevelIcon.svg        (content/securityLevelIcon.svg) | 
| 7 | - | |
| 8 | -securitylevel.jar:
 | |
| 9 | -# See New Identity for further information on how this works
 | |
| 10 | -% locale securitylevel en-US %locale/en-US/
 | |
| 11 | -    locale/en-US/securityLevel.properties                      (locale/en-US/securityLevel.properties) | 
| ... | ... | @@ -251,10 +251,6 @@ | 
| 251 | 251 |  @RESPATH@/browser/features/*
 | 
| 252 | 252 | |
| 253 | 253 |  ; Base Browser
 | 
| 254 | -@RESPATH@/browser/chrome/newidentity.manifest
 | |
| 255 | -@RESPATH@/browser/chrome/newidentity/
 | |
| 256 | -@RESPATH@/browser/chrome/securitylevel.manifest
 | |
| 257 | -@RESPATH@/browser/chrome/securitylevel/
 | |
| 258 | 254 |  @RESPATH@/components/SecurityLevel.manifest
 | 
| 259 | 255 | |
| 260 | 256 |  ; [DevTools Startup Files]
 | 
| ... | ... | @@ -42,6 +42,9 @@ | 
| 42 | 42 |      locale/browser/safebrowsing/safebrowsing.properties   (%chrome/browser/safebrowsing/safebrowsing.properties)
 | 
| 43 | 43 |      locale/browser/feeds/subscribe.properties       (%chrome/browser/feeds/subscribe.properties)
 | 
| 44 | 44 |      locale/browser/syncSetup.properties         (%chrome/browser/syncSetup.properties)
 | 
| 45 | +    locale/browser/securityLevel.properties        (%chrome/browser/securityLevel.properties)
 | |
| 46 | +    locale/browser/newIdentity.properties          (%chrome/browser/newIdentity.properties)
 | |
| 47 | +    locale/browser/cryptoSafetyPrompt.properties    (%chrome/browser/cryptoSafetyPrompt.properties)
 | |
| 45 | 48 |  % locale browser-region @AB_CD@ %locale/browser-region/
 | 
| 46 | 49 |  # the following files are browser-specific overrides
 | 
| 47 | 50 |      locale/browser/netError.dtd                (%chrome/overrides/netError.dtd) |