Skip to content

Commit

Permalink
Merge release/25.6 into trunk (#23899)
Browse files Browse the repository at this point in the history
* Bump version number

* Update draft release notes for 25.6.

* Update draft release notes for 25.6.

* Release Notes: add new section for next version (25.7)

* Update strings for localization
  • Loading branch information
wpmobilebot authored Dec 16, 2024
1 parent 5feba94 commit 67a3534
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 12 deletions.
4 changes: 4 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
25.7
-----


25.6
-----

Expand Down
7 changes: 2 additions & 5 deletions WordPress/Jetpack/Resources/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
This month, we've:
- Fixed some crashes in reader, improved search, and made posts load more smoothly.
- Enabled TikTok embeds in reader.
- Stability improvements to the experimental editor (you should try it if you haven't already!)
- Adjusted how users log into WordPress.com – we hope it'll make it easier for folks to get started.


18 changes: 16 additions & 2 deletions WordPress/Resources/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -3124,6 +3124,9 @@ Example: Reply to Pamela Nguyen */
/* Error message displayed when site credentials aren't configured. */
"Enter your server credentials" = "Enter your server credentials";

/* A name of the ID field (it's a technical field, has to be short, displayed below everything else) */
"entityMetadataFooterView.id" = "ID";

/* Generic error alert title
Generic error.
Generic popup title for any type of error. */
Expand Down Expand Up @@ -7333,6 +7336,15 @@ Example: given a notice format "Following %@" and empty site name, this will be
/* Context menu action */
"reader.postContextMenu.viewInBrowser" = "View in Browser";

/* Reader post details view placeholder when blog name not avail */
"reader.postDetails.blog" = "blog";

/* Reader post details view */
"reader.postDetails.viewModeDescription" = "The owner of this site only allows us to show a brief summary of their content. To view the full post, you'll have to visit their site.";

/* Reader post details view */
"reader.postDetails.viewMoreOn" = "Visit %@ for the full post";

/* Name for the Candy color theme, used in the Reader's reading preferences. */
"reader.preferences.color.candy" = "Candy";

Expand Down Expand Up @@ -8592,6 +8604,9 @@ Feel free to replace it with other bracket types that you think looks better for
/* Accessibility hint for actions when displaying media items. */
"siteMedia.cellAccessibilityHint" = "Select media.";

/* Title for the URL field */
"siteMedia.details.url" = "URL";

/* Accessibility hint for media item preview for user's viewing an item in their media library */
"siteMediaItem.contentViewAccessibilityHint" = "Tap to view media in full screen";

Expand Down Expand Up @@ -8764,8 +8779,7 @@ Feel free to replace it with other bracket types that you think looks better for
/* Title shown on the dashboard when it fails to load */
"Some data wasn't loaded" = "Some data wasn't loaded";

/* A generic error message
Title for a label that appears when the scan failed
/* Title for a label that appears when the scan failed
Title for the error view when the scan start has failed */
"Something went wrong" = "Something went wrong";

Expand Down
5 changes: 2 additions & 3 deletions WordPress/Resources/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
This month, we've:
- Stability improvements to the experimental editor (you should try it if you haven't already!)
- Adjusted how users log into WordPress.com – we hope it'll make it easier for folks to get started.


4 changes: 2 additions & 2 deletions config/Version.public.xcconfig
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
VERSION_LONG = 25.5.0.2
VERSION_SHORT = 25.5
VERSION_LONG = 25.6.0.0
VERSION_SHORT = 25.6

0 comments on commit 67a3534

Please sign in to comment.