[tbb-commits] [tor-browser/tor-browser-78.3.0esr-10.5-1] Merge remote-tracking branch 'gitlab/merge-requests/50' into tor-browser-78.3.0esr-10.5-1

[gk at torproject.org]

commit 7694fb95cdca2cea372681ff14473183b3378271
Merge: 94e52171a339 9233838b9b58
Author: Georg Koppen <gk at torproject.org>
Date:   Mon Sep 28 15:47:45 2020 +0000

    Merge remote-tracking branch 'gitlab/merge-requests/50' into tor-browser-78.3.0esr-10.5-1

 browser/actors/WebRTCParent.jsm                              |  2 +-
 browser/base/content/aboutDialog.xhtml                       |  2 +-
 browser/base/content/aboutNetError.xhtml                     |  2 +-
 browser/base/content/aboutRestartRequired.xhtml              |  2 +-
 browser/base/content/aboutTabCrashed.xhtml                   |  2 +-
 browser/base/content/blockedSite.xhtml                       |  2 +-
 browser/base/content/browser.js                              |  2 +-
 browser/base/content/browser.xhtml                           |  2 +-
 browser/base/content/macWindow.inc.xhtml                     |  2 +-
 browser/base/content/newInstallPage.html                     |  2 +-
 browser/base/content/safeMode.xhtml                          |  2 +-
 browser/base/content/webrtcIndicator.xhtml                   |  2 +-
 browser/components/aboutconfig/content/aboutconfig.html      |  2 +-
 browser/components/aboutlogins/AboutLoginsParent.jsm         |  4 ++--
 browser/components/aboutlogins/content/aboutLogins.html      |  2 +-
 browser/components/customizableui/content/panelUI.js         |  2 +-
 .../components/enterprisepolicies/content/aboutPolicies.html |  2 +-
 browser/components/migration/content/aboutWelcomeBack.xhtml  |  2 +-
 .../components/newtab/aboutwelcome/content/aboutwelcome.html |  2 +-
 browser/components/newtab/bin/render-activity-stream-html.js |  2 +-
 .../content-src/asrouter/templates/FirstRun/FirstRun.jsx     |  2 +-
 .../newtab/data/content/abouthomecache/page.html.template    |  2 +-
 .../components/newtab/data/content/activity-stream.bundle.js |  2 +-
 browser/components/newtab/lib/OnboardingMessageProvider.jsm  |  2 +-
 browser/components/newtab/lib/RemoteL10n.jsm                 |  2 +-
 .../components/newtab/prerendered/activity-stream-debug.html |  2 +-
 .../newtab/prerendered/activity-stream-noscripts.html        |  2 +-
 browser/components/newtab/prerendered/activity-stream.html   |  2 +-
 .../components/newtab/test/unit/asrouter/RemoteL10n.test.js  |  4 ++--
 browser/components/pioneer/content/pioneer.html              |  2 +-
 browser/components/preferences/dialogs/blocklists.xhtml      |  2 +-
 .../components/preferences/dialogs/browserLanguages.xhtml    |  2 +-
 browser/components/preferences/dialogs/clearSiteData.xhtml   |  2 +-
 browser/components/preferences/dialogs/connection.xhtml      |  2 +-
 browser/components/preferences/dialogs/sanitize.xhtml        |  2 +-
 .../components/preferences/dialogs/siteDataSettings.xhtml    |  2 +-
 browser/components/preferences/main.js                       |  2 +-
 browser/components/preferences/preferences.xhtml             |  2 +-
 browser/components/preferences/privacy.js                    |  2 +-
 .../privatebrowsing/content/aboutPrivateBrowsing.html        |  2 +-
 browser/components/protections/content/protections.html      |  2 +-
 .../sessionstore/content/aboutSessionRestore.xhtml           |  2 +-
 devtools/client/aboutdebugging/aboutdebugging.js             |  2 +-
 intl/l10n/L10nRegistry.jsm                                   | 12 ++++++++++++
 security/manager/pki/resources/content/exceptionDialog.xhtml |  2 +-
 toolkit/components/certviewer/content/certviewer.html        |  2 +-
 toolkit/content/aboutProfiles.xhtml                          |  2 +-
 toolkit/content/aboutRights-unbranded.xhtml                  |  2 +-
 toolkit/content/aboutRights.xhtml                            |  2 +-
 toolkit/content/aboutServiceWorkers.xhtml                    |  2 +-
 toolkit/content/aboutSupport.xhtml                           |  2 +-
 toolkit/content/aboutTelemetry.xhtml                         |  2 +-
 toolkit/content/resetProfile.xhtml                           |  2 +-
 toolkit/mozapps/downloads/content/unknownContentType.xhtml   |  2 +-
 toolkit/mozapps/extensions/content/aboutaddons.html          |  2 +-
 toolkit/mozapps/extensions/content/abuse-report-frame.html   |  2 +-
 toolkit/mozapps/extensions/content/blocklist.xhtml           |  2 +-
 toolkit/mozapps/extensions/content/extensions.xhtml          |  2 +-
 toolkit/mozapps/preferences/changemp.xhtml                   |  2 +-
 toolkit/mozapps/update/content/updateElevation.xhtml         |  2 +-
 toolkit/profile/content/createProfileWizard.xhtml            |  2 +-
 toolkit/profile/content/profileDowngrade.xhtml               |  2 +-
 toolkit/profile/content/profileSelection.xhtml               |  2 +-
 63 files changed, 76 insertions(+), 64 deletions(-)