Merge 14.8 final to develop

.circleci/config.yml

@@ -94,7 +94,7 @@ jobs:
           command: mv libs/gutenberg-mobile/bundle/android/App.js libs/gutenberg-mobile/react-native-gutenberg-bridge/android/build/assets/index.android.bundle
       - save-gutenberg-bundle-cache
   test:
-    executor: 
+    executor:
       name: android/default
       api-version: "28"
     steps:
@@ -103,6 +103,11 @@ jobs:
       - android/restore-gradle-cache
       - copy-gradle-properties
       - restore-gutenberg-bundle-cache
+      - run:
+          name: Ensure assets folder exists
+          command: mkdir libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
+      - attach_workspace:
+          at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
       - run:
           name: Test WordPress
           environment:
@@ -116,7 +121,7 @@ jobs:
       - android/save-gradle-cache
       - android/save-test-results
   lint:
-    executor: 
+    executor:
       name: android/default
       api-version: "28"
     steps:
@@ -125,6 +130,11 @@ jobs:
       - android/restore-gradle-cache
       - copy-gradle-properties
       - restore-gutenberg-bundle-cache
+      - run:
+          name: Ensure assets folder exists
+          command: mkdir libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
+      - attach_workspace:
+          at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
       - run:
           name: Checkstyle
           environment:
@@ -150,7 +160,7 @@ jobs:
               ./gradlew --stacktrace violationCommentsToGitHub -DGITHUB_PULLREQUESTID=${CIRCLE_PULL_REQUEST##*/} -DGITHUB_OAUTH2TOKEN=$GITHUB_API_TOKEN
             else
               echo "Not posting lint errors to Github because \$GITHUB_API_TOKEN is not found"
-            fi 
+            fi
       - android/save-gradle-cache
       - android/save-lint-results
   Installable Build:
@@ -167,6 +177,11 @@ jobs:
           command: bundle exec fastlane run configure_apply
       - android/restore-gradle-cache
       - restore-gutenberg-bundle-cache
+      - run:
+          name: Ensure assets folder exists
+          command: mkdir libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
+      - attach_workspace:
+          at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
       - run:
           name: Build APK
           environment:
@@ -207,6 +222,11 @@ jobs:
       - android/restore-gradle-cache
       - copy-gradle-properties
       - restore-gutenberg-bundle-cache
+      - run:
+          name: Ensure assets folder exists
+          command: mkdir libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
+      - attach_workspace:
+          at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
       - run:
           name: Build
           environment:
@@ -245,6 +265,11 @@ jobs:
       - android/restore-gradle-cache
       - copy-gradle-properties
       - restore-gutenberg-bundle-cache
+      - run:
+          name: Ensure assets folder exists
+          command: mkdir libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
+      - attach_workspace:
+          at: libs/gutenberg-mobile/react-native-gutenberg-bridge/android/src/main/assets
       - run:
           name: Build
           environment:
@@ -271,7 +296,7 @@ jobs:
       - checkout-gutenberg-mobile-submodule-only
       - run:
           name: Install bundler
-          command: gem install bundler --version 2.0.2 
+          command: gem install bundler --version 2.0.2
       - bundle-install/bundle-install:
           cache_key_prefix: strings-check
       - run:

RELEASE-NOTES.txt

@@ -21,6 +21,7 @@
 * Block editor: Update quote block to visually reflect selected alignment
 * Block editor: Fix bug where buttons in page templates were not rendering correctly on web
 * Block editor: You can now crop, zoom in/out and rotate images from the device that are being inserted in a post.
+* Block editor: Remove Subscription Button from the Blog template since it didn't have an initial functionality and it is hard to configure for users.
 * Added reblog functionality
 
 14.7

WordPress/build.gradle

@@ -55,9 +55,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "alpha-220"
+            versionName "alpha-222"
         }
-        versionCode 860
+        versionCode 865
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
 
@@ -85,9 +85,9 @@ android {
             dimension "buildType"
             // Only set the release version if one isn't provided
             if (!project.hasProperty("versionName")) {
-                versionName "14.8-rc-1"
+                versionName "14.8"
             }
-            versionCode 859
+            versionCode 866
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
             buildConfigField "boolean", "TENOR_AVAILABLE", "false"
         }

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

