Merge mullvad browser strings into one file

Merge Info

Related Issues

• #349 (closed)

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

Issue Tracking

• Link resolved issues with appropriate Release Prep issue for changelog generation

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) : jwilde, 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 : jwilde, ma1
  • signing : boklm, richard
  • updater : pierov
  • windows : jwilde, richard
  • misc/other : pierov, richard

Change Description

Merge the mullvad browser strings into one file.

Also removed about-mullvad-browser-page-title which is unused in both 14.0 and 13.5.

I'll also open a matching translation merge request, merging the files for the other locales.

@pierov do you need to change the build system to accommodate this?

How Tested

Opened "about:mullvad-browser", "about:preferences#home", "about:rights" and "about:telemetry". Also checked the about dialog.

requested review from @pierov

assigned to @henry

mentioned in merge request tpo/translation!118 (merged)

changed title from Mullvad Browser strings to Merge mullvad browser strings into one file

resolved all threads

approved this merge request

The target branch is closed because the 128.3.0 rebase is pending for review.

But if it's important to merge ASAP for continuing with the localization pipeline we can re-open and cherry-pick it to the rebase MR.

added 351 commits

• 0401111f...350b19e0 - 341 earlier commits
• cbec5612 - MB 213: Customize the search engines list
• 79721f60 - squash! MB 213: Customize the search engines list
• 832f998a - MB 214: Enable cross-tab identity leak protection in "quiet" mode
• 151ac295 - MB 80: Enable Mullvad Browser as a default browser
• 57d2cd5a - MB 320: Temporarily disable WebRTC and WDBA on Windows.
• 564c9f37 - MB 329: Customize toolbar for mullvad-browser.
• cbadd0c5 - Mullvad Browser strings
• 96e5e78f - fixup! MB 37: Customization for the about dialog
• e0227da3 - fixup! MB 39: Add home page about:mullvad-browser
• 6243c664 - fixup! MB 63: Customize some about pages for Mullvad Browser

Compare with previous version

marked this merge request as draft from henry/mullvad-browser@907bad30

marked this merge request as ready

changed target branch from mullvad-browser-128.2.0esr-14.0-1 to mullvad-browser-128.3.0esr-14.0-1

resolved all threads

merged

mentioned in issue #359 (closed)