Merge 17.7 into develop after 17.6.1, 17.7-rc-2 and Release Notes

WordPress/build.gradle

@@ -151,7 +151,7 @@ android {
             buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "3600"
             buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "false"
             buildConfigField "boolean", "CONTACT_INFO_BLOCK_AVAILABLE", "true"
-            buildConfigField "boolean", "LAYOUT_GRID_BLOCK_AVAILABLE", "false"
+            buildConfigField "boolean", "LAYOUT_GRID_BLOCK_AVAILABLE", "true"
         }
 
         zalpha { // alpha version - enable experimental features

WordPress/jetpack_metadata/PlayStoreStrings.po

@@ -0,0 +1 @@
+../metadata/JetpackPlayStoreStrings.po

WordPress/jetpack_metadata/full_description.txt

@@ -0,0 +1,9 @@
+Get powerful security and performance tools in your pocket with Jetpack for Android.
+
+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.
+
+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.
+
+Jetpack for Android supports WordPress sites with Jetpack enabled and an account connected to WordPress.com.
+
+View the Privacy Notice for California Users at https://automattic.com/privacy/#california-consumer-privacy-act-ccpa.

WordPress/jetpack_metadata/release_notes.txt

@@ -0,0 +1 @@
+Block editor: New block layout grid, Badge style tweaks, Fixed new block not created when pressing enter inside text-based block, Tablet view fixes for inserter button

WordPress/jetpack_metadata/short_description.txt

@@ -0,0 +1 @@
+Get powerful security and performance tools in your pocket.

WordPress/jetpack_metadata/title.txt

@@ -0,0 +1 @@
+Jetpack: WP Security & Speed

WordPress/metadata/JetpackPlayStoreStrings.po

@@ -11,6 +11,12 @@ msgstr ""
 "Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_177"
+msgid ""
+"17.7:\n"
+"Block editor: New block layout grid, Badge style tweaks, Fixed new block not created when pressing enter inside text-based block, Tablet view fixes for inserter button\n"
+msgstr ""
+
 msgctxt "release_note_176"
 msgid ""
 "17.6:\n"
@@ -37,13 +43,13 @@ msgid ""
 "\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."
+"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 "Jetpack : WP Security & Speed"
+msgstr ""
 
 #. Description for the first app store image
 msgctxt "screenshot-text-1"

WordPress/metadata/PlayStoreStrings.po

@@ -11,6 +11,15 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_177"
+msgid ""
+"17.7:\n"
+"- New! Get blogging reminder prompts on days of your choice\n"
+"- Block editor: New block layout grid, Badge style tweaks, Fixed new block not created when pressing enter inside text-based block, Tablet view fixes for inserter button\n"
+"- Fixed Reader duplicate post issue\n"
+"- Added ability to subscribe to conversations by email from Reader\n"
+msgstr ""
+
 msgctxt "release_note_176"
 msgid ""
 "17.6:\n"
@@ -21,20 +30,6 @@ msgid ""
 "Finally, we made it clearer that you can’t edit the automatically generated post archives page.\n"
 msgstr ""
 
-msgctxt "release_note_175"
-msgid ""
-"17.5:\n"
-"What’s new in 17.5?\n"
-"\n"
-"Reusable blocks let you create block content once and reuse it infinite times, right from the block inserter.\n"
-"\n"
-"Slash commands make adding blocks easy: just tap a forward slash and block name into the editor.\n"
-"\n"
-"You can now pull in audio via URL with the Audio block.\n"
-"\n"
-"Finally, screen readers can now select the stepper cell.\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"

WordPress/metadata/release_notes.txt

@@ -1,7 +1,4 @@
-* [*] Block editor: Tablet view fixes for inserter button. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3602]
-* [**] Block editor: Fixed an issue where pressing enter inside a text-based block was not creating a new block when using Gboard [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3590]
-* [*] Block editor: Tweaks to the badge component's styling, including change of background color and reduced padding. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3642]
-* [***] Block editor: New block Layout grid. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3513]
-* [***] Added blogging reminders to site settings and after a new post has been created
-* [*] Fixed Reader duplicate post issue [https://github.com/wordpress-mobile/WordPress-Android/issues/12938]
-
+- New! Get blogging reminder prompts on days of your choice
+- Block editor: New block layout grid, Badge style tweaks, Fixed new block not created when pressing enter inside text-based block, Tablet view fixes for inserter button
+- Fixed Reader duplicate post issue
+- Added ability to subscribe to conversations by email from Reader

WordPress/src/main/res/values-ar/strings.xml

@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2021-06-17 23:17:29+0000
+Translation-Revision-Date: 2021-06-30 21:21:09+0000
 Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((n % 100 >= 3 && n % 100 <= 10) ? 3 : ((n % 100 >= 11 && n % 100 <= 99) ? 4 : 5))));
 Generator: GlotPress/3.0.0-alpha.2
 Language: ar
 -->
 <resources>
     <string name="blogging_reminders_done">تمّ</string>