@@ -1,11 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Translation-Revision-Date: 2020-04-29 15:54:11+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/2.4.0-alpha
+Translation-Revision-Date: 2020-05-14 08:54:08+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
 Language: ar
 -->
 <resources>
+    <string name="feature_announcement_find_out_mode">اكتشاف المزيد</string>
+    <string name="feature_announcement_dialog_label">ما الجديد في ووردبريس</string>
+    <string name="insert_label_with_count">إدراج%d</string>
+    <string name="crop">قص</string>
+    <string name="error_failed_to_load_into_file">فشل التحميل إلى الملف، يرجى المحاولة مرة أخرى.</string>
+    <string name="preview_image_thumbnail_description">معاينة الصورة المصغَّرة</string>
+    <string name="photo_picker_use_media">استخدام هذه الوسائط</string>
+    <string name="photo_picker_use_video">استخدام هذا الفيديو</string>
+    <string name="photo_picker_photo_or_video_title">اختيار الوسائط</string>
+    <string name="photo_picker_video_title">اختيار مقطع فيديو</string>
+    <string name="site_picker_ask_site_select">تعذر تحديد الموقع. يُرجى المحاولة مرة أخرى.</string>
+    <string name="sitepicker_continue_flow">المتابعة</string>
+    <string name="reader_reblog_error">فشلت إعادة التدوين</string>
+    <string name="reader_no_site_to_reblog_action">إدارة المواقع</string>
+    <string name="reader_no_site_to_reblog_detail">بمجرد إنشاء موقع ووردبريس.كوم، يمكنك إعادة تدوين المحتوى الذي أعجبك على موقعك الخاص.</string>
+    <string name="reader_no_site_to_reblog_title">لا تتوافر مواقع ووردبريس.كوم</string>
+    <string name="whats_new_in_version_title">الجديد</string>
+    <string name="comment_q_action_copied_url">تم نسخ عنوان الرابط</string>
+    <string name="copy_link_address">نسخ عنوان الرابط</string>
+    <string name="comment_share_link_via">مشاركة عبر</string>
+    <string name="comment_toast_err_share_intent">تعذرت المشاركة</string>
+    <string name="button_insert">إدراج</string>
+    <string name="continue_label">المتابعة</string>
+    <string name="copy_text">نسخ</string>
     <string name="gutenberg_native_subscribe">اشترك</string>
     <string name="gutenberg_native_number_of_columns">عدد الأعمدة</string>
     <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">نقل المكوِّن إلى اليمين من الموضع %1$s إلى الموضع%2$s</string>
@@ -40,7 +64,7 @@ Language: ar
     <string name="media_accessing_failed">فشل الوصول إلى محتوى الموقع الخاص. قد تصبح بعض الوسائط غير متاحة</string>
     <string name="media_accessing_progress">الوصول إلى محتوى الموقع الخاص</string>
     <string name="error_failed_to_crop_and_save_image">فشل اقتصاص الصورة وحفظها، يرجى المحاولة مرة أخرى.</string>
-    <string name="failed_to_insert_image_tap_to_retry">فشلت عملية إدراج وسائط.\nيرجى النقر لإعادة المحاولة.</string>
+    <string name="failed_to_load_image_tap_to_retry">فشل تحميل الصورة.\nيرجى النقر لإعادة المحاولة.</string>
     <string name="preview_image_description">صورة المعاينة</string>
     <string name="error_unknown_page_type">تنسيق الصفحة غير معروف</string>
     <string name="error_page_not_submitted">لم نتمكن من إكمال هذا الإجراء، ولم نرسل هذه الصفحة للمراجعة.</string>
@@ -1322,7 +1346,6 @@ Language: ar
     <string name="media_edit_filename_caption">اسم الملف</string>
     <string name="media_edit_url_caption">عنوان URL</string>
     <string name="media_edit_alttext_text">النص البديل</string>
-    <string name="copy_text">نسخ</string>
     <string name="connect_site">الاتصال بالموقع</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">ضوء وميض</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">جهاز الاهتزاز</string>
@@ -2187,6 +2210,7 @@ Language: ar
     <string name="reader_btn_unfollow">متابع</string>
     <string name="reader_btn_follow">تابع</string>
     <string name="reader_btn_share">مشاركة</string>
