diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 3cc2370127de..ebbc4b938eb9 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,9 @@ *** PLEASE FOLLOW THIS FORMAT: [] [] +24.1 +----- + + 24.0 ----- * [*] Filter media types when sharing files to the editor [https://github.com/wordpress-mobile/WordPress-Android/pull/19754] diff --git a/WordPress/jetpack_metadata/release_notes.txt b/WordPress/jetpack_metadata/release_notes.txt index f80ecfc08a7d..e2c9297fb6cb 100644 --- a/WordPress/jetpack_metadata/release_notes.txt +++ b/WordPress/jetpack_metadata/release_notes.txt @@ -1,4 +1,9 @@ -No updates this week! Enjoy these reindeer facts: -- Male reindeer shed their antlers in fall and females in spring, so Santa’s reindeer are female. -- Reindeer don’t actually have red noses. -- Santa hasn’t eaten milk and cookies since 2003 because Blitzen always gets there first. +* [*] Filter media types when sharing files to the editor [https://github.com/wordpress-mobile/WordPress-Android/pull/19754] +* [***] [Jetpack-only] Plans: Upgrade to a Plan from domains dashboard in Jetpack app [https://github.com/wordpress-mobile/WordPress-Android/pull/19818] +* [**] [internal] Removes unused resources and code [https://github.com/wordpress-mobile/WordPress-Android/pull/19788] +* [*] Block Editor: Add support for unselecting blocks with the hardware back button [https://github.com/wordpress-mobile/WordPress-Android/pull/19828] +* [**] [internal] Removes unused code using android tool [https://github.com/wordpress-mobile/WordPress-Android/pull/19850] +* [**] [internal] [Jetpack-only] Adds support for dynamic dashboard cards driven by the backend [https://github.com/wordpress-mobile/WordPress-Android/pull/19801] +* [***] Block Editor: Avoid keyboard dismiss when interacting with text blocks [https://github.com/WordPress/gutenberg/pull/57070] +* [**] Block Editor: Auto-scroll upon block insertion [https://github.com/WordPress/gutenberg/pull/57273] + diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt index f80ecfc08a7d..8ba136d8403a 100644 --- a/WordPress/metadata/release_notes.txt +++ b/WordPress/metadata/release_notes.txt @@ -1,4 +1,8 @@ -No updates this week! Enjoy these reindeer facts: -- Male reindeer shed their antlers in fall and females in spring, so Santa’s reindeer are female. -- Reindeer don’t actually have red noses. -- Santa hasn’t eaten milk and cookies since 2003 because Blitzen always gets there first. +* [*] Filter media types when sharing files to the editor [https://github.com/wordpress-mobile/WordPress-Android/pull/19754] +* [**] [internal] Removes unused resources and code [https://github.com/wordpress-mobile/WordPress-Android/pull/19788] +* [*] Block Editor: Add support for unselecting blocks with the hardware back button [https://github.com/wordpress-mobile/WordPress-Android/pull/19828] +* [**] [internal] Removes unused code using android tool [https://github.com/wordpress-mobile/WordPress-Android/pull/19850] +* [**] [internal] [Jetpack-only] Adds support for dynamic dashboard cards driven by the backend [https://github.com/wordpress-mobile/WordPress-Android/pull/19801] +* [***] Block Editor: Avoid keyboard dismiss when interacting with text blocks [https://github.com/WordPress/gutenberg/pull/57070] +* [**] Block Editor: Auto-scroll upon block insertion [https://github.com/WordPress/gutenberg/pull/57273] + diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 5deafd9e0e73..3e591eeda435 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -4836,5 +4836,10 @@ translators: %s: Select control option value e.g: "Auto, 25%". --> State of the Word 2023 Check out WordPress co-founder Matt Mullenweg’s annual keynote to stay on top of what’s coming in 2024 and beyond. Watch now + File type not supported as a media file. + Font Size, %1$s + Network connection lost, working offline + Network connection re-established + Working Offline diff --git a/build.gradle b/build.gradle index 773555a2d729..5fa34308c9bc 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ ext { automatticTracksVersion = '3.3.0' gutenbergMobileVersion = 'v1.110.0' wordPressAztecVersion = 'v1.9.0' - wordPressFluxCVersion = 'trunk-37ca3a9ecd10dcd73402c29a4728ab46106dbc1e' + wordPressFluxCVersion = '2.61.0' wordPressLoginVersion = '1.10.0' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.11.0' diff --git a/fastlane/jetpack_resources/values/strings.xml b/fastlane/jetpack_resources/values/strings.xml index 616900674fef..0d3260586334 100644 --- a/fastlane/jetpack_resources/values/strings.xml +++ b/fastlane/jetpack_resources/values/strings.xml @@ -21,10 +21,14 @@ Respond to comments Restore a backup Search for plugins - Share on Facebook + Share on social Fix a security issue Post a photo - Add an author + Read other blogs + Build an audience + Post a photo + Write from anywhere + Manage your domains Check your email on this device and tap the link in the email you received from Jetpack.com. diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml index c5abc53d61f1..ad913439331d 100644 --- a/fastlane/resources/values/strings.xml +++ b/fastlane/resources/values/strings.xml @@ -2328,7 +2328,7 @@ Create a new site for your business, magazine, or personal blog; or connect an existing WordPress installation. You don\'t have any sites Add new site - All WordPress.com plans include a custom domain name. Register your free premium domain now. + All WordPress.com annual plans include a custom domain name. Register your free domain now. Verify your email address - instructions sent to %s Verify your email address - instructions sent to your email Site Icon @@ -2660,7 +2660,7 @@ Register Domain Select domain No suggestions found - Choose a premium domain name + Choose a custom domain name This is where people will find you on the internet. Type a keyword for more ideas %s<span style="color:#50575e;"> /year</span> @@ -2692,16 +2692,14 @@ Select State Registering domain name… - Your free WordPress.com address is - Change site address - %s - Primary site address - Your site domains + %s + Primary domain + Other domains for %s + Your free WordPress.com domain Expires on %s + Never expires <span style="color:#d63638;">Expires on %s</span> Add a domain - Your domains will redirect to your site at %s - Manage Domains Claim your free domain You have a free one-year domain registration included with your plan Add your domain @@ -2709,6 +2707,9 @@ Get your domain Domains purchased on this site will redirect visitors to <b>%s</b> Search for a domain + Get a free one-year domain registration or transfer with any annual paid plan. + Upgrade to a plan + Just search for a domain Expires %1$s @@ -4576,13 +4577,6 @@ translators: %s: Select control option value e.g: "Auto, 25%". --> Contact support Close - - News - Reclaim Your Google Domains - As you may know, Google Domains has been sold to Squarespace. Transfer your domains to WordPress.com now, and we\'ll pay all transfer fees plus an extra year of your domain registration. - Transfer your domains - @string/my_site_dashboard_card_more_menu_hide_card - Free domain with annual plan Get a free domain for the first year, remove ads on your site, and increase your storage. @@ -4820,6 +4814,8 @@ translators: %s: Select control option value e.g: "Auto, 25%". --> For this reason, we recommend editing the block using the web editor. For this reason, we recommend editing the block using your web browser. + We cannot open media at the moment. Please try again later + Bloganuary is coming! Bloganuary is here! @@ -4835,9 +4831,14 @@ translators: %s: Select control option value e.g: "Auto, 25%". --> Turn on blogging prompts Let’s go! - State of the Word 2023 Check out WordPress co-founder Matt Mullenweg’s annual keynote to stay on top of what’s coming in 2024 and beyond. Watch now + File type not supported as a media file. + Font Size, %1$s + Network connection lost, working offline + Network connection re-established + Working Offline + diff --git a/version.properties b/version.properties index 9342778772a9..0a755af12895 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=23.9 -versionCode=1398 +versionName=24.0-rc-1 +versionCode=1399 \ No newline at end of file