Skip to content

Commit 52e54c8

Browse files
wpmobilebotoguzkocer
wpmobilebot
and
oguzkocer
authored
Merge release/26.0 into trunk (#21991)
* Bump version number * Update draft release notes for 26.0 * Update draft release notes for Jetpack 26.0. * Release Notes: add new section for next version (26.1) * Add raw release notes for 26.0 * Add a Jetpack release note for managing subscribers * Freeze strings for translation --------- Co-authored-by: Oguz Kocer <[email protected]>
1 parent 0c94b11 commit 52e54c8

File tree

5 files changed

+59
-15
lines changed

5 files changed

+59
-15
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.1
4+
-----
5+
6+
37
26.0
48
-----
59

‎WordPress/jetpack_metadata/release_notes.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
- The “me” icon is now the correct color when you’re in dark mode.
2-
- We’ve added a warning that tells you if your QR code scan was unsuccessful. No waiting, no guesswork, no problem.
1+
* [***] Introduces experimental Application Passwords authentication which will allow improving existing features and introduce new features once it's fully integrated.
2+
* [**] Introduces experimental feature to manage your site's [subscribers](https://wordpress.com/support/subscribers/)

‎WordPress/metadata/release_notes.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
- The keyboard no longer overlaps the editor, meaning you can see your amazing work at all times.
2-
- The “me” icon is now the correct color when you’re in dark mode.
3-
- We’ve added a warning that tells you if your QR code scan was unsuccessful. No waiting, no guesswork, no problem.
1+
* [***] Introduces experimental Application Passwords authentication which will allow improving existing features and introduce new features once it's fully integrated.

‎fastlane/resources/values/strings.xml

Lines changed: 50 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@
114114
<string name="sending">Sending</string>
115115
<string name="item_selected">Selected</string>
116116
<string name="coming_soon">Coming soon!</string>
117+
<string name="filter">Filter</string>
118+
<string name="clear">Clear</string>
119+
<string name="sort_by">Sort by</string>
117120

118121
<string name="button_not_now">Not now</string>
119122
<string name="button_skip">Skip</string>
@@ -2982,10 +2985,6 @@
29822985
<string name="my_profile">My Profile</string>
29832986
<string name="first_name">First name</string>
29842987
<string name="last_name">Last name</string>
2985-
<string name="public_display_name">Public display name</string>
2986-
<string name="public_display_name_hint">Display name will default to your username if it is not set</string>
2987-
<string name="about_me">About me</string>
2988-
<string name="about_me_hint">A few words about you…</string>
29892988
<string name="start_over">Start Over</string>
29902989
<string name="site_settings_start_over_hint">Start your site over</string>
29912990
<string name="start_over_email_subject">Start over with site %s</string>
@@ -3015,8 +3014,6 @@
30153014
<string name="gravatar_info_title">Your WordPress.com profile is powered by Gravatar</string>
30163015
<string name="gravatar_info_description">Updating your avatar, name, and about info here will also update it across all sites that use Gravatar profiles.</string>
30173016
<string name="gravatar_info_learn_more_link">What is Gravatar?</string>
3018-
<string name="gravatar_info_sync_message">Updates might take some time to sync with your Gravatar profile.</string>
3019-
<string name="gravatar_info_sync_done_button">Done</string>
30203017

30213018

30223019
<!-- Self-hosted Users -->
@@ -3071,8 +3068,8 @@
30713068
<string name="error_cropping_image">Error cropping the image</string>
30723069
<string name="error_locating_image">Error locating the cropped image</string>
30733070
<string name="error_refreshing_gravatar">Error reloading your Gravatar</string>
3074-
<string name="error_updating_gravatar">Error updating your Gravatar</string>
30753071
<string name="avatar_update_email_unverified">To update your avatar, you need to verify your email address first.</string>
3072+
<string name="about_update_email_unverified">To update your profile, you need to verify your email address first.</string>
30763073

30773074
<!-- Editor -->
30783075
<string name="discard">Discard</string>
@@ -3297,7 +3294,6 @@
32973294

32983295
<!-- Signup -->
32993296
<string name="sign_up_label" tools:ignore="UnusedResources" a8c-src-lib="module:login">Sign Up</string>
3300-
<string name="signup_epilogue_error_avatar">There was some trouble uploading your avatar.</string>
33013297
<string name="signup_epilogue_error_avatar_view">Your avatar has been uploaded and will be available shortly.</string>
33023298
<string name="signup_epilogue_error_generic">There was some trouble updating your account. You can retry or revert your changes to continue.</string>
33033299
<string name="signup_epilogue_error_button_negative">Revert</string>
@@ -4994,8 +4990,54 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
49944990
<string name="gutenberg_native_replace_image" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Replace image</string>
49954991
<string name="default_web_client_id" a8c-src-lib="module:login">placeholder</string>
49964992

4993+
<!-- Subscribers -->
4994+
<string name="subscribers_filter_email_subscription">Email subscription</string>
4995+
<string name="subscribers_filter_reader_subscription">Reader subscription</string>
4996+
<string name="subscribers_sort_email">Email address</string>
4997+
<string name="subscribers_sort_date">Date subscribed</string>
4998+
<string name="subscribers_sort_display_name">Display name</string>
4999+
<string name="subscribers_sort_plan">Plan</string>
5000+
<string name="subscribers_empty">There are no subscribers</string>
5001+
<string name="subscribers_empty_search">No results found</string>
5002+
<string name="subscribers_error_title">Something went wrong</string>
5003+
<string name="subscribers_subscription_status">Subscription status</string>
5004+
<string name="subscribers_emails_sent_label">Emails</string>
5005+
<string name="subscribers_opened_label">Opened</string>
5006+
<string name="subscribers_clicked_label">Clicked</string>
5007+
<string name="subscribers_newsletter_label">Newsletter subscription</string>
5008+
<string name="subscribers_detail_label">Subscriber details</string>
5009+
<string name="subscribers_date_label">Subscription date</string>
5010+
<string name="subscribers_status_label">Subscription status</string>
5011+
<string name="subscribers_plan_label">Plan</string>
5012+
<string name="subscribers_email_label">Email</string>
5013+
<string name="subscribers_country_label">Country</string>
5014+
<string name="subscribers_site_label">Site</string>
5015+
<string name="subscribers_delete_button">Delete subscriber</string>
5016+
<string name="subscribers_gift_plan_label">Gift plan</string>
5017+
<string name="subscribers_plan_details_label">Plan details</string>
5018+
<string name="subscribers_start_date">Start date</string>
5019+
<string name="subscribers_end_date">End date</string>
5020+
<string name="subscribers_billing_info">Billing information</string>
5021+
<string name="subscribers_billing_interval">Billing interval</string>
5022+
<string name="subscribers_inactive_interval">Inactive interval</string>
5023+
<string name="subscribers_price">Price</string>
5024+
<string name="subscribers_renewal_info">Renewal information</string>
5025+
<string name="subscribers_renewal_interval">Renewal interval</string>
5026+
<string name="subscribers_gift_content_description">Gift</string>
5027+
<string name="subscribers_add_subscribers">Add subscribers</string>
5028+
<string name="subscribers_add_email_hint">[email protected]</string>
5029+
<string name="subscribers_add_disclosure">
5030+
By clicking Send you represent that you\'ve obtained the appropriate consent to email each person. Spam complaints or high bounce rate from your subscribers may lead to action against your account.
5031+
</string>
5032+
<string name="subscribers_add_success">Successfully added subscribers</string>
5033+
<string name="subscribers_add_failed">Failed to add subscribers</string>
5034+
49975035
<!-- Application Password authentication -->
49985036
<string name="application_password_credentials_stored">Application password credentials stored for %1$s</string>
5037+
<string name="application_password_credentials_storing_error">There was an error storing Application password credentials for %1$s</string>
49995038
<string name="application_password_title">Authenticate using Application Password</string>
50005039
<string name="application_password_not_supported_error" a8c-src-lib="module:login">The provided site does not support Application Password authentication.</string>
5040+
<string name="application_password_invalid">Invalid Application Password</string>
5041+
<string name="application_password_disable_feature_title">Disable Application Password?</string>
5042+
<string name="application_password_disable_feature_description">Disabling application password will remove your login info from %1$s sites.</string>
50015043
</resources>

‎version.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
versionName=25.9
2-
versionCode=1467
1+
versionName=26.0-rc-1
2+
versionCode=1468

0 commit comments

Comments
 (0)