Merge remote-tracking branch 'upstream/develop' into add-sticky-switc…

…h-to-post-settings

WordPress/jetpack_metadata/PlayStoreStrings.po

@@ -0,0 +1,103 @@
+# Translation of Jetpack - Apps - Android - Release Notes in English (US)
+# This file is distributed under the same license as the Jetpack - Apps - Android - Release Notes package.
+msgid ""
+msgstr ""
+"PO-Revision-Date: 2018-05-23 11:49:24+0000\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: VsCode\n"
+"Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
+
+#. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_short_183"
+msgid ""
+"18.3:\n"
+"In the block editor, we fixed a toolbar issue on devices set to an RTL language, and made updates to the Embed block, like enabling WordPress, Instagram, and Vimeo previews and adding options to retry or convert media into a link.\n"
+"\n"
+"More updates include a fix affecting video on some sites, and updating My Site menu labels (“Posts” and “Pages”).\n"
+msgstr ""
+
+#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_183"
+msgid ""
+"18.3:\n"
+"Lots of improvements in the block editor! We fixed a toolbar issue affecting devices set to an RTL language, and made many updates to the Embed block, including enabling WordPress, Instagram, and Vimeo previews and offering options to retry or convert media into a link if it’s not embeddable.\n"
+"\n"
+"Other updates include a fix affecting .mp4 video on some sites, and streamlining My Site menu labels (“Posts” and “Pages”).\n"
+msgstr ""
+
+msgctxt "release_note_182"
+msgid ""
+"18.2:\n"
+"We have made a couple of handy tweaks to the Block editor: The Embed block now gives you a sneak preview when you add something from YouTube or Twitter (more providers to come); and when you go to insert a block and nothing is found, there is now a no results view.\n"
+msgstr ""
+
+#. translators: Short description of the Jetpack app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!
+msgctxt "short-description"
+msgid "Get powerful security and performance tools in your pocket."
+msgstr ""
+
+#. translators: Multi-paragraph text used to display in the Play Store.
+msgctxt "app-store-description"
+msgid ""
+"Get powerful security and performance tools in your pocket with Jetpack for Android.\n"
+"\n"
+"Restore your site from anywhere if something goes wrong. Scan for threats and resolve them with a tap. Keep tabs on site activity to see who changed what and when. Check your stats to see what new countries today’s visitors are coming from.\n"
+"\n"
+"The app also supports WordPress features that you expect. Draft a spontaneous haiku from the couch. Snap and post a photo on your lunch break. Respond to your latest comments.\n"
+"\n"
+"Jetpack for Android supports WordPress sites with Jetpack enabled and an account connected to WordPress.com.\n"
+"\n"
+"View the Privacy Notice for California Users at https://automattic.com/privacy/#california-consumer-privacy-act-ccpa.\n"
+msgstr ""
+
+#. App store app name
+msgctxt "app-store-name"
+msgid "Jetpack: WP Security & Speed"
+msgstr ""
+
+#. Description for the first app store image
+msgctxt "screenshot-text-1"
+msgid ""
+"Safer.\n"
+"Faster.\n"
+"More traffic."
+msgstr ""
+
+#. Description for the second app store image
+msgctxt "screenshot-text-2"
+msgid ""
+"Bring your\n"
+"Jetpack with you."
+msgstr ""
+
+#. Description for the third app store image
+msgctxt "screenshot-text-3"
+msgid ""
+"Keep tabs on\n"
+"your site activity."
+msgstr ""
+
+#. Description for the fourth app store image
+msgctxt "screenshot-text-4"
+msgid ""
+"Scan for issues\n"
+"on the go."
+msgstr ""
+
+#. Description for the fifth app store image
+msgctxt "screenshot-text-5"
+msgid ""
+"Back Up your site\n"
+"at any moment."
+msgstr ""
+
+#. Description for the sixth app store image
+msgctxt "screenshot-text-6"
+msgid ""
+"Site stats in your\n"
+"pocket."
+msgstr ""
+

WordPress/jetpack_metadata/release_notes.txt