-    <string name="set_your_blogging_goals_button">تحديد الأهداف</string>
-    <string name="blogging_goals_n_times_a_week">%d مرة في الأسبوع</string>
-    <string name="blogging_goals_not_set">لا شيء محدد</string>
-    <string name="set_your_blogging_goals_message">جاري نشر مقالتك… في غضون ذلك، قم بإعداد أهداف التدوين الخاصة بك للحصول على تذكيرات، وتتبّع تقدمك.</string>
     <string name="blogging_reminders_notify_me">إشعاري بذلك</string>
     <string name="restore_details_enter_server_creds_msg">&lt;a href=\"%1$s\"&gt;أدخل بيانات اعتماد الخادم الخاص بك&lt;/a&gt; لتمكين استعادة الموقع بنقرة واحدة من النُسخ الاحتياطية.</string>
-    <string name="set_your_blogging_goals_title">تحديد أهداف التدوين الخاصة بك</string>
     <string name="gutenberg_native_remove_as_featured_image">إزالة الصورة البارزة </string>
     <string name="fab_add_category_desc">إنشاء تصنيف</string>
     <string name="gutenberg_native_set_as_featured_image">تعيين كصورة بارزة </string>
@@ -22,9 +17,9 @@ Language: ar
     <string name="site_settings_categories_empty_title">ليس لديك أي تصنيفات</string>
     <string name="site_settings_categories_hint">إدارة تصنيفات موقعك</string>
     <string name="site_settings_categories_title">التصنيفات</string>
-    <string name="site_settings_blogging_reminders_title">أهداف التدوين</string>
     <string name="site_settings_categories_empty_button">إنشاء تصنيف</string>
     <string name="page_is_posts_page_warning">تم إنشاء محتوى صفحة أحدث المقالات تلقائيًّا ولا يمكن تحريره.</string>
+    <string name="site_settings_blogging_reminders_title">تذكيرات التدوين</string>
     <string name="gutenberg_native_border_settings">إعدادات الحدود</string>
     <string name="storage_utils_dialog_dont_show_button">عدم العرض مرة أخرى</string>
     <string name="storage_utils_dialog_ok_button">عرض مساحة التخزين</string>
@@ -193,8 +188,6 @@ Language: ar
     <string name="backup_item_roots">جذر ووردبريس</string>
     <string name="backup_item_contents">دليل WP-content</string>
     <string name="backup_download_details_choose_items_header">العناصر المضمنة في هذا التنزيل</string>
-    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">تُعد المكوِّنات القابلة لإعادة الاستخدام غير قابلة للتحرير على ووردبريس بالنسبة إلى نظام تشغيل iOS</string>
-    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">تُعد المكوِّنات القابلة لإعادة الاستخدام غير قابلة للتحرير على ووردبريس بالنسبة إلى نظام تشغيل Android</string>
     <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">فشل إدراج الملف الصوتي. يرجى النقر على الخيارات.</string>
     <string name="gutenberg_native_lock_icon">أيقونة القفل</string>
     <string name="gutenberg_native_open">فتح</string>
