[tor-commits] [Git][tpo/applications/tor-browser][base-browser-115.10.0esr-13.5-1] 4 commits: fixup! Base Browser strings

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch base-browser-115.10.0esr-13.5-1 at The Tor Project / Applications / Tor Browser


Commits:
f1d27be7 by Henry Wilkes at 2024-04-22T20:49:17+01:00
fixup! Base Browser strings

Bug 42537: Move base-browser.ftl to toolkit.

- - - - -
3aa48e65 by Henry Wilkes at 2024-04-22T20:49:43+01:00
fixup! Bug 4234: Use the Firefox Update Process for Base Browser.

Bug 42537: Move base-browser.ftl to toolkit.

- - - - -
a402e72c by Henry Wilkes at 2024-04-22T20:49:47+01:00
fixup! Bug 40926: Implemented the New Identity feature

Bug 42537: Move base-browser.ftl to toolkit.

- - - - -
ca81f26e by Henry Wilkes at 2024-04-22T20:49:47+01: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
=====================================
@@ -30,7 +30,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"/>
   </linkset>
 
   <html:div id="aboutDialogContainer">


=====================================
browser/base/content/browser.xhtml
=====================================
@@ -88,7 +88,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"/>
   <!-- Untranslated FTL files -->
   <link rel="localization" href="preview/firefoxSuggest.ftl" />
   <link rel="localization" href="preview/identityCredentialNotification.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
=====================================
@@ -57,7 +57,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="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)
   browser                                          (%browser/**/*.ftl)
 
 @AB_CD at .jar:


=====================================
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/5616a8da37ac9bdac4f0d9df222b1f6fffa537d5...ca81f26e66ca397beeb201bc81940b79e3298ebf

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5616a8da37ac9bdac4f0d9df222b1f6fffa537d5...ca81f26e66ca397beeb201bc81940b79e3298ebf
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20240423/513f636f/attachment-0001.htm>