From 14ccdb1f701dd05a55a50dd1660b9db1ee10b787 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 12:01:56 +0000 Subject: [PATCH 1/9] master (cea3da70): 250 updated files --- _data/master.json | 14 ++++++++------ browser/browser/browser.ftl | 2 ++ browser/browser/newtab/newtab.ftl | 11 ++++++++++- devtools/client/netmonitor.properties | 4 ++++ 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/_data/master.json b/_data/master.json index 8ae8c69be..ef428ecac 100644 --- a/_data/master.json +++ b/_data/master.json @@ -936,6 +936,7 @@ "urlbar-result-action-tabtosearch-other-engine", "urlbar-result-action-copy-to-clipboard", "urlbar-result-action-calculator-result", + "urlbar-result-action-undefined-calculator-result", "urlbar-searchmode-button2.label", "urlbar-searchmode-button2.tooltiptext", "urlbar-searchmode-button-no-engine.label", @@ -2621,15 +2622,15 @@ "newtab-section-block-button", "newtab-section-blocked-button", "newtab-section-unblock-button", - "newtab-section-confirm-block-section-p1", - "newtab-section-confirm-block-section-p2", - "newtab-section-block-section-button", + "newtab-section-confirm-block-topic-p1", + "newtab-section-confirm-block-topic-p2", + "newtab-section-block-topic-button", "newtab-section-cancel-button", "newtab-section-mangage-topics-title", - "newtab-section-mangage-topics-button.label", - "newtab-section-mangage-topics-followed-topics-subtitle", + "newtab-section-manage-topics-button-v2.label", + "newtab-section-mangage-topics-followed-topics", "newtab-section-mangage-topics-followed-topics-empty-state", - "newtab-section-mangage-topics-blocked-topics-subtitle", + "newtab-section-mangage-topics-blocked-topics", "newtab-section-mangage-topics-blocked-topics-empty-state" ], "browser/browser/newtab/onboarding.ftl": [ @@ -7403,6 +7404,7 @@ "netmonitor.request.raw", "requestHeaders", "requestHeadersFromUpload", + "earlyHintsResponseHeaders", "responseHeaders", "requestCookies", "responseCookies", diff --git a/browser/browser/browser.ftl b/browser/browser/browser.ftl index 264f85a49..be0bd472b 100644 --- a/browser/browser/browser.ftl +++ b/browser/browser/browser.ftl @@ -671,6 +671,8 @@ urlbar-result-action-copy-to-clipboard = Copy # Variables # $result (String): the string representation for a formula result urlbar-result-action-calculator-result = = { $result } +# The string returned for an undefined calculator result such as when dividing by 0 +urlbar-result-action-undefined-calculator-result = undefined ## Strings used for buttons in the urlbar diff --git a/browser/browser/newtab/newtab.ftl b/browser/browser/newtab/newtab.ftl index 8f6f6e79e..a9af17791 100644 --- a/browser/browser/newtab/newtab.ftl +++ b/browser/browser/newtab/newtab.ftl @@ -122,7 +122,7 @@ newtab-menu-about-fakespot = About { -fakespot-brand-name } newtab-menu-section-block = Block # "Follow", "unfollow", and "following" are social media terms that refer to subscribing to or unsubscribing from a section of stories. # e.g. Following the travel section of stories. -newtab-menu-section-unfollow = Unfollow Topic +newtab-menu-section-unfollow = Unfollow topic ## Message displayed in a modal window to explain privacy and provide context for sponsored content. @@ -478,13 +478,22 @@ newtab-section-confirm-block-section-p1 = Are you sure you want to block this se newtab-section-confirm-block-section-p2 = Blocked section will no longer appear in your feed. newtab-section-block-section-button = Block this section newtab-section-cancel-button = Not now +newtab-section-confirm-block-topic-p1 = Are you sure you want to block this topic? +newtab-section-confirm-block-topic-p2 = Blocked topics will no longer appear in your feed. +# Variables: +# $topic (string) - Name of topic that user is blocking +newtab-section-block-topic-button = Block { $topic } ## Panel in the Customize menu section to manage followed and blocked topics newtab-section-mangage-topics-title = Topics +newtab-section-manage-topics-button-v2 = + .label = Manage topics +newtab-section-mangage-topics-followed-topics = Followed newtab-section-mangage-topics-button = .label = Followed and blocked topics newtab-section-mangage-topics-followed-topics-subtitle = Followed Topics newtab-section-mangage-topics-followed-topics-empty-state = You have not followed any topics yet. +newtab-section-mangage-topics-blocked-topics = Blocked newtab-section-mangage-topics-blocked-topics-subtitle = Blocked Topics newtab-section-mangage-topics-blocked-topics-empty-state = You have not blocked any topics yet. diff --git a/devtools/client/netmonitor.properties b/devtools/client/netmonitor.properties index a4c9d029a..2bda9154e 100644 --- a/devtools/client/netmonitor.properties +++ b/devtools/client/netmonitor.properties @@ -100,6 +100,10 @@ requestHeaders = Request Headers # in the network details headers tab identifying the request headers from # the upload stream of a POST request's body. requestHeadersFromUpload = Request headers from upload stream +# LOCALIZATION NOTE (earlyHintsResponseHeaders): This is the label displayed +# in the network details headers tab identifying the early hints response headers. +# Do not translate `Early Hints`, since it's the header type. +earlyHintsResponseHeaders = Early Hints Response Headers # LOCALIZATION NOTE (responseHeaders): This is the label displayed # in the network details headers tab identifying the response headers. responseHeaders = Response Headers From 1826417df5f4aee8d6bd71100d5a5c78172de692 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2025 12:02:01 +0000 Subject: [PATCH 2/9] master (4ecc0a13): 250 updated files --- _data/master.json | 18 +++++------------- browser/browser/aboutDialog.ftl | 2 ++ browser/browser/browser.ftl | 4 ++++ browser/browser/newtab/onboarding.ftl | 2 ++ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/_data/master.json b/_data/master.json index ef428ecac..45b18e971 100644 --- a/_data/master.json +++ b/_data/master.json @@ -43,8 +43,8 @@ "community-2", "helpus", "bottomLinks-license", - "bottomLinks-rights", - "bottomLinks-privacy", + "bottom-links-terms", + "bottom-links-privacy", "aboutDialog-version", "aboutDialog-version-nightly", "aboutdialog-version-arch", @@ -948,7 +948,7 @@ "urlbar-searchmode-actions.label", "urlbar-searchmode-exit-button.tooltiptext", "urlbar-searchmode-popup-description", - "urlbar-searchmode-popup-search-settings", + "urlbar-searchmode-popup-search-settings-menuitem.label", "urlbar-result-search-with", "urlbar-result-search-with-local-search-mode", "urlbar-result-search-with-engine-keywords", @@ -2803,7 +2803,8 @@ "desktop-to-mobile-headline", "desktop-to-mobile-subtitle", "dismiss-button-label", - "sync-to-mobile-button-label" + "sync-to-mobile-button-label", + "desktop-to-mobile-qr-code-alt.aria-label" ], "browser/browser/originControls.ftl": [ "origin-controls-no-access.label", @@ -4409,8 +4410,6 @@ "preferences-doh-setting-off.label", "preferences-doh-setting-off.accesskey", "preferences-doh-off-desc", - "preferences-doh-checkbox-warn.label", - "preferences-doh-checkbox-warn.accesskey", "preferences-doh-select-resolver", "preferences-doh-manage-exceptions.label", "preferences-doh-manage-exceptions.accesskey", @@ -13489,8 +13488,6 @@ "connectionFailure-title", "deniedPortAccess-title", "dnsNotFound-title", - "dns-not-found-trr-only-title2", - "dns-not-found-native-fallback-title2", "fileNotFound-title", "fileAccessDenied-title", "generic-title", @@ -13570,8 +13567,6 @@ "neterror-add-exception-button", "neterror-settings-button", "neterror-view-certificate-link", - "neterror-trr-continue-this-time", - "neterror-disable-native-feedback-warning", "neterror-pref-reset", "neterror-generic-error", "neterror-load-error-try-again", @@ -13595,9 +13590,6 @@ "neterror-dns-not-found-bad-trr-url", "neterror-dns-not-found-system-sleep", "neterror-dns-not-found-trr-unknown-problem", - "neterror-dns-not-found-native-fallback-reason2", - "neterror-dns-not-found-native-fallback-heuristic", - "neterror-dns-not-found-native-fallback-not-confirmed2", "neterror-file-not-found-filename", "neterror-file-not-found-moved", "neterror-access-denied", diff --git a/browser/browser/aboutDialog.ftl b/browser/browser/aboutDialog.ftl index 35f998256..ed140b01f 100644 --- a/browser/browser/aboutDialog.ftl +++ b/browser/browser/aboutDialog.ftl @@ -51,6 +51,8 @@ community-exp =