[Git][tpo/applications/tor-browser][tor-browser-115.10.0esr-13.5-1] 8 commits: fixup! Tor Browser strings - tor-commits

22 Apr 2024


      Pier Angelo Vendrame pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser
Commits:
ba71db7d by Henry Wilkes at 2024-04-22T18:17:43+01:00
fixup! Tor Browser strings
Bug 42537: Move tor-browser.ftl to toolkit.
- - - - -
3878b648 by Henry Wilkes at 2024-04-22T18:17:44+01:00
fixup! Bug 40209: Implement Basic Crypto Safety
Bug 42537: Move tor-browser.ftl to toolkit.
- - - - -
70f8caa3 by Henry Wilkes at 2024-04-22T18:17:44+01:00
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Bug 42537: Move tor-browser.ftl to toolkit.
- - - - -
401d5c98 by Henry Wilkes at 2024-04-22T18:17:45+01:00
fixup! Bug 7494: Create local home page for TBB.
Bug 42537: Move tor-browser.ftl to toolkit.
- - - - -
ed24f5ca by Henry Wilkes at 2024-04-22T18:17:45+01:00
fixup! Bug 40701: Add security warning when downloading a file
Bug 42537: Move tor-browser.ftl to toolkit.
- - - - -
179b425c by Henry Wilkes at 2024-04-22T18:17:46+01:00
fixup! Bug 40458: Implement .tor.onion aliases
Bug 42537: Move tor-browser.ftl to toolkit.
- - - - -
b8698ae3 by Henry Wilkes at 2024-04-22T18:17:46+01:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Bug 42537: Move tor-browser.ftl to toolkit.
- - - - -
464c9389 by Henry Wilkes at 2024-04-22T18:17:47+01:00
fixup! Bug 30237: Add v3 onion services client authentication prompt
Bug 42537: Move tor-browser.ftl to toolkit.
- - - - -
20 changed files:
- browser/actors/CryptoSafetyParent.jsm
- browser/base/content/aboutDialog.xhtml
- browser/base/content/browser.xhtml
- browser/components/abouttor/content/aboutTor.html
- browser/components/downloads/content/contentAreaDownloadsView.xhtml
- browser/components/places/content/places.xhtml
- browser/components/preferences/preferences.xhtml
- browser/components/rulesets/content/aboutRulesets.html
- browser/components/torpreferences/content/bridgeQrDialog.xhtml
- browser/components/torpreferences/content/builtinBridgeDialog.xhtml
- browser/components/torpreferences/content/connectionSettingsDialog.xhtml
- browser/components/torpreferences/content/loxInviteDialog.xhtml
- browser/components/torpreferences/content/provideBridgeDialog.xhtml
- browser/components/torpreferences/content/requestBridgeDialog.xhtml
- browser/components/torpreferences/content/torLogDialog.xhtml
- browser/locales/jar.mn
- toolkit/content/aboutNetError.xhtml
- browser/locales-preview/tor-browser-no-translate.ftl → toolkit/locales-preview/tor-browser-no-translate.ftl
- browser/locales/en-US/browser/tor-browser.ftl → toolkit/locales/en-US/toolkit/global/tor-browser.ftl
- toolkit/locales/jar.mn
Changes:
=====================================
browser/actors/CryptoSafetyParent.jsm
=====================================
@@ -21,7 +21,7 @@ ChromeUtils.defineModuleGetter(
 );
ChromeUtils.defineLazyGetter(lazy, "CryptoStrings", function () {
-  return new Localization(["browser/tor-browser.ftl"]);
+  return new Localization(["toolkit/global/tor-browser.ftl"]);
 });
