Update messages for fenix

_data/fenix/beta.json

@@ -22,6 +22,7 @@
     "search_hint_general_engine",
     "history_search_hint",
     "bookmark_search_hint",
+    "bookmark_close_search_description",
     "tab_search_hint",
     "application_search_hint",
     "tab_manager_empty_private_tabs_page_header",
@@ -49,7 +50,6 @@
     "open_in_app_cfr_info_message_2",
     "open_in_app_cfr_positive_button_text",
     "open_in_app_cfr_negative_button_text",
-    "address_bar_swipe_cfr_message_2",
     "camera_permissions_needed_message",
     "camera_permissions_needed_positive_button_text",
     "camera_permissions_needed_negative_button_text",
@@ -65,6 +65,7 @@
     "home_screen_shortcut_open_new_tab_2",
     "home_screen_shortcut_open_new_private_tab_2",
     "home_screen_shortcut_passwords",
+    "home_screen_shortcut_uninstall_survey",
     "recent_tabs_header",
     "recent_tabs_show_all",
     "recent_tabs_show_all_content_description_2",
@@ -131,8 +132,6 @@
     "browser_menu_default_banner_subtitle_2",
     "browser_menu_default_banner_dismiss_promotion",
     "browser_menu_recommended_extensions_content_description",
-    "menu_cfr_title",
-    "menu_cfr_body",
     "extensions_management_no_extensions",
     "browser_toolbar_translate",
     "browser_toolbar_summarize_cfr_description",
@@ -263,8 +262,9 @@
     "nova_onboarding_marketing_body_link_text",
     "nova_onboarding_marketing_body_link_text_1",
     "nova_onboarding_marketing_primary_button_text",
-    "nova_onboarding_marketing_primary_button_text_2",
+    "nova_onboarding_marketing_primary_button_text_3",
     "nova_onboarding_marketing_secondary_button_text",
+    "nova_onboarding_marketing_secondary_button_text_2",
     "nova_onboarding_notifications_title",
     "nova_onboarding_notifications_subtitle",
     "nova_onboarding_notifications_button",
@@ -312,23 +312,7 @@
     "preferences_https_only_title",
     "preferences_pbm_lock_screen_title",
     "preferences_pbm_lock_screen_summary_3",
-    "cookie_banner_blocker",
     "preferences_cookie_banner_reduction_private_mode",
-    "reduce_cookie_banner_off_for_site",
-    "cookie_banner_handling_details_site_is_not_supported_cancel_button",
-    "cookie_banner_handling_details_site_is_not_supported_request_support_button_2",
-    "cookie_banner_handling_details_site_is_not_supported_title_2",
-    "cookie_banner_handling_report_site_snack_bar_text_2",
-    "reduce_cookie_banner_on_for_site",
-    "reduce_cookie_banner_unsupported_site_request_submitted_2",
-    "reduce_cookie_banner_unsupported_site",
-    "reduce_cookie_banner_details_panel_title_on_for_site_1",
-    "reduce_cookie_banner_details_panel_title_off_for_site_1",
-    "reduce_cookie_banner_details_panel_title_unsupported_site_request_2",
-    "reduce_cookie_banner_details_panel_description_off_for_site_1",
-    "reduce_cookie_banner_details_panel_description_on_for_site_3",
-    "cookie_banner_cfr_title",
-    "cookie_banner_cfr_message",
     "preferences_https_only_summary",
     "preferences_https_only_off",
     "preferences_https_only_on_all",
@@ -614,6 +598,7 @@
     "tabs_header_synced_tabs_counter_title",
     "add_tab",
     "add_private_tab",
+    "create_tab_group_content_description",
     "tab_manager_search_bar_placeholder",
     "tab_tray_menu_recently_closed",
     "tab_tray_menu_select_all_tabs",
@@ -688,7 +673,6 @@
     "tab_group_color_grey",
     "history_search_1",
     "history_delete_all",
-    "history_delete_multiple_items_snackbar",
     "history_delete_single_item_snackbar",
     "history_delete_item",
     "history_multi_select_title",
@@ -775,13 +759,12 @@
     "webcompat_reporter_learn_more",
     "webcompat_reporter_label_url",
     "webcompat_reporter_url_error_invalid",
-    "webcompat_reporter_label_whats_broken_2",
-    "webcompat_reporter_choose_reason_2",
-    "webcompat_reporter_choose_reason_error",
-    "webcompat_reporter_label_description_2",
-    "webcompat_reporter_add_more_info",
+    "webcompat_reporter_label_whats_broken_3",
+    "webcompat_reporter_clear_reason_content_description",
+    "webcompat_reporter_description_error",
+    "webcompat_reporter_label_mandatory_description",
     "webcompat_reporter_cancel",
