Pier Angelo Vendrame pushed to branch tor-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser
Commits: 26909ecf by Henry Wilkes at 2024-04-22T17:14:34+00:00 fixup! Base Browser strings
Bug 42537: Move base-browser.ftl to toolkit.
- - - - - 3db6db01 by Henry Wilkes at 2024-04-22T17:14:34+00:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser.
Bug 42537: Move base-browser.ftl to toolkit.
- - - - - f223c735 by Henry Wilkes at 2024-04-22T17:14:34+00:00 fixup! Bug 40926: Implemented the New Identity feature
Bug 42537: Move base-browser.ftl to toolkit.
- - - - - 9d6fa205 by Henry Wilkes at 2024-04-22T17:14:34+00:00 fixup! Bug 41698: Reword the recommendation badges in about:addons
Bug 42537: Move base-browser.ftl to toolkit.
- - - - -
9 changed files:
- browser/base/content/aboutDialog.xhtml - browser/base/content/browser.xhtml - browser/components/newidentity/content/newIdentityDialog.xhtml - browser/components/preferences/preferences.xhtml - browser/locales/jar.mn - browser/locales-preview/base-browser-no-translate.ftl → toolkit/locales-preview/base-browser-no-translate.ftl - browser/locales/en-US/browser/base-browser.ftl → toolkit/locales/en-US/toolkit/global/base-browser.ftl - toolkit/locales/jar.mn - toolkit/mozapps/extensions/content/aboutaddons.html
Changes:
===================================== browser/base/content/aboutDialog.xhtml ===================================== @@ -31,7 +31,7 @@ <linkset> <html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="browser/aboutDialog.ftl"/> - <html:link rel="localization" href="browser/base-browser.ftl"/> + <html:link rel="localization" href="toolkit/global/base-browser.ftl"/> <html:link rel="localization" href="browser/tor-browser.ftl"/> </linkset>
===================================== browser/base/content/browser.xhtml ===================================== @@ -95,7 +95,7 @@ <link rel="localization" href="toolkit/branding/brandings.ftl"/> <link rel="localization" href="toolkit/global/textActions.ftl"/> <link rel="localization" href="toolkit/printing/printUI.ftl"/> - <link rel="localization" href="browser/base-browser.ftl"/> + <link rel="localization" href="toolkit/global/base-browser.ftl"/> <link rel="localization" href="browser/tor-browser.ftl"/> <!-- Untranslated FTL files --> <link rel="localization" href="preview/firefoxSuggest.ftl" />
===================================== browser/components/newidentity/content/newIdentityDialog.xhtml ===================================== @@ -22,7 +22,7 @@ <dialog id="newIdentityDialog" buttons="accept,cancel" defaultButton="accept"> <linkset> <html:link rel="localization" href="branding/brand.ftl" /> - <html:link rel="localization" href="browser/base-browser.ftl" /> + <html:link rel="localization" href="toolkit/global/base-browser.ftl" /> </linkset>
<div xmlns="http://www.w3.org/1999/xhtml">
===================================== browser/components/preferences/preferences.xhtml ===================================== @@ -59,7 +59,7 @@ <link rel="localization" href="security/certificates/certManager.ftl"/> <link rel="localization" href="security/certificates/deviceManager.ftl"/> <link rel="localization" href="toolkit/updates/history.ftl"/> - <link rel="localization" href="browser/base-browser.ftl"/> + <link rel="localization" href="toolkit/global/base-browser.ftl"/> <link rel="localization" href="browser/tor-browser.ftl"/>
<link rel="shortcut icon" href="chrome://global/skin/icons/settings.svg"/>
===================================== 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/base-browser-no-translate.ftl (../locales-preview/base-browser-no-translate.ftl) preview/tor-browser-no-translate.ftl (../locales-preview/tor-browser-no-translate.ftl) browser (%browser/**/*.ftl)
===================================== browser/locales-preview/base-browser-no-translate.ftl → toolkit/locales-preview/base-browser-no-translate.ftl =====================================
===================================== browser/locales/en-US/browser/base-browser.ftl → toolkit/locales/en-US/toolkit/global/base-browser.ftl =====================================
===================================== toolkit/locales/jar.mn ===================================== @@ -8,6 +8,7 @@ services (%services/**/*.ftl) 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) #ifdef MOZ_LAYOUT_DEBUGGER layoutdebug/layoutdebug.ftl (../../layout/tools/layout-debug/ui/content/layoutdebug.ftl) #endif
===================================== toolkit/mozapps/extensions/content/aboutaddons.html ===================================== @@ -35,7 +35,7 @@ <link rel="localization" href="toolkit/about/aboutAddons.ftl" /> <link rel="localization" href="toolkit/about/abuseReports.ftl" />
- <link rel="localization" href="browser/base-browser.ftl" /> + <link rel="localization" href="toolkit/global/base-browser.ftl" />
<!-- Defer scripts so all the templates are loaded by the time they run. --> <script
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/94374ba...