- tbb-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.1.0esr-14.0-1] fixup! Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
by Pier Angelo Vendrame (＠pierov) 22 Aug '24

22 Aug '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 91750307 by Morgan at 2024-08-22T09:30:50+02:00 fixup! Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots - Revert 612d54e8e97017891865db8003826d8688ad5a9b - - - - - 1 changed file: - browser/components/BrowserGlue.sys.mjs Changes: ===================================== browser/components/BrowserGlue.sys.mjs ==========================… [View More]

1 0

[Git][tpo/applications/tor-browser][base-browser-128.1.0esr-14.0-1] fixup! Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
by Pier Angelo Vendrame (＠pierov) 22 Aug '24

22 Aug '24

Pier Angelo Vendrame pushed to branch base-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 8b6e208e by Morgan at 2024-08-22T09:29:41+02:00 fixup! Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots - Revert 612d54e8e97017891865db8003826d8688ad5a9b - - - - - 1 changed file: - browser/components/BrowserGlue.sys.mjs Changes: ===================================== browser/components/BrowserGlue.sys.mjs =================================… [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] fixup! Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
by Pier Angelo Vendrame (＠pierov) 22 Aug '24

22 Aug '24

Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 73f74173 by Morgan at 2024-08-22T02:23:04+00:00 fixup! Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots - Revert 612d54e8e97017891865db8003826d8688ad5a9b - - - - - 1 changed file: - browser/components/BrowserGlue.sys.mjs Changes: ===================================== browser/components/BrowserGlue.sys.mjs ==================================… [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.14.0esr-13.5-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by morgan (＠morgan) 22 Aug '24

22 Aug '24

morgan pushed to branch tor-browser-115.14.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: dbdcd092 by Henry Wilkes at 2024-08-22T01:29:55+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42697: Remove inline-start padding from tor bridge provider list. - - - - - 1 changed file: - browser/components/torpreferences/content/torPreferences.css Changes: ===================================== browser/… [View More]

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.14.0esr-13.5-1] fixup! Bug 42835: Create an actor to filter file data transfers
by ma1 (＠ma1) 21 Aug '24

21 Aug '24

ma1 pushed to branch mullvad-browser-115.14.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 56186dd9 by hackademix at 2024-08-22T00:37:37+02:00 fixup! Bug 42835: Create an actor to filter file data transfers Bug 43064: Make file filtering more specific - - - - - 1 changed file: - toolkit/actors/FilesFilterChild.sys.mjs Changes: ===================================== toolkit/actors/FilesFilterChild.sys.mjs ===================================== @@ -12,11 +12,14 @@… [View More]

1 0

[Git][tpo/applications/tor-browser][base-browser-115.14.0esr-13.5-1] fixup! Bug 42835: Create an actor to filter file data transfers
by ma1 (＠ma1) 21 Aug '24

21 Aug '24

ma1 pushed to branch base-browser-115.14.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 18be328e by hackademix at 2024-08-22T00:37:33+02:00 fixup! Bug 42835: Create an actor to filter file data transfers Bug 43064: Make file filtering more specific - - - - - 1 changed file: - toolkit/actors/FilesFilterChild.sys.mjs Changes: ===================================== toolkit/actors/FilesFilterChild.sys.mjs ===================================== @@ -12,11 +12,14 @@ … [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.14.0esr-13.5-1] fixup! Bug 42835: Create an actor to filter file data transfers
by ma1 (＠ma1) 21 Aug '24

21 Aug '24

ma1 pushed to branch tor-browser-115.14.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 6f5ad1e3 by hackademix at 2024-08-22T00:37:28+02:00 fixup! Bug 42835: Create an actor to filter file data transfers Bug 43064: Make file filtering more specific - - - - - 1 changed file: - toolkit/actors/FilesFilterChild.sys.mjs Changes: ===================================== toolkit/actors/FilesFilterChild.sys.mjs ===================================== @@ -12,11 +12,14 @@ … [View More]

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.1.0esr-14.0-1] fixup! Bug 42835: Create an actor to filter file data transfers
by ma1 (＠ma1) 21 Aug '24

21 Aug '24

ma1 pushed to branch mullvad-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 2e3f9dd6 by hackademix at 2024-08-22T00:37:08+02:00 fixup! Bug 42835: Create an actor to filter file data transfers Bug 43064: Make file filtering more specific - - - - - 1 changed file: - toolkit/actors/FilesFilterChild.sys.mjs Changes: ===================================== toolkit/actors/FilesFilterChild.sys.mjs ===================================== @@ -12,11 +12,14 @@ … [View More]

1 0

[Git][tpo/applications/tor-browser][base-browser-128.1.0esr-14.0-1] fixup! Bug 42835: Create an actor to filter file data transfers
by ma1 (＠ma1) 21 Aug '24

21 Aug '24

ma1 pushed to branch base-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 6abbbf97 by hackademix at 2024-08-22T00:37:03+02:00 fixup! Bug 42835: Create an actor to filter file data transfers Bug 43064: Make file filtering more specific - - - - - 1 changed file: - toolkit/actors/FilesFilterChild.sys.mjs Changes: ===================================== toolkit/actors/FilesFilterChild.sys.mjs ===================================== @@ -12,11 +12,14 @@ … [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] 3 commits: fixup! Bug 40701: Add security warning when downloading a file
by morgan (＠morgan) 21 Aug '24

21 Aug '24

morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 8a68fba1 by Henry Wilkes at 2024-08-21T19:22:49+00:00 fixup! Bug 40701: Add security warning when downloading a file Bug 41820: Convert downloads warning to moz-message-bar. Move the logic to DownloadsTorWarning.sys.mjs so it remains in one place. - - - - - 49c2f08e by Henry Wilkes at 2024-08-21T19:22:49+00:00 fixup! Tor Browser strings Bug 41820: Use moz-message-bar for the … [View More]downloads warning. - - - - - 04d6d341 by Henry Wilkes at 2024-08-21T19:22:49+00:00 fixup! Tor Browser localization migration scripts. Bug 41820: Use moz-message-bar for the downloads warning. We add a migration to convert the old string values into the new value. - - - - - 13 changed files: - + browser/components/downloads/DownloadsTorWarning.sys.mjs - browser/components/downloads/content/allDownloadsView.js - browser/components/downloads/content/contentAreaDownloadsView.js - browser/components/downloads/content/contentAreaDownloadsView.xhtml - browser/components/downloads/content/downloads.css - browser/components/downloads/content/downloads.js - browser/components/downloads/content/downloadsPanel.inc.xhtml - browser/components/downloads/moz.build - browser/components/places/content/places.js - browser/components/places/content/places.xhtml - browser/themes/shared/downloads/downloads.inc.css - toolkit/locales/en-US/toolkit/global/tor-browser.ftl - + tools/torbrowser/l10n/migrations/bug-41820-moz-message-bar-download-warning.py Changes: ===================================== browser/components/downloads/DownloadsTorWarning.sys.mjs ===================================== @@ -0,0 +1,152 @@ +/* import-globals-from /browser/base/content/utilityOverlay.js */ + +const PREF_SHOW_DOWNLOAD_WARNING = "browser.download.showTorWarning"; + +/** + * Manages an instance of a tor warning. + */ +export class DownloadsTorWarning { + /** + * Observer for showing or hiding the warning. + * + * @type {function} + */ + #torWarningPrefObserver; + + /** + * Whether the warning is active. + * + * @type {boolean} + */ + #active = false; + + /** + * The moz-message-bar element that should show the warning. + * + * @type {MozMessageBar} + */ + #warningElement; + + /** + * The dismiss button for the warning. + * + * @type {HTMLButton} + */ + #dismissButton; + + /** + * Attach to an instance of the tor warning. + * + * @param {MozMessageBar} warningElement - The warning element to initialize + * and attach to. + * @param {boolean} isChrome - Whether the element belongs to the chrome. + * Otherwise it belongs to content. + * @param {function} moveFocus - Callback to move the focus out of the warning + * when it is hidden. + * @param {function} [onLinkClick] - Callback that is called when a link is + * about to open. + */ + constructor(warningElement, isChrome, moveFocus, onLinkClick) { + const doc = warningElement.ownerDocument; + this.#warningElement = warningElement; + warningElement.setAttribute( + "data-l10n-id", + "downloads-tor-warning-message-bar" + ); + warningElement.setAttribute("data-l10n-attrs", "heading, message"); + + // Observe changes to the tor warning pref. + this.#torWarningPrefObserver = () => { + if (Services.prefs.getBoolPref(PREF_SHOW_DOWNLOAD_WARNING)) { + warningElement.hidden = false; + } else { + const hadFocus = warningElement.contains(doc.activeElement); + warningElement.hidden = true; + if (hadFocus) { + moveFocus(); + } + } + }; + + const tailsLink = doc.createElement("a"); + tailsLink.setAttribute("slot", "support-link"); + tailsLink.href = "https://tails.net/"; + tailsLink.target = "_blank"; + tailsLink.setAttribute("data-l10n-id", "downloads-tor-warning-tails-link"); + if (isChrome) { + // Intercept clicks on the tails link. + tailsLink.addEventListener("click", event => { + event.preventDefault(); + onLinkClick?.(); + doc.defaultView.openWebLinkIn(tailsLink.href, "tab"); + }); + } + + const dismissButton = doc.createElement("button"); + dismissButton.setAttribute("slot", "actions"); + dismissButton.setAttribute( + "data-l10n-id", + "downloads-tor-warning-dismiss-button" + ); + if (isChrome) { + dismissButton.classList.add("footer-button"); + } + + dismissButton.addEventListener("click", () => { + Services.prefs.setBoolPref(PREF_SHOW_DOWNLOAD_WARNING, false); + }); + + warningElement.append(tailsLink); + warningElement.append(dismissButton); + + this.#dismissButton = dismissButton; + } + + /** + * Whether the warning is hidden by the preference. + * + * @type {boolean} + */ + get hidden() { + return this.#warningElement.hidden; + } + + /** + * The dismiss button for the warning. + * + * @type {HTMLButton} + */ + get dismissButton() { + return this.#dismissButton; + } + + /** + * Activate the instance. + */ + activate() { + if (this.#active) { + return; + } + this.#active = true; + Services.prefs.addObserver( + PREF_SHOW_DOWNLOAD_WARNING, + this.#torWarningPrefObserver + ); + // Initialize. + this.#torWarningPrefObserver(); + } + + /** + * Deactivate the instance. + */ + deactivate() { + if (!this.#active) { + return; + } + this.#active = false; + Services.prefs.removeObserver( + PREF_SHOW_DOWNLOAD_WARNING, + this.#torWarningPrefObserver + ); + } +} ===================================== browser/components/downloads/content/allDownloadsView.js ===================================== @@ -213,7 +213,6 @@ var DownloadsView = { */ function DownloadsPlacesView( aRichListBox, - torWarningMessageBar, aActive = true, aSuppressionFlag = DownloadsCommon.SUPPRESS_ALL_DOWNLOADS_OPEN ) { @@ -242,46 +241,6 @@ function DownloadsPlacesView( aSuppressionFlag; } - // Tor browser warning message/alert shown above the list. - - const PREF_SHOW_DOWNLOAD_WARNING = "browser.download.showTorWarning"; - // Observe changes to the tor warning pref. - const torWarningPrefObserver = () => { - if (Services.prefs.getBoolPref(PREF_SHOW_DOWNLOAD_WARNING)) { - torWarningMessageBar.hidden = false; - } else { - // Re-assign focus if it is about to be lost. - if (torWarningMessageBar.contains(document.activeElement)) { - // Try and focus the downloads list. - // NOTE: If #downloadsListBox is still hidden, this will do nothing. - // But in this case there are no other focusable targets within the - // view, so we just leave it up to the focus handler. - this._richlistbox.focus({ preventFocusRing: true }); - } - torWarningMessageBar.hidden = true; - } - }; - - Services.prefs.addObserver( - PREF_SHOW_DOWNLOAD_WARNING, - torWarningPrefObserver - ); - // Initialize. - torWarningPrefObserver(); - - window.addEventListener("unload", () => { - Services.prefs.removeObserver( - PREF_SHOW_DOWNLOAD_WARNING, - torWarningPrefObserver - ); - }); - - torWarningMessageBar - .querySelector(".downloads-tor-warning-dismiss-button") - .addEventListener("click", () => { - Services.prefs.setBoolPref(PREF_SHOW_DOWNLOAD_WARNING, false); - }); - // Make sure to unregister the view if the window is closed. window.addEventListener( "unload", ===================================== browser/components/downloads/content/contentAreaDownloadsView.js ===================================== @@ -8,12 +8,30 @@ const { PrivateBrowsingUtils } = ChromeUtils.importESModule( "resource://gre/modules/PrivateBrowsingUtils.sys.mjs" ); +const { DownloadsTorWarning } = ChromeUtils.importESModule( + "resource:///modules/DownloadsTorWarning.sys.mjs" +); + var ContentAreaDownloadsView = { init() { - const torWarningMessage = document.getElementById( - "aboutDownloadsTorWarning" - ); let box = document.getElementById("downloadsListBox"); + + const torWarning = new DownloadsTorWarning( + document.getElementById("aboutDownloadsTorWarning"), + false, + () => { + // Try and focus the downloads list. + // NOTE: If #downloadsListBox is still hidden, this will do nothing. + // But in this case there are no other focusable targets within the + // view, so we just leave it up to the focus handler. + box.focus({ preventFocusRing: true }); + } + ); + torWarning.activate(); + window.addEventListener("unload", () => { + torWarning.deactivate(); + }); + let suppressionFlag = DownloadsCommon.SUPPRESS_CONTENT_AREA_DOWNLOADS_OPEN; box.addEventListener( "InitialDownloadsLoaded", @@ -30,7 +48,7 @@ var ContentAreaDownloadsView = { // experience was bad. // Without auto-focusing the downloads list, a screen reader should not // skip beyond the alert's content. - if (torWarningMessage.hidden) { + if (torWarning.hidden) { document .getElementById("downloadsListBox") .focus({ focusVisible: false }); @@ -44,12 +62,7 @@ var ContentAreaDownloadsView = { }, { once: true } ); - let view = new DownloadsPlacesView( - box, - torWarningMessage, - true, - suppressionFlag - ); + let view = new DownloadsPlacesView(box, true, suppressionFlag); document.addEventListener("visibilitychange", () => { let indicator = DownloadsCommon.getIndicatorData(window); if (document.visibilityState === "visible") { ===================================== browser/components/downloads/content/contentAreaDownloadsView.xhtml ===================================== @@ -49,36 +49,7 @@ </keyset> #endif - <html:message-bar - id="aboutDownloadsTorWarning" - class="downloads-tor-warning-message-bar" - role="alert" - aria-labelledby="aboutDownloadsTorWarningTitle" - aria-describedby="aboutDownloadsTorWarningDescription" - > - <html:div class="downloads-tor-warning-grid"> - <html:p - id="aboutDownloadsTorWarningTitle" - class="downloads-tor-warning-title" - data-l10n-id="downloads-tor-warning-title" - ></html:p> - <html:p - id="aboutDownloadsTorWarningDescription" - class="downloads-tor-warning-description" - data-l10n-id="downloads-tor-warning-description" - > - <html:a - href="https://tails.net/" - target="_blank" - data-l10n-name="tails-link" - ></html:a> - </html:p> - <html:button - class="downloads-tor-warning-dismiss-button" - data-l10n-id="downloads-tor-warning-dismiss-button" - ></html:button> - </html:div> - </html:message-bar> + <html:moz-message-bar id="aboutDownloadsTorWarning"></html:moz-message-bar> <richlistbox flex="1" seltype="multiple" ===================================== browser/components/downloads/content/downloads.css ===================================== @@ -92,63 +92,13 @@ #downloadsPanel-mainView { min-width: 37em; padding: 0.62em; - /* If we don't set a width, #downloadsPanelTorWarningDescription will request + /* If we don't set a width, #downloadsPanelTorWarning will request * its max-content width. */ width: 37em; } -#downloadsPanel-mainView { - /* Fix the layout to ensure the #downloadsWarningDescription is given enough - * vertical space. For tor-browser#40701. - * TODO: May no longer be necessary after esr 115 due to bugzilla bug 1816455. - */ - display: flex; - flex-direction: column; -} - -.downloads-tor-warning-grid { - display: grid; - grid-template: - "title button" min-content - "description button" auto - / 1fr max-content; - gap: 8px; - margin-block: 8px; - /* Some extra space between the text and the icon. */ - margin-inline-start: 8px; -} - -.downloads-tor-warning-grid .downloads-tor-warning-title { - grid-area: title; - margin: 0; -} - -.downloads-tor-warning-grid .downloads-tor-warning-description { - grid-area: description; - margin: 0; -} - -.downloads-tor-warning-grid .downloads-tor-warning-dismiss-button { - grid-area: button; - align-self: center; -} - -.downloads-tor-warning-description, -.downloads-tor-warning-title { - line-height: 1.4; -} - -.downloads-tor-warning-title { - font-weight: bold; -} - -#downloadsPanelTorWarning :is( - .downloads-tor-warning-description, - .downloads-tor-warning-title -) { - padding-inline: 8px; - margin-block-start: 8px; - margin-block-end: 0; +#downloadsPanelTorWarning { + margin-block-end: var(--arrowpanel-menuitem-padding-block); } #downloadsHistory, ===================================== browser/components/downloads/content/downloads.js ===================================== @@ -31,8 +31,6 @@ "use strict"; -const PREF_SHOW_DOWNLOAD_WARNING = "browser.download.showTorWarning"; - var { XPCOMUtils } = ChromeUtils.importESModule( "resource://gre/modules/XPCOMUtils.sys.mjs" ); @@ -42,6 +40,7 @@ ChromeUtils.defineESModuleGetters(this, { FileUtils: "resource://gre/modules/FileUtils.sys.mjs", NetUtil: "resource://gre/modules/NetUtil.sys.mjs", PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs", + DownloadsTorWarning: "resource:///modules/DownloadsTorWarning.sys.mjs", }); const { Integration } = ChromeUtils.importESModule( @@ -76,11 +75,11 @@ var DownloadsPanel = { _waitingDataForOpen: false, /** - * State of tor's download warning. It should only be initialized once (text assigned, - * button commands assigned). This tracks if that has been performed and prevents - * repeats. + * Tracks whether to show the tor warning or not. + * + * @type {?DownloadsTorWarning} */ - _torWarningInitialized: false, + _torWarning: null, /** * Starts loading the download data in background, without opening the panel. @@ -98,30 +97,20 @@ var DownloadsPanel = { ); } - const torWarningMessage = document.getElementById( - "downloadsPanelTorWarning" - ); - if (!this._torWarningPrefObserver) { - // Observe changes to the tor warning pref. - this._torWarningPrefObserver = () => { - if (Services.prefs.getBoolPref(PREF_SHOW_DOWNLOAD_WARNING)) { - torWarningMessage.hidden = false; - } else { - const hadFocus = torWarningMessage.contains(document.activeElement); - torWarningMessage.hidden = true; + if (!this._torWarning) { + this._torWarning = new DownloadsTorWarning( + document.getElementById("downloadsPanelTorWarning"), + true, + () => { // Re-assign focus that was lost. - if (hadFocus) { - this._focusPanel(true); - } + this._focusPanel(true); + }, + () => { + this.hidePanel(); } - }; - Services.prefs.addObserver( - PREF_SHOW_DOWNLOAD_WARNING, - this._torWarningPrefObserver ); - // Initialize - this._torWarningPrefObserver(); } + this._torWarning.activate(); if (this._initialized) { DownloadsCommon.log("DownloadsPanel is already initialized."); @@ -149,33 +138,6 @@ var DownloadsPanel = { DownloadsSummary ); - if (!this._torWarningInitialized) { - // Intercept clicks on the tails link. - // NOTE: We listen for clicks on the parent instead of the - // <a data-l10n-name="tails-link"> element because the latter may be - // swapped for a new instance by Fluent when refreshing the parent. - torWarningMessage - .querySelector(".downloads-tor-warning-description") - .addEventListener("click", event => { - const tailsLink = event.target.closest( - ".downloads-tor-warning-tails-link" - ); - if (!tailsLink) { - return; - } - event.preventDefault(); - this.hidePanel(); - openWebLinkIn(tailsLink.href, "tab"); - }); - - torWarningMessage - .querySelector(".downloads-tor-warning-dismiss-button") - .addEventListener("click", () => { - Services.prefs.setBoolPref(PREF_SHOW_DOWNLOAD_WARNING, false); - }); - this._torWarningInitialized = true; - } - DownloadsCommon.log( "DownloadsView attached - the panel for this window", "should now see download items come in." @@ -218,13 +180,7 @@ var DownloadsPanel = { DownloadIntegration.downloadSpamProtection.unregister(window); } - if (this._torWarningPrefObserver) { - Services.prefs.removeObserver( - PREF_SHOW_DOWNLOAD_WARNING, - this._torWarningPrefObserver - ); - delete this._torWarningPrefObserver; - } + this._torWarning?.deactivate(); this._initialized = false; @@ -582,13 +538,8 @@ var DownloadsPanel = { // Focus the "Got it" button if it is visible. // This should ensure that the alert is read aloud by Orca when the // downloads panel is opened. See tor-browser#42642. - const torWarningMessage = document.getElementById( - "downloadsPanelTorWarning" - ); - if (!torWarningMessage.hidden) { - torWarningMessage - .querySelector(".downloads-tor-warning-dismiss-button") - .focus(focusOptions); + if (!this._torWarning?.hidden) { + this._torWarning.dismissButton.focus(focusOptions); return; } ===================================== browser/components/downloads/content/downloadsPanel.inc.xhtml ===================================== @@ -104,37 +104,8 @@ disablekeynav="true"> <panelview id="downloadsPanel-mainView"> - <vbox id="downloadsPanelTorWarning"> - <vbox - role="alert" - aria-labelledby="downloadsPanelTorWarningTitle" - aria-describedby="downloadsPanelTorWarningDescription" - > - <html:p - id="downloadsPanelTorWarningTitle" - class="downloads-tor-warning-title" - data-l10n-id="downloads-tor-warning-title" - ></html:p> - <html:p - id="downloadsPanelTorWarningDescription" - class="downloads-tor-warning-description" - data-l10n-id="downloads-tor-warning-description" - > - <html:a - href="https://tails.net/" - data-l10n-name="tails-link" - class="downloads-tor-warning-tails-link" - ></html:a> - </html:p> - <html:moz-button-group class="panel-footer"> - <html:button - class="footer-button downloads-tor-warning-dismiss-button" - data-l10n-id="downloads-tor-warning-dismiss-button" - ></html:button> - </html:moz-button-group> - </vbox> - <toolbarseparator /> - </vbox> + <html:moz-message-bar id="downloadsPanelTorWarning"> + </html:moz-message-bar> <vbox class="panel-view-body-unscrollable"> <richlistbox id="downloadsListBox" data-l10n-id="downloads-panel-items" ===================================== browser/components/downloads/moz.build ===================================== @@ -15,6 +15,7 @@ EXTRA_JS_MODULES += [ "DownloadsCommon.sys.mjs", "DownloadSpamProtection.sys.mjs", "DownloadsTaskbar.sys.mjs", + "DownloadsTorWarning.sys.mjs", "DownloadsViewableInternally.sys.mjs", "DownloadsViewUI.sys.mjs", ] ===================================== browser/components/places/content/places.js ===================================== @@ -6,7 +6,6 @@ /* import-globals-from editBookmark.js */ /* import-globals-from /toolkit/content/contentAreaUtils.js */ /* import-globals-from /browser/components/downloads/content/allDownloadsView.js */ -/* import-globals-from /browser/base/content/utilityOverlay.js */ /* Shared Places Import - change other consumers if you change this: */ var { XPCOMUtils } = ChromeUtils.importESModule( @@ -18,6 +17,7 @@ ChromeUtils.defineESModuleGetters(this, { PlacesBackups: "resource://gre/modules/PlacesBackups.sys.mjs", PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs", DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs", + DownloadsTorWarning: "resource:///modules/DownloadsTorWarning.sys.mjs", }); XPCOMUtils.defineLazyScriptGetter( this, @@ -158,15 +158,25 @@ var PlacesOrganizer = { "&sort=" + Ci.nsINavHistoryQueryOptions.SORT_BY_DATE_DESCENDING; - const torWarningMessage = document.getElementById( - "placesDownloadsTorWarning" + const torWarning = new DownloadsTorWarning( + document.getElementById("placesDownloadsTorWarning"), + true, + () => { + document + .getElementById("downloadsListBox") + .focus({ preventFocusRing: true }); + } ); + torWarning.activate(); + window.addEventListener("unload", () => { + torWarning.deactivate(); + }); + ContentArea.setContentViewForQueryString( DOWNLOADS_QUERY, () => new DownloadsPlacesView( document.getElementById("downloadsListBox"), - torWarningMessage, false ), { @@ -176,23 +186,6 @@ var PlacesOrganizer = { } ); - // Intercept clicks on the tor warning tails link. - // NOTE: We listen for clicks on the parent instead of the - // <a data-l10n-name="tails-link"> element because the latter may be - // swapped for a new instance by Fluent when refreshing the parent. - document - .querySelector(".downloads-tor-warning-description") - .addEventListener("click", event => { - const tailsLink = event.target.closest( - ".downloads-tor-warning-tails-link" - ); - if (!tailsLink) { - return; - } - event.preventDefault(); - openWebLinkIn(tailsLink.href, "tab"); - }); - ContentArea.init(); this._places = document.getElementById("placesList"); @@ -1432,6 +1425,7 @@ var ContentArea = { oldView.associatedElement.hidden = true; aNewView.associatedElement.hidden = false; + // Hide the Tor warning when not in the downloads view. const isDownloads = aNewView.associatedElement.id === "downloadsListBox"; const torWarningMessage = document.getElementById( "placesDownloadsTorWarning" ===================================== browser/components/places/content/places.xhtml ===================================== @@ -363,35 +363,8 @@ </tree> <splitter collapse="none" persist="state"></splitter> <vbox id="contentView"> - <html:message-bar - id="placesDownloadsTorWarning" - role="alert" - aria-labelledby="placesDownloadsTorWarningTitle" - aria-describedby="placesDownloadsTorWarningDescription" - > - <html:div class="downloads-tor-warning-grid"> - <html:p - id="placesDownloadsTorWarningTitle" - class="downloads-tor-warning-title" - data-l10n-id="downloads-tor-warning-title" - ></html:p> - <html:p - id="placesDownloadsTorWarningDescription" - class="downloads-tor-warning-description" - data-l10n-id="downloads-tor-warning-description" - > - <html:a - href="https://tails.net/" - class="downloads-tor-warning-tails-link" - data-l10n-name="tails-link" - ></html:a> - </html:p> - <html:button - class="downloads-tor-warning-dismiss-button" - data-l10n-id="downloads-tor-warning-dismiss-button" - ></html:button> - </html:div> - </html:message-bar> + <html:moz-message-bar id="placesDownloadsTorWarning"> + </html:moz-message-bar> <vbox id="placesViewsBox" flex="1"> <tree id="placeContent" class="placesTree" ===================================== browser/themes/shared/downloads/downloads.inc.css ===================================== @@ -252,7 +252,6 @@ } /*** Toolbarseparator ***/ -#downloadsPanelTorWarning toolbarseparator, #downloadsFooterButtons > toolbarseparator { margin-inline: 0; } ===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -559,9 +559,13 @@ crypto-safety-prompt-dismiss-button = Dismiss Warning ## Downloads warning. ## Shown in downloads panel, about:downloads and Library window. -downloads-tor-warning-title = Be careful opening downloads -# "Tails" is the brand name for the Tails operating system and should be localized appropriately, and will be a link to its website. The name should be wrapped in '<a data-l10n-name="tails-link">' and '</a>'. -downloads-tor-warning-description = Some files may connect to the internet when opened without using Tor. To be safe, open the files while offline or use a portable operating system like <a data-l10n-name="tails-link">Tails</a>. +# "Tails" is the brand name for the Tails operating system and should be localized appropriately. +downloads-tor-warning-message-bar = + .heading = Be careful opening downloads + .message = Some files may connect to the internet when opened without using Tor. To be safe, open the files while offline or use a portable operating system like Tails. +# This will be a link to the Tails operating system website. +# "Tails" is the brand name for the Tails operating system and should be localized appropriately. +downloads-tor-warning-tails-link= Learn more about Tails # Button to dismiss the warning forever. downloads-tor-warning-dismiss-button = Got it ===================================== tools/torbrowser/l10n/migrations/bug-41820-moz-message-bar-download-warning.py ===================================== @@ -0,0 +1,67 @@ +import re + +import fluent.syntax.ast as FTL +from fluent.migrate.transforms import COPY_PATTERN, FluentSource +from fluent.syntax.visitor import Visitor + + +class RemoveAnchorVisitor(Visitor): + """Class to remove <a> and </a> wrappers from a Fluent TextElement.""" + + def __init__(self): + # Good enough regex for our needs that will match starting and ending + # tags. + self._anchor_regex = re.compile(r"<\/?[aA](| [^>]*)>") + super().__init__() + + def visit_TextElement(self, node): + node.value = self._anchor_regex.sub("", node.value) + + +class RemoveAnchorTransform(FluentSource): + """Class to remove <a> and </a> wrappers from a Fluent source.""" + + def __call__(self, ctx): + pattern = ctx.get_fluent_source_pattern(self.path, self.key).clone() + # Visit every node in the pattern, replacing each TextElement's content. + RemoveAnchorVisitor().visit(pattern) + return pattern + + +def migrate(ctx): + # Convert + # + # downloads-tor-warning-title = A + # downloads-tor-warning-description = B<a data-l10n-name="tails-link">C</a>D + # + # to + # + # downloads-tor-warning-message-bar = + # .heading = A + # .message = BCD + ctx.add_transforms( + "tor-browser.ftl", + "tor-browser.ftl", + [ + FTL.Message( + id=FTL.Identifier("downloads-tor-warning-message-bar"), + value=None, + attributes=[ + FTL.Attribute( + id=FTL.Identifier("heading"), + value=COPY_PATTERN( + "tor-browser.ftl", + "downloads-tor-warning-title", + ), + ), + FTL.Attribute( + id=FTL.Identifier("message"), + value=RemoveAnchorTransform( + "tor-browser.ftl", + "downloads-tor-warning-description", + ), + ), + ], + ), + ], + ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f650da… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f650da… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41221: Use Go build tags to reduce PT binary sizes
by morgan (＠morgan) 21 Aug '24

21 Aug '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 9f4afa27 by Cecylia Bocovich at 2024-08-21T12:04:24-04:00 Bug 41221: Use Go build tags to reduce PT binary sizes - - - - - 2 changed files: - projects/conjure/build - projects/snowflake/build Changes: ===================================== projects/conjure/build ===================================== @@ -18,7 +18,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] tar -xf $rootdir/[% c('… [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.14.0esr-13.5-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by morgan (＠morgan) 21 Aug '24

21 Aug '24

morgan pushed to branch tor-browser-115.14.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 4c12da1a by Henry Wilkes at 2024-08-21T18:23:59+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42691: Allow users to copy built-in addresses. - - - - - 1 changed file: - browser/components/torpreferences/content/connectionPane.js Changes: ===================================== browser/components/… [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.14.0esr-13.5-1] fixup! Bug 40701: Add security warning when downloading a file
by morgan (＠morgan) 21 Aug '24

21 Aug '24

morgan pushed to branch tor-browser-115.14.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: f3b141db by Henry Wilkes at 2024-08-21T18:14:24+00:00 fixup! Bug 40701: Add security warning when downloading a file Bug 42642: Focus the "Got it" button when opening the downloads panel. This should ensure that the alert is read aloud by Orca screen reader. - - - - - 1 changed file: - browser/components/downloads/content/downloads.js Changes: =============… [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] fixup! Add CI for Tor Browser
by Pier Angelo Vendrame (＠pierov) 21 Aug '24

21 Aug '24

Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: f650dacf by Henry Wilkes at 2024-08-21T13:41:55+01:00 fixup! Add CI for Tor Browser Bug 42480: Add android torbrowser_strings.xml to our translation CI. - - - - - 1 changed file: - .gitlab/ci/update-translations.yml Changes: ===================================== .gitlab/ci/update-translations.yml ===================================== @@ -26,6 +26,7 @@ combine-en-… [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.14.0esr-13.5-1] TEMPORARY: Copy torbrowser_strings.xml to the 13.5 branch.
by Pier Angelo Vendrame (＠pierov) 21 Aug '24

21 Aug '24

Pier Angelo Vendrame pushed to branch tor-browser-115.14.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: ba841d9b by Henry Wilkes at 2024-08-21T14:24:18+01:00 TEMPORARY: Copy torbrowser_strings.xml to the 13.5 branch. NOTE: Only needed for the `tor-browser` `13.5` branches. Bug 42480: Make sure the torbrowser_strings.xml file is in the 13.5 branch for the tor-browser `update-translations` CI. The file should otherwise remain unused for the 13.5 branch. File was copied … [View More]from https://gitlab.torproject.org/tpo/translation/-/blob/f27eda6d10a4585a8402c5… - - - - - 1 changed file: - + mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -0,0 +1,147 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<resources> +  + <string name="tor_about_content">%1$s is produced by the Tor Project, a U.S.-based 501(c)(3) nonprofit.</string> + +  + <string name="preferences_disable_normal_mode">Allow Only Private Browsing Mode</string> +  + <string name="preferences_donate">Donate to The Tor Project</string> +  + <string name="preferences_allow_screenshots">Allow screenshots</string> + + <string name="tor_bootstrap_connect">Connect</string> + <string name="tor_bootstrap_connecting">Connecting</string> + <string name="tor_bootstrap_connecting_failed">Connecting Failed</string> + <string name="tor_bootstrap_quick_start_label">Quick Start</string> + <string name="tor_bootstrap_quick_start_disabled">Enable Quick Start to connect automatically in the future</string> + <string name="tor_bootstrap_quick_start_enabled">%s will connect automatically to the Tor Network in the future</string> + <string name="tor_bootstrap_swipe_for_logs">Swipe to the left to see Tor logs</string> + <string name="tor_initializing_log">Initializing Tor Log</string> + + <string name="tor_onboarding_security_level">Set your Security Level</string> + <string name="tor_onboarding_security_level_description">Disable certain web features that can be used to attack you, and harm your security, anonymity, and privacy.</string> + <string name="tor_onboarding_chosen_security_level_label">Current Security Level: %s</string> + <string name="tor_onboarding_security_settings_button">Open Security Settings</string> + <string name="tor_onboarding_donate_header">Donate and keep Tor safe</string> + <string name="tor_onboarding_donate_description">Tor is free to use because of donations from people like you.</string> + <string name="tor_onboarding_donate_button">Donate Now</string> + + <string name="tor_explore_privately">Explore. Privately.</string> + + <string name="preferences_tor_network_settings">Tor Network</string> + <string name="preferences_tor_network_settings_explanation">Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world.</string> + <string name="preferences_tor_network_settings_bridge_config">Config Bridge</string> + <string name="preferences_tor_network_settings_bridge_config_description">Use a Bridge to connect to Tor</string> + <string name="preferences_tor_network_settings_bridge_config_description_builtin_transport_enabled">You’re using a built-in bridge to connect to Tor</string> + <string name="preferences_tor_network_settings_bridge_config_description_user_provided_enabled">You provided a bridge to connect to Tor</string> + <string name="preferences_tor_network_settings_bridge_config_explanation">Bridges are unlisted relays that make it more difficult to block connections to the Tor Network. Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.</string> + <string name="preferences_tor_network_settings_bridge_config_toggle">Use a Bridge</string> + <string name="preferences_tor_network_settings_bridge_config_toggle_description">Config a bridge to connect to Tor</string> + <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_obfs4">obfs4</string> + <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_meek_azure">meek-azure</string> + <string name="preferences_tor_network_settings_bridge_config_builtin_bridge_snowflake">snowflake</string> + <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge">Provide a Bridge I know</string> + <string name="preferences_tor_network_settings_bridge_config_user_provided_bridge_description">Enter bridge information from a trusted source</string> + <string name="preferences_tor_network_settings_bridge_config_current_bridge">Current Configured Bridge: %s</string> + <string name="tor_network_settings_bridge_not_configured">Not Configured</string> + <string name="preferences_tor_network_settings_status">Current Status</string> + <string name="preferences_tor_network_settings_tor_ready">Is Tor Ready: %s</string> + <string name="preferences_tor_network_settings_state">State: %s</string> + <string name="preferences_tor_network_settings_yes">Yes</string> + <string name="preferences_tor_network_settings_no">No</string> + <string name="preferences_tor_network_settings_disconnected">Disconnected</string> + <string name="preferences_tor_network_settings_connecting">Connecting</string> + <string name="preferences_tor_network_settings_connected">Connected</string> + <string name="preferences_tor_network_settings_restarting">Restarting</string> + <string name="preferences_tor_network_settings_bridges_enabled">Bridges are enabled: %s</string> + +  + <string name="preferences_tor_security_level_settings">Security Settings</string> + <string name="preferences_tor_security_level_options">Security Level</string> + +  + <string name="tor_security_level_standard_option">Standard</string> + <string name="tor_security_level_standard_description">All Tor Browser and website features are enabled.</string> + <string name="tor_security_level_safer_option">Safer</string> + <string name="tor_security_level_safer_description">Disable website features that are often dangerous, causing some sites to lose functionality.</string> + <string name="tor_security_level_safest_option">Safest</string> + <string name="tor_security_level_safest_description">Only allow website features required for static sites and basic services. These changes affect images, media, and scripts.</string> + +  + <string name="tor_spoof_english">Request English versions of web pages for enhanced privacy</string> +  + <string name="preferences_tor_prioritize_onions">Prioritize .onion sites</string> + +  + <string name="connection_assist_tor_connect_title">Connect to Tor</string> +  + <string name="connection_assist_always_connect_automatically_toggle_description">Always connect automatically</string> +  + <string name="connection_assist_configure_connection_button">Configure connection…</string> + +  + <string name="connection_assist_connecting_title">Establishing a connection…</string> + +  + <string name="connection_assist_internet_error_title">We can’t reach the internet</string> +  + <string name="connection_assist_internet_error_description">This could be due to a connection issue rather than Tor being blocked. Check your internet connection, proxy, and firewall settings before trying again. %1$s</string> +  + <string name="connection_assist_internet_error_learn_more">Learn more</string> +  + <string name="connection_assist_internet_error_try_again">Try again</string> + +  + <string name="connection_assist_trying_again_waiting_title">Trying again…</string> + +  + <string name="connection_assist_cant_connect_to_tor_title">We can’t connect to Tor directly</string> +  + <string name="connection_assist_try_a_bridge_description">Try connecting via a bridge instead. By providing your location, we can look up the bridge that’s most likely to unblock the internet in your country or region. %1$s</string> +  + <string name="connection_assist_unblock_the_internet_in_country_or_region">Unblock the internet in:</string> +  + <string name="connection_assist_share_my_location_country_or_region">Share my location</string> +  + <string name="connection_assist_try_a_bridge_button">Try a bridge</string> + +  + <string name="connection_assist_try_a_bridge_learn_more_description1">Tor Browser will need to establish a brief non-Tor connection to determine your location and look up a bridge. If you don’t want to do that, you can %1$s instead.</string> +  + <string name="connection_assist_choose_a_bridge_manually_link">choose a bridge manually</string> +  + <string name="connection_assist_try_a_bridge_learn_more_error_code">Error code: %s</string> + +  + <string name="connection_assist_trying_a_bridge_title">Trying a bridge…</string> + +  + <string name="connection_assist_location_error_title">We couldn’t find your location</string> +  + <string name="connection_assist_location_error_description" translatable="false">%1$s %2$s %3$s</string> + <string name="connection_assist_find_bridge_location_description">To find a bridge that can unblock your internet, we need to know where you’re connecting from.</string> + <string name="connection_assist_select_country_try_again">Select your country or region and try again.</string> +  + <string name="connection_assist_location_error_last_try_description">%1$s %2$s %3$s</string> + <string name="connection_assist_check_location_settings_try_again">Please check your location settings are correct and try again.</string> + + <string name="connection_assist_location_error_learn_more_link">Learn more</string> + +  + <string name="connection_assist_location_check_title">We’re still having trouble connecting</string> + +  + <string name="connection_assist_last_try_title">Trying one more time…</string> + +  + <string name="connection_assist_final_error_title">We weren’t able to connect automatically</string> +  + <string name="connection_assist_final_error_description1">Despite our best efforts, we weren’t able to connect to Tor. We recommend %1$s and adding a bridge manually instead. %2$s</string> +  + <string name="connection_assist_final_error_troubleshoot_connection_link">troubleshooting your connection</string> +  + <string name="connection_assist_final_error_learn_more_link">Learn more</string> +</resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ba841d9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ba841d9… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] Bug 41218: Use new Tor Browser gpg subkey for signing stable releases
by boklm (＠boklm) 21 Aug '24

21 Aug '24

boklm pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: 3f16675b by Nicolas Vigier at 2024-08-21T13:08:19+02:00 Bug 41218: Use new Tor Browser gpg subkey for signing stable releases With #40964 we started using a new subkey for signing alpha releases. We now start using the new subkey for signing stable releases too. - - - - - 3 changed files: - tools/signing/linux-signer-gpg-sign - tools/signing/machines-setup/sudoers.d/sign-gpg - tools/signing/… [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] fixup! Bug 23247: Communicating security expectations for .onion
by Pier Angelo Vendrame (＠pierov) 21 Aug '24

21 Aug '24

Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 880f3361 by Pier Angelo Vendrame at 2024-08-21T12:45:09+02:00 fixup! Bug 23247: Communicating security expectations for .onion Bug 43013: Mixed content upgrades also .onion domains. - - - - - 1 changed file: - netwerk/base/nsNetUtil.cpp Changes: ===================================== netwerk/base/nsNetUtil.cpp ===================================== @@ -3054,7 +… [View More]

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41218: Use new Tor Browser gpg subkey for signing stable releases
by boklm (＠boklm) 21 Aug '24

21 Aug '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f4580f58 by Nicolas Vigier at 2024-08-21T13:07:03+02:00 Bug 41218: Use new Tor Browser gpg subkey for signing stable releases With #40964 we started using a new subkey for signing alpha releases. We now start using the new subkey for signing stable releases too. - - - - - 3 changed files: - tools/signing/linux-signer-gpg-sign - tools/signing/machines-setup/sudoers.d/sign-gpg - tools/signing/… [View More]

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] fixup! Bug 41817: tor-browser semantic colors.
by Pier Angelo Vendrame (＠pierov) 21 Aug '24

21 Aug '24

Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 32a8ac00 by Henry Wilkes at 2024-08-21T11:00:25+01:00 fixup! Bug 41817: tor-browser semantic colors. Bug 43071: Fix focus styling for primary tor-button buttons. Also, add a prefers-contrast and forced-colors variant for the tor colors that use the Firefox design system colors. - - - - - 1 changed file: - toolkit/themes/shared/tor-colors.css Changes: ===========… [View More]========================== toolkit/themes/shared/tor-colors.css ===================================== @@ -101,19 +101,43 @@ ); } -button.tor-button, +@media ((prefers-contrast) or (forced-colors)) { + :root { + /* Use Firefox design system accent colors. */ + --tor-accent-color: var(--color-accent-primary); + --tor-accent-color-hover: var(--color-accent-primary-hover); + --tor-accent-color-active: var(--color-accent-primary-active); + + /* Use Firefox design system primary button colors. */ + --tor-button-text-color: var(--button-text-color-primary); + --tor-button-text-color-hover: var(--button-text-color-primary-hover); + --tor-button-text-color-active: var(--button-text-color-primary-active); + --tor-button-background-color: var(--button-background-color-primary); + --tor-button-background-color-hover: var(--button-background-color-primary-hover); + --tor-button-background-color-active: var(--button-background-color-primary-active); + + /* Use Firefox design system default colors. */ + --tor-focus-outline-color: var(--focus-outline-color); + --tor-link-color: var(--link-color); + --tor-link-color-hover: var(--link-color-hover); + --tor-link-color-active: var(--link-color-active); + } +} + +/* Has a higher specificity than `button` and `button.primary`. */ +button.tor-button:is(*, .primary), .tor-button { color: var(--tor-button-text-color); background-color: var(--tor-button-background-color); } -button.tor-button:hover, +button.tor-button:is(*, .primary):hover, .tor-button:hover { color: var(--tor-button-text-color-hover); background-color: var(--tor-button-background-color-hover); } -button.tor-button:hover:active, +button.tor-button:is(*, .primary):hover:active, .tor-button:hover:active { color: var(--tor-button-text-color-active); background-color: var(--tor-button-background-color-active); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/32a8ac0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/32a8ac0… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.14.0esr-13.5-1] 2 commits: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by Pier Angelo Vendrame (＠pierov) 21 Aug '24

