Skip to content

Commit cdb7eab

Browse files
authored
Merge changes from 20.7 code freeze (#17145)
2 parents dff7ebd + afb680b commit cdb7eab

File tree

8 files changed

+40
-32
lines changed

8 files changed

+40
-32
lines changed

RELEASE-NOTES.txt

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

3+
20.8
4+
-----
5+
6+
37
20.7
48
-----
59
* [*] Fixes Media control toggles difficult to see [https://github.com/wordpress-mobile/WordPress-Android/pull/17068]
610
* [*] Fix night mode text colors on the screens shown after scanning a Login Code [https://github.com/wordpress-mobile/WordPress-Android/pull/17086]
711
* [***] Jetpack App: Widgets are now on Jetpack. Long press on app icon to find and add widgets to home screen. [https://github.com/wordpress-mobile/WordPress-Android/pull/17100]
8-
* [*] [Jetpack-only] Block Editor: Makes some small changes to the editor's accent colours for consistency. [#16968]
912
* [*] [Jetpack-only] Block Editor: Makes some small changes to the editor's accent colours for consistency. [https://github.com/wordpress-mobile/WordPress-Android/pull/16968]
1013

1114
20.6

WordPress/jetpack_metadata/PlayStoreStrings.po

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,22 @@ msgstr ""
1111
"Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
1212

1313
#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
14+
msgctxt "release_note_207"
15+
msgid ""
16+
"20.7:\n"
17+
"- Jetpack widgets are now available on your device’s home screen\n"
18+
"- Media preview controls are visible in both light and dark mode\n"
19+
"- Compose theme’s Login Code screen has better color contrast\n"
20+
"- Certain elements of the editor and post settings are now WordPress blue\n"
21+
msgstr ""
22+
1423
msgctxt "release_note_206"
1524
msgid ""
1625
"20.6:\n"
1726
"- You can now log in to the app using an email address that contains a special character.\n"
1827
"- Preloading themes no longer crash the app during Site Creation. Whew.\n"
1928
msgstr ""
2029

21-
msgctxt "release_note_205"
22-
msgid ""
23-
"20.5:\n"
24-
"- We added a label in App Settings to show the app’s current interface language.\n"
25-
"- We bumped up the screenshot size in the site theme picker to go with high-resolution image previews.\n"
26-
"- In the site creation process, we changed the Skip button text from blue to Jetpack green.\n"
27-
msgstr ""
28-
2930
#. translators: Title to be displayed in the Play Store. Limit to 30 characters including spaces and commas!
3031
msgctxt "play_store_app_title"
3132
msgid "Jetpack – Website Builder"
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
- You can now log in to the app using an email address that contains a special character.
2-
- Preloading themes no longer crash the app during Site Creation. Whew.
1+
- Jetpack widgets are now available on your device’s home screen
2+
- Media preview controls are visible in both light and dark mode
3+
- Compose theme’s Login Code screen has better color contrast
4+
- Certain elements of the editor and post settings are now WordPress blue

WordPress/metadata/PlayStoreStrings.po

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ msgstr ""
1111
"Project-Id-Version: Release Notes & Play Store Descriptions\n"
1212

1313
#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
14+
msgctxt "release_note_207"
15+
msgid ""
16+
"20.7:\n"
17+
"We can see clearly now—media preview controls (like the back button) are now visible in both light and dark mode.\n"
18+
"\n"
19+
"The Login Code screen in the Compose theme also has better color contrast for more readable text. Shiny.\n"
20+
msgstr ""
21+
1422
msgctxt "release_note_206"
1523
msgid ""
1624
"20.6:\n"
@@ -19,13 +27,6 @@ msgid ""
1927
"- Power up—the Jetpack Powered banner is shown in lists of search results.\n"
2028
msgstr ""
2129

22-
msgctxt "release_note_205"
23-
msgid ""
24-
"20.5:\n"
25-
"- We added a new label in App Settings to show the app’s current interface language. Shiny.\n"
26-
"- Now that the app supports higher-resolution image previews, we bumped up the size of theme screenshots in the site theme picker. No more pixellation, only pixel perfection.\n"
27-
msgstr ""
28-
2930
#. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
3031
msgctxt "sample_post_content"
3132
msgid "The best moment of any trip, for me, is when I first step foot off the plane. The whole of the trip is in front me, ripe with possibility."

WordPress/metadata/release_notes.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
- You can now log in to the app using an email address that contains a special character.
2-
- Preloading themes no longer crash the app during Site Creation. Whew.
3-
- Power up—the Jetpack Powered banner is shown in lists of search results.
1+
We can see clearly now—media preview controls (like the back button) are now visible in both light and dark mode.
2+
3+
The Login Code screen in the Compose theme also has better color contrast for more readable text. Shiny.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99

1010
ext {
1111
wordPressUtilsVersion = '2.7.0'
12-
wordPressLoginVersion = 'trunk-692264f8a2a0efa540b7713d3e1ad7fc09b87d47'
12+
wordPressLoginVersion = '0.19.0'
1313
gutenbergMobileVersion = 'v1.82.0'
1414
storiesVersion = '1.4.0'
1515
aboutAutomatticVersion = '0.0.6'

fastlane/resources/values/strings.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,7 +1277,7 @@
12771277
<string name="stats_view_videos">Videos</string>
12781278
<string name="stats_view_comments" translatable="false">@string/comments</string>
12791279
<string name="stats_view_search_terms">Search Terms</string>
1280-
<string name="stats_view_publicize">Social Media Connections</string>
1280+
<string name="stats_view_publicize">Jetpack Social Connections</string>
12811281
<string name="stats_view_followers">Followers</string>
12821282
<string name="stats_view_follower_totals">Follower Totals</string>
12831283
<string name="stats_view_total_likes">Total Likes</string>
@@ -1380,6 +1380,7 @@
13801380

13811381
<!-- Stats refreshed widgets -->
13821382
<string name="stats_widget_log_in_message">Please log in to the WordPress app to add a widget.</string>
1383+
<string name="stats_widget_log_in_to_add_message">Please log in to the Jetpack app to add a widget.</string>
13831384
<string name="stats_widget_weekly_views_name">Views this week</string>
13841385
<string name="stats_widget_all_time_insights_name">All-time</string>
13851386
<string name="stats_widget_today_insights_name">Today</string>
@@ -1709,7 +1710,7 @@
17091710
<string name="notification_post_will_be_published_in_one_hour">\"%s\" will be published in 1 hour</string>
17101711
<string name="notification_post_will_be_published_in_ten_minutes">\"%s\" will be published in 10 minutes</string>
17111712
<string name="calendar_scheduled_post_title">WordPress Scheduled Post: \"%s\"</string>
1712-
<string name="calendar_scheduled_post_description">\"%1$s\" scheduled for publishing on \"%2$s\" in your WordPress app \n %3$s</string>
1713+
<string name="calendar_scheduled_post_description">\"%1$s\" scheduled for publishing on \"%2$s\" in your %3$s app \n %4$s</string>
17131714

17141715
<!-- Post Status -->
17151716
<string name="post_status_publish_post">Publish</string>
@@ -2368,14 +2369,14 @@
23682369
<string name="previous_button" translatable="false">&lt;</string>
23692370
<string name="next_button" translatable="false">&gt;</string>
23702371

2371-
<!-- Publicize and sharing -->
2372+
<!-- Jetpack Social and sharing -->
23722373
<string name="sharing">Sharing</string>
23732374
<string name="sharing_disabled">Sharing module disabled</string>
23742375
<string name="sharing_disabled_description">You cannot access your sharing settings because your Sharing Jetpack module is disabled.</string>
2375-
<string name="connections_label">Connections</string>
2376+
<string name="connections_label">Jetpack Social Connections</string>
23762377
<string name="connections_description">Connect your favorite social media services to automatically share new posts with friends.</string>
23772378
<string name="connected_accounts_label">Connected accounts</string>
2378-
<string name="connection_service_label">Publicize to %s</string>
2379+
<string name="connection_service_label">Share post to %s</string>
23792380
<string name="connection_service_description">Connect to automatically share your blog posts to %s.</string>
23802381
<string name="share_btn_connect">Connect</string>
23812382
<string name="share_btn_disconnect">Disconnect</string>
@@ -2427,7 +2428,7 @@
24272428
<string name="sharing_label_message">Change the text of the sharing buttons\' label. This text won\'t appear until you add at least one sharing button.</string>
24282429
<string name="sharing_twitter_message">This will be included in tweets when people share using the Twitter button</string>
24292430
<string name="dialog_title_sharing_facebook_account_must_have_pages">Not Connected</string>
2430-
<string name="sharing_facebook_account_must_have_pages">The Facebook connection cannot find any Pages. Publicize cannot connect to Facebook Profiles, only published Pages.</string>
2431+
<string name="sharing_facebook_account_must_have_pages">The Facebook connection cannot find any Pages. Jetpack Social cannot connect to Facebook Profiles, only published Pages.</string>
24312432
<string name="sharing_facebook_warning_message">You can connect your Facebook account on the WordPress.com website. When you\'re done, return to the WordPress app to change your Sharing settings.</string>
24322433
<string name="sharing_facebook_warning_positive_button">Go to web</string>
24332434

@@ -3347,7 +3348,7 @@
33473348
<string name="site_creation_intent_writing_poetry">Writing &amp; Poetry</string>
33483349

33493350
<!-- App rating dialog -->
3350-
<string name="app_rating_title">Enjoying WordPress?</string>
3351+
<string name="app_rating_title">Enjoying %s?</string>
33513352
<string name="app_rating_message">Nice to see you again! If you’re digging the app, we\’d love a rating on the Google Play Store.</string>
33523353
<string name="app_rating_rate_now">Rate now</string>
33533354
<string name="app_rating_rate_later">Later</string>
@@ -3366,7 +3367,7 @@
33663367
<string name="insert_label_with_count">Insert %d</string>
33673368

33683369
<!-- Feature Announcement -->
3369-
<string name="feature_announcement_dialog_label">What\'s New In WordPress</string>
3370+
<string name="feature_announcement_dialog_label">What\'s New In %s</string>
33703371
<string name="feature_announcement_find_out_mode">Find out more</string>
33713372

33723373
<!-- Prepublishing Nudges -->

version.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#Mon, 30 Aug 2021 11:48:28 +0200
22

3-
versionName=20.6
4-
versionCode=1266
3+
versionName=20.7-rc-1
4+
versionCode=1267

0 commit comments

Comments
 (0)