Verified Commit 63965afe authored Apr 06, 2023 by Pier Angelo Vendrame

fixup! Bug 10760: Integrate TorButton to TorBrowser core

Remove string changes from Torbutton.
We will add them back in the TorStrings commit.

parent e55fdfad

browser/base/content/browser-doctype.inc

deleted100644 → 0

+0 −8

Original line number	Diff line number	Diff line
		<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
		%brandDTD;
		<!ENTITY % torbuttonDTD SYSTEM "chrome://torbutton/locale/torbutton.dtd">
		%torbuttonDTD;
		<!ENTITY % aboutTorDTD SYSTEM "chrome://torbutton/locale/aboutTor.dtd">
		%aboutTorDTD;
		<!ENTITY % aboutDialogDTD SYSTEM "chrome://torbutton/locale/aboutDialog.dtd">
		%aboutDialogDTD;

browser/base/content/hiddenWindowMac.xhtml

+0 −4

Original line number	Diff line number	Diff line
		@@ -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

+0 −6

Original line number	Diff line number	Diff line
		@@ -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

+1 −5

Original line number	Diff line number	Diff line
		@@ -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

+0 −6

Original line number	Diff line number	Diff line
		@@ -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"