@@ -2725,7 +2718,6 @@ Language: ar
     <string name="new_media">وسائط جديدة</string>
     <string name="local_changes">التغيرات المحلية</string>
     <string name="post_settings">إعدادات المقالة</string>
-    <string name="comment_status_approved">تمت الموافقة</string>
     <string name="error_blog_hidden">هذه المدونة مخفية و لايمكن تحميلها . قم بتفعيلها مرة اخرى من الإعدادات وأعد المحاولة.</string>
     <string name="fatal_db_error">حدث خطأ اثناء إنشاء قاعدة بيانات التطبيق. حاول إعادة تنصيب التطبيق.</string>
     <string name="trash">سلة المهملات</string>
@@ -2749,6 +2741,7 @@ Language: ar
     <string name="reader_toast_err_remove_tag">غير قادر على إزالة هذا الموضوع</string>
     <string name="reader_toast_err_add_tag">غير قادر على إضافة هذا الموضوع</string>
     <string name="http_authorization_required">التخويل مطلوب</string>
+    <string name="comment_status_approved">تمّت الموافقة</string>
     <string name="share_link">رابط المشاركة</string>
     <string name="reader_empty_posts_in_tag_updating">يتم الآن جلب المقالات …</string>
     <string name="reader_label_reply">رد</string>

WordPress/src/main/res/values-cs/strings.xml

@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2021-06-17 12:58:55+0000
+Translation-Revision-Date: 2021-06-29 10:18:52+0000
 Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n >= 2 && n <= 4) ? 1 : 2);
 Generator: GlotPress/3.0.0-alpha.2
 Language: cs_CZ
 -->
 <resources>
     <string name="blogging_reminders_done">Hotovo</string>
     <string name="blogging_reminders_notify_me">Informujte mě</string>
-    <string name="blogging_goals_not_set">Žádná sada</string>
-    <string name="blogging_goals_n_times_a_week">%d krát týdně</string>
-    <string name="set_your_blogging_goals_button">Stanovte si cíle</string>
-    <string name="set_your_blogging_goals_title">Stanovte si své cíle v blogování</string>
+    <string name="restore_details_enter_server_creds_msg">&lt;a href=\"%1$s\"&gt;Zadejte přihlašovací údaje k serveru&lt;/a&gt; a povolte obnovování stránek jedním kliknutím ze záloh.</string>
     <string name="support_ticket_subject">WordPress pro Android podporu</string>
     <string name="fab_add_category_desc">Vytvořit rubriku</string>
     <string name="gutenberg_native_remove_as_featured_image">Odstranit náhledový obrázek</string>
     <string name="gutenberg_native_set_as_featured_image">Použít jako náhledový obrázek</string>
     <string name="site_settings_categories_empty_title">Nemáte žádné rubriky</string>
+    <string name="site_settings_categories_hint">Spravujte rubriky svého webu</string>
+    <string name="site_settings_categories_empty_subtitle">Přidejte sem často používané rubriky, aby je bylo možné rychle vybrat při kategorizaci vašich příspěvků</string>
     <string name="site_settings_categories_title">Rubriky</string>
     <string name="site_settings_categories_empty_button">Vytvořit rubriku</string>
+    <string name="page_is_posts_page_warning">Obsah stránky s nejnovějšími příspěvky je generován automaticky a nelze jej upravovat.</string>
+    <string name="site_settings_blogging_reminders_title">Připomenutí blogů</string>
     <string name="gutenberg_native_border_settings">Nastavení okrajů</string>
     <string name="storage_utils_dialog_dont_show_button">Neptat se znovu</string>
     <string name="storage_utils_dialog_ok_button">Zobrazit úložiště</string>
@@ -30,6 +31,7 @@ Language: cs_CZ
     <string name="gutenberg_native_s_has_url_set">%s má nastavenou URL</string>
     <string name="gutenberg_native_s_has_no_url_set">%s nemá nastavenou URL</string>
     <string name="gutenberg_native_tap_to_add_content">Přidejte obsah kliknutím</string>