-    "webcompat_reporter_send",
+    "webcompat_reporter_send_report",
     "webcompat_reporter_success_snackbar_text_2",
     "webcompat_reporter_problem_description_placeholder_text_2",
     "webcompat_reporter_etp_checkbox_text_2",
@@ -798,7 +781,8 @@
     "webcompat_reporter_reason_content2",
     "webcompat_reporter_reason_account2",
     "webcompat_reporter_reason_turn_off_adblocker",
-    "webcompat_reporter_reason_notsupported",
+    "webcompat_reporter_reason_notsupported_2",
+    "webcompat_reporter_reason_site_is_deceptive",
     "webcompat_reporter_reason_other",
     "tab_crash_title_2",
     "tab_crash_send_report",
@@ -871,8 +855,9 @@
     "bookmark_empty_list_folder_description",
     "bookmark_select_folder_new_folder_button_title",
     "bookmark_moved_single_item",
+    "bookmark_no_search_results",
+    "bookmark_no_search_results_additional_text",
     "phone_feature_go_to_settings",
-    "quick_settings_sheet",
     "phone_feature_recommended",
     "clear_permissions",
     "clear_permissions_positive",
@@ -980,6 +965,7 @@
     "nimbus_survey_message_text",
     "preferences_take_survey",
     "preferences_not_take_survey",
+    "uninstall_survey_error_failed",
     "snackbar_tab_closed",
     "snackbar_num_tabs_closed",
     "snackbar_message_bookmarks_saved_in_2",
@@ -1040,7 +1026,6 @@
     "sign_out_disconnect",
     "sign_out_cancel",
     "bookmark_cannot_edit_root",
-    "etp_settings",
     "preference_enhanced_tracking_protection",
     "preference_enhanced_tracking_protection_summary",
     "preference_enhanced_tracking_protection_explanation_2",
@@ -1078,9 +1063,7 @@
     "preference_enhanced_tracking_protection_custom_tracking_content_2",
     "preference_enhanced_tracking_protection_custom_cryptominers",
     "preference_enhanced_tracking_protection_custom_known_fingerprinters",
-    "enhanced_tracking_protection_details",
     "enhanced_tracking_protection_blocked",
-    "enhanced_tracking_protection_allowed",
     "etp_social_media_trackers_title",
     "etp_social_media_trackers_description",
     "etp_cookies_title",
@@ -1092,8 +1075,6 @@
     "etp_known_fingerprinters_description",
     "etp_tracking_content_title",
     "etp_tracking_content_description",
-    "etp_panel_on",
-    "etp_panel_off",
     "enhanced_tracking_protection_exceptions",
     "etp_back_button_content_description",
     "about_whats_new",
@@ -1103,8 +1084,6 @@
     "etp_suspected_fingerprinters_title",
     "etp_suspected_fingerprinters_description",
     "etp_known_fingerprinters_title",
-    "preference_etp_smartblock_description",
-    "preference_etp_smartblock_learn_more",
     "preference_etp_exceptions_icon_description",
     "preference_doh_title",
     "preference_doh_summary",
@@ -1266,6 +1245,18 @@
     "ip_protection_connection_error_snackbar",
     "ip_protection_data_limit_reached_snackbar",
     "ip_protection_data_limit_reached_snackbar_action",
+    "ip_protection_settings_description",
+    "ip_protection_location_title",
+    "ip_protection_recommended_location",
+    "ip_protection_mozilla_vpn_upsell_headline",
+    "ip_protection_mozilla_vpn_upsell_body",
+    "ip_protection_mozilla_vpn_upsell_button",
+    "ip_protection_location_picker_title",
+    "ip_protection_location_fastest_description",
+    "ip_protection_location_unavailable",
+    "ip_protection_location_unavailable_recommended_snackbar",
+    "ip_protection_location_unavailable_title",
+    "ip_protection_location_unavailable_recommended_description",
     "preferences_autofill",
     "preferences_addresses",
     "preferences_credit_cards_2",
@@ -1367,18 +1358,13 @@
     "phone_feature_blocked_step_settings",
     "phone_feature_blocked_step_permissions",
     "phone_feature_blocked_step_feature",
-    "quick_settings_sheet_secure_connection_2",
-    "quick_settings_sheet_insecure_connection_2",
-    "quick_settings_sheet_local_page",
     "clear_site_data",
