diff options
Diffstat (limited to 'mobile/android/fenix/app/src/main/res/values')
6 files changed, 141 insertions, 38 deletions
diff --git a/mobile/android/fenix/app/src/main/res/values/attrs.xml b/mobile/android/fenix/app/src/main/res/values/attrs.xml index edd57c6d88..fef61285a5 100644 --- a/mobile/android/fenix/app/src/main/res/values/attrs.xml +++ b/mobile/android/fenix/app/src/main/res/values/attrs.xml @@ -29,7 +29,7 @@ <!-- Disabled text --> <attr name="textDisabled" format="reference" /> <!-- Warning text --> - <attr name="textWarning" format="reference"/> + <attr name="textCritical" format="reference"/> <!-- Small heading, Text link --> <attr name="textAccent" format="reference" /> <!-- Text Inverted/On Color --> diff --git a/mobile/android/fenix/app/src/main/res/values/colors.xml b/mobile/android/fenix/app/src/main/res/values/colors.xml index 9abba577a2..d5d58df47e 100644 --- a/mobile/android/fenix/app/src/main/res/values/colors.xml +++ b/mobile/android/fenix/app/src/main/res/values/colors.xml @@ -27,11 +27,11 @@ <!-- Warning background --> <color name="fx_mobile_layer_color_warning" tools:ignore="UnusedResources">@color/photonYellow20</color> <!-- Confirmation background --> - <color name="fx_mobile_layer_color_confirmation" tools:ignore="UnusedResources">@color/photonGreen20</color> + <color name="fx_mobile_layer_color_success" tools:ignore="UnusedResources">@color/photonGreen20</color> <!-- Error background --> - <color name="fx_mobile_layer_color_error" tools:ignore="UnusedResources">@color/photonRed10</color> + <color name="fx_mobile_layer_color_critical" tools:ignore="UnusedResources">@color/photonRed10</color> <!-- Info background --> - <color name="fx_mobile_layer_color_info" tools:ignore="UnusedResources">@color/photonBlue50A44</color> + <color name="fx_mobile_layer_color_information" tools:ignore="UnusedResources">@color/photonBlue50A44</color> <!-- Action --> <!-- Primary button, Snackbar, Floating action button, Chip selected --> @@ -47,11 +47,11 @@ <!-- Warning button --> <color name="fx_mobile_action_color_warning" tools:ignore="UnusedResources">@color/photonYellow60A40</color> <!-- Confirmation button --> - <color name="fx_mobile_action_color_confirmation" tools:ignore="UnusedResources">@color/photonGreen60</color> + <color name="fx_mobile_action_color_success" tools:ignore="UnusedResources">@color/photonGreen60</color> <!-- Error button --> - <color name="fx_mobile_action_color_error" tools:ignore="UnusedResources">@color/photonRed30</color> + <color name="fx_mobile_action_color_critical" tools:ignore="UnusedResources">@color/photonRed30</color> <!-- Info button --> - <color name="fx_mobile_action_color_info" tools:ignore="UnusedResources">@color/photonBlue50</color> + <color name="fx_mobile_action_color_information" tools:ignore="UnusedResources">@color/photonBlue50</color> <!-- Checkbox default, Radio button default --> <color name="fx_mobile_action_color_form_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</color> <!-- Checkbox selected, Radio button selected --> @@ -77,9 +77,9 @@ <!-- Disabled text --> <color name="fx_mobile_text_color_disabled">@color/photonDarkGrey90A40</color> <!-- Warning text --> - <color name="fx_mobile_text_color_warning">@color/photonRed70</color> + <color name="fx_mobile_text_color_critical">@color/photonRed70</color> <!-- Warning text on Secondary button --> - <color name="fx_mobile_text_color_warning_button">@color/photonRed70</color> + <color name="fx_mobile_text_color_critical_button">@color/photonRed70</color> <!-- Small heading, Text link --> <color name="fx_mobile_text_color_accent">@color/photonViolet70</color> <!-- Small heading, Text link --> @@ -116,10 +116,10 @@ <color name="fx_mobile_icon_color_information">@color/photonBlue30</color> <!-- Icon button --> <color name="fx_mobile_icon_color_button" tools:ignore="UnusedResources">@color/photonInk20</color> - <color name="fx_mobile_icon_color_warning" tools:ignore="UnusedResources">@color/photonRed70</color> + <color name="fx_mobile_icon_color_critical" tools:ignore="UnusedResources">@color/photonRed70</color> <!-- Warning icon on Secondary button --> - <color name="fx_mobile_icon_color_warning_button">@color/photonRed70</color> - <color name="fx_mobile_icon_color_accent_violet">@color/photonViolet60</color> + <color name="fx_mobile_icon_color_critical_button">@color/photonRed70</color> + <color name="fx_mobile_icon_color_accent_violet">@color/photonViolet70</color> <color name="fx_mobile_icon_color_accent_blue">@color/photonBlue60</color> <color name="fx_mobile_icon_color_accent_pink">@color/photonPink60</color> <color name="fx_mobile_icon_color_accent_green">@color/photonGreen60</color> @@ -150,15 +150,15 @@ <!-- Form parts --> <color name="fx_mobile_border_color_disabled" tools:ignore="UnusedResources">@color/photonDarkGrey90A40</color> <!-- Form parts --> - <color name="fx_mobile_border_color_warning" tools:ignore="UnusedResources">@color/photonRed70</color> + <color name="fx_mobile_border_color_critical" tools:ignore="UnusedResources">@color/photonRed70</color> <!-- Private theme color variables --> <!-- Layers --> <!-- Default Screen background, Frontlayer background, App Bar Top, App Bar Bottom, Frontlayer header --> - <color name="fx_mobile_private_layer_color_1">@color/photonInk50</color> + <color name="fx_mobile_private_layer_color_1">@color/photonViolet90</color> <!-- Card background, Menu background, Dialog, Banner --> - <color name="fx_mobile_private_layer_color_2">@color/photonInk50</color> + <color name="fx_mobile_private_layer_color_2">@color/photonViolet90</color> <!-- Search --> <color name="fx_mobile_private_layer_color_3">@color/photonInk90</color> <color name="fx_mobile_private_layer_color_search">@color/photonInk90</color> @@ -184,7 +184,7 @@ <!-- Primary button, Snackbar, Floating action button, Chip selected --> <color name="fx_mobile_private_action_color_primary">@color/photonViolet60</color> <!-- Secondary button --> - <color name="fx_mobile_private_action_color_secondary" tools:ignore="UnusedResources">@color/photonLightGrey30</color> + <color name="fx_mobile_private_action_color_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey05</color> <!-- Filter --> <color name="fx_mobile_private_action_color_tertiary" tools:ignore="UnusedResources">@color/photonDarkGrey10</color> <!-- Chip --> @@ -214,9 +214,9 @@ <!-- Disabled text --> <color name="fx_mobile_private_text_color_disabled">@color/photonLightGrey05A40</color> <!-- Warning text --> - <color name="fx_mobile_private_text_color_warning">@color/photonRed20</color> + <color name="fx_mobile_private_text_color_critical">@color/photonRed20</color> <!-- Warning text on Secondary button --> - <color name="fx_mobile_private_text_color_warning_button" tools:ignore="UnusedResources">@color/photonRed70</color> + <color name="fx_mobile_private_text_color_critical_button" tools:ignore="UnusedResources">@color/photonRed20</color> <!-- Small heading, Text link --> <color name="fx_mobile_private_text_color_accent">@color/photonViolet20</color> <!-- Small heading, Text link --> @@ -228,7 +228,7 @@ <!-- Action Primary text --> <color name="fx_mobile_private_text_color_action_primary">@color/photonLightGrey05</color> <!-- Action Secondary text --> - <color name="fx_mobile_private_text_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color> + <color name="fx_mobile_private_text_color_action_secondary" tools:ignore="UnusedResources">@color/photonLightGrey05</color> <!-- Action Tertiary text --> <color name="fx_mobile_private_text_color_action_tertiary" tools:ignore="UnusedResources">@color/photonLightGrey05</color> <!-- Action Tertiary Active text --> @@ -251,9 +251,9 @@ <color name="fx_mobile_private_icon_color_information" tools:ignore="UnusedResources">@color/photonBlue30</color> <!-- Icon button --> <color name="fx_mobile_private_icon_color_button" tools:ignore="UnusedResources">@color/photonLightGrey05</color> - <color name="fx_mobile_private_icon_color_warning" tools:ignore="UnusedResources">@color/photonRed20</color> + <color name="fx_mobile_private_icon_color_critical" tools:ignore="UnusedResources">@color/photonRed20</color> <!-- Warning icon on Secondary button --> - <color name="fx_mobile_private_icon_color_warning_button" tools:ignore="UnusedResources">@color/photonRed70</color> + <color name="fx_mobile_private_icon_color_critical_button" tools:ignore="UnusedResources">@color/photonRed20</color> <color name="fx_mobile_private_icon_color_accent_violet" tools:ignore="UnusedResources">@color/photonViolet20</color> <color name="fx_mobile_private_icon_color_accent_blue" tools:ignore="UnusedResources">@color/photonBlue20</color> <color name="fx_mobile_private_icon_color_accent_pink" tools:ignore="UnusedResources">@color/photonPink20</color> @@ -262,7 +262,7 @@ <!-- Action Primary Icon --> <color name="fx_mobile_private_icon_color_action_primary" tools:ignore="UnusedResources">@color/photonLightGrey05</color> <!-- Action Secondary Icon --> - <color name="fx_mobile_private_icon_color_action_secondary" tools:ignore="UnusedResources">@color/photonDarkGrey90</color> + <color name="fx_mobile_private_icon_color_action_secondary" tools:ignore="UnusedResources">@color/photonLightGrey05</color> <!-- Action Tertiary Icon --> <color name="fx_mobile_private_icon_color_action_tertiary" tools:ignore="UnusedResources">@color/photonLightGrey05</color> <!-- Reader, ETP Shield --> @@ -272,7 +272,7 @@ <!-- Border --> <!-- Default, Divider, Dotted --> - <color name="fx_mobile_private_border_color_primary">@color/photonDarkGrey05</color> + <color name="fx_mobile_private_border_color_primary">@color/photonInk05</color> <color name="fx_mobile_private_border_color_secondary">@color/photonInk10</color> <!-- Onboarding --> <color name="fx_mobile_private_border_color_inverted" tools:ignore="UnusedResources">@color/photonLightGrey30</color> @@ -283,7 +283,7 @@ <!-- Form parts --> <color name="fx_mobile_private_border_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey05A40</color> <!-- Form parts --> - <color name="fx_mobile_private_border_color_warning" tools:ignore="UnusedResources">@color/photonRed40</color> + <color name="fx_mobile_private_border_color_critical" tools:ignore="UnusedResources">@color/photonRed20</color> <!-- Toolbar divider --> <color name="fx_mobile_private_border_color_toolbar_divider">@color/photonViolet80</color> diff --git a/mobile/android/fenix/app/src/main/res/values/preference_keys.xml b/mobile/android/fenix/app/src/main/res/values/preference_keys.xml index 8e94d3251f..678602bd9b 100644 --- a/mobile/android/fenix/app/src/main/res/values/preference_keys.xml +++ b/mobile/android/fenix/app/src/main/res/values/preference_keys.xml @@ -17,6 +17,7 @@ <string name="pref_key_accessibility_force_enable_zoom" translatable="false">pref_key_accessibility_force_enable_zoom</string> <string name="pref_key_advanced" translatable="false">pref_key_advanced</string> <string name="pref_key_language" translatable="false">pref_key_language</string> + <string name="pref_key_translation" translatable="false">pref_key_translation</string> <string name="pref_key_data_choices" translatable="false">pref_key_data_choices</string> <string name="pref_key_delete_browsing_data" translatable="false">pref_key_delete_browsing_data</string> <string name="pref_key_delete_browsing_data_on_quit_preference" translatable="false">pref_key_delete_browsing_data_on_quit_preference</string> @@ -53,6 +54,9 @@ <string name="pref_key_override_sync_tokenserver" translatable="false">pref_key_override_sync_tokenserver</string> <string name="pref_key_override_push_server" translatable="false">pref_key_override_push_server</string> <string name="pref_key_sync_debug_quit" translatable="false">pref_key_sync_debug_quit</string> + <string name="pref_key_sync_debug_network_error" translatable="false">pref_key_sync_debug_network_error</string> + <string name="pref_key_sync_debug_temporary_auth_error" translatable="false">pref_key_sync_debug_temporary_auth_error</string> + <string name="pref_key_sync_debug_permanent_auth_error" translatable="false">pref_key_sync_debug_permanent_auth_error</string> <string name="pref_key_customize" translatable="false">pref_key_customize</string> <string name="pref_key_private_browsing" translatable="false">pref_key_private_browsing</string> <string name="pref_key_leakcanary" translatable="false">pref_key_leakcanary</string> @@ -164,7 +168,7 @@ <string name="pref_key_swipe_toolbar_switch_tabs" translatable="false">pref_key_swipe_toolbar_switch_tabs</string> <string name="pref_key_swipe_toolbar_show_tabs" translatable="false">pref_key_swipe_toolbar_show_tabs</string> <string name="pref_key_recent_tabs" translatable="false">pref_key_recent_tabs</string> - <string name="pref_key_recent_bookmarks" translatable="false">pref_key_recent_bookmarks</string> + <string name="pref_key_customization_bookmarks" translatable="false">pref_key_recent_bookmarks</string> <string name="pref_key_customization_category_toolbar" translatable="false">pref_key_customization_category_toolbar</string> <!-- HTTPS Only Settings --> diff --git a/mobile/android/fenix/app/src/main/res/values/static_strings.xml b/mobile/android/fenix/app/src/main/res/values/static_strings.xml index 66ec907040..6ed8c8901c 100644 --- a/mobile/android/fenix/app/src/main/res/values/static_strings.xml +++ b/mobile/android/fenix/app/src/main/res/values/static_strings.xml @@ -66,6 +66,12 @@ <string name="preferences_sync_debug_quit_button_title">Stop Firefox</string> <!-- Quit app button summary for the Sync Debug preferences --> <string name="preferences_sync_debug_quit_button_summary">Custom server changes will take effect on the next Firefox run.</string> + <!-- Button title for simulating an FxA network error inside the Sync Debug menu --> + <string name="preferences_sync_debug_network_error_button_title">Simulate account network error</string> + <!-- Button title for simulating an FxA temporary auth error inside the Sync Debug menu --> + <string name="preferences_sync_debug_temporary_auth_error_button_title">Simulate temporary account auth error</string> + <!-- Button title for simulating an FxA permanent auth error inside the Sync Debug menu --> + <string name="preferences_sync_debug_permanent_auth_error_button_title">Simulate permanent account auth error</string> <!-- Label for enabling the Tabs Tray to Compose changes --> <string name="preferences_debug_settings_tabs_tray_to_compose" translatable="false">Enable Tabs Tray to Compose rewrite</string> <!-- Label for enabling the Compose Top Sites --> diff --git a/mobile/android/fenix/app/src/main/res/values/strings.xml b/mobile/android/fenix/app/src/main/res/values/strings.xml index a2a5d53866..9cfeb301e5 100644 --- a/mobile/android/fenix/app/src/main/res/values/strings.xml +++ b/mobile/android/fenix/app/src/main/res/values/strings.xml @@ -47,11 +47,19 @@ <!-- Home - Recently saved bookmarks --> <!-- Title for the home screen section with recently saved bookmarks. --> - <string name="recently_saved_title">Recently saved</string> + <string name="recently_saved_title" moz:removedIn="127" tools:ignore="UnusedResources">Recently saved</string> <!-- Content description for the button which navigates the user to show all of their saved bookmarks. --> - <string name="recently_saved_show_all_content_description_2">Show all saved bookmarks</string> + <string name="recently_saved_show_all_content_description_2" moz:removedIn="127" tools:ignore="UnusedResources">Show all saved bookmarks</string> <!-- Text for the menu button to remove a recently saved bookmark from the user's home screen --> - <string name="recently_saved_menu_item_remove">Remove</string> + <string name="recently_saved_menu_item_remove" moz:removedIn="127" tools:ignore="UnusedResources">Remove</string> + + <!-- Home - Bookmarks --> + <!-- Title for the home screen section with bookmarks. --> + <string name="home_bookmarks_title">Bookmarks</string> + <!-- Content description for the button which navigates the user to show all of their bookmarks. --> + <string name="home_bookmarks_show_all_content_description">Show all bookmarks</string> + <!-- Text for the menu button to remove a recently saved bookmark from the user's home screen --> + <string name="home_bookmarks_menu_item_remove">Remove</string> <!-- About content. The first parameter is the name of the application. (For example: Fenix) --> <string name="about_content">%1$s is produced by Mozilla.</string> @@ -184,6 +192,10 @@ <string name="browser_menu_add_ons" moz:removedIn="126" tools:ignore="UnusedResources">Add-ons</string> <!-- Browser menu button that opens the extensions manager --> <string name="browser_menu_extensions">Extensions</string> + <!-- Browser menu button that opens the extensions manager --> + <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 button that opens account settings --> <string name="browser_menu_account_settings">Account info</string> <!-- Text displayed when there are no add-ons to be shown --> @@ -202,18 +214,26 @@ <string name="browser_menu_open_in_regular_tab">Open in regular tab</string> <!-- Browser menu toggle that adds a shortcut to the site on the device home screen. --> <string name="browser_menu_add_to_homescreen">Add to Home screen</string> + <!-- Browser menu toggle that adds a shortcut to the site on the device home screen. --> + <string name="browser_menu_add_to_homescreen_2">Add to Home screen…</string> <!-- Browser menu toggle that installs a Progressive Web App shortcut to the site on the device home screen. --> <string name="browser_menu_install_on_homescreen" moz:removedIn="126" tools:ignore="UnusedResources">Install</string> <!-- Content description (not visible, for screen readers etc.) for the Resync tabs button --> <string name="resync_button_content_description">Resync</string> <!-- Browser menu button that opens the find in page menu --> <string name="browser_menu_find_in_page">Find in page</string> + <!-- Browser menu button that opens the find in page menu --> + <string name="browser_menu_find_in_page_2">Find in page…</string> <!-- Browser menu button that opens the translations dialog, which has options to translate the current browser page. --> <string name="browser_menu_translations">Translate page</string> <!-- Browser menu button that saves the current tab to a collection --> + <string name="browser_menu_save_to_collection">Save to collection…</string> + <!-- Browser menu button that saves the current tab to a collection --> <string name="browser_menu_save_to_collection_2">Save to collection</string> <!-- Browser menu button that open a share menu to share the current site --> <string name="browser_menu_share">Share</string> + <!-- Browser menu button that open a share menu to share the current site --> + <string name="browser_menu_share_2">Share…</string> <!-- Browser menu button shown in custom tabs that opens the current tab in Fenix The first parameter is the name of the app defined in app_name (for example: Fenix) --> <string name="browser_menu_open_in_fenix">Open in %1$s</string> @@ -249,6 +269,33 @@ <string name="browser_menu_new_private_tab">New private tab</string> <!-- Browser menu label that navigates to the Password screen --> <string name="browser_menu_passwords">Passwords</string> + <!-- Browser menu label that navigates to the SUMO page for the Firefox for Android release notes. + The first parameter is the name of the app defined in app_name (for example: Fenix)--> + <string name="browser_menu_new_in_firefox">New in %1$s</string> + <!-- Browser menu label that toggles the request for the desktop site of the currently visited page --> + <string name="browser_menu_switch_to_desktop_site">Switch to desktop site</string> + <!-- Browser menu label that navigates to the page tools sub-menu --> + <string name="browser_menu_tools">Tools</string> + <!-- Browser menu label that navigates to the save sub-menu, which contains various save related menu items such as + bookmarking a page, saving to collection, shortcut or as a PDF, and adding to home screen --> + <string name="browser_menu_save">Save</string> + <!-- Browser menu label that bookmarks the currently visited page --> + <string name="browser_menu_bookmark_this_page">Bookmark this page</string> + <!-- Browser menu label that navigates to the edit bookmark screen for the current bookmarked page --> + <string name="browser_menu_edit_bookmark">Edit bookmark</string> + <!-- Browser menu label that the saves the currently visited page as a PDF --> + <string name="browser_menu_save_as_pdf">Save as PDF…</string> + <!-- Browser menu label for turning ON reader view of the current visited page --> + <string name="browser_menu_turn_on_reader_view">Turn on Reader View</string> + <!-- Browser menu label for turning OFF reader view of the current visited page --> + <string name="browser_menu_turn_off_reader_view">Turn off Reader View</string> + <!-- Browser menu label for navigating to the translation feature, which provides language translation options the current visited page --> + <string name="browser_menu_translate_page">Translate page…</string> + <!-- Browser menu label that is displayed when the current page has been translated by the translation feature. + The first parameter is the name of the language that page was translated to (e.g. English). --> + <string name="browser_menu_translated_to">Translated to %1$s</string> + <!-- Browser menu label for the print feature --> + <string name="browser_menu_print">Print…</string> <!-- Extensions management fragment --> <!-- Text displayed when there are no extensions to be shown --> @@ -541,6 +588,10 @@ <string name="preferences_account_sync_error">Reconnect to resume syncing</string> <!-- Preference for language --> <string name="preferences_language">Language</string> + <!-- Preference for translation --> + <string name="preferences_translation" moz:removedIn="127" tools:ignore="UnusedResources">Translation</string> + <!-- Preference for translations --> + <string name="preferences_translations">Translations</string> <!-- Preference for data choices --> <string name="preferences_data_choices">Data choices</string> <!-- Preference for data collection --> @@ -641,7 +692,9 @@ <!-- Header text for jumping back into the recent tab in customize the home screen --> <string name="customize_toggle_jump_back_in">Jump back in</string> <!-- Title for the customize home screen section with recently saved bookmarks. --> - <string name="customize_toggle_recent_bookmarks">Recent bookmarks</string> + <string name="customize_toggle_recent_bookmarks" moz:removedIn="127" tools:ignore="UnusedResources">Recent bookmarks</string> + <!-- Title for the customize home screen section with bookmarks. --> + <string name="customize_toggle_bookmarks">Bookmarks</string> <!-- Title for the customize home screen section with recently visited. Recently visited is a section where users see a list of tabs that they have visited in the past few days --> <string name="customize_toggle_recently_visited">Recently visited</string> @@ -774,6 +827,14 @@ <!-- %s is the device name --> <string name="fxa_tab_received_from_notification_name">Tab from %s</string> + <!-- Close Synced Tabs --> + <!-- The title for a notification shown when the user closes tabs that are currently + open on this device from another device that's signed in to the same Mozilla account. + %1$s is a placeholder for the app name; %2$d is the number of tabs closed. --> + <string name="fxa_tabs_closed_notification_title">%1$s tabs closed: %2$d</string> + <!-- The body for a "closed synced tabs" notification. --> + <string name="fxa_tabs_closed_text">View recently closed tabs</string> + <!-- Advanced Preferences --> <!-- Preference for tracking protection exceptions --> <string name="preferences_tracking_protection_exceptions">Exceptions</string> @@ -2403,6 +2464,8 @@ <string name="translations_bottom_sheet_negative_button">Not now</string> <!-- Button text on the translations dialog to restore the translated website back to the original untranslated version. --> <string name="translations_bottom_sheet_negative_button_restore">Show original</string> + <!-- Accessibility announcement (not visible, for screen readers etc.) for the translations dialog after restore button was pressed that indicates the original untranslated page was loaded. --> + <string name="translations_bottom_sheet_restore_accessibility_announcement">Original untranslated page loaded</string> <!-- Button text on the translations dialog when a translation error appears, used to dismiss the dialog and return to the browser. --> <string name="translations_bottom_sheet_negative_button_error">Done</string> <!-- Button text on the translations dialog to begin a translation of the website. --> @@ -2576,6 +2639,8 @@ <string name="debug_drawer_title">Debug Tools</string> <!-- Content description (not visible, for screen readers etc.): Navigate back within the debug drawer. --> <string name="debug_drawer_back_button_content_description">Navigate back</string> + <!-- Content description (not visible, for screen readers etc.): Open debug drawer. --> + <string name="debug_drawer_fab_content_description">Open debug drawer</string> <!-- Debug drawer tabs tools --> <!-- The title of the Tab Tools feature in the Debug Drawer. --> @@ -2583,7 +2648,10 @@ <!-- The title of the tab count section in Tab Tools. --> <string name="debug_drawer_tab_tools_tab_count_title">Tab count</string> <!-- The active tab count category in the tab count section in Tab Tools. --> - <string name="debug_drawer_tab_tools_tab_count_normal">Active</string> + <string name="debug_drawer_tab_tools_tab_count_normal" moz:removedIn="127" + tools:ignore="UnusedResources">Active</string> + <!-- The active tab count category in the tab count section in Tab Tools. --> + <string name="debug_drawer_tab_tools_tab_count_active">Active</string> <!-- The inactive tab count category in the tab count section in Tab Tools. --> <string name="debug_drawer_tab_tools_tab_count_inactive">Inactive</string> <!-- The private tab count category in the tab count section in Tab Tools. --> @@ -2601,6 +2669,31 @@ <!-- The button text to add tabs to the private tab group in the tab creation tool. --> <string name="debug_drawer_tab_tools_tab_creation_tool_button_text_private">Add to private tabs</string> + <!-- Micro survey --> + + <!-- The continue button label --> + <string name="micro_survey_continue_button_label" tools:ignore="UnusedResources">Continue</string> + <!-- The survey header --> + <string name="micro_survey_survey_header">Complete this survey</string> + <!-- The privacy notice link --> + <string name="micro_survey_privacy_notice">Privacy Notice</string> + <!-- The submit button label text --> + <string name="micro_survey_submit_button_label" tools:ignore="UnusedResources">Submit</string> + <!-- The close button label text --> + <string name="micro_survey_close_button_label">Close</string> + <!-- The survey completion confirmation text --> + <string name="micro_survey_feedback_confirmation" tools:ignore="UnusedResources">Thanks for your feedback!</string> + <!-- Option for likert scale --> + <string name="likert_scale_option_1" tools:ignore="UnusedResources">Very Satisfied</string> + <!-- Option for likert scale --> + <string name="likert_scale_option_2" tools:ignore="UnusedResources">Satisfied</string> + <!-- Option for likert scale --> + <string name="likert_scale_option_3" tools:ignore="UnusedResources">Neutral</string> + <!-- Option for likert scale --> + <string name="likert_scale_option_4" tools:ignore="UnusedResources">Dissatisfied</string> + <!-- Option for likert scale --> + <string name="likert_scale_option_5" tools:ignore="UnusedResources">Very Dissatisfied</string> + <!-- Debug drawer logins --> <!-- The title of the Logins feature in the Debug Drawer. --> <string name="debug_drawer_logins_title">Logins</string> diff --git a/mobile/android/fenix/app/src/main/res/values/styles.xml b/mobile/android/fenix/app/src/main/res/values/styles.xml index c7a7932b8a..420511a5e2 100644 --- a/mobile/android/fenix/app/src/main/res/values/styles.xml +++ b/mobile/android/fenix/app/src/main/res/values/styles.xml @@ -34,9 +34,9 @@ <item name="android:textColorLink">@color/fx_mobile_text_color_accent</item> <item name="mozacInputLayoutErrorTextColor" - tools:ignore="UnusedResources">@color/fx_mobile_text_color_warning</item> + tools:ignore="UnusedResources">@color/fx_mobile_text_color_critical</item> <item name="mozacInputLayoutErrorIconColor" - tools:ignore="UnusedResources">@color/fx_mobile_text_color_warning</item> + tools:ignore="UnusedResources">@color/fx_mobile_text_color_critical</item> <item name="mozacLoginSelectHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectPromptHeaderTextStyle</item> <item name="mozacSelectCreditCardHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectPromptHeaderTextStyle</item> <item name="mozacSelectAddressHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectPromptHeaderTextStyle</item> @@ -67,7 +67,7 @@ <!-- Disabled text --> <item name="textDisabled">@color/fx_mobile_text_color_disabled</item> <!-- Warning text --> - <item name="textWarning">@color/fx_mobile_text_color_warning</item> + <item name="textCritical">@color/fx_mobile_text_color_critical</item> <!-- Small heading, Text link --> <item name="textAccent">@color/fx_mobile_text_color_accent</item> <!-- Text Inverted/On Color --> @@ -230,9 +230,9 @@ <item name="bottomSheetDialogTheme">@style/BottomSheetPrivate</item> <item name="mozacInputLayoutErrorTextColor" - tools:ignore="UnusedResources">@color/fx_mobile_private_text_color_warning</item> + tools:ignore="UnusedResources">@color/fx_mobile_private_text_color_critical</item> <item name="mozacInputLayoutErrorIconColor" - tools:ignore="UnusedResources">@color/fx_mobile_private_text_color_warning</item> + tools:ignore="UnusedResources">@color/fx_mobile_private_text_color_critical</item> <item name="mozacLoginSelectHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectPromptHeaderTextStyle</item> <item name="mozacSelectCreditCardHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectPromptHeaderTextStyle</item> <item name="mozacSelectAddressHeaderTextStyle" tools:ignore="UnusedResources">@style/SelectPromptHeaderTextStyle</item> @@ -263,7 +263,7 @@ <!-- Disabled text --> <item name="textDisabled">@color/fx_mobile_private_text_color_disabled</item> <!-- Warning text --> - <item name="textWarning">@color/fx_mobile_private_text_color_warning</item> + <item name="textCritical">@color/fx_mobile_private_text_color_critical</item> <!-- Small heading, Text link --> <item name="textAccent">@color/fx_mobile_private_text_color_accent</item> <!-- Text Inverted/On Color --> @@ -378,8 +378,8 @@ </style> <style name="DestructiveButton" parent="NeutralButton"> - <item name="iconTint">@color/fx_mobile_icon_color_warning_button</item> - <item name="android:textColor">@color/fx_mobile_text_color_warning_button</item> + <item name="iconTint">@color/fx_mobile_icon_color_critical_button</item> + <item name="android:textColor">@color/fx_mobile_text_color_critical_button</item> </style> <style name="PositiveButton" parent="NeutralButton"> |