XPCOMUtils.defineLazyPreferenceGetter(
=====================================
browser/base/content/aboutDialog.xhtml
=====================================
@@ -32,7 +32,7 @@
     <html:link rel="localization" href="branding/brand.ftl"/>
     <html:link rel="localization" href="browser/aboutDialog.ftl"/>
     <html:link rel="localization" href="toolkit/global/base-browser.ftl"/>
-    <html:link rel="localization" href="browser/tor-browser.ftl"/>
+    <html:link rel="localization" href="toolkit/global/tor-browser.ftl"/>
   </linkset>
<html:div id="aboutDialogContainer">
=====================================
browser/base/content/browser.xhtml
=====================================
@@ -96,7 +96,7 @@
   <link rel="localization" href="toolkit/global/textActions.ftl"/>
   <link rel="localization" href="toolkit/printing/printUI.ftl"/>
   <link rel="localization" href="toolkit/global/base-browser.ftl"/>
-  <link rel="localization" href="browser/tor-browser.ftl"/>
+  <link rel="localization" href="toolkit/global/tor-browser.ftl"/>
   <!-- Untranslated FTL files -->
   <link rel="localization" href="preview/firefoxSuggest.ftl" />
   <link rel="localization" href="preview/identityCredentialNotification.ftl" />
=====================================
browser/components/abouttor/content/aboutTor.html
=====================================
@@ -20,7 +20,7 @@
     />
<link rel="localization" href="browser/newtab/newtab.ftl" />
-    <link rel="localization" href="browser/tor-browser.ftl" />
+    <link rel="localization" href="toolkit/global/tor-browser.ftl" />
<script
       type="module"
=====================================
browser/components/downloads/content/contentAreaDownloadsView.xhtml
=====================================
@@ -21,7 +21,7 @@
   <linkset>
     <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
     <html:link rel="localization" href="browser/downloads.ftl" />
-    <html:link rel="localization" href="browser/tor-browser.ftl" />
+    <html:link rel="localization" href="toolkit/global/tor-browser.ftl" />
   </linkset>
<script src="chrome://global/content/globalOverlay.js"/>
=====================================
browser/components/places/content/places.xhtml
=====================================
@@ -40,7 +40,7 @@
     <html:link rel="localization" href="browser/places.ftl"/>
     <html:link rel="localization" href="browser/downloads.ftl"/>
     <html:link rel="localization" href="browser/editBookmarkOverlay.ftl"/>
-    <html:link rel="localization" href="browser/tor-browser.ftl"/>
+    <html:link rel="localization" href="toolkit/global/tor-browser.ftl"/>
   </linkset>
<script src="chrome://browser/content/places/places.js"/>
=====================================
browser/components/preferences/preferences.xhtml
=====================================
@@ -60,7 +60,7 @@
   <link rel="localization" href="security/certificates/deviceManager.ftl"/>
   <link rel="localization" href="toolkit/updates/history.ftl"/>
   <link rel="localization" href="toolkit/global/base-browser.ftl"/>
-  <link rel="localization" href="browser/tor-browser.ftl"/>
+  <link rel="localization" href="toolkit/global/tor-browser.ftl"/>
<link rel="shortcut icon" href="chrome://global/skin/icons/settings.svg"/>
=====================================
browser/components/rulesets/content/aboutRulesets.html
=====================================
@@ -13,7 +13,7 @@
     />
<link rel="localization" href="branding/brand.ftl" />
-    <link rel="localization" href="browser/tor-browser.ftl" />
+    <link rel="localization" href="toolkit/global/tor-browser.ftl" />
   </head>
   <body>
     <!-- Warning -->
=====================================
browser/components/torpreferences/content/bridgeQrDialog.xhtml
=====================================
@@ -11,7 +11,7 @@
...
<dialog id="bridgeQr-dialog" buttons="accept">
     <linkset>
-      <html:link rel="localization" href="browser/tor-browser.ftl" />
+      <html:link rel="localization" href="toolkit/global/tor-browser.ftl" />
     </linkset>
<script src="chrome://browser/content/torpreferences/bridgeQrDialog.js" />
=====================================
browser/components/torpreferences/content/builtinBridgeDialog.xhtml
=====================================
@@ -12,7 +12,7 @@
   <dialog id="torPreferences-builtinBridge-dialog" buttons="accept,cancel">
     <linkset>
       <html:link rel="localization" href="branding/brand.ftl" />
-      <html:link rel="localization" href="browser/tor-browser.ftl" />
+      <html:link rel="localization" href="toolkit/global/tor-browser.ftl" />
     </linkset>
<script src="chrome://browser/content/torpreferences/builtinBridgeDialog.js" />
=====================================
browser/components/torpreferences/content/connectionSettingsDialog.xhtml
=====================================
@@ -12,7 +12,7 @@
   <dialog id="torPreferences-connection-dialog" buttons="accept,cancel">
     <linkset>
       <html:link rel="localization" href="branding/brand.ftl" />
-      <html:link rel="localization" href="browser/tor-browser.ftl" />
+      <html:link rel="localization" href="toolkit/global/tor-browser.ftl" />
     </linkset>
<script src="chrome://browser/content/torpreferences/connectionSettingsDialog.js" />
=====================================
browser/components/torpreferences/content/loxInviteDialog.xhtml
=====================================
@@ -19,10 +19,10 @@
   </menupopup>
   <dialog id="lox-invite-dialog" buttons="accept">
     <linkset>
-      <html:link rel="localization" href="browser/tor-browser.ftl" />
+      <html:link rel="localization" href="toolkit/global/tor-browser.ftl" />
       <html:link
         rel="localization"
-        href="preview/tor-browser-no-translate.ftl"
+        href="locales-preview/tor-browser-no-translate.ftl"
       />
     </linkset>
=====================================
browser/components/torpreferences/content/provideBridgeDialog.xhtml
=====================================
@@ -14,7 +14,7 @@
     class="show-entry-page"
...
<linkset>
-      <html:link rel="localization" href="browser/tor-browser.ftl" />
+      <html:link rel="localization" href="toolkit/global/tor-browser.ftl" />
     </linkset>
<script src="chrome://browser/content/torpreferences/bridgemoji/BridgeEmoji.js" />
=====================================
browser/components/torpreferences/content/requestBridgeDialog.xhtml
=====================================
@@ -11,7 +11,7 @@
...
<dialog id="torPreferences-requestBridge-dialog" buttons="accept,cancel">
     <linkset>
-      <html:link rel="localization" href="browser/tor-browser.ftl" />
+      <html:link rel="localization" href="toolkit/global/tor-browser.ftl" />
     </linkset>
<script src="chrome://browser/content/torpreferences/requestBridgeDialog.js" />
=====================================
browser/components/torpreferences/content/torLogDialog.xhtml
=====================================
@@ -11,7 +11,7 @@
...
<dialog id="torPreferences-torLog-dialog" buttons="accept,extra1">
     <linkset>
-      <html:link rel="localization" href="browser/tor-browser.ftl" />
+      <html:link rel="localization" href="toolkit/global/tor-browser.ftl" />
     </linkset>
<script src="chrome://browser/content/torpreferences/torLogDialog.js" />
=====================================
browser/locales/jar.mn
=====================================
@@ -14,7 +14,6 @@
   preview/firefoxSuggest.ftl                       (../components/urlbar/content/firefoxSuggest.ftl)
   preview/identityCredentialNotification.ftl       (../components/credentialmanager/identityCredentialNotification.ftl)
   preview/stripOnShare.ftl                         (../components/urlbar/content/stripOnShare.ftl)
-  preview/tor-browser-no-translate.ftl             (../locales-preview/tor-browser-no-translate.ftl)
   browser                                          (%browser/**/*.ftl)
@AB_CD@.jar:
=====================================
toolkit/content/aboutNetError.xhtml
=====================================
@@ -16,7 +16,7 @@
     <link rel="localization" href="branding/brand.ftl"/>
     <link rel="localization" href="toolkit/neterror/certError.ftl" />
     <link rel="localization" href="toolkit/neterror/netError.ftl"/>
-    <link rel="localization" href="browser/tor-browser.ftl"/>
+    <link rel="localization" href="toolkit/global/tor-browser.ftl"/>
   </head>
<body>
=====================================
browser/locales-preview/tor-browser-no-translate.ftl → toolkit/locales-preview/tor-browser-no-translate.ftl
=====================================
=====================================
browser/locales/en-US/browser/tor-browser.ftl → toolkit/locales/en-US/toolkit/global/tor-browser.ftl
=====================================
=====================================
toolkit/locales/jar.mn
=====================================
@@ -9,6 +9,7 @@
   toolkit                                          (%toolkit/**/*.ftl)
   locales-preview/aboutTranslations.ftl            (../locales-preview/aboutTranslations.ftl)
   locales-preview/base-browser-no-translate.ftl    (../locales-preview/base-browser-no-translate.ftl)
+  locales-preview/tor-browser-no-translate.ftl     (../locales-preview/tor-browser-no-translate.ftl)
 #ifdef MOZ_LAYOUT_DEBUGGER
   layoutdebug/layoutdebug.ftl                      (../../layout/tools/layout-debug/ui/content/layoutdebug.ftl)
 #endif
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9d6fa20...
-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9d6fa20...
You're receiving this email because of your account on gitlab.torproject.org.





    