+    <string name="reader_view_reblog">إعادة التدوين</string>
     <string name="reader_untitled_post">( بدون اسم )</string>
     <string name="comments_empty_list">لا توجد تعليقات حتى الآن</string>
     <string name="empty_list_default">هذه القائمة فارغة.</string>

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

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2015-12-08 01:00:08+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/2.4.0-alpha
+Generator: GlotPress/3.0.0-alpha
 Language: az
 -->
 <resources>

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

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2018-12-10 19:56:03+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/2.4.0-alpha
+Generator: GlotPress/3.0.0-alpha
 Language: bg
 -->
 <resources>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
 Translation-Revision-Date: 2020-03-31 06:52:54+0000
-Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;
-Generator: GlotPress/2.4.0-alpha
+Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n >= 2 && n <= 4) ? 1 : 2);
+Generator: GlotPress/3.0.0-alpha
 Language: cs_CZ
 -->
 <resources>
@@ -691,7 +691,6 @@ Language: cs_CZ
     <string name="media_edit_filename_caption">Jméno souboru</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Alternativní text</string>
-    <string name="copy_text">Kopírovat</string>
     <string name="connect_site">Web pro připojení</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">Blikat světlem</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Vibrovat zařízením</string>

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

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2017-03-25 17:35:05+0000
 Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;
-Generator: GlotPress/2.4.0-alpha
+Generator: GlotPress/3.0.0-alpha
 Language: cy_GB
 -->
 <resources>

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

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2018-06-14 08:40:50+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/2.4.0-alpha
+Generator: GlotPress/3.0.0-alpha
 Language: da_DK
 -->
 <resources>

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

@@ -1,11 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Translation-Revision-Date: 2020-04-23 17:17:27+0000
+Translation-Revision-Date: 2020-05-06 13:52:25+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/2.4.0-alpha
+Generator: GlotPress/3.0.0-alpha
 Language: de
 -->
 <resources>
+    <string name="feature_announcement_find_out_mode">Mehr erfahren</string>
+    <string name="feature_announcement_dialog_label">Was ist neu in WordPress?</string>
+    <string name="insert_label_with_count">%d einfügen</string>
+    <string name="crop">zuschneiden</string>
+    <string name="error_failed_to_load_into_file">Laden in die Datei fehlgeschlagen, bitte versuche es erneut. </string>
+    <string name="preview_image_thumbnail_description">Vorschau des Vorschaubilds</string>
+    <string name="photo_picker_use_media">Diese Medien verwenden</string>
+    <string name="photo_picker_use_video">Dieses Video verwenden</string>
+    <string name="photo_picker_photo_or_video_title">Medien auswählen</string>
+    <string name="photo_picker_video_title">Video auswählen</string>
+    <string name="site_picker_ask_site_select">Die Website konnte nicht ausgewählt werden. Bitte versuche es erneut.</string>
+    <string name="sitepicker_continue_flow">Weiter</string>
+    <string name="reader_reblog_error">Rebloggen ist fehlgeschlagen</string>
+    <string name="reader_no_site_to_reblog_action">Websites verwalten</string>
+    <string name="reader_no_site_to_reblog_detail">Sobald du eine Website bei WordPress.com erstellt hast, kannst du Inhalte, die dir gefallen, auf deiner eigenen Website rebloggen.</string>
+    <string name="reader_no_site_to_reblog_title">Keine verfügbaren Websites bei WordPress.com</string>
+    <string name="whats_new_in_version_title">Was ist neu?</string>
+    <string name="comment_q_action_copied_url">Link-Adresse wurde kopiert</string>
+    <string name="copy_link_address">Link-Adresse kopieren</string>
+    <string name="comment_share_link_via">Teilen über</string>
+    <string name="comment_toast_err_share_intent">Teilen nicht möglich</string>
+    <string name="button_insert">Einfügen</string>
+    <string name="continue_label">Weiter</string>
+    <string name="copy_text">Kopieren</string>
     <string name="gutenberg_native_subscribe">Abonnieren</string>
     <string name="gutenberg_native_number_of_columns">Anzahl an Spalten</string>
     <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Bewege den Block von Position %1$s nach rechts zur Position %2$s</string>
