From c2f0ea767f05ce41704b205f81eb9aacc939b6c1 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Tue, 2 Apr 2024 18:07:09 +0000 Subject: [PATCH 1/7] Bump version number --- version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.properties b/version.properties index 609ee2bacd74..a79cd5cc3d18 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=24.5 -versionCode=1419 +versionName=24.6-rc-1 +versionCode=1420 \ No newline at end of file From 50328dbbe5409838e4398139528cb8a20d0284e3 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Tue, 2 Apr 2024 18:07:09 +0000 Subject: [PATCH 2/7] Update draft release notes for 24.6. --- WordPress/metadata/release_notes.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt index caea09ca9412..37c63079c9ad 100644 --- a/WordPress/metadata/release_notes.txt +++ b/WordPress/metadata/release_notes.txt @@ -1 +1,4 @@ -The best things in life are worth the wait, like fresh-baked cookies, your coffee order, and the latest releases from your favorite app. (That’s us. See you next update.) +* [**] Block editor: Highlight text fixes [https://github.com/WordPress/gutenberg/pull/57650] +* [*] Block editor: Fixes an Aztec editor crash occurring on some occasions when the keyboard suggestions are used [https://github.com/wordpress-mobile/WordPress-Android/pull/20518] +* [*] [Jetpack-only] Change "∞" symbol with "100%" on stats [https://github.com/wordpress-mobile/WordPress-Android/pull/20564] + From 03c510d5be33d9b7cfacb978dbd6a48f6ebc0ef0 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Tue, 2 Apr 2024 18:07:09 +0000 Subject: [PATCH 3/7] Update draft release notes for Jetpack 24.6. --- WordPress/jetpack_metadata/release_notes.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/WordPress/jetpack_metadata/release_notes.txt b/WordPress/jetpack_metadata/release_notes.txt index 78ab52ed8099..37c63079c9ad 100644 --- a/WordPress/jetpack_metadata/release_notes.txt +++ b/WordPress/jetpack_metadata/release_notes.txt @@ -1 +1,4 @@ -Good news, everyone: we fixed the broken links on your announcement badge screen. Insights into your biggest publishing accomplishments are just a tap away. +* [**] Block editor: Highlight text fixes [https://github.com/WordPress/gutenberg/pull/57650] +* [*] Block editor: Fixes an Aztec editor crash occurring on some occasions when the keyboard suggestions are used [https://github.com/wordpress-mobile/WordPress-Android/pull/20518] +* [*] [Jetpack-only] Change "∞" symbol with "100%" on stats [https://github.com/wordpress-mobile/WordPress-Android/pull/20564] + From 86813bcf526de03a3463f46a41e783aababdcce7 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Tue, 2 Apr 2024 18:07:09 +0000 Subject: [PATCH 4/7] Release Notes: add new section for next version (24.7) --- RELEASE-NOTES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 7cb01b15dcad..cca5a3431484 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,9 @@ *** PLEASE FOLLOW THIS FORMAT: [] [] +24.7 +----- + + 24.6 ----- * [**] Block editor: Highlight text fixes [https://github.com/WordPress/gutenberg/pull/57650] From c717cf013fc6a4c5593f6ab34c64568df7db9af1 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Tue, 2 Apr 2024 14:32:55 -0400 Subject: [PATCH 5/7] Remove Jetpack only release notes from WordPress 24.6 release notes --- WordPress/metadata/release_notes.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt index 37c63079c9ad..f1d3b5c8a8c3 100644 --- a/WordPress/metadata/release_notes.txt +++ b/WordPress/metadata/release_notes.txt @@ -1,4 +1,3 @@ * [**] Block editor: Highlight text fixes [https://github.com/WordPress/gutenberg/pull/57650] * [*] Block editor: Fixes an Aztec editor crash occurring on some occasions when the keyboard suggestions are used [https://github.com/wordpress-mobile/WordPress-Android/pull/20518] -* [*] [Jetpack-only] Change "∞" symbol with "100%" on stats [https://github.com/wordpress-mobile/WordPress-Android/pull/20564] From 8dda9645e00b01d09489d55be7825e614c4a8aa8 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Tue, 2 Apr 2024 18:35:28 +0000 Subject: [PATCH 6/7] Merge strings from libraries for translation --- WordPress/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index a98f8033b020..e93b2cd4f041 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -4828,4 +4828,5 @@ translators: %s: Select control option value e.g: "Auto, 25%". --> Tap here to copy post text The editor has encountered an unexpected error You can copy your post text in case your content is impacted. Copy error details to debug and share with support. + Clear selected color From 6b4b5515b5956cf3413b0fce00459d0602fb7037 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Tue, 2 Apr 2024 18:35:28 +0000 Subject: [PATCH 7/7] Freeze strings for translation --- fastlane/resources/values/strings.xml | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml index 6a23dd4bba6f..e93b2cd4f041 100644 --- a/fastlane/resources/values/strings.xml +++ b/fastlane/resources/values/strings.xml @@ -296,6 +296,7 @@ Publish Sync View + Read Preview Insert Stats @@ -1643,8 +1644,10 @@ No blog subscriptions Subscribe to blogs in Discover and you’ll see their latest posts here. Or search for a blog that you like already. No tags + Follow a tag and you’ll be able to see the best posts from it here. Search for a blog Suggested tags + Follow a tag Log in to WordPress.com \u0020\u2022\u0020 There was a problem handling the request. Please try again later. @@ -1657,8 +1660,11 @@ By %1$s more items Welcome! + Follow tags to discover new blogs No recent posts + Try following more tags to broaden the search Get Started + Follow tags %1$s ▸ %2$s No response received Invalid response received @@ -1692,6 +1698,29 @@ 1 Tag %d Tags + Reading Preferences + reading,colors,fonts + Choose your colors, fonts and sizes. Preview your selection here, and read posts with your styles once you’re done. + + + This is a new feature still in development. To help us improve it %s. + send your feedback + + Default + Soft + Sepia + Evening + OLED + h4x0r + Candy + + Serif + Sans + Mono + + Aa + A + Post saved online Page saved online @@ -2097,6 +2126,7 @@ Follow tags + Followed tags Subscribed blogs @@ -2107,6 +2137,7 @@ Mark as seen Mark as unseen Block user + Reading Preferences Share @@ -2139,6 +2170,7 @@ Reply to post… Reply to comment… + Enter a URL or tag to follow Search WordPress Search subscribed blogs @@ -2189,6 +2221,7 @@ Couldn\'t post your comment + You\'re already following this tag That isn\'t a valid tag Unable to add this tag Unable to remove this tag @@ -2229,6 +2262,7 @@ Fetching posts… The blogs in this list have not posted anything recently Add tags here to find posts about your favorite topics + No followed tags No recommended blogs @string/reader_filter_empty_blogs_list_title No blogs matching your search @@ -4794,4 +4828,5 @@ translators: %s: Select control option value e.g: "Auto, 25%". --> Tap here to copy post text The editor has encountered an unexpected error You can copy your post text in case your content is impacted. Copy error details to debug and share with support. + Clear selected color