Skip to content

Commit dc52538

Browse files
wpmobilebotcrazytonyli
wpmobilebot
and
crazytonyli
authored
Merge release/26.4 into trunk (#22363)
* Bump version number * Update draft release notes for 26.4 * Update draft release notes for Jetpack 26.4. * Release Notes: add new section for next version (26.5) * Update release notes * Freeze strings for translation --------- Co-authored-by: Tony Li <tony.li@automattic.com>
1 parent c05cc20 commit dc52538

File tree

5 files changed

+122
-12
lines changed

5 files changed

+122
-12
lines changed

‎RELEASE-NOTES.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
*** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
22

3+
26.5
4+
-----
5+
6+
37
26.4
48
-----
59

‎WordPress/jetpack_metadata/release_notes.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
We added file size info to your media library, so you can see exactly what you're working with.
2-
3-
The experimental editor just got smoother, too. Your content stays put when you rotate your device or toggle dark mode, and dialogs now respond properly to the back button. Happy editing!
1+
* [*] Monochrome icon support for the WordPress app [#22321]
2+
* [*] Fixed high-resolution image loading issues [#22235]

‎WordPress/metadata/release_notes.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
1-
We added file size info to your media library, so you can see exactly what you're working with.
2-
3-
Increased the timeout for full-screen image loading, so some edge-cases and low connectivity cases have a higher chance to suncceed.
4-
5-
The experimental editor just got smoother, too. Your content stays put when you rotate your device or toggle dark mode, and dialogs now respond properly to the back button. Happy editing!
1+
* [*] Monochrome icon support for the WordPress app [#22321]
2+
* [*] Fixed high-resolution image loading issues [#22235]

‎fastlane/resources/values/strings.xml‎

Lines changed: 112 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -702,6 +702,8 @@
702702
<string name="site_settings_amp_summary">Your WordPress.com site supports the use of Accelerated Mobile Pages, a Google-led initiative that dramatically speeds up loading times on mobile devices</string>
703703
<string name="site_settings_gutenberg_default_for_new_posts">Use Block Editor</string>
704704
<string name="site_settings_gutenberg_default_for_new_posts_summary">Edit new posts and pages with the block editor</string>
705+
<string name="site_settings_use_theme_styles">Use Theme Styles</string>
706+
<string name="site_settings_use_theme_styles_summary">Make the block editor look like your theme</string>
705707
<string name="site_settings_password_updated">Password updated</string>
706708
<string name="site_settings_update_password_message">To reconnect the app to your self-hosted site, enter the site\'s new password here.</string>
707709
<string name="site_settings_homepage_settings">Homepage Settings</string>
@@ -971,8 +973,6 @@
971973
<string name="experimental_block_editor_note">Experimental block editor will become the default in a future release and the ability to disable it will be removed.</string>
972974
<string name="experimental_block_editor">Experimental block editor</string>
973975
<string name="experimental_block_editor_description">Access additional block types and settings</string>
974-
<string name="experimental_block_editor_theme_styles">Experimental block editor styles</string>
975-
<string name="experimental_block_editor_theme_styles_description">Apply theme styles to the editor</string>
976976
<string name="experimental_block_editor_plugins">Experimental block editor plugins</string>
977977
<string name="experimental_features_feedback_dialog_title">Share feedback</string>
978978
<string name="experimental_features_feedback_dialog_message">Are you willing to share feedback on the experimental editor?</string>
@@ -981,6 +981,8 @@
981981
<string name="experimental_subscribers_feature_description">View and manage newsletter subscribers</string>
982982
<string name="experimental_application_password_feature">Application Password log in</string>
983983
<string name="experimental_application_password_feature_description">Enable Application Password to log into self-hosted sites</string>
984+
<string name="modern_support">Modern Support</string>
985+
<string name="modern_support_description">Enable the new modern support experience</string>
984986

985987
<!-- Debug settings -->
986988
<string name="preference_open_debug_settings" translatable="false">Debug Settings</string>
@@ -2624,6 +2626,23 @@
26242626
<string name="support_identity_input_dialog_enter_email">Please enter your email address</string>
26252627
<string name="support_identity_input_dialog_email_label">Email</string>
26262628
<string name="support_identity_input_dialog_name_label">Name</string>
2629+
<string name="support_screen_title">Support</string>
2630+
<string name="support_screen_profile_section_title">Support Profile</string>
2631+
<string name="support_screen_login_button">Log into WordPress.com</string>
2632+
<string name="support_screen_how_can_we_help_title">How can we help?</string>
2633+
<string name="support_screen_help_center_title">Help Center</string>
2634+
<string name="support_screen_help_center_description">Documentation and Tutorials to help you get started</string>
2635+
<string name="support_screen_ask_bots_title">Ask the bots</string>
2636+
<string name="support_screen_ask_bots_description">Get quick answers to common questions</string>
2637+
<string name="support_screen_ask_happiness_engineers_title">Ask the Happiness Engineers</string>
2638+
<string name="support_screen_ask_happiness_engineers_description">For your tough questions. We\'ll reply via email</string>
2639+
<string name="support_screen_diagnostics_section_title">Diagnostics</string>
2640+
<string name="support_screen_application_logs_title">Application Logs</string>
2641+
<string name="support_screen_application_logs_description">Advanced tool to debug issues</string>
2642+
<string name="support_screen_user_avatar_content_description">User avatar</string>
2643+
<string name="logs_screen_empty_state">No logs available</string>
2644+
<string name="logs_screen_log_count">%d log entries</string>
2645+
<string name="logs_screen_general_error">Something went wrong…</string>
26272646

26282647
<!--Me-->
26292648
<string name="me_profile_photo">Profile Photo</string>
@@ -5074,6 +5093,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
50745093
<string name="application_password_info_description_3">You can view and manage these passwords in your user profile within your WordPress site\'s admin panel.</string>
50755094
<string name="application_password_info_description_4">Please note that revoking application passwords used by the app will terminate the app\'s access to your site. Be cautious when revoking application passwords created by the app.</string>
50765095
<string name="enable">Enable</string>
5096+
<string name="create">Create</string>
50775097
<string name="application_password_never_used">Never used</string>
50785098
<string name="application_password_name_label">Name:</string>
50795099
<string name="application_password_created_label">Created:</string>
@@ -5102,4 +5122,94 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
51025122
<string name="add_term">Add term</string>
51035123
<string name="error_saving_term">There was an error saving the term</string>
51045124
<string name="error_deleting_term">There was an error deleting the term</string>
5125+
5126+
<!-- AI Bot Support - Conversations List Screen -->
5127+
<string name="ai_bot_conversations_title">Conversations</string>
5128+
<string name="ai_bot_back_button_content_description">Back</string>
5129+
<string name="ai_bot_new_conversation_content_description">New conversation</string>
5130+
<string name="ai_bot_generic_error">Something went wrong. Please try again later.</string>
5131+
<string name="ai_bot_empty_conversations_title">No conversations yet</string>
5132+
<string name="ai_bot_empty_conversations_message">Start a new conversation to get help with your WordPress site or account.</string>
5133+
<string name="ai_bot_empty_conversations_button">Start conversation</string>
5134+
<string name="ai_bot_you">You</string>
5135+
<string name="ai_bot_support_bot">Support Bot</string>
5136+
5137+
<!-- AI Bot Support - Conversation Detail Screen -->
5138+
<string name="ai_bot_send_button_content_description">Send</string>
5139+
<string name="ai_bot_message_input_placeholder">Type a message…</string>
5140+
5141+
<!-- AI Bot Support - Welcome Header -->
5142+
<string name="ai_bot_welcome_greeting">Howdy %1$s 👋</string>
5143+
<string name="ai_bot_welcome_message">I\'m your personal AI assistant. I can help with any questions about your site or account.</string>
5144+
5145+
<!-- AI Bot Support - Conversation Utils -->
5146+
<string name="ai_bot_default_conversation_title">New Conversation</string>
5147+
<string name="ai_bot_time_just_now">Just now</string>
5148+
<string name="ai_bot_time_minute_ago">%1$d minute ago</string>
5149+
<string name="ai_bot_time_minutes_ago">%1$d minutes ago</string>
5150+
<string name="ai_bot_time_hour_ago">%1$d hour ago</string>
5151+
<string name="ai_bot_time_hours_ago">%1$d hours ago</string>
5152+
<string name="ai_bot_time_day_ago">%1$d day ago</string>
5153+
<string name="ai_bot_time_days_ago">%1$d days ago</string>
5154+
<string name="ai_bot_time_week_ago">%1$d week ago</string>
5155+
<string name="ai_bot_time_weeks_ago">%1$d weeks ago</string>
5156+
5157+
<!-- HE Support - Conversations List Screen -->
5158+
<string name="he_support_conversations_title">Support Conversations</string>
5159+
<string name="he_support_new_conversation_content_description">New conversation</string>
5160+
<string name="he_support_empty_conversations_title">No conversations yet</string>
5161+
<string name="he_support_empty_conversations_message">Start a conversation with our support team to get help with your questions.</string>
5162+
<string name="he_support_empty_conversations_button">Start Conversation</string>
5163+
5164+
<!-- HE Support - Conversation Detail Screen -->
5165+
<string name="he_support_message_count">%1$d Messages</string>
5166+
<string name="he_support_last_updated">Last updated %1$s</string>
5167+
<string name="he_support_reply_button">Reply</string>
5168+
<string name="he_support_send_button">Send</string>
5169+
<string name="he_support_message_label">Message</string>
5170+
<string name="he_support_downloading_attachment">Downloading %1$s…</string>
5171+
<string name="he_support_loading_image">Loading image</string>
5172+
<string name="he_support_attachment_image">Attachment image</string>
5173+
<string name="he_support_failed_to_load_image">Failed to load image</string>
5174+
<string name="he_support_screenshots_label">Screenshots (Optional)</string>
5175+
<string name="he_support_screenshots_description">Adding screenshots can help us understand and resolve your issue faster.</string>
5176+
<string name="he_support_add_screenshots_button">Add Screenshots</string>
5177+
<string name="he_support_screenshot_preview">Screenshot preview</string>
5178+
<string name="he_support_remove_screenshot">Remove screenshot</string>
5179+
<string name="he_support_attachment_size_label">Attachment limit: %1$s of %2$s</string>
5180+
<string name="he_support_skipped_files_header">Skipped Files: %1$s</string>
5181+
<string name="he_support_app_logs_label">Application Logs (Optional)</string>
5182+
<string name="he_support_include_logs_title">Include application logs</string>
5183+
<string name="he_support_include_logs_description">Including logs can help our team investigate issues. Logs may contain recent app activity.</string>
5184+
<string name="he_support_download_attachment">Download attachment</string>
5185+
<string name="he_support_select_attachments">Select attachments</string>
5186+
<string name="he_support_status_waiting_for_support">Waiting for Support</string>
5187+
<string name="he_support_status_waiting_for_user">Waiting for User</string>
5188+
<string name="he_support_status_solved">Solved</string>
5189+
<string name="he_support_status_closed">Closed</string>
5190+
<string name="he_support_status_unknown">Unknown</string>
5191+
<string name="he_support_conversation_closed_message">This conversation is closed. You can no longer reply to it.</string>
5192+
<string name="he_support_video_playback_error_title">Unable to play video</string>
5193+
<string name="he_support_video_playback_error_message">This video cannot be played inline. Please download it to view.</string>
5194+
<string name="he_support_download_video_button">Download Video</string>
5195+
5196+
<!-- HE Support - New Ticket Screen -->
5197+
<string name="he_support_contact_support_title">Contact Support</string>
5198+
<string name="he_support_need_help_with">I need help with</string>
5199+
<string name="he_support_category_application">Application</string>
5200+
<string name="he_support_category_jetpack_connection">Jetpack Connection</string>
5201+
<string name="he_support_category_site_management">Site Management</string>
5202+
<string name="he_support_category_billing">Billing &amp; Subscriptions</string>
5203+
<string name="he_support_category_technical_issues">Technical Issues</string>
5204+
<string name="he_support_category_other">Other</string>
5205+
<string name="he_support_issue_details">Issue Details</string>
5206+
<string name="he_support_subject_label">Subject</string>
5207+
<string name="he_support_subject_placeholder">Brief summary of your issue</string>
5208+
<string name="he_support_site_address_label">Site Address (Optional)</string>
5209+
<string name="he_support_site_address_placeholder">https://yoursite.com</string>
5210+
<string name="he_support_contact_information">Contact Information</string>
5211+
<string name="he_support_contact_email_message">We\'ll email you at this address.</string>
5212+
<string name="he_support_send_ticket_button">Send</string>
5213+
<string name="he_support_generic_error">An error occurred. Please try again later.</string>
5214+
<string name="he_support_forbidden_error">Sorry, you are not allowed to perform this action.</string>
51055215
</resources>

‎version.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
versionName=26.3.1
2-
versionCode=1478
1+
versionName=26.4-rc-1
2+
versionCode=1479

0 commit comments

Comments
 (0)