@@ -40,7 +64,7 @@ Language: de
     <string name="media_accessing_failed">Auf den Inhalt einer privaten Website konnte nicht zugegriffen werden. Einige Medien sind möglicherweise nicht verfügbar.</string>
     <string name="media_accessing_progress">Auf den Inhalt einer privaten Website wird zugegriffen</string>
     <string name="error_failed_to_crop_and_save_image">Das Bild konnte nicht zugeschnitten und gespeichert werden, bitte versuche es erneut.</string>
-    <string name="failed_to_insert_image_tap_to_retry">Das Einfügen von Medien ist fehlgeschlagen.\nBitte tippe, um es erneut zu versuchen.</string>
+    <string name="failed_to_load_image_tap_to_retry">Das Laden des Bildes ist fehlgeschlagen.\nBitte tippe, um es erneut zu versuchen.</string>
     <string name="preview_image_description">Vorschaubild</string>
     <string name="error_unknown_page_type">Unbekanntes Seitenformat</string>
     <string name="error_page_not_submitted">Wir konnten diese Aktion nicht abschließen und haben diese Seite nicht zur Überprüfung gesendet.</string>
@@ -836,7 +860,7 @@ Language: de
     <string name="reader_empty_followed_tags_subtitle">Füge hier Tags hinzu, um Beiträge zu deinen Lieblingsthemen zu finden</string>
     <string name="login_to_to_connect_jetpack">Melde dich bei deinem WordPress.com-Konto an, das du für die Jetpack-Verbindung verwendet hast.</string>
     <string name="install_jetpack_retry">Erneut versuchen</string>
-    <string name="install_jetpack_continue">Weiter</string>
+    <string name="install_jetpack_continue">Einrichten</string>
     <string name="jetpack_installation_problem_message">Jetpack kann zurzeit nicht installiert werden</string>
     <string name="jetpack_installation_problem">Es ist ein Problem aufgetreten</string>
     <string name="jetpack_installed">Jetpack installiert</string>
@@ -1322,7 +1346,6 @@ Language: de
     <string name="media_edit_filename_caption">Dateiname</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Alternativtext</string>
-    <string name="copy_text">Kopieren</string>
     <string name="connect_site">Website verbinden</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">Blinklicht</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Gerät vibrieren lassen</string>
@@ -2187,6 +2210,7 @@ Language: de
     <string name="reader_btn_unfollow">Folge ich</string>
     <string name="reader_btn_follow">Folgen</string>
     <string name="reader_btn_share">Teilen</string>
+    <string name="reader_view_reblog">Rebloggen</string>
     <string name="reader_untitled_post">(Ohne Titel)</string>
     <string name="comments_empty_list">Bisher keine Kommentare</string>
     <string name="empty_list_default">Diese Liste ist leer</string>

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

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2020-02-28 09:54:01+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/2.4.0-alpha
+Generator: GlotPress/3.0.0-alpha
 Language: el_GR
 -->
 <resources>
@@ -438,7 +438,6 @@ Language: el_GR
     <string name="media_edit_filename_caption">Όνομα Αρχείου</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Ενναλακτικό κείμενο</string>
-    <string name="copy_text">Αντιγραφή</string>
     <string name="connect_site">Σύνδεση ιστότοπου</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Δόνηση συσκευής</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">Επιλογή ήχου</string>

WordPress/src/main/res/values-en-rAU/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2019-11-20 03:34:20+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/2.4.0-alpha
+Generator: GlotPress/3.0.0-alpha
 Language: en_AU
 -->
 <resources>
@@ -1015,7 +1015,6 @@ Language: en_AU
     <string name="media_edit_filename_caption">File Name</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Alt text</string>
-    <string name="copy_text">Copy</string>
     <string name="connect_site">Connect Site</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">Blink light</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Vibrate device</string>

WordPress/src/main/res/values-en-rCA/strings.xml

@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2019-12-19 20:28:48+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/2.4.0-alpha
+Generator: GlotPress/3.0.0-alpha
 Language: en_CA
 -->
 <resources>
@@ -1110,7 +1110,6 @@ Language: en_CA
     <string name="media_edit_filename_caption">File Name</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Alt text</string>
-    <string name="copy_text">Copy</string>
     <string name="connect_site">Connect Site</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">Blink light</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Vibrate device</string>