-    "confirm_clear_site_data",
     "confirm_clear_permissions_on_all_sites",
     "confirm_clear_permissions_site",
     "confirm_clear_permission_site",
     "no_site_exceptions",
     "browser_menu_add_to_shortcuts",
     "browser_menu_remove_from_shortcuts",
-    "certificate_info_verified_by",
     "login_deletion_confirmation_2",
     "dialog_delete_positive",
     "dialog_delete_negative",
@@ -1571,6 +1557,7 @@
     "connection_security_panel_not_secure",
     "connection_security_panel_local_pdf",
     "connection_security_panel_verified_by",
+    "tracker_protections_dashboard_close_handlebar_content_description",
     "connection_security_panel_issued_to",
     "connection_security_panel_qualified_certificate",
     "debug_drawer_title",
@@ -1619,6 +1606,14 @@
     "microsurvey_search_title",
     "microsurvey_sync_title",
     "microsurvey_describe_your_experience_title",
+    "microsurvey_uninstall_survey_title",
+    "uninstall_survey_option_1_v2",
+    "uninstall_survey_option_2_v2",
+    "uninstall_survey_option_3_v2",
+    "uninstall_survey_option_4_v2",
+    "uninstall_survey_option_5_v2",
+    "uninstall_survey_option_6_v2",
+    "uninstall_survey_button_label",
     "microsurvey_app_icon_content_description",
     "microsurvey_feature_icon_content_description",
     "microsurvey_close_handle_content_description",
@@ -1825,8 +1820,11 @@
     "content_description_take_photo",
     "context_menu_open_image_with_google_lens",
     "lens_camera_permission_denied",
-    "ai_controls_google_lens_title",
-    "ai_controls_google_lens_description",
+    "lens_camera_title_lens",
+    "lens_camera_title_qr",
+    "search_settings_google_lens_title",
+    "search_settings_google_lens_description",
+    "preferences_google_lens_availability_caption",
     "lens_camera_mode_lens",
     "lens_camera_mode_qr",
     "lens_camera_qr_no_code_found",
@@ -1843,6 +1841,7 @@
     "firefox_labs_restore_defaults_dialog_message",
     "firefox_labs_feature_enable_dialog_message",
     "firefox_labs_feature_disable_dialog_message",
+    "firefox_labs_feature_conflict",
     "firefox_labs_no_labs_available_description"
   ]
 }

_data/fenix/main.json

@@ -411,7 +411,6 @@
     "customize_wallpapers",
     "browser_menu_change_wallpaper",
     "customize_toggle_contile",
-    "customize_toggle_world_cup",
     "wallpapers_item_name_content_description",
     "wallpaper_download_error_snackbar_message",
     "wallpaper_download_error_snackbar_action",
@@ -763,6 +762,7 @@
     "webcompat_reporter_clear_reason_content_description",
     "webcompat_reporter_description_error",
     "webcompat_reporter_label_mandatory_description",
+    "webcompat_reporter_label_optional_description",
     "webcompat_reporter_cancel",
     "webcompat_reporter_send_report",
     "webcompat_reporter_success_snackbar_text_2",
@@ -1222,7 +1222,6 @@
     "ip_protection_data_reset_info",
     "ip_protection_location_section",
     "ip_protection_location_recommended_label",
-    "ip_protection_location_recommended_description",
     "preferences_ip_protection_on",
     "preferences_ip_protection_off",
     "ip_protection_menu_connecting",
@@ -1729,88 +1728,6 @@
     "terms_of_use_prompt_title_option_b",
     "terms_of_use_prompt_body_line_two_alternative",
     "terms_of_use_prompt_body_line_two_alternative_link",