+    <string name="gutenberg_native_slash_inserter_results">Výsledky lomítka</string>
     <string name="gutenberg_native_s_converted_to_regular_blocks">%s převeden na běžné bloky</string>
     <string name="gutenberg_native_s_block">%s blok</string>
     <string name="gutenberg_native_minimum_height">Minimální výška</string>
@@ -51,6 +53,7 @@ Language: cs_CZ
     <string name="error_media_file_type_not_allowed">Tento typ souboru není povolen</string>
     <string name="threat_fix_enter_server_creds_msg_plural">Chcete-li opravit hrozby &lt;a href=\"%1$s\"&gt;vložte přihlašovací údaje k vašemu serveru&lt;/a&gt;.</string>
     <string name="threat_fix_enter_server_creds_msg_singular">Chcete-li opravit hrozbu &lt;a href=\"%1$s\"&gt;vložte přihlašovací údaje k vašemu serveru&lt;/a&gt;.</string>
+    <string name="error_media_unexpected_null_value">Média byla prázdná</string>
     <string name="gutenberg_native_add_link">Přidat odkaz</string>
     <string name="login_empty_view_try_another_account">Zkuste to s jiným účtem</string>
     <string name="gutenberg_native_double_tap_to_add_a_link">Dvojitým klepnutím přidáte odkaz</string>
@@ -185,8 +188,6 @@ Language: cs_CZ
     <string name="backup_item_roots">WordPress root</string>
     <string name="backup_download_details_choose_items_header">Položky obsažené v tomto stažení</string>
     <string name="gutenberg_native_uploading">Nahrávání…</string>
-    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Opakovaně použitelné bloky nelze upravovat na WordPress pro iOS</string>
-    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Opakovaně použitelné bloky nelze upravovat na WordPress pro Android</string>
     <string name="gutenberg_native_lock_icon">Ikona zámku</string>
     <string name="gutenberg_native_replace_file">Nahradit soubor</string>
     <string name="gutenberg_native_replace_audio">Nahradit zvuk</string>
@@ -834,7 +835,9 @@ Language: cs_CZ
     <string name="gutenberg_native_link_to">Odkaz na</string>
     <string name="gutenberg_native_only_show_excerpt">Zobrazit pouze výňatek</string>
     <string name="gutenberg_native_excerpt_length_words">Délka výňatku (slova)</string>
+    <string name="gutenberg_native_edit_cover_media">Upravit náhled médií</string>
     <string name="gutenberg_native_customize">PŘIZPŮSOBIT</string>
+    <string name="gutenberg_native_button_link_url">URL odkaz tlačítka</string>
     <string name="gutenberg_native_add_paragraph_block">Přidat blok odstavců</string>
     <string name="gutenberg_native_border_radius">Zaoblení okrajů</string>
     <string name="create_post_page_fab_tooltip_contributors">Vytvořit příspěvek</string>
@@ -876,6 +879,7 @@ Language: cs_CZ
     <string name="gutenberg_native_add_a_shortcode">Přidat krátký kód …</string>
     <string name="gutenberg_native_edit_video">Upravit video</string>
     <string name="gutenberg_native_video_caption_s">Titulek videa. %s</string>
+    <string name="gutenberg_native_edit_media">Upravit mediální soubor</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="stats_box_type_low">nízký</string>
     <string name="stats_box_type_medium">střední</string>
@@ -970,6 +974,7 @@ Language: cs_CZ
     <string name="gutenberg_native_double_tap_to_edit_this_value">Tuto hodnotu upravíte dvojitým klepnutím</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Dvojitým klepnutím přesunete blok dolů</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Dvojitým klepnutím posunete blok nahoru</string>
+    <string name="gutenberg_native_double_tap_and_hold_to_edit">Upravte dvojitým klepnutím a podržením</string>
     <string name="gutenberg_native_choose_from_device">Vyberte si ze zařízení</string>
     <string name="gutenberg_native_current_value_is_s">Aktuální hodnota je %s</string>
     <string name="gutenberg_native_add_image">PŘIDAT OBRÁZEK</string>