@@ -1,12 +1,3 @@
-* [**] Media: Fix Atomic sites video not playing issue. (https://github.com/wordpress-mobile/WordPress-Android/pull/15285)
-* [*] Block editor: Fixes bug preventing button block gradient background from being updated in the editor [https://github.com/wordpress-mobile/WordPress-Android/pull/15312]
-* [*] Updated the wording for the "Posts" and "Pages" entries in My Site screen [https://github.com/wordpress-mobile/WordPress-Android/pull/15327]
-* [**] Block editor: Embed block: Enable WordPress embed preview [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3853]
-* [**] Block editor: Embed block: Add error bottom sheet with retry and convert to link actions. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3921]
-* [**] Block editor: Embed block: Implemented the No Preview UI when an embed is successful, but we're unable to show an inline preview [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3927]
-* [**] Block editor: Fix issue of main toolbar initial position being wrong when RTL [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3923]
-* [*] Block editor: Embed block: Add device's locale to preview content [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3788]
-* [*] Block editor: Embed block: Fix content disappearing when switching light/dark mode [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3859]
-* [*] Block editor: Column block: Translate column width's control labels [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3952]
-* [**] Block editor: Embed block: Enable embed preview for Instagram and Vimeo providers. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3918]
+Lots of improvements in the block editor! We fixed a toolbar issue affecting devices set to an RTL language, and made many updates to the Embed block, including enabling WordPress, Instagram, and Vimeo previews and offering options to retry or convert media into a link if it’s not embeddable.
 
+Other updates include a fix affecting .mp4 video on some sites, and streamlining My Site menu labels (“Posts” and “Pages”).

WordPress/jetpack_metadata/release_notes_short.txt

@@ -0,0 +1,3 @@
+In the block editor, we fixed a toolbar issue on devices set to an RTL language, and made updates to the Embed block, like enabling WordPress, Instagram, and Vimeo previews and adding options to retry or convert media into a link.
+
+More updates include a fix affecting video on some sites, and updating My Site menu labels (“Posts” and “Pages”).

WordPress/metadata/PlayStoreStrings.po

@@ -10,7 +10,24 @@ msgstr ""
 "X-Generator: VsCode\n"
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
+#. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_short_183"
+msgid ""
+"18.3:\n"
+"In the block editor, we fixed a toolbar issue on devices set to an RTL language, and made updates to the Embed block, like enabling WordPress, Instagram, and Vimeo previews and adding options to retry or convert media into a link.\n"
+"\n"
+"More updates include a fix affecting video on some sites, and updating My Site menu labels (“Posts” and “Pages”).\n"
+msgstr ""
+
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_183"
+msgid ""
+"18.3:\n"
+"Lots of improvements in the block editor! We fixed a toolbar issue affecting devices set to an RTL language, and made many updates to the Embed block, including enabling WordPress, Instagram, and Vimeo previews and offering options to retry or convert media into a link if it’s not embeddable.\n"
+"\n"
+"Other updates include a fix affecting .mp4 video on some sites, and streamlining My Site menu labels (“Posts” and “Pages”).\n"
+msgstr ""
+
 msgctxt "release_note_182"
 msgid ""
 "18.2:\n"
@@ -20,16 +37,6 @@ msgid ""
 "- Liking a post in the Reader also adds your avatar to the like.\n"
 msgstr ""
 
-msgctxt "release_note_181"
-msgid ""
-"18.1:\n"
-"-A Weekly Roundup: a summary of activity (views, likes, comments) on your most-used sites, sent to you each Monday.\n"
-"-A toggle option in the Embed block to resize embedded content, like videos and other media, on smaller devices.\n"
-"-A time selection feature that lets you choose a specific time to receive a Blogging Reminder.\n"
-msgstr ""
-
-#. translators: A shorter version of the Release notes to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
-#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 msgctxt "sample_post_content"
 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."
 msgstr ""

WordPress/metadata/release_notes.txt

@@ -1,12 +1,3 @@
-* [**] Media: Fix Atomic sites video not playing issue. (https://github.com/wordpress-mobile/WordPress-Android/pull/15285)
-* [*] Block editor: Fixes bug preventing button block gradient background from being updated in the editor [https://github.com/wordpress-mobile/WordPress-Android/pull/15312]
-* [*] Updated the wording for the "Posts" and "Pages" entries in My Site screen [https://github.com/wordpress-mobile/WordPress-Android/pull/15327]
-* [**] Block editor: Embed block: Enable WordPress embed preview [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3853]
-* [**] Block editor: Embed block: Add error bottom sheet with retry and convert to link actions. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3921]
-* [**] Block editor: Embed block: Implemented the No Preview UI when an embed is successful, but we're unable to show an inline preview [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3927]
-* [**] Block editor: Fix issue of main toolbar initial position being wrong when RTL [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3923]
-* [*] Block editor: Embed block: Add device's locale to preview content [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3788]
-* [*] Block editor: Embed block: Fix content disappearing when switching light/dark mode [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3859]
-* [*] Block editor: Column block: Translate column width's control labels [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3952]
-* [**] Block editor: Embed block: Enable embed preview for Instagram and Vimeo providers. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3918]
+Lots of improvements in the block editor! We fixed a toolbar issue affecting devices set to an RTL language, and made many updates to the Embed block, including enabling WordPress, Instagram, and Vimeo previews and offering options to retry or convert media into a link if it’s not embeddable.
 
+Other updates include a fix affecting .mp4 video on some sites, and streamlining My Site menu labels (“Posts” and “Pages”).

WordPress/metadata/release_notes_short.txt

@@ -0,0 +1,3 @@
+In the block editor, we fixed a toolbar issue on devices set to an RTL language, and made updates to the Embed block, like enabling WordPress, Instagram, and Vimeo previews and adding options to retry or convert media into a link.
+
+More updates include a fix affecting video on some sites, and updating My Site menu labels (“Posts” and “Pages”).

WordPress/src/main/java/org/wordpress/android/Constants.java

@@ -7,4 +7,5 @@ public class Constants {
     public static final String URL_DATETIME_FORMAT_HELP = "https://codex.wordpress.org/Formatting_Date_and_Time";
     public static final String URL_TIMEZONE_ENDPOINT = "https://public-api.wordpress.com/wpcom/v2/timezones";
     public static final String URL_JETPACK_SETTINGS = "https://wordpress.com/settings/jetpack";
+    public static final String URL_MANAGE_DOMAINS = "https://wordpress.com/domains/manage";
 }