[tbb-commits] [Git][tpo/applications/tor-browser][tor-browser-115.10.0esr-13.5-1] fixup! Add TorStrings module for localization

Thu May 2 07:26:28 UTC 2024


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


Commits:
f8bdd0d3 by Henry Wilkes at 2024-05-01T15:26:43+01:00
fixup! Add TorStrings module for localization

Bug 42549: Remove brand.dtd

- - - - -


8 changed files:

- − browser/base/content/browser-doctype.inc
- browser/base/content/browser.xhtml
- browser/base/content/hiddenWindowMac.xhtml
- browser/base/content/pageinfo/pageInfo.xhtml
- browser/components/places/content/places.xhtml
- browser/components/shell/content/setDesktopBackground.xhtml
- − toolkit/torbutton/chrome/locale/en-US/brand.dtd
- toolkit/torbutton/jar.mn


Changes:

=====================================
browser/base/content/browser-doctype.inc deleted
=====================================
@@ -1,4 +0,0 @@
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-%brandDTD;
-<!ENTITY % torbuttonDTD SYSTEM "chrome://torbutton/locale/torbutton.dtd">
-%torbuttonDTD;


=====================================
browser/base/content/browser.xhtml
=====================================
@@ -41,7 +41,8 @@
 <?xml-stylesheet href="chrome://global/content/torconnect/torConnectTitlebarStatus.css" type="text/css"?>
 
 <!DOCTYPE window [
-#include browser-doctype.inc
+  <!ENTITY % torbuttonDTD SYSTEM "chrome://torbutton/locale/torbutton.dtd">
+%torbuttonDTD;
 ]>
 
 <html id="main-window"


=====================================
browser/base/content/hiddenWindowMac.xhtml
=====================================
@@ -8,10 +8,6 @@
 
 <?xml-stylesheet href="chrome://browser/skin/webRTC-menubar-indicator.css" type="text/css"?>
 
-<!DOCTYPE window [
-#include browser-doctype.inc
-]>
-
 <window id="main-window"
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"


=====================================
browser/base/content/pageinfo/pageInfo.xhtml
=====================================
@@ -6,12 +6,6 @@
 <?xml-stylesheet href="chrome://browser/content/pageinfo/pageInfo.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?>
 
-<!DOCTYPE window [
-#ifdef XP_MACOSX
-#include ../browser-doctype.inc
-#endif
-]>
-
 <window id="main-window"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/1999/xhtml"


=====================================
browser/components/places/content/places.xhtml
=====================================
@@ -16,11 +16,7 @@
 <?xml-stylesheet href="chrome://browser/content/downloads/downloads.css"?>
 <?xml-stylesheet href="chrome://browser/skin/downloads/allDownloadsView.css"?>
 
-<!DOCTYPE window [
-#ifdef XP_MACOSX
-#include ../../../base/content/browser-doctype.inc
-#endif
-]>
+<!DOCTYPE window>
 
 <window id="places"
         data-l10n-id="places-library3"


=====================================
browser/components/shell/content/setDesktopBackground.xhtml
=====================================
@@ -7,12 +7,6 @@
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/setDesktopBackground.css" type="text/css"?>
 
-<!DOCTYPE window [
-#ifdef XP_MACOSX
-#include ../../../base/content/browser-doctype.inc
-#endif
-]>
-
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         windowtype="Shell:SetDesktopBackground"


=====================================
toolkit/torbutton/chrome/locale/en-US/brand.dtd deleted
=====================================
@@ -1,9 +0,0 @@
-<!-- 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/. -->
-
-<!ENTITY  brandShortName        "Tor Browser">
-
-<!-- Still used in aboutDialog -->
-<!ENTITY  vendorShortName       "Tor Project">


=====================================
toolkit/torbutton/jar.mn
=====================================
@@ -5,7 +5,6 @@ torbutton.jar:
 % category l10n-registry torbutton resource://torbutton/locale/{locale}/
 
 # browser branding
-% override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd
 % override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties
 
 # Strings for the about:tbupdate page



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f8bdd0d38f8195251cd1db81cc11417be831d422

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f8bdd0d38f8195251cd1db81cc11417be831d422
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/tbb-commits/attachments/20240502/ff9a0033/attachment-0001.htm>