-    "sports_widget_country_selector_title",
-    "sports_widget_confederation_north_america",
-    "sports_widget_confederation_africa",
-    "sports_widget_confederation_asia",
-    "sports_widget_confederation_concacaf",
-    "sports_widget_confederation_europe",
-    "sports_widget_confederation_oceania",
-    "sports_widget_confederation_south_america",
-    "sports_widget_country_england",
-    "sports_widget_country_scotland",
-    "sports_widget_match_live",
-    "sports_widget_champions_title",
-    "sports_widget_runner_up_title",
-    "sports_widget_third_place_title",
-    "sports_widget_round_of_32",
-    "sports_widget_round_of_16",
-    "sports_widget_quarter_final",
-    "sports_widget_semi_final",
-    "sports_widget_final",
-    "sports_widget_bronze_final",
-    "sports_widget_error_load_failed",
-    "sports_widget_error_connection_interrupted",
-    "sports_widget_error_refresh",
-    "sports_widget_group_a",
-    "sports_widget_group_b",
-    "sports_widget_group_c",
-    "sports_widget_group_d",
-    "sports_widget_group_e",
-    "sports_widget_group_f",
-    "sports_widget_group_g",
-    "sports_widget_group_h",
-    "sports_widget_group_i",
-    "sports_widget_group_j",
-    "sports_widget_group_k",
-    "sports_widget_group_l",
-    "sports_widget_see_results",
-    "sports_widget_view_match_details",
-    "sports_widget_related_matches",
-    "sports_widget_upcoming",
-    "sports_widget_match_full_time_suffix",
-    "sports_widget_match_full_time_2",
-    "sports_widget_card_title",
-    "sports_widget_card_description",
-    "sports_widget_change_team",
-    "sports_widget_get_custom_wallpaper",
-    "sports_widget_remove",
-    "sports_widget_still_want_to_follow",
-    "sports_widget_choose_another_team",
-    "sports_widget_follow_another_team",
-    "sports_widget_countdown_to_world_cup",
-    "sports_widget_view_schedule",
-    "sports_widget_skip",
-    "sports_widget_halftime",
-    "sports_widget_extra_time",
-    "sports_widget_penalties",
-    "sports_widget_countdown_days",
-    "sports_widget_countdown_hours",
-    "sports_widget_countdown_minutes",
-    "sports_widget_close_team_selection_sheet_content_description",
-    "sports_widget_close_content_description",
-    "sports_widget_more_options_content_description",
-    "sports_widget_countdown_remaining_content_description",
-    "sports_widget_go_to_world_cup_site_content_description",
-    "sports_widget_upcoming_match_content_description",
-    "sports_widget_match_content_description",
-    "sports_widget_live_game_content_description",
-    "sports_widget_live_score_content_description",
-    "sports_widget_match_elapsed_minutes",
-    "sports_widget_page_position_content_description",
-    "sports_widget_final_results_page_content_description",
-    "sports_widget_final_results_content_description",
-    "sports_widget_remove_content_description",
-    "sports_widget_team_followed_title",
-    "sports_widget_team_followed_description",
-    "sports_widget_first_half",
-    "sports_widget_second_half",
-    "sports_widget_error_connection_offline_title",
-    "sports_widget_error_connection_offline_description",
-    "sports_widget_group_stage",
-    "sports_widget_error_load_failed_title",
-    "sports_widget_error_load_failed_description",
-    "sports_widget_team_to_be_determined",
     "privacy_notice_updated_homepage_message",
     "privacy_notice_updated_homepage_message_privacy_notice",
     "privacy_notice_updated_homepage_message_learn_more",

mozilla-mobile/fenix/app/src/main/res/values/strings.xml

@@ -1977,6 +1977,8 @@
   <string name="webcompat_reporter_description_error">Please enter at least 10 characters</string>
   <!-- The label/title of a mandatory field in the Web Compat Reporter feature for adding additional information. -->
   <string name="webcompat_reporter_label_mandatory_description">Describe the problem in detail to help us investigate the issue</string>
+  <!-- The label/title of a optional field in the Web Compat Reporter feature for adding additional information. -->
+  <string name="webcompat_reporter_label_optional_description">Describe the problem in detail to help us investigate the issue (optional)</string>
   <!-- The label/title of a field in the Web Compat Reporter feature for explaining a high-level reason why the site is broken. -->
   <string name="webcompat_reporter_label_whats_broken_2">What’s broken?</string>
   <!-- The placeholder text for the dropdown where a user selects a high-level reason why the site is broken. -->
@@ -3145,7 +3147,7 @@
   <!-- Title for the browser VPN location picker screen. -->
   <string name="ip_protection_location_picker_title" tools:ignore="UnusedResources">Choose VPN location</string>
   <!-- Description for what it means to use the Recommended setting and let the app automatically pick the best server location. -->
-  <string name="ip_protection_location_fastest_description" tools:ignore="UnusedResources, BrandUsage">Firefox finds the fastest location</string>
+  <string name="ip_protection_location_fastest_description" tools:ignore="BrandUsage">Firefox finds the fastest location</string>
   <!-- Error message shown when the selected browser VPN location is unavailable. -->
   <string name="ip_protection_location_unavailable" tools:ignore="UnusedResources">Location unavailable. Choose another location.</string>
   <!-- Snackbar (in-app pop-up notification) text shown when the previously selected browser VPN location is unavailable and the recommended location was used instead. -->