From 709362d6221145d90e503beed186b26fb38c637d Mon Sep 17 00:00:00 2001 From: Bryan Olsson Date: Fri, 17 Jan 2025 17:29:13 -0800 Subject: [PATCH] Address additional feedback --- src/products/firefox_desktop/firefox_l10n_faqs.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/products/firefox_desktop/firefox_l10n_faqs.md b/src/products/firefox_desktop/firefox_l10n_faqs.md index e7dc1953..016af22e 100644 --- a/src/products/firefox_desktop/firefox_l10n_faqs.md +++ b/src/products/firefox_desktop/firefox_l10n_faqs.md @@ -50,9 +50,9 @@ Typically once or twice a week, the quarantined content (in the `update` branch) While Nightly is always open for new strings, Beta and Release are string frozen, meaning that patches with new strings are normally not allowed to land. -Uplifts need to be evaluated case by case, but in general they should be avoided in the context of a 4-weeks release cycle. Possible alternatives are uplifting ad-hoc patches without string changes, or exposing the feature/change only to English users. +Uplifts need to be evaluated case by case, but in general they should be avoided in the context of a [4-week release cycle](./build_system.md). Possible alternatives are uplifting ad-hoc patches without string changes, or exposing the feature/change only to English users. -In the event an uplift request is made and approved, translations for uplifted strings should be included in the uplift patch if they have landed and have had enough time for localization. To include the latest translations, an appropriate commit hash from [`firefox-l10n`](https://github.com/mozilla-l10n/firefox-l10n) (usually the most recent commit) should replace the values of `revision` for all locales in [`l10n-changesets.json`](https://searchfox.org/mozilla-central/source/browser/locales/l10n-changesets.json). +In the event an uplift request is made and approved, translations for uplifted strings should also be uplifted if they have landed and have had enough time for localization. For translations to appear in the build, the `revision` value for all locales in [`l10n-changesets.json`](https://searchfox.org/mozilla-central/source/browser/locales/l10n-changesets.json) must have a commit hash containing the appropriate translations from [`firefox-l10n`](https://github.com/mozilla-l10n/firefox-l10n). Typically, the `l10n-changesets.json` file from mozilla-beta is used since it has gone through the build system at least once (even if it isn't the latest). There are two options to ensure these changes are uplifted: an ad-hoc patch including the updates to the `l10n-changesets.json` file or asking Release Management to land a follow-up change for the l10n changesets. One more thing to consider is the timing of the uplift. The second part of the Beta cycle is completely frozen, meaning that we can’t take any updates to localization and ship it in that version. Anything uplifted close to the deadline, or after, will ship untranslated. For more details about the Beta timeline for l10n, see the [Build system document](build_system.md#timeline-and-deadlines).