Skip to content

Migrate about dialog strings to Fluent

Merge Info

Related Issues

Backporting

Timeline

  • Immediate: patchset needed as soon as possible
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport
  • No Backport (preferred): patchset for the next major stable

(Optional) Justification

  • Emergency security update: patchset fixes CVEs, 0-days, etc
  • Censorship event: patchset enables censorship circumvention
  • Critical bug-fix: patchset fixes a bug in core-functionality
  • Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
  • Sponsor required: patchset required for sponsor
  • Localization: typos and other localization changes that should be also in the release branch
  • Other: please explain

Merging

  • Merge to tor-browser - !fixups to tor-browser-specific commits, new features, security backports
  • Merge to base-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
    • NOTE: if your changeset includes patches to both base-browser and tor-browser please clearly label in the change description which commits should be cherry-picked to base-browser after merging

Issue Tracking

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, richard
    • localization : henry, pierov
    • macos : clairehurst, dan
    • nightly builds : boklm
    • rebases/release-prep : dan, ma1, pierov, richard
    • security : ma1
    • signing : boklm, richard
    • updater : pierov
    • misc/other : pierov, richard

Change Description

First of many Fluent migration patches! We convert the "Help > About Tor Browser" dialog to use Fluent, dropping "aboutDialog.dtd".

We also add a migration script "bug-42203-about-dialog.py". This will be run with tools/torbrowser/l10n/migrate.py in the translation repository once it receives the new Fluent changes. The will fill the non-en-US tor-browser.ftl files with the existing strings found in the translated "aboutDialog.dtd".

All the strings could be migrated using the existing DTD strings, with the exception of about-dialog-trademark-statement, which had to be changed:

  • To use double-quotes rather than ASCII single quotes.
  • To capitalize "The" and include it as part of the trademark name and the corporation name.
  • Add a note to translators to not translate the trademark names. The previous translations often translated "Onion Logo" even though it is a trademark name.

How Tested

Open "Help > About Tor Browser". All the strings should be present, and all the links should work.

Migration script runs successfully.

Merge request reports

Loading