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.

Sign up for GitHub

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

Import fenix quarantine #793

Merged
merged 1 commit into from
Aug 29, 2024
Merged

Import fenix quarantine #793

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions mozilla-mobile/fenix/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@
<string name="browser_menu_manage_extensions">Manage extensions</string>
<!-- Browser menu button that opens AMO in a tab -->
<string name="browser_menu_discover_more_extensions">Discover more extensions</string>
<!-- Browser menu description that is shown when one or more extensions are disabled due to extension errors -->
<string name="browser_menu_extensions_disabled_description">Temporarily disabled</string>
Copy link
Contributor

Choose a reason for hiding this comment

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

@gabrielluong Please update comment to something like "Browser menu description that is shown when one or more extensions are disabled due to extension errors" (previous comment)
This will help me finalize expsoing the remaining strings in this PR.
Thanks!

Copy link
Contributor

Choose a reason for hiding this comment

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

@gabrielluong Ping in case this fell through the cracks

<!-- Browser menu button that opens account settings -->
<string name="browser_menu_account_settings">Account info</string>
<!-- Browser menu button that sends a user to help articles -->
Expand Down Expand Up @@ -315,6 +317,12 @@
The first parameter is the name of the app defined in app_name (for example: Fenix). -->
<string name="browser_menu_delete_browsing_data_on_quit">Quit %1$s</string>

<!-- Menu "contextual feature recommendation" (CFR) -->
<!-- Text for the title in the contextual feature recommendation popup promoting the menu feature. -->
<string name="menu_cfr_title">New: streamlined menu</string>
<!-- Text for the message in the contextual feature recommendation popup promoting the menu feature. -->
<string name="menu_cfr_body">Find what you need faster, from private browsing to save actions.</string>
Copy link
Contributor

Choose a reason for hiding this comment

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

@timc-mozilla: I think this should rather be "(...) to saved actions"?

Copy link
Contributor

Choose a reason for hiding this comment

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

I believe this is intended according to the content design in https://www.figma.com/design/RFz9fYtotQCQuinwcZujZt/Menu-Redesign?node-id=16563-182996&m=dev

Copy link
Contributor

Choose a reason for hiding this comment

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

Pinged Content Design to be extra sure, thanks

Copy link
Contributor

Choose a reason for hiding this comment

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

From EmilyW on Slack: "It's correct because we're referring to actions you use to save, not actions you yourself have saved, or anything about saved in the past tense."


<!-- Extensions management fragment -->
<!-- Text displayed when there are no extensions to be shown -->
<string name="extensions_management_no_extensions">No extensions here</string>
Expand Down Expand Up @@ -533,9 +541,13 @@
<!-- Text for cancel button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
<string name="cookie_banner_handling_details_site_is_not_supported_cancel_button">Cancel</string>
<!-- Text for request support button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
<string name="cookie_banner_handling_details_site_is_not_supported_request_support_button_2">Send request</string>
<string name="cookie_banner_handling_details_site_is_not_supported_request_support_button_2" moz:RemovedIn="130" tools:ignore="UnusedResources">Send request</string>
<!-- Text for request support button indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
<string name="cookie_banner_handling_details_site_is_not_supported_request_support_button_3">Ask to add site</string>
<!-- Text for title indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. -->
<string name="cookie_banner_handling_details_site_is_not_supported_title_2">Request support for this site?</string>
<string name="cookie_banner_handling_details_site_is_not_supported_title_2" moz:RemovedIn="130" tools:ignore="UnusedResources">Request support for this site?</string>
<!-- Text for title indicating that cookie banner reduction is not supported for the current site, this is shown as part of the cookie banner details view. The first parameter is the application name -->
<string name="cookie_banner_handling_details_site_is_not_supported_title_3">Ask %1$s to auto refuse cookies</string>
<!-- Label for the snackBar, after the user reports with success a website where cookie banner reducer did not work -->
<string name="cookie_banner_handling_report_site_snack_bar_text_2">Request sent</string>
<!-- Text for indicating cookie banner handling is on this site, this is shown as part of the protections panel with the tracking protection toggle -->
Expand All @@ -544,12 +556,16 @@
<string name="reduce_cookie_banner_unsupported_site_request_submitted_2">Support request sent</string>
<!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
<string name="reduce_cookie_banner_unsupported_site" moz:RemovedIn="130" tools:ignore="UnusedResources">Site currently not supported</string>
<!-- Text for indicating cookie banner handling is currently not supported for this site, this is shown as part of the protections panel with the tracking protection toggle -->
<string name="reduce_cookie_banner_unsupported_site_1">Site not supported</string>
<!-- Title text for a detail explanation indicating cookie banner handling is on this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
<string name="reduce_cookie_banner_details_panel_title_on_for_site_1">Turn on Cookie Banner Blocker for %1$s?</string>
<!-- Title text for a detail explanation indicating cookie banner handling is off this site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is a shortened URL of the current site-->
<string name="reduce_cookie_banner_details_panel_title_off_for_site_1">Turn off Cookie Banner Blocker for %1$s?</string>
<!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name-->
<string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_2" moz:RemovedIn="130" tools:ignore="UnusedResources">%1$s can’t automatically reject cookie requests on this site. You can send a request to support this site in the future.</string>
<!-- Title text for a detail explanation indicating cookie banner reducer didn't work for the current site, this is shown as part of the cookie banner panel in the toolbar.-->
<string name="reduce_cookie_banner_details_panel_title_unsupported_site_request_3">We can’t auto refuse cookie pop-ups on this site right now.</string>
<!-- Long text for a detail explanation indicating what will happen if cookie banner handling is off for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
<string name="reduce_cookie_banner_details_panel_description_off_for_site_1">Turn off and %1$s will clear cookies and reload this site. This may sign you out or empty shopping carts.</string>
<!-- Long text for a detail explanation indicating what will happen if cookie banner handling is on for a site, this is shown as part of the cookie banner panel in the toolbar. The first parameter is the application name -->
Expand Down Expand Up @@ -1140,6 +1156,8 @@
<string name="bookmark_add_folder">Add folder</string>
<!-- Snackbar title shown after a bookmark has been created. -->
<string name="bookmark_saved_snackbar">Bookmark saved!</string>
<!-- Snackbar title that confirms a bookmark was saved into a folder. Parameter will be replaced by the name of the folder the bookmark was saved into. -->
<string name="bookmark_saved_in_folder_snackbar">Saved in “%s”</string>
<!-- Snackbar edit button shown after a bookmark has been created. -->
<string name="edit_bookmark_snackbar_action">EDIT</string>
<!-- Bookmark overflow menu edit button -->
Expand Down