Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates from bedrock #473

Merged
merged 4 commits into from
Feb 5, 2025
Merged

Updates from bedrock #473

merged 4 commits into from
Feb 5, 2025

Conversation

MozmarRobot
Copy link
Collaborator

From file changes in mozilla/bedrock@8616c04

From file changes in mozilla/bedrock@8616c04
@MozmarRobot MozmarRobot requested a review from a team as a code owner January 30, 2025 21:06
@flodolo
Copy link
Contributor

flodolo commented Jan 31, 2025

Noting that there's an ongoing conversation on Slack to understand if this should have been a new, separate template/file.

@flodolo
Copy link
Contributor

flodolo commented Feb 3, 2025

Blocked by mozilla/bedrock#15959

From file changes in mozilla/bedrock@1bcc344
Copy link
Contributor

@peiying2 peiying2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor change request in the file.

On the naming convention to a new file, the previous major revision to a file has been using the year in the file name. Should we follow the same naming convention instead of using -v2? See how it was done before: https://github.com/mozilla-l10n/www-l10n/tree/master/en/firefox/features

@maureenlholland

features-adblocker-tool-3 = <strong>Custom Mode:</strong> For those who want full control, Custom mode lets you select what to block, from cookies to trackers and more.
features-adblocker-to-adjust = To adjust these settings, click the shield icon to the left of the address bar on any webpage and select “Protection Settings.” This will open a menu where you can choose the right level of protection for you.
features-adblocker-why-use = Why Use an Ad Blocker?
features-adblocker-ad-blockers-do-more = Ad blockers do more than manage ads—they can enhance your browsing speed and security by reducing unnecessary content. They empower you to create a tailored, distraction-free web experience, letting you focus on what matters most.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a space before and after the em-dash … than manage ads — they can enhance…

From file changes in mozilla/bedrock@b18326f
@peiying2
Copy link
Contributor

peiying2 commented Feb 5, 2025

@maureenlholland thanks for the update. We need to remove en/firefox/features/adblocker-v2.ftl.

@flodolo
Copy link
Contributor

flodolo commented Feb 5, 2025

@maureenlholland thanks for the update. We need to remove en/firefox/features/adblocker-v2.ftl.

I think that's the usual automation problem :-(
mozilla/bedrock#13811

The PR is renaming the file correctly. I'll remove it manually from here and see what happens.

@peiying2 peiying2 merged commit 10c8b67 into master Feb 5, 2025
2 checks passed
@peiying2 peiying2 deleted the update-from-bedrock-8616c046 branch February 5, 2025 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants