Merge betas 18.1.0.1 and 18.1.0.2 (#17080)

RELEASE-NOTES.txt

@@ -9,6 +9,7 @@
 * [**] Added a time selection feature to Blogging Reminders: users can now choose at what time they will receive the reminders [#17024, #17033]
 * [**] Block editor: Embed block: Add "Resize for smaller devices" setting. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3753]
 * [**] Account Settings: added the ability to close user account.
+* [*] Users can now share WordPress app with friends. Accessible from Me and About screen. [#16995]
 
 18.0
 -----

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -43,7 +43,7 @@ enum FeatureFlag: Int, CaseIterable, OverrideableFlag {
         case .unifiedCommentsAndNotificationsList:
             return true
         case .recommendAppToOthers:
-            return BuildConfiguration.current ~= [.localDeveloper, .a8cBranchTest]
+            return true
         case .newCommentEdit:
             return false
         }

WordPress/Classes/ViewRelated/Me/Account Settings/AccountSettingsViewController.swift

@@ -288,7 +288,7 @@ private class AccountSettingsController: SettingsController {
             return NSLocalizedString("You're not authorized to close the account.",
                                      comment: "Error message displayed when unable to close user account due to being unauthorized.")
         case "atomic-site":
-            return NSLocalizedString("This user account cannot be closed while it has active atomic sites.",
+            return NSLocalizedString("This user account could not be closed. Please contact us by going to Me > Help & Support screen.",
                                      comment: "Error message displayed when unable to close user account due to having active atomic site.")
         case "chargebacked-site":
             return NSLocalizedString("This user account cannot be closed if there are unresolved chargebacks.",

WordPress/Jetpack/Resources/AppStoreStrings.po

@@ -38,17 +38,15 @@ msgctxt "app_store_keywords"
 msgid "social,notes,jetpack,writing,geotagging,media,blog,website,blogging,journal"
 msgstr ""
 
-msgctxt "v18.0-whats-new"
+msgctxt "v18.1-whats-new"
 msgid ""
-"In 18.0 we’ve optimized the images used for Themes, bringing you faster downloads and reduced impact on your mobile data plan.\n"
+"Do you use the Embed block? For media that you embed on your site, you’ll now see an option to “Resize for smaller devices.” Toggle on to resize your content to fit your screen; toggle off to disable.\n"
 "\n"
-"You can now set or remove a featured image for a post from the image block’s settings. And in case you forget, a new ‘featured’ banner highlights your current selection.\n"
+"Enjoying the Blogging Reminders tool? We’ve added a new feature that lets you choose a specific time to receive a notification.\n"
 "\n"
-"Also on the design front, comments and notifications now have a unified look and feel. And when it comes to choosing a domain or design for your site, headings have been refined for accessibility on devices set to use larger text sizes.\n"
+"Need to close your account? (We hope you never leave us!) But if needed, you now have the ability to do so in your Account Settings.\n"
 "\n"
-"When we let you know you’ve published a post with an in-app notice, you’ll now see any ampersands in your title displayed in their full, non-HTML-entity glory.\n"
-"\n"
-"Last but not least, we’ve smoothed a bump in the road when recovering from invalidated authentication tokens.\n"
+"Geotagging posts is no longer supported on the web, so we’ve removed the Location option under Post Settings.\n"
 msgstr ""
 
 #. translators: This is a promo message that will be attached on top of the first screenshot in the App Store.

WordPress/Jetpack/Resources/release_notes.txt

@@ -1,9 +1,7 @@
-In 18.0 we’ve optimized the images used for Themes, bringing you faster downloads and reduced impact on your mobile data plan.
+Do you use the Embed block? For media that you embed on your site, you’ll now see an option to “Resize for smaller devices.” Toggle on to resize your content to fit your screen; toggle off to disable.
 
-You can now set or remove a featured image for a post from the image block’s settings. And in case you forget, a new ‘featured’ banner highlights your current selection.
+Enjoying the Blogging Reminders tool? We’ve added a new feature that lets you choose a specific time to receive a notification.
 
-Also on the design front, comments and notifications now have a unified look and feel. And when it comes to choosing a domain or design for your site, headings have been refined for accessibility on devices set to use larger text sizes.
+Need to close your account? (We hope you never leave us!) But if needed, you now have the ability to do so in your Account Settings.
 
-When we let you know you’ve published a post with an in-app notice, you’ll now see any ampersands in your title displayed in their full, non-HTML-entity glory.
-
-Last but not least, we’ve smoothed a bump in the road when recovering from invalidated authentication tokens.
+Geotagging posts is no longer supported on the web, so we’ve removed the Location option under Post Settings.

WordPress/Resources/AppStoreStrings.po

@@ -40,17 +40,17 @@ msgctxt "app_store_keywords"
 msgid "social,notes,jetpack,writing,geotagging,media,blog,website,blogging,journal"
 msgstr ""
 
-msgctxt "v18.0-whats-new"
+msgctxt "v18.1-whats-new"
 msgid ""
-"In 18.0 we’ve optimized the images used for Themes, bringing you faster downloads and reduced impact on your mobile data plan.\n"
+"Do you use the Embed block? For media that you embed on your site, you’ll now see an option to “Resize for smaller devices.” Toggle on to resize your content to fit your screen; toggle off to disable.\n"
 "\n"
-"You can now set or remove a featured image for a post from the image block’s settings. And in case you forget, a new ‘featured’ banner highlights your current selection.\n"
+"Enjoying the Blogging Reminders tool? We’ve added a new feature that lets you choose a specific time to receive a notification.\n"
 "\n"
-"Also on the design front, comments and notifications now have a unified look and feel. And when it comes to choosing a domain or design for your site, headings have been refined for accessibility on devices set to use larger text sizes.\n"
+"Need to close your account? (We hope you never leave us!) But if needed, you now have the ability to do so in your Account Settings.\n"
 "\n"
-"When we let you know you’ve published a post with an in-app notice, you’ll now see any ampersands in your title displayed in their full, non-HTML-entity glory.\n"
+"Geotagging posts is no longer supported on the web, so we’ve removed the Location option under Post Settings.\n"
 "\n"
-"Last but not least, we’ve smoothed a bump in the road when recovering from invalidated authentication tokens.\n"
+"We also made other improvements, including a fix to a cropping issue in the Reader, as well as the ability to recommend the app to your friends on your Me and About screens.\n"
 msgstr ""
 
 #. translators: This is a standard chunk of text used to tell a user what's new with a release when nothing major has changed.