Skip to content

Commit

Permalink
Updates from bedrock
Browse files Browse the repository at this point in the history
From file changes in mozilla/bedrock@2b87d76
  • Loading branch information
MozmarRobot committed Oct 15, 2024
1 parent 56a8a52 commit bf7d7fe
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 141 deletions.
6 changes: 0 additions & 6 deletions en/mozilla-account-promo.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ moz-account-promo-title = One login. <br> <span { $class }>Everything</span> { -
# $learn_more_url - link to https://www.mozilla.org/en-US/firefox/accounts/
moz-account-already-have-v2 = Already have an account? <a { $sign_in_url }>Sign in</a> or <a { $learn_more_url }>learn more</a> about joining { -brand-name-mozilla }.
# Obsolete string (expires: 2024-09-12)
# Variables
# $sign_in_url - link to
# $learn_more_url - link to https://www.mozilla.org/en-US/firefox/accounts/
moz-account-already-have = Already have an account? <a { $sign_in_url }>Sign in</a> or <a { $learn_more_url }>learn more</a> about { -brand-name-mozilla }
moz-account-product-firefox = { -brand-name-firefox }
moz-account-product-monitor = { -brand-name-monitor }
moz-account-product-pocket = { -brand-name-pocket }
Expand Down
115 changes: 3 additions & 112 deletions en/navigation.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -2,119 +2,10 @@
# 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/.

navigation-download-firefox = Download { -brand-name-firefox }
navigation-get-a-firefox-account = Get a { -brand-name-firefox-account }
navigation-firefox-browser-for-desktop = { -brand-name-firefox-browser } for Desktop
navigation-get-the-browser-that-respects = Get the browser that respects your privacy automatically. On { -brand-name-windows }, { -brand-name-mac } or { -brand-name-linux }.
# Obsolete string (expires 2024-12-10)
navigation-firefox-browser-for-mobile = { -brand-name-firefox-browser } for Mobile
# Obsolete string (expires 2024-12-10)
navigation-take-speed-privacy-and = Take speed, privacy and peace of mind with you. On { -brand-name-android } and { -brand-name-ios }.
navigation-download-for-ios = Download for { -brand-name-ios }
navigation-download-for-android = Download for { -brand-name-android }
navigation-ios-support = { -brand-name-ios } Support
navigation-android-support = { -brand-name-android } Support
navigation-firefox-browser-for-enterprise = { -brand-name-firefox-browser } for Enterprise
navigation-strap-on-your-goggles = Strap on your goggles and step into the immersive web with { -brand-name-firefox-browser } for VR.
navigation-firefox-for-fire-tv = { -brand-name-firefox } for { -brand-name-fire-tv }
navigation-watch-videos-and-browse = Watch videos and browse the internet on your { -brand-name-amazon } { -brand-name-fire-tv }.
navigation-firefox-browsers-put = { -brand-name-firefox } browsers put your privacy first — and always have.
navigation-take-the-passwords-youve = Take the passwords you’ve saved in { -brand-name-firefox } with you everywhere.
navigation-firefox-blog = { -brand-name-firefox } Blog
navigation-read-about-new-firefox = Read about new { -brand-name-firefox } features, and get tips for staying safer online.
navigation-the-non-profit-behind = The non-profit behind { -brand-name-firefox } is fighting for a healthy internet for all.
navigation-learn-how-firefox-treats = Learn how { -brand-name-firefox } treats your data with respect.
navigation-mozilla-careers = { -brand-name-mozilla } Careers
navigation-approach-your-career = Approach your career with a sense of purpose. Find worthy work at { -brand-name-mozilla }.
navigation-close-firefox-menu = Close { -brand-name-firefox } menu
navigation-get-the-browser-that-gives = Get the browser that gives more power to you on { -brand-name-windows }, { -brand-name-mac } or { -brand-name-linux }.
navigation-take-firefox-and-firefox = Take { -brand-name-firefox } and { -brand-name-firefox-focus } with you. For { -brand-name-android } and { -brand-name-ios }.
navigation-get-firefox = Get { -brand-name-firefox }
navigation-get-firefox-focus = Get { -brand-name-firefox-focus }
navigation-android-extensions = { -brand-name-android } Extensions
navigation-your-firefox-account = Your { -brand-name-firefox-account }
navigation-make-the-most-of-your = Make the most of your { -brand-name-firefox } experience, across every device.
navigation-explore-the-immersive = Explore the immersive web on your virtual reality headset.
navigation-mozilla-mixed-reality = { -brand-name-mozilla } Mixed Reality
navigation-mozilla-brings-virtual = { -brand-name-mozilla } brings virtual and augmented reality to the open web.
navigation-firefox-built-just-for = { -brand-name-firefox }, built just for developers.
navigation-preview-the-latest-build = Preview the latest build of { -brand-name-firefox } and help us make it the best.
navigation-firefox-playground = { -brand-name-firefox } Playground
navigation-mozilla-open-source-support = { -brand-name-mozilla } Open Source Support (MOSS)
navigation-mozilla-manifesto = { -brand-name-mozilla } Manifesto
navigation-menu = Menu
navigation-check-out-the-benefits = Check out the Benefits
navigation-browsers = Browsers
navigation-close-browsers-menu = Close Browsers menu
navigation-download = Download
navigation-extensions = Extensions
navigation-privacy = Privacy
navigation-get-unmatched-data-protection = Get unmatched data protection on the release cadence that suits your organization.
navigation-made-with-respect = Made with respect
navigation-close-products-menu = Close Products menu
navigation-see-if-your-personal = See if your personal info has been leaked online, and sign up for future breach alerts.
navigation-check-for-breaches = Check for Breaches
navigation-see-breaches = See Breaches
navigation-security-tips = Security Tips
navigation-share-large-files-safely = Share large files safely, with links that ‘self-destruct’.
navigation-save-quality-content = Save quality content from anywhere. Fuel your mind everywhere.
navigation-sign-up = Sign Up
navigation-mozilla-vpn = { -brand-name-mozilla-vpn }: Fast. Simple. Private.
navigation-protect-your-entire-device = Protect your entire device and all applications. Mask your real location and connect up to 5 devices. Subscribe now.
navigation-join = Join
navigation-close-join-menu = Close Join menu
navigation-sign-in = Sign In
navigation-benefits = Benefits
navigation-protect-your-life-online = Protect your life online with a whole family of privacy-first products.
navigation-about = About
navigation-close-about-menu = Close About menu
navigation-meet-the-technology-company = Meet the technology company that puts people before profit.
navigation-new-features = New Features
navigation-save-content-absorb-knowledge = Save content. Absorb knowledge.
navigation-same-speed-and-safety = Same speed and safety you trust, designed just for business.
navigation-projects = Projects
navigation-close-projects-menu = Close Projects menu
navigation-donate-your-voice-to = Donate your voice to help make voice recognition open to everyone.
navigation-machine-learning = Machine Learning
navigation-help-make-deep-learning = Help make deep learning algorithms available to the open source world.
navigation-developers = Developers
navigation-close-developers-menu = Close Developers menu
navigation-test-soon-to-be-released = Test soon-to-be-released features in our most stable pre-release build.
navigation-developer-innovations = Developer Innovations
navigation-projects-that-help-keep = Projects that help keep the internet open and accessible for all.
navigation-mixed-reality = Mixed Reality
navigation-resources = Resources
navigation-resources-for-developers = Resources for developers, by developers.
navigation-developer-blog = Developer Blog
navigation-build-test-scale-and = Build, test, scale and more with the only browser built just for developers.
navigation-leadership = Leadership
navigation-mission = Mission
navigation-press-center = Press Center
navigation-contact = Contact
navigation-careers = Careers
navigation-work-for-a-mission-driven = Work for a mission-driven organization that builds purpose-driven products.
navigation-get-involved = Get involved
navigation-join-the-fight-for-a = Join the fight for a healthy internet.
navigation-events = Events
navigation-donate = Donate
navigation-your-right-to-security = Your right to security and privacy on the internet is fundamental – never optional.
navigation-release-notes = Release Notes
navigation-features = Features
navigation-products = Products
navigation-mozilla = { -brand-name-mozilla }
navigation-mozilla-foundation = { -brand-name-mozilla-foundation }
navigation-mozilla-corporation = { -brand-name-mozilla-corporation }
navigation-firefox-developer-edition = { -brand-name-firefox-developer-edition }
navigation-firefox-beta = { -brand-name-firefox-beta }
navigation-firefox-nightly = { -brand-name-firefox-nightly }
navigation-firefox-reality = { -brand-name-firefox-reality }
navigation-firefox-lockwise = { -brand-name-firefox-lockwise }
navigation-firefox-send = { -brand-name-firefox-send }
navigation-pocket = { -brand-name-pocket }
navigation-common-voice = { -brand-name-common-voice }
navigation-hubs = { -brand-name-hubs }
navigation-rust = { -brand-name-rust }
navigation-mdn-web-docs = { -brand-name-mdn-web-docs }
2 changes: 2 additions & 0 deletions en/navigation_v2.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ navigation-v2-firefox-for-android = { -brand-name-firefox } for { -brand-name-an
navigation-v2-get-the-customizable-mobile = Get the customizable mobile browser for { -brand-name-android } smartphones.
navigation-v2-firefox-for-ios = { -brand-name-firefox } for { -brand-name-ios }
navigation-v2-get-the-mobile-browser = Get the mobile browser for your { -brand-name-iphone } or { -brand-name-ipad }.
navigation-v2-firefox-for-mobile = { -brand-name-firefox-browser } for Mobile
navigation-v2-take-speed-privacy-and = Take speed, privacy and peace of mind with you. On { -brand-name-android } and { -brand-name-ios }.
navigation-v2-firefox-focus = { -brand-name-firefox-focus }
navigation-v2-simply-private-mobile = Simply private mobile browsing.
navigation-v2-firefox-blog = { -brand-name-firefox } Blog
Expand Down
23 changes: 0 additions & 23 deletions en/privacy/faq.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,10 @@ privacy-faq-we-follow-a-set-of-data-privacy = We follow a set of <a href="{ $lin
privacy-faq-we-only-collect-the-data-we = We only collect the data we need to make the best products.
privacy-faq-we-put-people-in-control-of = We put people in control of their data and online experiences.
# Obsolete string (expires 2024-09-11)
privacy-faq-we-adhere-to-no-surprises-principle = We adhere to “no surprises” principle, meaning we work hard to ensure people’s understanding of { -brand-name-firefox } matches reality.
privacy-faq-we-adhere-to-no-surprises-principle-v2 = We adhere to the “no surprises” principle, meaning we work hard to ensure people’s understanding of { -brand-name-firefox } matches reality.
privacy-faq-the-following-questions-and = The following questions and answers should help you understand what to expect from { -brand-name-mozilla } and { -brand-name-firefox }:
privacy-faq-i-use-firefox-for-almost-everything = I use { -brand-name-firefox } for almost everything on the web. You folks at { -brand-name-mozilla } must know a ton of stuff about me, right?
# Obsolete string (expires 2024-09-11)
privacy-faq-firefox-the-web-browser-that = { -brand-name-firefox }, the web browser that runs on your device or computer, is your gateway to the internet. Your browser will manage a lot of information about the websites you visit, but that information stays on your device. { -brand-name-mozilla }, the company that makes { -brand-name-firefox }, doesn’t collect it (unless you ask us to).
privacy-faq-firefox-the-web-browser-that-v2 = { -brand-name-firefox }, the web browser that runs on your device or computer, is your gateway to the internet. Your browser will manage a lot of information about the websites you visit, but that information generally stays on your device. { -brand-name-mozilla }, the company that makes { -brand-name-firefox }, doesn’t collect it (unless you ask us to).
privacy-faq-really-you-dont-collect-my-browsing = Really, you don’t collect my browsing history?
privacy-faq-mozilla-doesnt-know-as-much-v2 = { -brand-name-mozilla } doesn’t know as much as you’d expect about how people browse the web. As a browser maker, that’s actually a big challenge for us. That is why we’ve built opt-in tools, which allow interested users to give us insight into their web browsing. If you sync your browsing history across { -brand-name-firefox } installations, we don’t know what that history is — because it’s encrypted by your device.
Expand All @@ -43,12 +37,6 @@ privacy-faq-mozilla-is-not-your-average = { -brand-name-mozilla } is not your av
# A "softball" is a question that is really easy to answer.
privacy-faq-okay-those-first-few-were-softballs = Okay, those first few were softballs. What data do you collect?
# Obsolete string (expires 2024-09-11)
# Variables:
# $data (url) - link to https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/
# $privacy (url) - link to https://www.mozilla.org/privacy/firefox/
privacy-faq-mozilla-does-collect-a-limited = { -brand-name-mozilla } does collect a limited set of data by default from { -brand-name-firefox } that helps us to understand how people use the browser. That data is tied to a random identifier rather than your name or email address. You can read more about that on our <a href="{ $privacy }">privacy notice</a> and you can read the <a href="{ $data }">full documentation for that data collection</a>.
# Variables:
# $data (url) - link to https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/
# $privacy (url) - link to https://www.mozilla.org/privacy/firefox/
Expand All @@ -60,22 +48,11 @@ privacy-faq-that-documentation-is-gobbledygook = That documentation is gobbledyg
privacy-faq-there-are-two-categories-of = There are two categories of data that we collect by default in our release version of { -brand-name-firefox }.
privacy-faq-the-first-is-what-we-call-technical = The first is what we call “technical data.” This is data about the browser itself, such as the operating system it is running on and information about errors or crashes.
# Obsolete string (expires 2024-09-11)
privacy-faq-the-second-is-what-we-call-interaction = The second is what we call “interaction data.” This is data about an individual’s engagement with { -brand-name-firefox }, such as the number of tabs that were open, the status of user preferences, or number of times certain browser features were used, such as screenshots or containers. For example, we collect this data in terms of the back button, that arrow in the upper left corner of your browser that lets you navigate back to a previous webpage in a way that shows us someone used the back button, but doesn’t tell what specific webpages are accessed.
privacy-faq-the-second-is-what-we-call-interaction-v2 = The second is what we call “interaction data.” This is data about an individual’s engagement with { -brand-name-firefox }, such as the number of tabs that were open, the status of user preferences, or number of times certain browser features were used, such as screenshots or containers. For example, we collect this data through the back button (that arrow in the upper left corner of your browser that lets you navigate back to a previous webpage) in a way that shows us someone used the back button, but doesn’t tell what specific webpages are accessed.
privacy-faq-do-you-collect-more-data-in = Do you collect more data in pre-release versions of { -brand-name-firefox }?
# Obsolete string (expires 2024-09-11)
privacy-faq-sort-of-in-addition-to-the-data = Sort-of. In addition to the data described above, we receive crash and error reports by default in pre-release version of { -brand-name-firefox }.
privacy-faq-sort-of-in-addition-to-the-data-v2 = Sort-of. In addition to the data described above, we receive crash and error reports by default in pre-release versions of { -brand-name-firefox }.
# Obsolete string (expires 2024-09-11)
# Variables:
# $link (url) - link to https://support.mozilla.org/kb/shield
privacy-faq-we-may-also-collect-additional = We may also collect additional data in pre-release for one of our <a href="{ $link }">studies</a>. For example, some studies require what we call “web activity data” data, which may include URLs and other information about certain websites. This helps us answer specific questions to improve { -brand-name-firefox }, for example, how to better integrate popular websites in specific locales.
# Variables:
# $link (url) - link to https://support.mozilla.org/kb/shield
privacy-faq-we-may-also-collect-additional-v2 = We may also collect additional data in pre-release for one of our <a href="{ $link }">studies</a>. For example, some studies require what we call “web activity data”, which may include URLs and other information about certain websites. This helps us answer specific questions to improve { -brand-name-firefox }, such as, how to better integrate popular websites in specific locales.
Expand Down

0 comments on commit bf7d7fe

Please sign in to comment.