Merge 24.4-rc-2 to trunk

RELEASE-NOTES.txt

@@ -15,6 +15,7 @@
 * [*] Block editor: Prevent crash when autoscrolling to blocks [https://github.com/WordPress/gutenberg/pull/59110]
 * [*] Block editor: Remove opacity change when images are being uploaded [https://github.com/WordPress/gutenberg/pull/59264]
 * [*] Block editor: Media & Text blocks correctly show an error message when the attached video upload fails [https://github.com/WordPress/gutenberg/pull/59288]
+* [*] [Jetpack-only] Themes: Filters themes that are not available due to tier to prevent activation errors. [https://github.com/wordpress-mobile/WordPress-Android/pull/20425]
 
 24.3
 -----

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/traffic/TrafficOverviewUseCase.kt

@@ -92,7 +92,8 @@ class TrafficOverviewUseCase(
                     statsSiteProvider.siteModel,
                     lowerGranularity,
                     LimitMode.Top(OVERVIEW_ITEMS_TO_LOAD),
-                    it
+                    it,
+                    false
                 )
             }
         } else {

WordPress/src/main/res/values-az/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2015-12-08 01:00:08+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.3
+Generator: GlotPress/4.0.0-rc.1
 Language: az
 -->
 <resources>

WordPress/src/main/res/values-bg/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2018-12-10 19:56:03+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.3
+Generator: GlotPress/4.0.0-rc.1
 Language: bg
 -->
 <resources>

WordPress/src/main/res/values-cy/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2017-03-25 17:35:05+0000
 Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;
-Generator: GlotPress/4.0.0-beta.3
+Generator: GlotPress/4.0.0-rc.1
 Language: cy_GB
 -->
 <resources>

WordPress/src/main/res/values-da/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2021-08-01 11:11:29+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.3
+Generator: GlotPress/4.0.0-rc.1
 Language: da_DK
 -->
 <resources>

WordPress/src/main/res/values-el/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2023-06-13 08:27:23+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.3
+Generator: GlotPress/4.0.0-rc.1
 Language: el_GR
 -->
 <resources>
@@ -43,14 +43,10 @@ Language: el_GR
     <string name="gutenberg_native_error">Σφάλμα </string>
     <string name="gutenberg_native_choose_file">Επιλέξτε αρχείο</string>
     <string name="button_copy">Διπλότυπο</string>
-    <string name="toast_edit_story_update_in_progress_title">Η ιστορία αποθηκευεται, παρακαλούμε περιμένετε…</string>
     <string name="gutenberg_native_file_name">Όνομα αρχείου</string>
     <string name="activity_log_activity_type_filter_apply">Εκτέλεση</string>
     <string name="activity_log_activity_type_filter_clear">Καθαρισμός</string>
     <string name="label_done_button">Ολοκληρώθηκε</string>
-    <string name="dialog_discard_story_title_edit">Απόρριψη αλλαγών;</string>
-    <string name="dialog_discard_story_ok_button_edit">Απόρριψη</string>
-    <string name="color_picker_label_background">Φόντο</string>
     <string name="prepublishing_nudges_add_category_button">Προσθήκη κατηγορίας</string>
     <string name="prepublishing_nudges_toolbar_title_add_categories">Προσθήκη Νέας Κατηγορίας</string>
     <string name="prepublishing_nudges_toolbar_title_categories">Κατηγορίες</string>
@@ -59,7 +55,6 @@ Language: el_GR
     <string name="login_prologue_fifth_caption_three">Μουσεία στο Λονδίνο</string>
     <string name="gutenberg_native_help_button">Κουμπί Βοήθειας</string>
     <string name="gutenberg_native_choose_images">Επιλέξτε εικόνες</string>
-    <string name="stories_intro_create_story_post_label">Δημιουργήστε μια ιστορία</string>
     <string name="post_signup_interstitial_not_right_now">Όχι τώρα</string>
     <string name="post_signup_interstitial_title">Καλώς ήρθατε στο WordPress!</string>
     <string name="photo_picker_image_selected">, Επιλεγμένο</string>

WordPress/src/main/res/values-en-rGB/strings.xml

@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-02-20 09:01:27+0000
+Translation-Revision-Date: 2024-03-04 22:08:04+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.3
+Generator: GlotPress/4.0.0-rc.1
 Language: en_GB
 -->
 <resources>
+    <string name="gutenberg_native_video_caption_s_0141bd20">Video caption. %s</string>
+    <string name="gutenberg_native_video_caption_empty_663aab49">Video caption. Empty</string>
+    <string name="gutenberg_native_edit_video_024aee6d">Edit video</string>
+    <string name="gutenberg_native_autoplay_may_cause_usability_issues_for_some_users">Autoplay may cause usability issues for some users.</string>
+    <string name="notifications_action_mark_all_as_read">Mark all as read</string>
+    <string name="notifications_unread_content_description">Unread</string>
     <string name="qrcode_media_deeplink_error">Site not found. Check that you are logged into the correct account.</string>
     <string name="gravatar_info_sync_done_button">Done</string>
     <string name="gravatar_info_sync_message">Updates might take some time to sync with your Gravatar profile.</string>
@@ -387,7 +393,6 @@ Language: en_GB
     <string name="jetpack_full_plugin_install_onboarding_description_this_site">This site</string>
     <string name="jetpack_full_plugin_install_concise_description_multiple">%1$s is using %2$s, which don’t support all features of the app yet. Please install the %3$s.</string>
     <string name="jetpack_full_plugin_install_concise_description_single">%1$s is using %2$s, which doesn’t support all features of the app yet. Please install the %3$s.</string>
-    <string name="wp_jetpack_feature_removal_static_posters_phase">Moving to the Jetpack app in a few days.</string>
     <string name="wp_jp_static_poster_footnote">Switching is free and only takes a minute.</string>
     <string name="wp_jp_static_poster_button_secondary">Learn more at Jetpack.com</string>
     <string name="wp_jp_static_poster_button_primary">Switch to the Jetpack app</string>
@@ -1174,7 +1179,6 @@ Language: en_GB
     <string name="jetpack_brute_force_allowlist_title">Always allowed IP addresses</string>
     <string name="site_settings_denylist_title">Disallowed comments</string>
     <string name="gutenberg_native_add_button_text">Add button text</string>
-    <string name="stories_intro_main_subtitle">A new way to create and publish engaging content on your site.</string>
     <string name="activity_log_backup_download_notice_dismiss_action">Dismiss</string>
     <string name="activity_log_backup_download_notice_download_action">Download</string>
     <string name="threat_fix_all_status_success_message_plural">Threats were successfully fixed.</string>
@@ -1343,7 +1347,6 @@ Language: en_GB
     <string name="request_failed_message">There was a problem handling the request. Please try again later.</string>
     <string name="gutenberg_native_move_to_bottom">Move to bottom</string>
     <string name="gutenberg_native_change_block_position">Change block position</string>
-    <string name="label_control_upload">Upload</string>
     <string name="jetpack_icon_content_description">icon</string>
     <string name="backup_download_complete_info">We\'ve also emailed you a link to your file.</string>
     <string name="backup_download_complete_download_share_action_button_content_description">Share link button</string>
@@ -1444,7 +1447,6 @@ Language: en_GB
     <string name="dialog_confirm_copy_local_message">The post you are trying to copy has two versions that are in conflict, or you recently made changes but didn\'t save them.\nEdit the post first to resolve any conflict or proceed with copying the version from this app.</string>
     <string name="dialog_confirm_copy_local_title">Post sync conflict</string>
     <string name="button_copy">Duplicate</string>
-    <string name="toast_edit_story_update_in_progress_title">Story being saved, please wait…</string>
     <string name="gutenberg_native_file_name">File name</string>
     <string name="gutenberg_native_file_block_settings">File block settings</string>
     <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Failed to upload files.\nPlease tap for options.</string>
@@ -1462,23 +1464,8 @@ Language: en_GB
     <string name="reader_follow_comments_null_response">No response received</string>
     <string name="activity_log_activity_type_filter_clear">Clear</string>
     <string name="activity_log_activity_type_filter_apply">Apply</string>
-    <string name="dialog_edit_story_unsupported_format_message">One or more slides have not been added to your Story because Stories don\'t support GIF files at the moment. Please choose a static image or video background instead.</string>
-    <string name="dialog_edit_story_unsupported_format_title">GIF files not supported</string>
-    <string name="dialog_edit_story_unrecoverable_message">We couldn\'t find the media for this story on the site.</string>
-    <string name="dialog_edit_story_unrecoverable_title">Can\'t edit Story</string>
-    <string name="dialog_edit_story_unavailable_message">Unable to load media for this story. Check your internet connection and try again in a moment.</string>
-    <string name="dialog_edit_story_unavailable_title">Can\'t edit Story</string>
-    <string name="dialog_edit_story_limited_message">This story was edited on a different device and the ability to edit certain objects may be limited.</string>
-    <string name="dialog_edit_story_limited_title">Limited Story Editing</string>
     <string name="cannot_retry_deleted_media_item_fatal">Media has been removed. Try re-creating your Story.</string>
-    <string name="color_picker_label_background">Background</string>
-    <string name="color_picker_label_text">Text</string>
-    <string name="dialog_discard_story_ok_button_edit">Discard</string>
-    <string name="dialog_discard_story_message_edit">Any changes made will not be saved.</string>
-    <string name="dialog_discard_story_title_edit">Discard changes?</string>
     <string name="label_done_button">Done</string>
-    <string name="label_next_button">Next</string>
-    <string name="delete_button_alt">Delete</string>
     <string name="hpp_choose_error">There was an error while selecting the theme.</string>
     <string name="hpp_retry_error">Please check your internet connection and retry.</string>
     <string name="hpp_error_subtitle">Tap retry when you\'re back online.</string>
@@ -1528,14 +1515,6 @@ Language: en_GB
     <string name="gutenberg_native_help_button">Help button</string>
     <string name="gutenberg_native_edit_using_web_editor">Edit using web editor</string>
     <string name="gutenberg_native_choose_images">Choose images</string>
-    <string name="stories_intro_create_story_post_label">Create Story Post</string>
-    <string name="stories_intro_description_second">They’re published as a new blog post on your site, so your audience never misses out on a thing.</string>
-    <string name="stories_intro_title_second">Story posts don\'t disappear</string>
-    <string name="stories_intro_description_first">Combine photos, videos, and text to create engaging and tappable story posts that your visitors will love.</string>
-    <string name="stories_intro_title_first">Now stories are for everyone</string>
-    <string name="stories_intro_image_caption_second">Example story title</string>
-    <string name="stories_intro_image_caption_first">How to create a story post</string>
-    <string name="stories_intro_main_title">Introducing Story Posts</string>
     <string name="mlp_notice_blank_page_created">Blank page created</string>
     <string name="mlp_notice_page_created">Page created</string>
     <string name="media_insert_failed">Media insert failed.</string>
@@ -1556,13 +1535,6 @@ Language: en_GB
     <string name="gutenberg_native_add_this_link">Add this link</string>
     <string name="gutenberg_native_add_this_email_link">Add this email link</string>
     <string name="suggestion_no_connection">No internet connection.\nSuggestions are unavailable.</string>
-    <string name="typeface_label_shrikhand">Bold</string>
-    <string name="typeface_label_space_mono">Modern</string>
-    <string name="typeface_label_pacifico">Playful</string>
-    <string name="typeface_label_oswald">Strong</string>
-    <string name="typeface_label_libre_baskerville">Classic</string>
-    <string name="typeface_label_nunito">Casual</string>
-    <string name="toast_capture_operation_permission_needed">You need to grant the app audio recording permission in order to record video</string>
     <string name="mlp_notselected_description">%s</string>
     <string name="mlp_selected_description">%s selected</string>
     <string name="login_get_link_by_email">Get a login link by email</string>
@@ -1589,66 +1561,13 @@ Language: en_GB
     <string name="gutenberg_native_page_title_empty">Page title. Empty</string>
     <string name="toast_error_playing_video">An error occurred while playing your video</string>
     <string name="camera_error">This device doesn\'t support Camera2 API.</string>
-    <string name="toast_error_saving_video">Video could not be saved</string>
-    <string name="toast_error_saving_image">Error saving image</string>
-    <string name="toast_capture_operation_in_progress">Operation in progress, try again</string>
-    <string name="toast_story_page_not_found">Couldn\'t find Story slide</string>
-    <string name="dialog_insufficient_device_storage_error_ok_button">View Storage</string>
-    <string name="dialog_insufficient_device_storage_error_message">We need to save the story on your device before it can be published. Review your storage settings and remove files to free up space.</string>
-    <string name="dialog_insufficient_device_storage_error_title">Insufficient device storage</string>
-    <string name="dialog_story_saving_error_message">Retry saving, or delete the slides, then try publishing your story again.</string>
-    <string name="dialog_story_saving_error_title_plural">Unable to save %1$d slides</string>
-    <string name="dialog_story_saving_error_title_singular">Unable to save one slide</string>
-    <string name="story_saving_failed_quick_action_manage">Manage</string>
-    <string name="story_saving_failed_message_plural">%1$d slides require action</string>
-    <string name="story_saving_failed_message_singular">One slide requires action</string>
-    <string name="story_saving_failed_title">Unable to upload \"%1$s\"</string>
-    <string name="story_saving_snackbar_finished_with_error">Unable to upload \"%1$s\"</string>
-    <string name="story_saving_snackbar_finished_successfully">\"%1$s\" published</string>
-    <string name="story_saving_snackbar_started">Uploading \"%1$s\"…</string>
-    <string name="story_saving_subtitle_frames_remaining_plural">%1$d slides remaining</string>
-    <string name="story_saving_subtitle_frames_remaining_singular">One slide remaining</string>
-    <string name="story_saving_title_several">several stories</string>
-    <string name="story_saving_title">Saving \"%1$s\"…</string>
-    <string name="story_saving_untitled">Untitled</string>
-    <string name="dialog_discard_story_ok_button">Discard</string>
-    <string name="dialog_discard_story_message">Your story post will not be saved as a draft.</string>
-    <string name="dialog_discard_story_title">Discard story post?</string>
-    <string name="dialog_discard_page_ok_button">Delete</string>
-    <string name="dialog_discard_errored_page_message">This slide has not been saved yet. If you delete this slide, you will lose any edits you have made.</string>
-    <string name="dialog_discard_page_message">This slide will be removed from your story.</string>
-    <string name="dialog_discard_page_title">Delete story slide?</string>
-    <string name="label_text_color_button">Change text colour</string>
-    <string name="label_text_alignment_button">Change text alignment</string>
-    <string name="label_frame_errored">errored</string>
-    <string name="label_frame_selected_border">selected</string>
-    <string name="label_frame_unselected_border">unselected</string>
-    <string name="label_frame_image">Slide</string>
-    <string name="label_retry_icon">Retry</string>
-    <string name="label_saved_icon">Saved</string>
     <string name="label_close_button">Close</string>
-    <string name="label_share_to">Share to</string>
-    <string name="label_snackbar_share">SHARE</string>
-    <string name="label_snackbar_loop_frame_saved">Saved to photos</string>
-    <string name="label_control_retry">Retry</string>
-    <string name="label_control_saved">Saved</string>
-    <string name="label_control_saving">Saving</string>
-    <string name="label_control_flash">Flash</string>
-    <string name="label_control_flip_camera">Flip</string>
-    <string name="sound_button_alt">Sound</string>
-    <string name="text_button_alt">Text</string>
-    <string name="stickers_button_alt">Stickers</string>
-    <string name="flash_button_alt">Flash</string>
-    <string name="flip_button_alt">Flip camera</string>
-    <string name="capture_button_alt">Capture</string>
     <string name="mlp_preview_page">Preview</string>
     <string name="mlp_create_page">Create page</string>
     <string name="mlp_create_blank_page">Create blank page</string>
     <string name="mlp_choose_layout_subtitle">Get started by choosing from a wide variety of pre-made page layouts. Or just start with a blank page.</string>
     <string name="mlp_choose_layout_title">Choose a layout</string>
     <string name="prepublishing_nudges_story_title_hint">Give your story a title</string>
-    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Create a post or story</string>
-    <string name="create_post_page_fab_tooltip_stories_enabled">Create a post, page, or story</string>
     <string name="quick_start_dialog_create_new_post_message_short">Tap %1$s Create. %2$s Then select &lt;b&gt;Blog post&lt;/b&gt;</string>
     <string name="photo_picker_choose_file">Choose from device</string>
     <string name="my_site_bottom_sheet_add_story">Story post</string>

WordPress/src/main/res/values-es-rCL/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2020-05-09 06:46:56+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.3
+Generator: GlotPress/4.0.0-rc.1
 Language: es_CL
 -->
 <resources>