From 22e2874bf6412144ab4b51b95327306ef9609b2c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 05:02:55 +0200 Subject: Merging upstream version 126.0.1. Signed-off-by: Daniel Baumann --- browser/base/content/browser.xhtml | 1 - browser/base/content/webext-panels.xhtml | 2 +- browser/config/version.txt | 2 +- browser/config/version_display.txt | 2 +- browser/locales-preview/select-translations.ftl | 54 -------------- browser/locales/en-US/browser/translations.ftl | 93 +++++++++++++++++++++++++ browser/locales/jar.mn | 1 - 7 files changed, 96 insertions(+), 59 deletions(-) delete mode 100644 browser/locales-preview/select-translations.ftl (limited to 'browser') diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml index a01138c7da..8ef14813b1 100644 --- a/browser/base/content/browser.xhtml +++ b/browser/base/content/browser.xhtml @@ -92,7 +92,6 @@ - diff --git a/browser/base/content/webext-panels.xhtml b/browser/base/content/webext-panels.xhtml index f421d9bf80..1b97794a8d 100644 --- a/browser/base/content/webext-panels.xhtml +++ b/browser/base/content/webext-panels.xhtml @@ -28,7 +28,7 @@ - + diff --git a/browser/config/version.txt b/browser/config/version.txt index ab2a50c778..9931f67c71 100644 --- a/browser/config/version.txt +++ b/browser/config/version.txt @@ -1 +1 @@ -126.0 +126.0.1 diff --git a/browser/config/version_display.txt b/browser/config/version_display.txt index ab2a50c778..9931f67c71 100644 --- a/browser/config/version_display.txt +++ b/browser/config/version_display.txt @@ -1 +1 @@ -126.0 +126.0.1 diff --git a/browser/locales-preview/select-translations.ftl b/browser/locales-preview/select-translations.ftl deleted file mode 100644 index 39c882ec64..0000000000 --- a/browser/locales-preview/select-translations.ftl +++ /dev/null @@ -1,54 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at https://mozilla.org/MPL/2.0/. - - -# Text displayed in the right-click context menu for translating -# selected text to a yet-to-be-determined language. -main-context-menu-translate-selection = - .label = Translate Selection… - -# Text displayed in the right-click context menu for translating -# selected text to a target language. -# -# Variables: -# $language (string) - The localized display name of the target language -main-context-menu-translate-selection-to-language = - .label = Translate Selection to { $language } - -# Text displayed in the right-click context menu for translating -# the text of a hyperlink to a yet-to-be-determined language. -main-context-menu-translate-link-text = - .label = Translate Link Text… - -# Text displayed in the right-click context menu for translating -# the text of a hyperlink to a target language. -# -# Variables: -# $language (string) - The localized display name of the target language -main-context-menu-translate-link-text-to-language = - .label = Translate Link Text to { $language } - -# Text displayed in the select translations panel header. -select-translations-panel-header = Translation - -# Text displayed above the from-language dropdown menu. -select-translations-panel-from-label = From - -# Text displayed above the to-language dropdown menu. -select-translations-panel-to-label = To - -# Text displayed on the copy button. -select-translations-panel-copy-button = Copy - -# Text displayed on the done button. -select-translations-panel-done-button = Done - -# Text displayed on translate-full-page button. -select-translations-panel-translate-full-page-button = Translate full page - -# Text displayed as a placeholder when the panel is idle. -select-translations-panel-idle-placeholder-text = Translated text will appear here. - -# Text displayed as a placeholder when the panel is actively translating. -select-translations-panel-translating-placeholder-text = Translating… diff --git a/browser/locales/en-US/browser/translations.ftl b/browser/locales/en-US/browser/translations.ftl index 8483a4591a..92f21220f1 100644 --- a/browser/locales/en-US/browser/translations.ftl +++ b/browser/locales/en-US/browser/translations.ftl @@ -166,3 +166,96 @@ translations-settings-remove-all-sites-button = translations-settings-close-dialog = .buttonlabelaccept = Close .buttonaccesskeyaccept = C + +# Text displayed in the right-click context menu for translating +# selected text to a yet-to-be-determined language. +main-context-menu-translate-selection = + .label = Translate Selection… + .accesskey = n + +# Text displayed in the right-click context menu for translating +# selected text to a target language. +# +# Variables: +# $language (string) - The localized display name of the target language +main-context-menu-translate-selection-to-language = + .label = Translate Selection to { $language } + .accesskey = n + +# Text displayed in the right-click context menu for translating +# the text of a hyperlink to a yet-to-be-determined language. +main-context-menu-translate-link-text = + .label = Translate Link Text… + .accesskey = n + +# Text displayed in the right-click context menu for translating +# the text of a hyperlink to a target language. +# +# Variables: +# $language (string) - The localized display name of the target language +main-context-menu-translate-link-text-to-language = + .label = Translate Link Text to { $language } + .accesskey = n + +# Text displayed in the select translations panel header. +select-translations-panel-header = Translation + +# Text displayed above the from-language dropdown menu. +select-translations-panel-from-label = From + +# Text displayed above the to-language dropdown menu. +select-translations-panel-to-label = To + +# Text displayed above the try-another-source-language dropdown menu. +select-translations-panel-try-another-language-label = Try another source language + +select-translations-panel-cancel-button = + .label = Cancel + +# Text displayed on the copy button before it is clicked. +select-translations-panel-copy-button = + .label = Copy + +# Text displayed on the copy button after it is clicked. +select-translations-panel-copy-button-copied = + .label = Copied + +select-translations-panel-done-button = + .label = Done + +select-translations-panel-translate-full-page-button = + .label = Translate full page + +select-translations-panel-translate-button = + .label = Translate + +select-translations-panel-try-again-button = + .label = Try again + +# Text displayed as a placeholder when the panel is idle. +select-translations-panel-idle-placeholder-text = Translated text will appear here. + +# Text displayed as a placeholder when the panel is actively translating. +select-translations-panel-translating-placeholder-text = Translating… + +select-translations-panel-init-failure-message = + .message = Couldn’t load languages. Check your internet connection and try again. + +# Text displayed when the translation fails to complete. +select-translations-panel-translation-failure-message = + .message = There was a problem translating. Please try again. + +# If your language requires declining the language name, a possible solution +# is to adapt the structure of the phrase, or use a support noun, e.g. +# `Sorry, we don't support the language yet: { $language } +# +# Variables: +# $language (string) - The language of the document. +select-translations-panel-unsupported-language-message-known = + .message = Sorry, we don’t support { $language } yet. +select-translations-panel-unsupported-language-message-unknown = + .message = Sorry, we don’t support this language yet. + +# Text displayed on the menuitem that opens the Translation Settings page. +select-translations-panel-open-translations-settings-menuitem = + .label = Translation settings diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index 51cd7853b0..c3b7556aa3 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -15,7 +15,6 @@ preview/shopping.ftl (../components/shopping/content/shopping.ftl) preview/sidebar.ftl (../components/sidebar/sidebar.ftl) preview/onboarding.ftl (../components/aboutwelcome/content/onboarding.ftl) - preview/select-translations.ftl (../locales-preview/select-translations.ftl) preview/translations.ftl (../locales-preview/translations.ftl) browser (%browser/**/*.ftl) preview/profiles.ftl (../components/profiles/content/profiles.ftl) -- cgit v1.2.3