21 Aug '24

Pier Angelo Vendrame pushed to branch tor-browser-115.14.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 4543a87f by Henry Wilkes at 2024-08-21T10:37:58+02:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42661: Rerun update_emojis.py for the bridge emojis. Add missing locales. - - - - - 5b120823 by Henry Wilkes at 2024-08-21T10:38:04+02:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 42661: … [View More]Rerun update_emojis.py for the circuit flags. Add missing locales. - - - - - 4 changed files: - browser/components/torcircuit/content/tor-circuit-flags/README.txt - browser/components/torpreferences/content/bridgemoji/annotations.json - browser/components/torpreferences/content/bridgemoji/svgs/README.txt - tools/torbrowser/update_emojis.py Changes: ===================================== browser/components/torcircuit/content/tor-circuit-flags/README.txt ===================================== @@ -1 +1 @@ -Generated by tools/torbrowser/update_emojis.py on 2023-04-03 \ No newline at end of file +Generated by tools/torbrowser/update_emojis.py on 2024-08-06 ===================================== browser/components/torpreferences/content/bridgemoji/annotations.json ===================================== @@ -1,5 +1,5 @@ { - "_comment": "Generated by tools/torbrowser/update_emojis.py on 2023-04-03", + "_comment": "Generated by tools/torbrowser/update_emojis.py on 2024-08-06", "ar": { "1f47d": "كائن فضائي", "1f916": "وجه روبوت", @@ -258,6 +258,522 @@ "1f9f9": "مكنسة", "1f5ff": "تمثال" }, + "be": { + "1f47d": "іншапланецянін", + "1f916": "робат", + "1f9e0": "мозг", + "1f441": "вока", + "1f9d9": "чараўнік", + "1f9da": "фея", + "1f9dc": "русалкі", + "1f435": "пыска малпы", + "1f9a7": "арангутан", + "1f436": "сабачая пыска", + "1f43a": "воўк", + "1f98a": "ліс", + "1f99d": "янот", + "1f431": "каціная пыска", + "1f981": "леў", + "1f42f": "пыска тыгра", + "1f434": "пыска каня", + "1f984": "пыска аднарога", + "1f993": "зебра", + "1f98c": "алень", + "1f42e": "пыска каровы", + "1f437": "пыска свінні", + "1f417": "дзік", + "1f42a": "вярблюд", + "1f999": "лама", + "1f992": "жыраф", + "1f418": "слон", + "1f9a3": "мамант", + "1f98f": "насарог", + "1f42d": "мышыная пыска", + "1f430": "заечая пыска", + "1f43f": "бурундук", + "1f994": "вожык", + "1f987": "кажан", + "1f43b": "мядзведжая пыска", + "1f428": "каала", + "1f9a5": "лянівец", + "1f9a6": "выдра", + "1f998": "кенгуру", + "1f425": "кураня спераду", + "1f426": "птушка", + "1f54a": "голуб", + "1f986": "качка", + "1f989": "сава", + "1f9a4": "дадо", + "1fab6": "пяро", + "1f9a9": "фламінга", + "1f99a": "паўлін", + "1f99c": "папугай", + "1f40a": "кракадзіл", + "1f422": "чарапаха", + "1f98e": "яшчарка", + "1f40d": "змяя", + "1f432": "галава цмока", + "1f995": "заўрапод", + "1f433": "фантануючы кіт", + "1f42c": "дэльфін", + "1f9ad": "цюлень", + "1f41f": "рыба", + "1f420": "трапічная рыба", + "1f988": "акула", + "1f419": "васьміног", + "1f41a": "спіральная ракушка", + "1f40c": "смоўж", + "1f98b": "матылёк", + "1f41b": "кузурка", + "1f41d": "пчала", + "1f41e": "божая кароўка", + "1f490": "букет", + "1f339": "ружа", + "1f33a": "гібіскус", + "1f33b": "сланечнік", + "1f337": "цюльпан", + "1f332": "вечназялёнае дрэва", + "1f333": "ліставое дрэва", + "1f334": "пальма", + "1f335": "кактус", + "1f33f": "лекавая трава", + "1f341": "кляновы ліст", + "1f344": "грыб", + "1f347": "вінаград", + "1f348": "дыня", + "1f349": "кавун", + "1f34a": "мандарын", + "1f34b": "лімон", + "1f34c": "банан", + "1f34d": "ананас", + "1f96d": "манга", + "1f34f": "зялёны яблык", + "1f350": "груша", + "1f351": "персік", + "1f352": "вішні", + "1f353": "клубніцы", + "1fad0": "буякі", + "1f95d": "ківі", + "1f345": "памідор", + "1fad2": "аліва", + "1f965": "какос", + "1f951": "авакада", + "1f346": "баклажан", + "1f955": "морква", + "1f33d": "катах кукурузы", + "1f336": "востры перац", + "1f96c": "зеляніна", + "1f966": "брокалі", + "1f9c5": "цыбуля", + "1f95c": "арахіс", + "1f950": "круасан", + "1f956": "багет", + "1f968": "крэндзель", + "1f96f": "пышка", + "1f95e": "бліны", + "1f9c7": "вафля", + "1f354": "гамбургер", + "1f355": "піца", + "1f32d": "хот-дог", + "1f32e": "така", + "1f37f": "папкорн", + "1f980": "краб", + "1f99e": "амар", + "1f368": "марожанае", + "1f369": "пончык", + "1f36a": "пячэнне", + "1f382": "імянінны торт", + "1f9c1": "кекс", + "1f36b": "плітка шакаладу", + "1f36c": "цукерка", + "1f36d": "ледзянец", + "1fad6": "чайнік", + "1f9c3": "пачак з напоем", + "1f9c9": "матэ", + "1f9ed": "компас", + "1f3d4": "заснежаная гара", + "1f30b": "вулкан", + "1f3d5": "кемпінг", + "1f3dd": "ненаселены востраў", + "1f3e1": "дом з садам", + "26f2": "фантан", + "1f3a0": "конік з каруселі", + "1f3a1": "кола агляду", + "1f3a2": "амерыканскія горкі", + "1f488": "каляровы слуп", + "1f686": "цягнік", + "1f68b": "трамвайны вагон", + "1f68d": "набліжаецца аўтобус", + "1f695": "таксі", + "1f697": "аўтамабіль", + "1f69a": "грузавік", + "1f69c": "трактар", + "1f6f5": "скутар", + "1f6fa": "аўтарыкша", + "1f6f4": "самакат", + "1f6f9": "скейтборд", + "1f6fc": "ролікавы канёк", + "2693": "якар", + "26f5": "паруснік", + "1f6f6": "каноэ", + "1f6a4": "быстраходны катар", + "1f6a2": "карабель", + "2708": "самалёт", + "1f681": "верталёт", + "1f6a0": "горны фунікулёр", + "1f6f0": "спадарожнік", + "1f680": "ракета", + "1f6f8": "лятаючая талерка", + "23f0": "будзільнік", + "1f319": "паўмесяц", + "1f321": "тэрмометр", + "2600": "сонца", + "1fa90": "планета з кальцом", + "1f31f": "бліскучая зорка", + "1f300": "цыклон", + "1f308": "вясёлка", + "2602": "парасон", + "2744": "сняжынка", + "2604": "камета", + "1f525": "агонь", + "1f4a7": "кропелька", + "1f30a": "хваля", + "1f383": "гарбузны ліхтар", + "2728": "іскры", + "1f388": "паветраны шарык", + "1f389": "хлапушка", + "1f38f": "каінаборы", + "1f380": "стужка", + "1f381": "запакаваны падарунак", + "1f39f": "уваходныя білеты", + "1f3c6": "кубак", + "26bd": "футбольны мяч", + "1f3c0": "баскетбол", + "1f3c8": "амерыканскі футбол", + "1f3be": "тэніс", + "1f94f": "фрысбі", + "1f3d3": "пінг-понг", + "1f3f8": "бадмінтон", + "1f93f": "маска для падводнага плавання", + "1f94c": "шайба для кёрлінгу", + "1f3af": "прамое пападанне", + "1fa80": "ё-ё", + "1fa81": "паветраны змей", + "1f52e": "крыштальны шар", + "1f3b2": "ігральная косць", + "1f9e9": "частка пазла", + "1f3a8": "палітра мастака", + "1f9f5": "нітка", + "1f455": "футболка", + "1f9e6": "шкарпэткі", + "1f457": "сукенка", + "1fa73": "шорты", + "1f392": "школьны ранец", + "1f45f": "красовак", + "1f451": "карона", + "1f9e2": "кепка", + "1f484": "памада", + "1f48d": "кальцо", + "1f48e": "каштоўны самацвет", + "1f4e2": "гучнагаварыцель", + "1f3b6": "музычныя ноты", + "1f399": "студыйны мікрафон", + "1f4fb": "радыё", + "1f3b7": "саксафон", + "1fa97": "акардэон", + "1f3b8": "гітара", + "1f3ba": "труба", + "1f3bb": "скрыпка", + "1fa95": "банджа", + "1f941": "барабан", + "260e": "хатні тэлефон", + "1f50b": "батарэйка", + "1f4bf": "аптычны дыск", + "1f9ee": "лічыльнікі", + "1f3ac": "нумаратар з хлапушкай", + "1f4a1": "лямпачка", + "1f526": "ліхтарык", + "1f3ee": "чырвоны папяровы ліхтар", + "1f4d5": "закрытая кніга", + "1f3f7": "бірка", + "1f4b3": "крэдытная карта", + "270f": "аловак", + "1f58c": "пэндзаль", + "1f58d": "пастэль", + "1f4cc": "канцылярская кнопка", + "1f4ce": "сашчэпка", + "1f511": "ключ", + "1fa83": "бумеранг", + "1f3f9": "лук са стралой", + "2696": "шалі", + "1f9f2": "магніт", + "1f9ea": "прабірка", + "1f9ec": "ДНК", + "1f52c": "мікраскоп", + "1f52d": "тэлескоп", + "1f4e1": "спадарожнікавая антэна", + "1fa91": "крэсла", + "1f9f9": "мятла", + "1f5ff": "мааі" + }, + "bg": { + "1f47d": "извънземно", + "1f916": "Лице на робот", + "1f9e0": "мозък", + "1f441": "око", + "1f9d9": "жена магьосник", + "1f9da": "фея", + "1f9dc": "жена амфибия", + "1f435": "Лице на маймуна", + "1f9a7": "орангутан", + "1f436": "муцуна на куче", + "1f43a": "вълк", + "1f98a": "лисица", + "1f99d": "енот", + "1f431": "муцуна на котка", + "1f981": "лъв", + "1f42f": "муцуна на тигър", + "1f434": "муцуна на кон", + "1f984": "еднорог", + "1f993": "зебра", + "1f98c": "елен", + "1f42e": "муцуна на крава", + "1f437": "зурла на прасе", + "1f417": "глиган", + "1f42a": "камила", + "1f999": "лама", + "1f992": "жираф", + "1f418": "слон", + "1f9a3": "мамут", + "1f98f": "носорог", + "1f42d": "муцуна на мишка", + "1f430": "муцуна на заек", + "1f43f": "катерица", + "1f994": "таралеж", + "1f987": "прилеп", + "1f43b": "мечка", + "1f428": "коала", + "1f9a5": "ленивец", + "1f9a6": "видра", + "1f998": "кенгуру", + "1f425": "пиленце, гледано отпред", + "1f426": "птица", + "1f54a": "гълъб", + "1f986": "патица", + "1f989": "бухал", + "1f9a4": "Додо", + "1fab6": "перо", + "1f9a9": "фламинго", + "1f99a": "паун", + "1f99c": "папагал", + "1f40a": "крокодил", + "1f422": "костенурка", + "1f98e": "гущер", + "1f40d": "змия", + "1f432": "глава на дракон", + "1f995": "завропод", + "1f433": "пръскащ кит", + "1f42c": "делфин", + "1f9ad": "тюлен", + "1f41f": "риба", + "1f420": "тропическа риба", + "1f988": "акула", + "1f419": "октопод", + "1f41a": "спирална раковина", + "1f40c": "охлюв", + "1f98b": "пеперуда", + "1f41b": "буболечка", + "1f41d": "пчела", + "1f41e": "калинка", + "1f490": "букет", + "1f339": "роза", + "1f33a": "хибискус", + "1f33b": "слънчоглед", + "1f337": "лале", + "1f332": "вечнозелено дърво", + "1f333": "листопадно дърво", + "1f334": "палма", + "1f335": "кактус", + "1f33f": "билка", + "1f341": "кленов лист", + "1f344": "гъба", + "1f347": "грозде", + "1f348": "пъпеш", + "1f349": "диня", + "1f34a": "мандарина", + "1f34b": "лимон", + "1f34c": "банан", + "1f34d": "ананас", + "1f96d": "манго", + "1f34f": "зелена ябълка", + "1f350": "круша", + "1f351": "праскова", + "1f352": "череши", + "1f353": "ягода", + "1fad0": "черни боровинки", + "1f95d": "плод киви", + "1f345": "домат", + "1fad2": "маслина", + "1f965": "кокосов орех", + "1f951": "авокадо", + "1f346": "патладжан", + "1f955": "морков", + "1f33d": "царевичен кочан", + "1f336": "люта чушка", + "1f96c": "листен зеленчук", + "1f966": "броколи", + "1f9c5": "лук", + "1f95c": "фъстъци", + "1f950": "кроасан", + "1f956": "багета", + "1f968": "брецел", + "1f96f": "геврек", + "1f95e": "палачинки", + "1f9c7": "гофрета", + "1f354": "хамбургер", + "1f355": "пица", + "1f32d": "хотдог", + "1f32e": "тако", + "1f37f": "пуканки", + "1f980": "рак", + "1f99e": "омар", + "1f368": "сладолед", + "1f369": "поничка", + "1f36a": "бисквитка", + "1f382": "торта за рожден ден", + "1f9c1": "къпкейк", + "1f36b": "шоколадово блокче", + "1f36c": "бонбон", + "1f36d": "близалка", + "1fad6": "чайник", + "1f9c3": "кутия за напитки", + "1f9c9": "мате", + "1f9ed": "компас", + "1f3d4": "покрита със сняг планина", + "1f30b": "вулкан", + "1f3d5": "къмпинг", + "1f3dd": "необитаем остров", + "1f3e1": "къща с градина", + "26f2": "фонтан", + "1f3a0": "кон от въртележка", + "1f3a1": "виенско колело", + "1f3a2": "влакче в увеселителен парк", + "1f488": "знак на бръснар", + "1f686": "влак", + "1f68b": "трамваен вагон", + "1f68d": "приближаващ автобус", + "1f695": "такси", + "1f697": "автомобил", + "1f69a": "камион за доставки", + "1f69c": "трактор", + "1f6f5": "моторен скутер", + "1f6fa": "авторикша", + "1f6f4": "тротинетка", + "1f6f9": "скейтборд", + "1f6fc": "ролери", + "2693": "котва", + "26f5": "яхта", + "1f6f6": "кану", + "1f6a4": "моторна лодка", + "1f6a2": "кораб", + "2708": "самолет", + "1f681": "хеликоптер", + "1f6a0": "лифт", + "1f6f0": "спътник", + "1f680": "ракета", + "1f6f8": "летяща чиния", + "23f0": "будилник", + "1f319": "полумесец", + "1f321": "термометър", + "2600": "слънце", + "1fa90": "планета с пръстен", + "1f31f": "блестяща звезда", + "1f300": "циклон", + "1f308": "дъга", + "2602": "чадър", + "2744": "снежинка", + "2604": "комета", + "1f525": "огън", + "1f4a7": "капка", + "1f30a": "вълна", + "1f383": "тиквен фенер", + "2728": "звездички", + "1f388": "балон", + "1f389": "конфети", + "1f38f": "коинобори", + "1f380": "панделка", + "1f381": "опакован подарък", + "1f39f": "билети за вход", + "1f3c6": "спортна купа", + "26bd": "футболна топка", + "1f3c0": "баскетболна топка", + "1f3c8": "топка за американски футбол", + "1f3be": "тенис", + "1f94f": "фризби", + "1f3d3": "тенис на маса", + "1f3f8": "бадминтон", + "1f93f": "маска за гмуркане", + "1f94c": "камък за кърлинг", + "1f3af": "точен удар", + "1fa80": "йо-йо", + "1fa81": "хвърчило", + "1f52e": "Кристално кълбо", + "1f3b2": "зар за игра", + "1f9e9": "част от пъзел", + "1f3a8": "палитра на художник", + "1f9f5": "конец", + "1f455": "тениска", + "1f9e6": "чорапи", + "1f457": "рокля", + "1fa73": "плувни шорти", + "1f392": "ученическа раница", + "1f45f": "спортна обувка", + "1f451": "корона", + "1f9e2": "шапка с козирка", + "1f484": "червило", + "1f48d": "пръстен", + "1f48e": "скъпоценен камък", + "1f4e2": "Високоговорител за обществени места", + "1f3b6": "ноти", + "1f399": "студиен микрофон", + "1f4fb": "радио", + "1f3b7": "саксофон", + "1fa97": "акордеон", + "1f3b8": "китара", + "1f3ba": "тромпет", + "1f3bb": "цигулка", + "1fa95": "банджо", + "1f941": "барабан", + "260e": "телефон", + "1f50b": "батерия", + "1f4bf": "оптичен диск", + "1f9ee": "сметало", + "1f3ac": "клапа", + "1f4a1": "електрическа крушка", + "1f526": "фенерче", + "1f3ee": "червен хартиен фенер", + "1f4d5": "затворена книга", + "1f3f7": "етикет", + "1f4b3": "кредитна карта", + "270f": "молив", + "1f58c": "четка", + "1f58d": "пастел", + "1f4cc": "кабърче", + "1f4ce": "кламер", + "1f511": "ключ", + "1fa83": "бумеранг", + "1f3f9": "лък и стрела", + "2696": "везна", + "1f9f2": "магнит", + "1f9ea": "епруветка", + "1f9ec": "ДНК", + "1f52c": "микроскоп", + "1f52d": "телескоп", + "1f4e1": "сателитна антена", + "1fa91": "стол", + "1f9f9": "метла", + "1f5ff": "моаи" + }, "ca": { "1f47d": "alienígena", "1f916": "robot", @@ -1366,7 +1882,7 @@ "1f337": "τουλίπα", "1f332": "αειθαλές δέντρο", "1f333": "φυλλοβόλο δέντρο", - "1f334": "φοίνικας", + "1f334": "φοινικόδεντρο", "1f335": "κάκτος", "1f33f": "βότανο", "1f341": "φύλλο σφενδάμου", @@ -1869,7 +2385,7 @@ "1f420": "pez tropical", "1f988": "tiburón", "1f419": "pulpo", - "1f41a": "concha de mar", + "1f41a": "caracola", "1f40c": "caracol", "1f98b": "mariposa", "1f41b": "bicho", @@ -2322,6 +2838,264 @@ "1f9f9": "جارو", "1f5ff": "سردیس موآی" }, + "fi": { + "1f47d": "avaruusolio", + "1f916": "robotti", + "1f9e0": "aivot", + "1f441": "silmä", + "1f9d9": "velho", + "1f9da": "keiju", + "1f9dc": "merenväki", + "1f435": "apinan naama", + "1f9a7": "oranki", + "1f436": "koiran naama", + "1f43a": "susi", + "1f98a": "kettu", + "1f99d": "pesukarhu", + "1f431": "kissan naama", + "1f981": "leijona", + "1f42f": "tiikerin naama", + "1f434": "hevosen naama", + "1f984": "yksisarvinen", + "1f993": "seepra", + "1f98c": "peura", + "1f42e": "lehmän naama", + "1f437": "sian naama", + "1f417": "villisika", + "1f42a": "kameli", + "1f999": "laama", + "1f992": "kirahvi", + "1f418": "elefantti", + "1f9a3": "mammutti", + "1f98f": "sarvikuono", + "1f42d": "hiiren naama", + "1f430": "jäniksen naama", + "1f43f": "maaorava", + "1f994": "siili", + "1f987": "lepakko", + "1f43b": "karhu", + "1f428": "koala", + "1f9a5": "laiskiainen", + "1f9a6": "saukko", + "1f998": "kenguru", + "1f425": "tipu edestäpäin", + "1f426": "lintu", + "1f54a": "kyyhky", + "1f986": "sorsa", + "1f989": "pöllö", + "1f9a4": "dodo", + "1fab6": "höyhen", + "1f9a9": "flamingo", + "1f99a": "riikinkukko", + "1f99c": "papukaija", + "1f40a": "krokotiili", + "1f422": "kilpikonna", + "1f98e": "lisko", + "1f40d": "käärme", + "1f432": "lohikäärmeen naama", + "1f995": "sauropodi", + "1f433": "suihkuttava valas", + "1f42c": "delfiini", + "1f9ad": "hylje", + "1f41f": "kala", + "1f420": "trooppinen kala", + "1f988": "hai", + "1f419": "mustekala", + "1f41a": "kotilo", + "1f40c": "etana", + "1f98b": "perhonen", + "1f41b": "ötökkä", + "1f41d": "mehiläinen", + "1f41e": "leppäkerttu", + "1f490": "kukkakimppu", + "1f339": "ruusu", + "1f33a": "kiinanruusu", + "1f33b": "auringonkukka", + "1f337": "tulppaani", + "1f332": "ikivihreä", + "1f333": "lehtipuu", + "1f334": "palmu", + "1f335": "kaktus", + "1f33f": "yrtti", + "1f341": "vaahteranlehti", + "1f344": "sieni", + "1f347": "viinirypäleet", + "1f348": "meloni", + "1f349": "vesimeloni", + "1f34a": "mandariini", + "1f34b": "sitruuna", + "1f34c": "banaani", + "1f34d": "ananas", + "1f96d": "mango", + "1f34f": "vihreä omena", + "1f350": "päärynä", + "1f351": "persikka", + "1f352": "kirsikat", + "1f353": "mansikka", + "1fad0": "mustikat", + "1f95d": "kiivi", + "1f345": "tomaatti", + "1fad2": "oliivi", + "1f965": "kookospähkinä", + "1f951": "avokado", + "1f346": "munakoiso", + "1f955": "porkkana", + "1f33d": "maissintähkä", + "1f336": "jalapeno", + "1f96c": "lehtivihannes", + "1f966": "parsakaali", + "1f9c5": "sipuli", + "1f95c": "maapähkinä", + "1f950": "voisarvi", + "1f956": "patonki", + "1f968": "rinkilä", + "1f96f": "vesirinkeli", + "1f95e": "letut", + "1f9c7": "vohveli", + "1f354": "hampurilainen", + "1f355": "pizza", + "1f32d": "hodari", + "1f32e": "taco", + "1f37f": "popcorn", + "1f980": "rapu", + "1f99e": "hummeri", + "1f368": "jäätelö", + "1f369": "donitsi", + "1f36a": "keksi", + "1f382": "syntymäpäiväkakku", + "1f9c1": "vuokaleivos", + "1f36b": "suklaapatukka", + "1f36c": "karkki", + "1f36d": "tikkari", + "1fad6": "teepannu", + "1f9c3": "juomatetra", + "1f9c9": "mate", + "1f9ed": "kompassi", + "1f3d4": "lumihuippuinen vuori", + "1f30b": "tulivuori", + "1f3d5": "telttailu", + "1f3dd": "autiosaari", + "1f3e1": "talo ja puutarha", + "26f2": "suihkulähde", + "1f3a0": "karusellihevonen", + "1f3a1": "maailmanpyörä", + "1f3a2": "vuoristorata", + "1f488": "punasiniraitainen pylväs", + "1f686": "juna", + "1f68b": "raitiovaunu", + "1f68d": "saapuva bussi", + "1f695": "taksi", + "1f697": "auto", + "1f69a": "kuljetusauto", + "1f69c": "traktori", + "1f6f5": "skootteri", + "1f6fa": "autorikša", + "1f6f4": "potkulauta", + "1f6f9": "rullalauta", + "1f6fc": "rullaluistin", + "2693": "ankkuri", + "26f5": "purjevene", + "1f6f6": "kanootti", + "1f6a4": "pikavene", + "1f6a2": "laiva", + "2708": "lentokone", + "1f681": "helikopteri", + "1f6a0": "gondolihissi", + "1f6f0": "satelliitti", + "1f680": "raketti", + "1f6f8": "lentävä lautanen", + "23f0": "herätyskello", + "1f319": "kuunsirppi", + "1f321": "lämpömittari", + "2600": "aurinko", + "1fa90": "rengasplaneetta", + "1f31f": "loistava tähti", + "1f300": "pyörremyrsky", + "1f308": "sateenkaari", + "2602": "sateenvarjo", + "2744": "lumihiutale", + "2604": "komeetta", + "1f525": "tuli", + "1f4a7": "pisara", + "1f30a": "aalto", + "1f383": "kurpitsalyhty", + "2728": "säihke", + "1f388": "ilmapallo", + "1f389": "paukkuserpentiini", + "1f38f": "karppiviiri", + "1f380": "rusetti", + "1f381": "lahjapaketti", + "1f39f": "pääsylippu", + "1f3c6": "pokaali", + "26bd": "jalkapallo", + "1f3c0": "koripallo", + "1f3c8": "amerikkalainen jalkapallo", + "1f3be": "tennis", + "1f94f": "liitokiekko", + "1f3d3": "pingis", + "1f3f8": "sulkapallo", + "1f93f": "sukellusmaski", + "1f94c": "curling-kivi", + "1f3af": "napakymppi", + "1fa80": "jojo", + "1fa81": "leija", + "1f52e": "kristallipallo", + "1f3b2": "noppa", + "1f9e9": "palapeli", + "1f3a8": "taiteilijan paletti", + "1f9f5": "lankarulla", + "1f455": "t-paita", + "1f9e6": "sukat", + "1f457": "mekko", + "1fa73": "uimashortsit", + "1f392": "koulureppu", + "1f45f": "juoksukenkä", + "1f451": "kruunu", + "1f9e2": "lippalakki", + "1f484": "huulipuna", + "1f48d": "sormus", + "1f48e": "jalokivi", + "1f4e2": "kovaääninen", + "1f3b6": "nuotteja", + "1f399": "studiomikrofoni", + "1f4fb": "radio", + "1f3b7": "saksofoni", + "1fa97": "harmonikka", + "1f3b8": "kitara", + "1f3ba": "trumpetti", + "1f3bb": "viulu", + "1fa95": "banjo", + "1f941": "rumpu", + "260e": "puhelin", + "1f50b": "akku", + "1f4bf": "CD", + "1f9ee": "helmitaulu", + "1f3ac": "klaffitaulu", + "1f4a1": "hehkulamppu", + "1f526": "taskulamppu", + "1f3ee": "punainen paperilyhty", + "1f4d5": "suljettu kirja", + "1f3f7": "lappu", + "1f4b3": "luottokortti", + "270f": "lyijykynä", + "1f58c": "sivellin", + "1f58d": "väriliitu", + "1f4cc": "nuppineula", + "1f4ce": "paperiliitin", + "1f511": "avain", + "1fa83": "bumerangi", + "1f3f9": "jousi ja nuoli", + "2696": "vaaka", + "1f9f2": "magneetti", + "1f9ea": "koeputki", + "1f9ec": "dna", + "1f52c": "mikroskooppi", + "1f52d": "kaukoputki", + "1f4e1": "lautasantenni", + "1fa91": "tuoli", + "1f9f9": "luuta", + "1f5ff": "moai" + }, "fr": { "1f47d": "alien", "1f916": "robot", @@ -3720,7 +4494,7 @@ "1f966": "brokkólí", "1f9c5": "laukur", "1f95c": "jarðhneta", - "1f950": "Croissant", + "1f950": "smjördeigshorn", "1f956": "fransbrauð", "1f968": "saltkringla", "1f96f": "beygla", @@ -5311,7 +6085,7 @@ "1f69a": "камион за испорака", "1f69c": "трактор", "1f6f5": "скутер", - "1f6fa": "авто-рикша", + "1f6fa": "моторизирана рикша", "1f6f4": "тротинет", "1f6f9": "скејтборд", "1f6fc": "ролшуи", @@ -5401,7 +6175,7 @@ "1f4b3": "кредитна картичка", "270f": "молив", "1f58c": "четка за боење", - "1f58d": "креон", + "1f58d": "мрсна боица", "1f4cc": "притискач", "1f4ce": "спојувалка", "1f511": "клуч", @@ -5805,7 +6579,7 @@ "1f36b": "ချောကလက် အချောင်း", "1f36c": "သကြားလုံး", "1f36d": "ချိုချဉ်ပလုတ်တုတ်", - "1fad6": "ခရား", + "1fad6": "ကရား", "1f9c3": "အဖျော်ရေ ဘူး", "1f9c9": "ချီမာရအို", "1f9ed": "သံလိုက်အိမ်မြှောင်", @@ -5934,6 +6708,264 @@ "1f9f9": "တံမြက်စည်း", "1f5ff": "မိုအိုင်" }, + "nb": { + "1f47d": "romvesen", + "1f916": "robot", + "1f9e0": "hjerne", + "1f441": "øye", + "1f9d9": "trollperson", + "1f9da": "fe", + "1f9dc": "havperson", + "1f435": "apefjes", + "1f9a7": "orangutang", + "1f436": "hundefjes", + "1f43a": "ulv", + "1f98a": "rev", + "1f99d": "vaskebjørn", + "1f431": "kattefjes", + "1f981": "løve", + "1f42f": "tigerfjes", + "1f434": "hestefjes", + "1f984": "enhjørning", + "1f993": "sebra", + "1f98c": "hjort", + "1f42e": "kufjes", + "1f437": "grisefjes", + "1f417": "villsvin", + "1f42a": "dromedar", + "1f999": "lama", + "1f992": "sjiraff", + "1f418": "elefant", + "1f9a3": "mammut", + "1f98f": "neshorn", + "1f42d": "musefjes", + "1f430": "kaninfjes", + "1f43f": "ekorn", + "1f994": "pinnsvin", + "1f987": "flaggermus", + "1f43b": "bjørn", + "1f428": "koala", + "1f9a5": "dovendyr", + "1f9a6": "oter", + "1f998": "kenguru", + "1f425": "kylling forfra", + "1f426": "fugl", + "1f54a": "fredsdue", + "1f986": "and", + "1f989": "ugle", + "1f9a4": "dronte", + "1fab6": "fjær", + "1f9a9": "flamingo", + "1f99a": "påfugl", + "1f99c": "papegøye", + "1f40a": "krokodille", + "1f422": "skilpadde", + "1f98e": "firfisle", + "1f40d": "slange", + "1f432": "dragefjes", + "1f995": "sauropod", + "1f433": "sprutende hval", + "1f42c": "delfin", + "1f9ad": "sel", + "1f41f": "fisk", + "1f420": "tropisk fisk", + "1f988": "hai", + "1f419": "blekksprut", + "1f41a": "spiralskjell", + "1f40c": "snegle", + "1f98b": "sommerfugl", + "1f41b": "insekt", + "1f41d": "honningbie", + "1f41e": "marihøne", + "1f490": "bukett", + "1f339": "rose", + "1f33a": "hibiskus", + "1f33b": "solsikke", + "1f337": "tulipan", + "1f332": "bartre", + "1f333": "løvtre", + "1f334": "palme", + "1f335": "kaktus", + "1f33f": "urteblader", + "1f341": "lønneblad", + "1f344": "sopp", + "1f347": "druer", + "1f348": "melon", + "1f349": "vannmelon", + "1f34a": "mandarin", + "1f34b": "sitron", + "1f34c": "banan", + "1f34d": "ananas", + "1f96d": "mango", + "1f34f": "grønt eple", + "1f350": "pære", + "1f351": "fersken", + "1f352": "kirsebær", + "1f353": "jordbær", + "1fad0": "blåbær", + "1f95d": "kiwi", + "1f345": "tomat", + "1fad2": "oliven", + "1f965": "kokosnøtt", + "1f951": "avokado", + "1f346": "aubergine", + "1f955": "gulrot", + "1f33d": "maiskolbe", + "1f336": "rød chili", + "1f96c": "bladgrønnsaker", + "1f966": "brokkoli", + "1f9c5": "løk", + "1f95c": "peanøtter", + "1f950": "croissant", + "1f956": "bagett", + "1f968": "saltkringle", + "1f96f": "bagel", + "1f95e": "pannekaker", + "1f9c7": "belgisk vaffel", + "1f354": "hamburger", + "1f355": "pizzastykke", + "1f32d": "pølse med brød", + "1f32e": "taco", + "1f37f": "popkorn", + "1f980": "krabbe", + "1f99e": "hummer", + "1f368": "iskrem", + "1f369": "donut", + "1f36a": "kjeks", + "1f382": "bursdagskake", + "1f9c1": "cupcake", + "1f36b": "sjokoladeplate", + "1f36c": "godteri", + "1f36d": "kjærlighet på pinne", + "1fad6": "tekanne", + "1f9c3": "drikkekartong", + "1f9c9": "mate", + "1f9ed": "kompass", + "1f3d4": "snødekt fjell", + "1f30b": "vulkan", + "1f3d5": "telttur", + "1f3dd": "øde øy", + "1f3e1": "hus med hage", + "26f2": "fontene", + "1f3a0": "karusellhest", + "1f3a1": "pariserhjul", + "1f3a2": "berg-og-dal-bane", + "1f488": "barberskilt", + "1f686": "tog", + "1f68b": "trikkevogn", + "1f68d": "motgående buss", + "1f695": "taxi", + "1f697": "bil", + "1f69a": "varebil", + "1f69c": "traktor", + "1f6f5": "scooter", + "1f6fa": "autorickshaw", + "1f6f4": "sparkesykkel", + "1f6f9": "skateboard", + "1f6fc": "rulleskøyter", + "2693": "anker", + "26f5": "seilbåt", + "1f6f6": "kano", + "1f6a4": "speedbåt", + "1f6a2": "skip", + "2708": "fly", + "1f681": "helikopter", + "1f6a0": "kabelbane", + "1f6f0": "satellitt", + "1f680": "rakett", + "1f6f8": "flygende tallerken", + "23f0": "vekkerklokke", + "1f319": "månesigd", + "1f321": "termometer", + "2600": "sol", + "1fa90": "planet med ringer", + "1f31f": "lysende stjerne", + "1f300": "syklon", + "1f308": "regnbue", + "2602": "paraply", + "2744": "snøfnugg", + "2604": "komet", + "1f525": "ild", + "1f4a7": "dråpe", + "1f30a": "bølge", + "1f383": "gresskarlykt", + "2728": "stjerner", + "1f388": "ballong", + "1f389": "smell-bon-bon", + "1f38f": "koinobori", + "1f380": "sløyfe", + "1f381": "gave", + "1f39f": "inngangsbilletter", + "1f3c6": "trofé", + "26bd": "fotball", + "1f3c0": "basketball", + "1f3c8": "amerikansk fotball", + "1f3be": "tennis", + "1f94f": "frisbee", + "1f3d3": "bordtennis", + "1f3f8": "badminton", + "1f93f": "dykkermaske", + "1f94c": "curlingstein", + "1f3af": "blink", + "1fa80": "jojo", + "1fa81": "papirdrage", + "1f52e": "krystallkule", + "1f3b2": "terning", + "1f9e9": "puslespillbrikke", + "1f3a8": "malerpalett", + "1f9f5": "tråd", + "1f455": "t-skjorte", + "1f9e6": "sokker", + "1f457": "kjole", + "1fa73": "shorts", + "1f392": "skolesekk", + "1f45f": "joggesko", + "1f451": "krone", + "1f9e2": "caps", + "1f484": "leppestift", + "1f48d": "ring", + "1f48e": "diamant", + "1f4e2": "høyttaler", + "1f3b6": "noter", + "1f399": "studiomikrofon", + "1f4fb": "radio", + "1f3b7": "saksofon", + "1fa97": "trekkspill", + "1f3b8": "gitar", + "1f3ba": "trompet", + "1f3bb": "fiolin", + "1fa95": "banjo", + "1f941": "tromme", + "260e": "telefon", + "1f50b": "batteri", + "1f4bf": "optisk plate", + "1f9ee": "kuleramme", + "1f3ac": "filmklapper", + "1f4a1": "lyspære", + "1f526": "lommelykt", + "1f3ee": "rød papirlykt", + "1f4d5": "lukket bok", + "1f3f7": "etikett", + "1f4b3": "kredittkort", + "270f": "blyant", + "1f58c": "pensel", + "1f58d": "fargestift", + "1f4cc": "stift", + "1f4ce": "binders", + "1f511": "nøkkel", + "1fa83": "bumerang", + "1f3f9": "pil og bue", + "2696": "likearmet skålvekt", + "1f9f2": "magnet", + "1f9ea": "prøverør", + "1f9ec": "dna", + "1f52c": "mikroskop", + "1f52d": "teleskop", + "1f4e1": "satellittantenne", + "1fa91": "stol", + "1f9f9": "feiekost", + "1f5ff": "moai-statue" + }, "nl": { "1f47d": "buitenaards wezen", "1f916": "robot", @@ -6561,7 +7593,7 @@ "1f950": "croissant", "1f956": "baguete", "1f968": "pretzel", - "1f96f": "rosca", + "1f96f": "bagel", "1f95e": "panquecas", "1f9c7": "waffle", "1f354": "hambúrguer", @@ -6826,7 +7858,7 @@ "1f355": "pizza", "1f32d": "hot dog", "1f32e": "taco", - "1f37f": "floricele de porumb", + "1f37f": "popcorn", "1f980": "rac", "1f99e": "homar", "1f368": "înghețată", @@ -7224,6 +8256,264 @@ "1f9f9": "метла", "1f5ff": "истукан" }, + "sq": { + "1f47d": "alien", + "1f916": "fytyrë roboti", + "1f9e0": "tru", + "1f441": "sy", + "1f9d9": "magjistar", + "1f9da": "zanë", + "1f9dc": "sirenë deti", + "1f435": "fytyrë majmuni", + "1f9a7": "orangutang", + "1f436": "fytyrë qeni", + "1f43a": "fytyrë ujku", + "1f98a": "fytyrë dhelpre", + "1f99d": "rakun", + "1f431": "fytyrë maceje", + "1f981": "fytyrë luani", + "1f42f": "fytyrë tigri", + "1f434": "fytyrë kali", + "1f984": "fytyrë njëbrirëshi", + "1f993": "zebër", + "1f98c": "dre", + "1f42e": "fytyrë lope", + "1f437": "fytyrë derri", + "1f417": "derr i egër", + "1f42a": "gamile", + "1f999": "lamë", + "1f992": "gjirafë", + "1f418": "elefant", + "1f9a3": "mamuth", + "1f98f": "rinoqeront", + "1f42d": "fytyrë miu", + "1f430": "fytyrë lepuri", + "1f43f": "ketër", + "1f994": "iriq", + "1f987": "lakuriq nate", + "1f43b": "fytyrë ariu", + "1f428": "koalë", + "1f9a5": "majmun i Bengalit", + "1f9a6": "vidër", + "1f998": "kangur", + "1f425": "zog pule përballë", + "1f426": "zog", + "1f54a": "pëllumb", + "1f986": "rosak", + "1f989": "buf", + "1f9a4": "zog i rëndë", + "1fab6": "pendë", + "1f9a9": "flamingo", + "1f99a": "pallua", + "1f99c": "papagall", + "1f40a": "krokodil", + "1f422": "breshkë", + "1f98e": "hardhucë", + "1f40d": "gjarpër", + "1f432": "fytyrë dragoi", + "1f995": "sauropod", + "1f433": "balenë që hedh ujë", + "1f42c": "delfin", + "1f9ad": "fokë", + "1f41f": "peshk", + "1f420": "peshk tropikal", + "1f988": "peshkaqen", + "1f419": "oktapod", + "1f41a": "guaskë spirale", + "1f40c": "kërmill", + "1f98b": "flutur", + "1f41b": "shumëkëmbësh", + "1f41d": "bletë", + "1f41e": "mollëkuqe", + "1f490": "buqetë", + "1f339": "trëndafil", + "1f33a": "hibisk", + "1f33b": "luledielli", + "1f337": "tulipan", + "1f332": "gjelbërim i përjetshëm", + "1f333": "pemë gjetherënëse", + "1f334": "palmë", + "1f335": "kaktus", + "1f33f": "erëza", + "1f341": "gjethe panje", + "1f344": "kërpudhë", + "1f347": "rrush", + "1f348": "pjepër", + "1f349": "shalqi", + "1f34a": "mandarinë", + "1f34b": "limon", + "1f34c": "banane", + "1f34d": "ananas", + "1f96d": "mango", + "1f34f": "mollë jeshile", + "1f350": "dardhë", + "1f351": "pjeshkë", + "1f352": "qershi", + "1f353": "luleshtrydhe", + "1fad0": "boronica", + "1f95d": "kivi", + "1f345": "domate", + "1fad2": "ulli", + "1f965": "arrë kokosi", + "1f951": "avokado", + "1f346": "patëllxhan", + "1f955": "karotë", + "1f33d": "kalli misri", + "1f336": "spec djegës", + "1f96c": "sallatë", + "1f966": "brokoli", + "1f9c5": "qepë", + "1f95c": "kikirik", + "1f950": "kroasant", + "1f956": "bagetë", + "1f968": "gjevrek i përdredhur", + "1f96f": "gjevrek", + "1f95e": "petulla", + "1f9c7": "vafer", + "1f354": "hamburger", + "1f355": "pica", + "1f32d": "hot-dog", + "1f32e": "tako", + "1f37f": "kokoshka", + "1f980": "gaforre", + "1f99e": "karavidhe", + "1f368": "akullore", + "1f369": "petull e ëmbël", + "1f36a": "biskotë", + "1f382": "tortë ditëlindjeje", + "1f9c1": "kek i vogël", + "1f36b": "çokollatë", + "1f36c": "ëmbëlsirë", + "1f36d": "lëpirëse", + "1fad6": "çajnik", + "1f9c3": "kuti pijeje", + "1f9c9": "kimarrao", + "1f9ed": "busull", + "1f3d4": "mal i mbuluar me borë në majë", + "1f30b": "vullkan", + "1f3d5": "kamp", + "1f3dd": "ishull shkretëtirë", + "1f3e1": "shtëpi me kopsht", + "26f2": "shatërvan", + "1f3a0": "kalë në karusel", + "1f3a1": "rrotullame", + "1f3a2": "tren lojërash me valëzim", + "1f488": "shenja e berberit", + "1f686": "tren", + "1f68b": "vagon tramvaji", + "1f68d": "autobus që vjen", + "1f695": "taksi", + "1f697": "automobil", + "1f69a": "kamion transporti", + "1f69c": "traktor", + "1f6f5": "skuter", + "1f6fa": "autorikshë", + "1f6f4": "ballëz dyrrotëshe", + "1f6f9": "dërrasë rrëshqitëse", + "1f6fc": "rollerskejt", + "2693": "spirancë", + "26f5": "varkë me vela", + "1f6f6": "kaike", + "1f6a4": "motobarkë e shpejtë", + "1f6a2": "anije", + "2708": "aeroplan", + "1f681": "helikopter", + "1f6a0": "teleferik në mal", + "1f6f0": "satelit", + "1f680": "raketë", + "1f6f8": "disk fluturues", + "23f0": "orë me zile", + "1f319": "hënë e ngrënë", + "1f321": "termometër", + "2600": "diell", + "1fa90": "planet me unazë", + "1f31f": "yll që shkëlqen", + "1f300": "ciklon", + "1f308": "ylber", + "2602": "çadër", + "2744": "flokë bore", + "2604": "kometë", + "1f525": "zjarr", + "1f4a7": "pikëz", + "1f30a": "dallgë uji", + "1f383": "kungulli i Halloween", + "2728": "xixëllima", + "1f388": "tullumbace", + "1f389": "fishek feste", + "1f38f": "koinobori", + "1f380": "fjongo", + "1f381": "dhuratë e mbështjellë", + "1f39f": "biletat e hyrjes", + "1f3c6": "trofe", + "26bd": "top futbolli", + "1f3c0": "basketboll", + "1f3c8": "futboll amerikan", + "1f3be": "tenis", + "1f94f": "hedhje disku", + "1f3d3": "pingpong", + "1f3f8": "badminton", + "1f93f": "maskë zhytjeje", + "1f94c": "gur kurlingu", + "1f3af": "goditje e drejtpërdrejtë", + "1fa80": "jo-jo", + "1fa81": "balonë", + "1f52e": "top kristali", + "1f3b2": "zar loje", + "1f9e9": "lojë me bashkim pjesësh figure", + "1f3a8": "paleta e artistit", + "1f9f5": "fije", + "1f455": "bluzë", + "1f9e6": "çorape", + "1f457": "fustan", + "1fa73": "pantallona të shkurtra", + "1f392": "çantë shkolle", + "1f45f": "atlete", + "1f451": "kurorë", + "1f9e2": "kapelë \"sqep\"", + "1f484": "buzëkuq", + "1f48d": "unazë", + "1f48e": "gur i çmuar", + "1f4e2": "altoparlant me zë", + "1f3b6": "nota muzikore", + "1f399": "mikrofon studioje", + "1f4fb": "radio", + "1f3b7": "saksofon", + "1fa97": "fizarmonikë", + "1f3b8": "kitarë", + "1f3ba": "trombë", + "1f3bb": "violinë", + "1fa95": "banxho", + "1f941": "daulle", + "260e": "telefon", + "1f50b": "bateri", + "1f4bf": "disk optik", + "1f9ee": "abak", + "1f3ac": "tabelë dublimi e skenës", + "1f4a1": "llambë", + "1f526": "elektrik dore", + "1f3ee": "fener me letër të kuqe", + "1f4d5": "libër i mbyllur", + "1f3f7": "etiketë", + "1f4b3": "kartë krediti", + "270f": "laps", + "1f58c": "furçë piktori", + "1f58d": "shkumës me ngjyrë", + "1f4cc": "gjilpërë kapëse", + "1f4ce": "kapëse letrash", + "1f511": "çelës", + "1fa83": "bumerang", + "1f3f9": "hark dhe shigjetë", + "2696": "peshore", + "1f9f2": "magnet", + "1f9ea": "epruvetë", + "1f9ec": "ADN", + "1f52c": "mikroskop", + "1f52d": "teleskop", + "1f4e1": "antenë satelitore", + "1fa91": "karrige", + "1f9f9": "fshesë", + "1f5ff": "moai" + }, "sv": { "1f47d": "utomjording", "1f916": "robotansikte", @@ -8268,13 +9558,13 @@ "1f9a7": "đười ươi", "1f436": "mặt cún", "1f43a": "mặt chó sói", - "1f98a": "mặt cáo", + "1f98a": "cáo", "1f99d": "gấu trúc", "1f431": "mặt mèo", "1f981": "mặt sư tử", "1f42f": "mặt hổ", "1f434": "mặt ngựa", - "1f984": "mặt kỳ lân", + "1f984": "kỳ lân", "1f993": "ngựa vằn", "1f98c": "hươu", "1f42e": "mặt bò", @@ -8291,7 +9581,7 @@ "1f43f": "sóc chuột", "1f994": "nhím", "1f987": "dơi", - "1f43b": "mặt gấu", + "1f43b": "gấu", "1f428": "gấu túi", "1f9a5": "con lười", "1f9a6": "rái cá", @@ -8341,7 +9631,7 @@ "1f348": "dưa", "1f349": "dưa hấu", "1f34a": "quýt", - "1f34b": "chanh", + "1f34b": "chanh tây", "1f34c": "chuối", "1f34d": "dứa", "1f96d": "xoài", @@ -8978,7 +10268,7 @@ "1f9e9": "拼圖", "1f3a8": "調色板", "1f9f5": "線", - "1f455": "T卹", + "1f455": "T恤", "1f9e6": "襪子", "1f457": "洋裝", "1fa73": "短泳褲", ===================================== browser/components/torpreferences/content/bridgemoji/svgs/README.txt ===================================== @@ -1 +1 @@ -Generated by tools/torbrowser/update_emojis.py on 2023-04-03 \ No newline at end of file +Generated by tools/torbrowser/update_emojis.py on 2024-08-06 ===================================== tools/torbrowser/update_emojis.py ===================================== @@ -17,6 +17,8 @@ SCRIPT_PATH = Path(__file__).relative_to(FIREFOX_ROOT) LANGS = [ "ar", + "be", + "bg", "ca", "cs", "da", @@ -25,6 +27,7 @@ LANGS = [ "en", "es", "fa", + "fi", "fr", "ga", "he", @@ -39,12 +42,13 @@ LANGS = [ "mk", "ms", "my", - # "nb", # Empty file, currently!! + "nb", # no "nl", "pl", "pt", "ro", "ru", + "sq", "sv", "th", "tr", @@ -57,7 +61,7 @@ LANGS = [ def generated_message(): """Get the message describing the generation script and time.""" - date = datetime.date.isoformat(datetime.datetime.utcnow()) + date = datetime.date.isoformat(datetime.datetime.now(datetime.UTC)) return f"Generated by {SCRIPT_PATH} on {date}" @@ -83,7 +87,7 @@ def copy_emoji_svgs(emoji_codepoints, from_dir, to_dir): file.unlink() with open(to_dir / "README.txt", "w", encoding="utf8") as file: - file.write(generated_message()) + file.write(generated_message() + "\n") def get_flag_codepoints(file): @@ -195,6 +199,8 @@ def save_bridge_emoji_descriptions(from_dir): filename = "zh" elif lang == "zh-TW": filename = "zh_Hant" + elif lang == "nb": + filename = "no" else: filename = lang with open( @@ -204,6 +210,7 @@ def save_bridge_emoji_descriptions(from_dir): with open(BRIDGE_DIR / "annotations.json", "w", encoding="utf8") as file: json.dump(data, file, ensure_ascii=False, indent=2) + file.write("\n") parser = argparse.ArgumentParser( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c02100… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c02100… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by morgan (＠morgan) 21 Aug '24

21 Aug '24

morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 3944afd9 by Henry Wilkes at 2024-08-21T02:53:48+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 43066: Ensure the about:torconnect title icon changes. - - - - - 1 changed file: - toolkit/components/torconnect/content/aboutTorConnect.css Changes: ===================================== toolkit/components/torconnect/content/aboutTorConnect.… [View More]

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 40925: Implemented the Security Level component
by morgan (＠morgan) 21 Aug '24

21 Aug '24

morgan pushed to branch mullvad-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 2f441e16 by Henry Wilkes at 2024-08-21T02:32:56+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 41817: Drop browser-colors.css. - - - - - e967b026 by Henry Wilkes at 2024-08-21T02:33:00+00:00 fixup! Bug 41659: Add canonical color definitions to base-browser Bug 41817: Drop browser-colors.css. - - - - - 4 changed files: - browser/components/… [View More]securitylevel/content/securityLevelPanel.css - browser/themes/shared/browser-shared.css - − toolkit/themes/shared/browser-colors.css - toolkit/themes/shared/minimal-toolkit.jar.inc.mn Changes: ===================================== browser/components/securitylevel/content/securityLevelPanel.css ===================================== @@ -51,7 +51,7 @@ #securityLevel-custom { border-radius: 4px; - background-color: var(--warning-color); + background-color: var(--warning-icon-bgcolor); color: black; padding: 0.4em 0.5em; margin-inline-start: 1em; ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -26,7 +26,6 @@ @import url("chrome://browser/skin/customizableui/customizeMode.css"); @import url("chrome://browser/skin/UITour.css"); @import url("chrome://browser/skin/formautofill-notification.css"); -@import url("chrome://global/skin/browser-colors.css"); @namespace html url("http://www.w3.org/1999/xhtml"); ===================================== toolkit/themes/shared/browser-colors.css deleted ===================================== @@ -1,97 +0,0 @@ -:root { - /* photon colors, not all of them are available for whatever reason - in firefox, so here they are */ - - --magenta-50: #ff1ad9; - --magenta-60: #ed00b5; - --magenta-70: #b5007f; - --magenta-80: #7d004f; - --magenta-90: #440027; - - --purple-30: #c069ff; - --purple-40: #ad3bff; - --purple-50: #9400ff; - --purple-60: #8000d7; - --purple-70: #6200a4; - --purple-80: #440071; - --purple-90: #25003e; - - --blue-40: #45a1ff; - --blue-50: #0a84ff; - --blue-50-a30: rgba(10, 132, 255, 0.3); - --blue-60: #0060df; - --blue-70: #003eaa; - --blue-80: #002275; - --blue-90: #000f40; - - --teal-50: #00feff; - --teal-60: #00c8d7; - --teal-70: #008ea4; - --teal-80: #005a71; - --teal-90: #002d3e; - - --green-50: #30e60b; - --green-60: #12bc00; - --green-70: #058b00; - --green-80: #006504; - --green-90: #003706; - - --yellow-50: #ffe900; - --yellow-60: #d7b600; - --yellow-70: #a47f00; - --yellow-80: #715100; - --yellow-90: #3e2800; - - --red-50: #ff0039; - --red-60: #d70022; - --red-70: #a4000f; - --red-80: #5a0002; - --red-90: #3e0200; - - --orange-50: #ff9400; - --orange-60: #d76e00; - --orange-70: #a44900; - --orange-80: #712b00; - --orange-90: #3e1300; - - --grey-10: #f9f9fa; - --grey-10-a10: rgba(249, 249, 250, 0.1); - --grey-10-a20: rgba(249, 249, 250, 0.2); - --grey-10-a40: rgba(249, 249, 250, 0.4); - --grey-10-a60: rgba(249, 249, 250, 0.6); - --grey-10-a80: rgba(249, 249, 250, 0.8); - --grey-20: #ededf0; - --grey-30: #d7d7db; - --grey-40: #b1b1b3; - --grey-50: #737373; - --grey-60: #4a4a4f; - --grey-70: #38383d; - --grey-80: #2a2a2e; - --grey-90: #0c0c0d; - --grey-90-a05: rgba(12, 12, 13, 0.05); - --grey-90-a10: rgba(12, 12, 13, 0.1); - --grey-90-a20: rgba(12, 12, 13, 0.2); - --grey-90-a30: rgba(12, 12, 13, 0.3); - --grey-90-a40: rgba(12, 12, 13, 0.4); - --grey-90-a50: rgba(12, 12, 13, 0.5); - --grey-90-a60: rgba(12, 12, 13, 0.6); - --grey-90-a70: rgba(12, 12, 13, 0.7); - --grey-90-a80: rgba(12, 12, 13, 0.8); - --grey-90-a90: rgba(12, 12, 13, 0.9); - - --ink-70: #363959; - --ink-80: #202340; - --ink-90: #0f1126; - - --white-100: #ffffff; - - /* TODO: Switch to some Firefox variable, once Mozilla adds one for this - color. Matches --warning-icon-bgcolor (but not on the dark theme variant). */ - --warning-color: #ffa436; -} - -@media (prefers-color-scheme: dark) { - :root { - --warning-color: #ffbd4f; - } -} ===================================== toolkit/themes/shared/minimal-toolkit.jar.inc.mn ===================================== @@ -45,5 +45,3 @@ toolkit.jar: # Text recognition widget skin/classic/global/media/textrecognition.css (../../shared/media/textrecognition.css) - - skin/classic/global/browser-colors.css (../../shared/browser-colors.css) View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/88… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/88… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser][base-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 40925: Implemented the Security Level component
by morgan (＠morgan) 21 Aug '24

21 Aug '24

morgan pushed to branch base-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: feef7a00 by Henry Wilkes at 2024-08-21T02:31:01+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 41817: Drop browser-colors.css. - - - - - 1ea7af2d by Henry Wilkes at 2024-08-21T02:31:46+00:00 fixup! Bug 41659: Add canonical color definitions to base-browser Bug 41817: Drop browser-colors.css. - - - - - 4 changed files: - browser/components/securitylevel/… [View More]content/securityLevelPanel.css - browser/themes/shared/browser-shared.css - − toolkit/themes/shared/browser-colors.css - toolkit/themes/shared/minimal-toolkit.jar.inc.mn Changes: ===================================== browser/components/securitylevel/content/securityLevelPanel.css ===================================== @@ -51,7 +51,7 @@ #securityLevel-custom { border-radius: 4px; - background-color: var(--warning-color); + background-color: var(--warning-icon-bgcolor); color: black; padding: 0.4em 0.5em; margin-inline-start: 1em; ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -26,7 +26,6 @@ @import url("chrome://browser/skin/customizableui/customizeMode.css"); @import url("chrome://browser/skin/UITour.css"); @import url("chrome://browser/skin/formautofill-notification.css"); -@import url("chrome://global/skin/browser-colors.css"); @namespace html url("http://www.w3.org/1999/xhtml"); ===================================== toolkit/themes/shared/browser-colors.css deleted ===================================== @@ -1,97 +0,0 @@ -:root { - /* photon colors, not all of them are available for whatever reason - in firefox, so here they are */ - - --magenta-50: #ff1ad9; - --magenta-60: #ed00b5; - --magenta-70: #b5007f; - --magenta-80: #7d004f; - --magenta-90: #440027; - - --purple-30: #c069ff; - --purple-40: #ad3bff; - --purple-50: #9400ff; - --purple-60: #8000d7; - --purple-70: #6200a4; - --purple-80: #440071; - --purple-90: #25003e; - - --blue-40: #45a1ff; - --blue-50: #0a84ff; - --blue-50-a30: rgba(10, 132, 255, 0.3); - --blue-60: #0060df; - --blue-70: #003eaa; - --blue-80: #002275; - --blue-90: #000f40; - - --teal-50: #00feff; - --teal-60: #00c8d7; - --teal-70: #008ea4; - --teal-80: #005a71; - --teal-90: #002d3e; - - --green-50: #30e60b; - --green-60: #12bc00; - --green-70: #058b00; - --green-80: #006504; - --green-90: #003706; - - --yellow-50: #ffe900; - --yellow-60: #d7b600; - --yellow-70: #a47f00; - --yellow-80: #715100; - --yellow-90: #3e2800; - - --red-50: #ff0039; - --red-60: #d70022; - --red-70: #a4000f; - --red-80: #5a0002; - --red-90: #3e0200; - - --orange-50: #ff9400; - --orange-60: #d76e00; - --orange-70: #a44900; - --orange-80: #712b00; - --orange-90: #3e1300; - - --grey-10: #f9f9fa; - --grey-10-a10: rgba(249, 249, 250, 0.1); - --grey-10-a20: rgba(249, 249, 250, 0.2); - --grey-10-a40: rgba(249, 249, 250, 0.4); - --grey-10-a60: rgba(249, 249, 250, 0.6); - --grey-10-a80: rgba(249, 249, 250, 0.8); - --grey-20: #ededf0; - --grey-30: #d7d7db; - --grey-40: #b1b1b3; - --grey-50: #737373; - --grey-60: #4a4a4f; - --grey-70: #38383d; - --grey-80: #2a2a2e; - --grey-90: #0c0c0d; - --grey-90-a05: rgba(12, 12, 13, 0.05); - --grey-90-a10: rgba(12, 12, 13, 0.1); - --grey-90-a20: rgba(12, 12, 13, 0.2); - --grey-90-a30: rgba(12, 12, 13, 0.3); - --grey-90-a40: rgba(12, 12, 13, 0.4); - --grey-90-a50: rgba(12, 12, 13, 0.5); - --grey-90-a60: rgba(12, 12, 13, 0.6); - --grey-90-a70: rgba(12, 12, 13, 0.7); - --grey-90-a80: rgba(12, 12, 13, 0.8); - --grey-90-a90: rgba(12, 12, 13, 0.9); - - --ink-70: #363959; - --ink-80: #202340; - --ink-90: #0f1126; - - --white-100: #ffffff; - - /* TODO: Switch to some Firefox variable, once Mozilla adds one for this - color. Matches --warning-icon-bgcolor (but not on the dark theme variant). */ - --warning-color: #ffa436; -} - -@media (prefers-color-scheme: dark) { - :root { - --warning-color: #ffbd4f; - } -} ===================================== toolkit/themes/shared/minimal-toolkit.jar.inc.mn ===================================== @@ -45,5 +45,3 @@ toolkit.jar: # Text recognition widget skin/classic/global/media/textrecognition.css (../../shared/media/textrecognition.css) - - skin/classic/global/browser-colors.css (../../shared/browser-colors.css) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9781ac… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/9781ac… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] 8 commits: Bug 41817: tor-browser semantic colors.
by morgan (＠morgan) 21 Aug '24

21 Aug '24

morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: a0742a1b by Henry Wilkes at 2024-08-21T02:05:06+00:00 Bug 41817: tor-browser semantic colors. - - - - - 8639aaa5 by Henry Wilkes at 2024-08-21T02:05:06+00:00 fixup! Bug 7494: Create local home page for TBB. Bug 41817: Use semantic tor color names in about:tor. - - - - - 3cf73e78 by Henry Wilkes at 2024-08-21T02:05:06+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and … [View More]firewall settings in about:preferences#connection Bug 41817: Use semantic color names for tor preferences. - - - - - 2595f644 by Henry Wilkes at 2024-08-21T02:05:06+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 41817: Use semantic tor color names for tor buttons. Also, for about:torconnect: + Use dark-mode variant for the buttons colors. + Add purple focus outline to the select element to match the buttons. + Stop applying the "primary" class to the cancel button. + Remove the checkbox styling since the checkbox was replaced with a moz-toggle-button. + Removed the "danger-button" class since it does not sufficiently telegraph a distinguished action, and has no dark-mode variant. + Use warning color from common-shared.css. + Drop --grey-40 for breadcrumb arrows, which did not adjust to theme. - - - - - 6d76bafb by Henry Wilkes at 2024-08-21T02:05:06+00:00 fixup! Bug 21952: Implement Onion-Location - - - - - 4eaccbd8 by Henry Wilkes at 2024-08-21T02:05:06+00:00 fixup! Bug 30237: Add v3 onion services client authentication prompt Bug 41817: Drop browser-colors.css. - - - - - 6be73a77 by Henry Wilkes at 2024-08-21T02:05:06+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 41817: Drop browser-colors.css. - - - - - d45ef470 by Henry Wilkes at 2024-08-21T02:05:06+00:00 fixup! Bug 41659: Add canonical color definitions to base-browser Bug 41817: Drop browser-colors.css. - - - - - 16 changed files: - browser/base/content/navigator-toolbox.inc.xhtml - browser/components/abouttor/content/aboutTor.css - browser/components/onionservices/content/authPreferences.css - browser/components/onionservices/content/onionlocation-urlbar.inc.xhtml - browser/components/securitylevel/content/securityLevelPanel.css - browser/components/torpreferences/content/torPreferences.css - browser/themes/shared/browser-shared.css - browser/themes/shared/tor-urlbar-button.css - toolkit/components/torconnect/content/aboutTorConnect.css - toolkit/components/torconnect/content/aboutTorConnect.html - toolkit/components/torconnect/content/aboutTorConnect.js - toolkit/components/torconnect/content/torConnectTitlebarStatus.css - − toolkit/themes/shared/browser-colors.css - toolkit/themes/shared/desktop-jar.inc.mn - toolkit/themes/shared/minimal-toolkit.jar.inc.mn - + toolkit/themes/shared/tor-colors.css Changes: ===================================== browser/base/content/navigator-toolbox.inc.xhtml ===================================== @@ -431,7 +431,7 @@ <hbox id="tor-connect-urlbar-button" role="button" - class="tor-urlbar-button" + class="tor-button tor-urlbar-button" hidden="true"> <label id="tor-connect-urlbar-button-label"/> </hbox> ===================================== browser/components/abouttor/content/aboutTor.css ===================================== @@ -1,4 +1,4 @@ -@import url("chrome://global/skin/browser-colors.css"); +@import url("chrome://global/skin/tor-colors.css"); body { margin: 0; @@ -179,7 +179,7 @@ body:not(.show-tor-check) #tor-check { /* On dark background */ :root { background-color: #2C0449; - --focus-outline-color: var(--purple-30); + --focus-outline-color: var(--tor-focus-outline-color-dark); --focus-outline: var(--focus-outline-width) solid var(--focus-outline-color); --in-content-focus-outline-color: var(--focus-outline-color); --in-content-focus-outline: var(--focus-outline); @@ -194,14 +194,9 @@ body:not(.show-tor-check) #tor-check { --in-content-page-color: #fbfbfe; --in-content-text-color: #fbfbfe; color: var(--in-content-text-color); - --link-color: var(--purple-30); - /* FIXME: Since we have a dark background, the color should get lighter on - * hover, but --purple-40 and --pruple-50 are darker than --purple-30. - * However, we do not have a standard lighter purple in our current set of - * Photon colors. - * See tor-browser#42025 */ - --link-color-hover: var(--purple-40); - --link-color-active: var(--purple-50); + --link-color: var(--tor-link-color-dark); + --link-color-hover: var(--tor-link-color-hover-dark); + --link-color-active: var(--tor-link-color-active-dark); } #search-form { @@ -209,7 +204,9 @@ body:not(.show-tor-check) #tor-check { } #search-form.search-input-focus-visible { - border-color: var(--purple-60); + /* Use a light-themed inner-border to contrast with the dark-themed + * focus outline. */ + border-color: var(--tor-focus-outline-color-light); } #search-form.onionized-search:not(.search-input-focus-visible) { @@ -218,17 +215,17 @@ body:not(.show-tor-check) #tor-check { /* Light background. */ #search-form > * { - --focus-outline-color: var(--purple-60); + --focus-outline-color: var(--tor-focus-outline-color-light); --focus-outline: var(--focus-outline-width) solid var(--focus-outline-color); --in-content-focus-outline-color: var(--focus-outline-color); --in-content-focus-outline: var(--focus-outline); /* Variables used for --toggle- variables. */ - --color-accent-primary: var(--purple-60); - --color-accent-primary-hover: var(--purple-70); - --color-accent-primary-active: var(--purple-80); + --color-accent-primary: var(--tor-button-background-color-light); + --color-accent-primary-hover: var(--tor-button-background-color-hover-light); + --color-accent-primary-active: var(--tor-button-background-color-active-light); } #search-form.onionized-search #onionize-toggle { - color: var(--purple-60); + color: var(--tor-link-color-light); } } ===================================== browser/components/onionservices/content/authPreferences.css ===================================== @@ -1,7 +1,5 @@ /* Copyright (c) 2020, The Tor Project, Inc. */ -@import url("chrome://global/skin/browser-colors.css"); - #onionservices-savedkeys-dialog { min-width: 45em; } @@ -23,5 +21,5 @@ margin-inline-end: 4px; list-style-image: url("chrome://global/skin/icons/warning.svg"); -moz-context-properties: fill; - fill: var(--warning-color); + fill: var(--in-content-warning-icon-color); } ===================================== browser/components/onionservices/content/onionlocation-urlbar.inc.xhtml ===================================== @@ -1,7 +1,7 @@ # Copyright (c) 2020, The Tor Project, Inc. <hbox id="onion-location-box" - class="tor-urlbar-button" + class="tor-button tor-urlbar-button" role="button" hidden="true" onclick="OnionLocationParent.buttonClick(event);"> ===================================== browser/components/securitylevel/content/securityLevelPanel.css ===================================== @@ -51,7 +51,7 @@ #securityLevel-custom { border-radius: 4px; - background-color: var(--warning-color); + background-color: var(--warning-icon-bgcolor); color: black; padding: 0.4em 0.5em; margin-inline-start: 1em; ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -1,4 +1,4 @@ -@import url("chrome://global/skin/browser-colors.css"); +@import url("chrome://global/skin/tor-colors.css"); #category-connection > .category-icon { @@ -137,13 +137,7 @@ button.spoof-button-disabled { } .bridge-status-badge.bridge-status-connected { - color: var(--purple-60); -} - -@media (prefers-color-scheme: dark) { - .bridge-status-badge.bridge-status-connected { - color: var(--purple-30); - } + color: var(--tor-accent-color); } .bridge-status-badge.bridge-status-current-built-in { @@ -990,7 +984,7 @@ hbox#torPreferences-requestBridge-incorrectCaptchaHbox { image#torPreferences-requestBridge-errorIcon { list-style-image: url("chrome://global/skin/icons/warning.svg"); -moz-context-properties: fill; - fill: var(--warning-color); + fill: var(--in-content-warning-icon-color); } groupbox#torPreferences-bridges-group textarea { ===================================== browser/themes/shared/browser-shared.css ===================================== @@ -26,8 +26,8 @@ @import url("chrome://browser/skin/customizableui/customizeMode.css"); @import url("chrome://browser/skin/UITour.css"); @import url("chrome://browser/skin/formautofill-notification.css"); -@import url("chrome://global/skin/browser-colors.css"); @import url("chrome://browser/skin/tor-branding.css"); +@import url("chrome://global/skin/tor-colors.css"); @import url("chrome://browser/skin/tor-urlbar-button.css"); @import url("chrome://browser/skin/onionlocation.css"); ===================================== browser/themes/shared/tor-urlbar-button.css ===================================== @@ -1,9 +1,4 @@ .tor-urlbar-button:not([hidden]) { - --tor-urlbar-button-background-color: var(--purple-60); - background-color: var(--tor-urlbar-button-background-color); - /* FIXME: Use different colors for light and dark theme, rather than "white". - * See tor-browser#41787 */ - color: white; display: flex; align-items: center; gap: 0.5em; @@ -31,8 +26,7 @@ * urlbar background, but we keep the rounded corners. */ outline: var(--focus-outline); outline-offset: var(--focus-outline-offset); - /* Use the background color for the outline, same as in-content buttons. */ - outline-color: var(--tor-urlbar-button-background-color); + outline-color: var(--tor-focus-outline-color); /* Calculate the difference between the button's border area and the outline * area. */ --tor-urlbar-focus-outline-difference: calc( @@ -64,31 +58,9 @@ display: none; } -.tor-urlbar-button:hover { - --tor-urlbar-button-background-color: var(--purple-70); -} - -.tor-urlbar-button:hover:active { - --tor-urlbar-button-background-color: var(--purple-80); -} - -@media (prefers-color-scheme: dark) { - .tor-urlbar-button { - --tor-urlbar-button-background-color: var(--purple-50); - } - - .tor-urlbar-button:hover { - --tor-urlbar-button-background-color: var(--purple-60); - } - - .tor-urlbar-button:hover:active { - --tor-urlbar-button-background-color: var(--purple-70); - } -} - /* Make the button look plain like the identity #urlbar-label-box. */ .tor-urlbar-button.tor-urlbar-button-plain { - --tor-urlbar-button-background-color: var(--urlbar-box-bgcolor); + background-color: var(--urlbar-box-bgcolor); color: var(--urlbar-box-text-color); } @@ -97,11 +69,11 @@ } .tor-urlbar-button.tor-urlbar-button-plain:hover { - --tor-urlbar-button-background-color: var(--urlbar-box-hover-bgcolor); + background-color: var(--urlbar-box-hover-bgcolor); color: var(--urlbar-box-hover-text-color); } .tor-urlbar-button.tor-urlbar-button-plain:hover:active { - --tor-urlbar-button-background-color: var(--urlbar-box-active-bgcolor); + background-color: var(--urlbar-box-active-bgcolor); color: var(--urlbar-box-hover-text-color); } ===================================== toolkit/components/torconnect/content/aboutTorConnect.css ===================================== @@ -2,7 +2,7 @@ /* Copyright (c) 2021, The Tor Project, Inc. */ @import url("chrome://global/skin/error-pages.css"); -@import url("chrome://global/skin/browser-colors.css"); +@import url("chrome://global/skin/tor-colors.css"); :root { --onion-opacity: 1; @@ -14,23 +14,10 @@ html { height: 100%; } -input[type="checkbox"]:focus, select:focus { - outline: none!important; - box-shadow: 0 0 0 3px var(--purple-30) !important; - border: 1px var(--purple-80) solid !important; -} - -@media (prefers-color-scheme: dark) { - input[type="checkbox"]:focus, select:focus { - box-shadow: 0 0 0 3px var(--purple-50)!important; - } -} - #breadcrumbs { display: flex; align-items: center; margin: 0 0 24px 0; - color: var(--grey-40); } #breadcrumbs.hidden { @@ -129,23 +116,8 @@ input[type="checkbox"]:focus, select:focus { list-style-image: url("chrome://global/content/torconnect/bridge.svg"); } -button { - --purple-button-text-color: rgb(251,251,254); - --in-content-primary-button-text-color: var(--purple-button-text-color); - --in-content-primary-button-background: var(--purple-60); - --in-content-primary-button-text-color-hover: var(--purple-button-text-color); - --in-content-primary-button-background-hover: var(--purple-70); - --in-content-primary-button-text-color-active: var(--purple-button-text-color); - --in-content-primary-button-background-active: var(--purple-80); - --in-content-focus-outline-color: var(--purple-60); - fill: white; -} - -#cancelButton { - color: var(--in-content-button-text-color); - border: 1px solid var(--in-content-button-border-color); - border-radius: 4px; - background-color: var(--in-content-button-background); +button, select { + --in-content-focus-outline-color: var(--tor-focus-outline-color); } #locationDropdownLabel { @@ -157,18 +129,6 @@ button { color: var(--text-color-error) } -#tryBridgeButton.danger-button { - background-color: var(--purple-70); -} - -#tryBridgeButton.danger-button:hover { - background-color: var(--purple-80); -} - -#tryBridgeButton.danger-button:active { - background-color: var(--purple-90); -} - /* this follows similar css in error-pages.css for buttons */ @media only screen and (min-width: 480px) { form#locationDropdown { @@ -195,35 +155,6 @@ form#locationDropdown select { font-weight: 700; } -/* checkbox css */ -input[type="checkbox"]:not(:disabled) { - background-color: var(--grey-20)!important; -} - -input[type="checkbox"]:not(:disabled):checked { - background-color: var(--purple-60)!important; - color: white; - fill: white; -} - -input[type="checkbox"]:not(:disabled):hover { - /* override firefox's default blue border on hover */ - border-color: var(--purple-70); - background-color: var(--grey-30)!important; -} - -input[type="checkbox"]:not(:disabled):hover:checked { - background-color: var(--purple-70)!important; -} - -input[type="checkbox"]:not(:disabled):active { - background-color: var(--grey-40)!important; -} - -input[type="checkbox"]:not(:disabled):active:checked { - background-color: var(--purple-80)!important; -} - :root { --progressbar-shadow-start: rgba(255, 255, 255, 0.7); --progressbar-gradient: linear-gradient(90deg, #FC00FF 0%, #00DBDE 50%, #FC00FF 100%); @@ -352,7 +283,7 @@ body.aboutTorConnect .title { .title.location { background-image: url("chrome://global/content/torconnect/connection-location.svg"); - stroke: var(--warning-color); + stroke: var(--in-content-warning-icon-color); } :root { ===================================== toolkit/components/torconnect/content/aboutTorConnect.html ===================================== @@ -75,8 +75,8 @@ <button id="restartButton" hidden="true"></button> <button id="configureButton" hidden="true"></button> <button id="cancelButton" hidden="true"></button> - <button id="connectButton" class="primary" hidden="true"></button> - <button id="tryBridgeButton" class="primary" hidden="true"></button> + <button id="connectButton" hidden="true"></button> + <button id="tryBridgeButton" hidden="true"></button> </span> </div> </div> ===================================== toolkit/components/torconnect/content/aboutTorConnect.js ===================================== @@ -188,8 +188,9 @@ class AboutTorConnect { Element helper methods */ - show(element, primary) { - element.classList.toggle("primary", primary !== undefined && primary); + show(element, primary = false) { + element.classList.toggle("primary", primary); + element.classList.toggle("tor-button", primary); element.removeAttribute("hidden"); } @@ -554,7 +555,7 @@ class AboutTorConnect { } else { this.hide(this.elements.viewLogButton); } - this.show(this.elements.cancelButton, true); + this.show(this.elements.cancelButton); if (state.StateChanged) { this.elements.cancelButton.focus(); } @@ -687,7 +688,6 @@ class AboutTorConnect { this.show(this.elements.locationDropdown); this.elements.locationDropdownLabel.classList.toggle("error", isError); this.show(this.elements.tryBridgeButton, true); - this.elements.tryBridgeButton.classList.toggle("danger-button", isError); if (buttonLabel !== undefined) { this.elements.tryBridgeButton.textContent = buttonLabel; } ===================================== toolkit/components/torconnect/content/torConnectTitlebarStatus.css ===================================== @@ -44,13 +44,7 @@ } #tor-connect-titlebar-status.tor-connect-status-connected { - color: var(--purple-60); -} - -@media (prefers-color-scheme: dark) { - #tor-connect-titlebar-status.tor-connect-status-connected { - color: var(--purple-30); - } + color: var(--tor-accent-color); } @keyframes onion-not-connected-to-connected { ===================================== toolkit/themes/shared/browser-colors.css deleted ===================================== @@ -1,97 +0,0 @@ -:root { - /* photon colors, not all of them are available for whatever reason - in firefox, so here they are */ - - --magenta-50: #ff1ad9; - --magenta-60: #ed00b5; - --magenta-70: #b5007f; - --magenta-80: #7d004f; - --magenta-90: #440027; - - --purple-30: #c069ff; - --purple-40: #ad3bff; - --purple-50: #9400ff; - --purple-60: #8000d7; - --purple-70: #6200a4; - --purple-80: #440071; - --purple-90: #25003e; - - --blue-40: #45a1ff; - --blue-50: #0a84ff; - --blue-50-a30: rgba(10, 132, 255, 0.3); - --blue-60: #0060df; - --blue-70: #003eaa; - --blue-80: #002275; - --blue-90: #000f40; - - --teal-50: #00feff; - --teal-60: #00c8d7; - --teal-70: #008ea4; - --teal-80: #005a71; - --teal-90: #002d3e; - - --green-50: #30e60b; - --green-60: #12bc00; - --green-70: #058b00; - --green-80: #006504; - --green-90: #003706; - - --yellow-50: #ffe900; - --yellow-60: #d7b600; - --yellow-70: #a47f00; - --yellow-80: #715100; - --yellow-90: #3e2800; - - --red-50: #ff0039; - --red-60: #d70022; - --red-70: #a4000f; - --red-80: #5a0002; - --red-90: #3e0200; - - --orange-50: #ff9400; - --orange-60: #d76e00; - --orange-70: #a44900; - --orange-80: #712b00; - --orange-90: #3e1300; - - --grey-10: #f9f9fa; - --grey-10-a10: rgba(249, 249, 250, 0.1); - --grey-10-a20: rgba(249, 249, 250, 0.2); - --grey-10-a40: rgba(249, 249, 250, 0.4); - --grey-10-a60: rgba(249, 249, 250, 0.6); - --grey-10-a80: rgba(249, 249, 250, 0.8); - --grey-20: #ededf0; - --grey-30: #d7d7db; - --grey-40: #b1b1b3; - --grey-50: #737373; - --grey-60: #4a4a4f; - --grey-70: #38383d; - --grey-80: #2a2a2e; - --grey-90: #0c0c0d; - --grey-90-a05: rgba(12, 12, 13, 0.05); - --grey-90-a10: rgba(12, 12, 13, 0.1); - --grey-90-a20: rgba(12, 12, 13, 0.2); - --grey-90-a30: rgba(12, 12, 13, 0.3); - --grey-90-a40: rgba(12, 12, 13, 0.4); - --grey-90-a50: rgba(12, 12, 13, 0.5); - --grey-90-a60: rgba(12, 12, 13, 0.6); - --grey-90-a70: rgba(12, 12, 13, 0.7); - --grey-90-a80: rgba(12, 12, 13, 0.8); - --grey-90-a90: rgba(12, 12, 13, 0.9); - - --ink-70: #363959; - --ink-80: #202340; - --ink-90: #0f1126; - - --white-100: #ffffff; - - /* TODO: Switch to some Firefox variable, once Mozilla adds one for this - color. Matches --warning-icon-bgcolor (but not on the dark theme variant). */ - --warning-color: #ffa436; -} - -@media (prefers-color-scheme: dark) { - :root { - --warning-color: #ffbd4f; - } -} ===================================== toolkit/themes/shared/desktop-jar.inc.mn ===================================== @@ -46,6 +46,7 @@ skin/classic/global/popupnotification.css (../../shared/popupnotification.css) skin/classic/global/splitter.css (../../shared/splitter.css) skin/classic/global/toolbarbutton.css (../../shared/toolbarbutton.css) + skin/classic/global/tor-colors.css (../../shared/tor-colors.css) skin/classic/global/tree/tree.css (../../shared/tree/tree.css) skin/classic/global/dirListing/dirListing.css (../../shared/dirListing/dirListing.css) #ifdef XP_MACOSX ===================================== toolkit/themes/shared/minimal-toolkit.jar.inc.mn ===================================== @@ -45,5 +45,3 @@ toolkit.jar: # Text recognition widget skin/classic/global/media/textrecognition.css (../../shared/media/textrecognition.css) - - skin/classic/global/browser-colors.css (../../shared/browser-colors.css) ===================================== toolkit/themes/shared/tor-colors.css ===================================== @@ -0,0 +1,120 @@ +:root { + /* Photon colors not available in Firefox. */ + --purple-30: #c069ff; + --purple-40: #ad3bff; + --purple-50: #9400ff; + --purple-60: #8000d7; + --purple-70: #6200a4; + --purple-80: #440071; + --purple-90: #25003e; + + /* On light backgrounds. */ + --tor-accent-color-light: var(--purple-60); + --tor-accent-color-hover-light: var(--purple-70); + --tor-accent-color-active-light: var(--purple-80); + + /* Acorn color grey light 05. */ + --tor-button-text-color-light: var(--color-gray-05); + --tor-button-text-color-hover-light: var(--color-gray-05); + --tor-button-text-color-active-light: var(--color-gray-05); + --tor-button-background-color-light: var(--tor-accent-color-light); + --tor-button-background-color-hover-light: var(--tor-accent-color-hover-light); + --tor-button-background-color-active-light: var(--tor-accent-color-active-light); + --tor-focus-outline-color-light: var(--tor-accent-color-light); + --tor-link-color-light: var(--tor-accent-color-light); + --tor-link-color-hover-light: var(--tor-accent-color-hover-light); + --tor-link-color-active-light: var(--tor-accent-color-active-light); + + + /* On dark backgrounds. */ + /* TODO: Need a dark theme purple color that gets *lighter* with hover and + * active states, see tor-browser#42025 */ + --tor-accent-color-dark: var(--purple-30); + --tor-accent-color-hover-dark: var(--purple-40); + --tor-accent-color-active-dark: var(--purple-50); + + /* TODO: Use a dark text color for dark theme. tor-browser#41787. */ + --tor-button-text-color-dark: var(--color-gray-05); + --tor-button-text-color-hover-dark: var(--color-gray-05); + --tor-button-text-color-active-dark: var(--color-gray-05); + --tor-button-background-color-dark: var(--tor-accent-color-dark); + --tor-button-background-color-hover-dark: var(--tor-accent-color-hover-dark); + --tor-button-background-color-active-dark: var(--tor-accent-color-active-dark); + --tor-focus-outline-color-dark: var(--tor-accent-color-dark); + --tor-link-color-dark: var(--tor-accent-color-dark); + --tor-link-color-hover-dark: var(--tor-accent-color-hover-dark); + --tor-link-color-active-dark: var(--tor-accent-color-active-dark); + + + /* Generic colors that adapt to theme. */ + --tor-accent-color: light-dark( + var(--tor-accent-color-light), + var(--tor-accent-color-dark) + ); + --tor-accent-color-hover: light-dark( + var(--tor-accent-color-hover-light), + var(--tor-accent-color-hover-dark) + ); + --tor-accent-color-active: light-dark( + var(--tor-accent-color-active-light), + var(--tor-accent-color-active-dark) + ); + --tor-button-text-color: light-dark( + var(--tor-button-text-color-light), + var(--tor-button-text-color-dark) + ); + --tor-button-text-color-hover: light-dark( + var(--tor-button-text-color-hover-light), + var(--tor-button-text-color-hover-dark) + ); + --tor-button-text-color-active: light-dark( + var(--tor-button-text-color-active-light), + var(--tor-button-text-color-active-dark) + ); + --tor-button-background-color: light-dark( + var(--tor-button-background-color-light), + var(--tor-button-background-color-dark) + ); + --tor-button-background-color-hover: light-dark( + var(--tor-button-background-color-hover-light), + var(--tor-button-background-color-hover-dark) + ); + --tor-button-background-color-active: light-dark( + var(--tor-button-background-color-active-light), + var(--tor-button-background-color-active-dark) + ); + --tor-focus-outline-color: light-dark( + var(--tor-focus-outline-color-light), + var(--tor-focus-outline-color-dark) + ); + --tor-link-color: light-dark( + var(--tor-link-color-light), + var(--tor-link-color-dark) + ); + --tor-link-color-hover: light-dark( + var(--tor-link-color-hover-light), + var(--tor-link-color-hover-dark) + ); + --tor-link-color-active: light-dark( + var(--tor-link-color-active-light), + var(--tor-link-color-active-dark) + ); +} + +button.tor-button, +.tor-button { + color: var(--tor-button-text-color); + background-color: var(--tor-button-background-color); +} + +button.tor-button:hover, +.tor-button:hover { + color: var(--tor-button-text-color-hover); + background-color: var(--tor-button-background-color-hover); +} + +button.tor-button:hover:active, +.tor-button:hover:active { + color: var(--tor-button-text-color-active); + background-color: var(--tor-button-background-color-active); +} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/908dda… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/908dda… You're receiving this email because of your account on gitlab.torproject.org. [View Less]

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41198: Add anti-censorship team to stakeholders to notify on packaging changes
by morgan (＠morgan) 21 Aug '24

21 Aug '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: e7e6c2f3 by Morgan at 2024-08-19T20:11:34+00:00 Bug 41198: Add anti-censorship team to stakeholders to notify on packaging changes - - - - - 1 changed file: - .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md ===================================== @@ -155,6 +155,7 @@ Tor Browser … [View More]

1 0