Merge pull request #17046 from wordpress-mobile/merge/20.5-rc-2

Merge release/20.5 after 20.5-rc-2

Author: AliSoftware

WordPress/src/main/java/org/wordpress/android/push/GCMMessageHandler.java

@@ -473,7 +473,10 @@ private void addActionsForCommentNotification(Context context, NotificationCompa
                 // if the comment is lacking approval, offer moderation actions
                 if (note.getCommentStatus() == CommentStatus.UNAPPROVED) {
                     if (note.canModerate()) {
-                        addCommentApproveActionForCommentNotification(context, builder, noteId);
+                        // TODO
+                        // Enable comment approve action after fixing content lost after approval.
+                        // Issue: https://github.com/wordpress-mobile/WordPress-Android/issues/17026
+                        // addCommentApproveActionForCommentNotification(context, builder, noteId);
                     }
                 } else {
                     // else offer REPLY / LIKE actions

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

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2022-07-27 13:54:09+0000
+Translation-Revision-Date: 2022-08-11 14:54:10+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/4.0.0-alpha.1
 Language: ar
 -->
 <resources>
+    <string name="wp_jetpack_powered_features">يحتوي تطبيق Jetpack الجديد على إحصاءات وقارئ وتنبيهات والمزيد الذي يجعل ووردبريس الخاص بك أفضل.</string>
+    <string name="wp_jetpack_powered_better_with_jetpack">ووردبريس أفضل مع Jetpack</string>
     <string name="gutenberg_native_upgrade_your_plan_to_use_video_covers">ترقية خطتك لاستخدام أغطية مقاطع الفيديو</string>
     <string name="gutenberg_native_upgrade_your_plan_to_upload_audio">ترقية خطتك لرفع مقاطع الصوت</string>
     <string name="gutenberg_native_jetpack_powered">مدعوم بواسطة Jetpack</string>
@@ -15,7 +17,6 @@ Language: ar
     <string name="wp_jetpack_continue_to_stats">المتابعة إلى الإحصاءات</string>
     <string name="wp_jetpack_continue_to_reader">المتابعة إلى القارئ</string>
     <string name="wp_jetpack_get_new_jetpack_app">تنزيل تطبيق Jetpack الجديد</string>
-    <string name="wp_jetpack_powered_features">الإحصاءات والقارئ والتنبيهات وغيرها من الميزات مدعومة بواسطة Jetpack.</string>
     <string name="gutenberg_native_problem_displaying_block_tap_to_attempt_block_recovery">ثمَّة مشكلة في أثناء عرض المكوِّن. \nانقر لمحاولة استعادة المكوِّن.</string>
     <string name="weekly_roundup_notification_text_views_and_comments">كانت لديك الأسبوع الماضي ⁦%1$s⁩ من المشاهدات و⁦%2$s⁩ من التعليقات</string>
     <string name="weekly_roundup_notification_text_views_and_likes">كانت لديك الأسبوع الماضي ⁦%1$s⁩ من المشاهدات و⁦%2$s⁩ من الإعجابات</string>
@@ -43,13 +44,9 @@ Language: ar
     <string name="qrcode_auth_flow_validated_primary_action">نعم، قم بتسجيل الدخول لي</string>
     <string name="qrcode_auth_flow_validated_subtitle">لا تقم سوى بمسح رموز الاستجابة السريعة ضوئيًا التي تم الحصول عليها مباشرةً من متصفح الويب الخاص بك. لا تقم أبدًا بمسح رمز ضوئيًا تم إرساله إليك بواسطة أي شخص آخر.</string>
     <string name="qrcode_auth_flow_scan_again">إعادة المسح</string>
-    <string name="stats_revamp_v2_intro_secondary_button_text">ذكرني لاحقًا</string>
     <string name="stats_revamp_v2_intro_header_title">تحديث الرؤى</string>
     <string name="qrcode_auth_flow_validated_title">هل تحاول تسجيل الدخول إلى ⁦%1$s⁩ بالقرب من ⁦%2$s⁩؟</string>
-    <string name="stats_revamp_v2_intro_primary_button_text">تجربته الآن</string>
-    <string name="stats_revamp_v2_intro_content">تساعدك الرؤى على فهم مدى أداء محتواك وما يفلح مع جمهورك.</string>
     <string name="stats_insights_followers_guide_card">💡يُعد التعليق على مدونات أخرى طريقة رائعة لإنشاء اهتمام ومتابعين لموقعك الجديد.</string>
-    <string name="stats_revamp_v2_intro_content_note">معرفة المزيد في موقعي &gt; الإحصاءات &gt; الرؤى</string>
     <string name="stats_insights_comments_guide_card">💡اضغط على \"عرض المزيد\" للاطلاع على أفضل المعلقين لديك.</string>
     <string name="stats_insights_views_and_visitors_visitors_empty_state">مراجعة أفضل نصائحنا لزيادة مشاهداتك وحركة مرورك ⁦%1$s⁩</string>
     <string name="stats_action_card_schedule_post_message">✍️ قم بجدولة مسوداتك لنشرها في أفضل وقت للوصول إلى جمهورك.</string>

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

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2022-07-28 13:54:21+0000
+Translation-Revision-Date: 2022-08-08 18:24:39+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/4.0.0-alpha.1
 Language: de
 -->
 <resources>
+    <string name="wp_jetpack_powered_features">Die neue Jetpack-App hat Statistiken, Reader, Benachrichtigungen und mehr, das dein WordPress verbessert.</string>
+    <string name="wp_jetpack_powered_better_with_jetpack">WordPress ist besser mit Jetpack</string>
     <string name="gutenberg_native_upgrade_your_plan_to_upload_audio">Führe ein Tarif-Upgrade durch, um Audiodateien hochzuladen</string>
     <string name="gutenberg_native_jetpack_powered">Von Jetpack unterstützt</string>
     <string name="gutenberg_native_invalid_url">Ungültige URL.</string>
@@ -14,7 +16,6 @@ Language: de
     <string name="wp_jetpack_continue_to_stats">Weiter zu Statistiken</string>
     <string name="wp_jetpack_continue_to_reader">Weiter zum Reader</string>
     <string name="wp_jetpack_get_new_jetpack_app">Hol dir die neue Jetpack-App</string>
-    <string name="wp_jetpack_powered_features">Statistiken, Reader, Benachrichtigungen und andere Funktionen werden von Jetpack unterstützt.</string>
     <string name="gutenberg_native_upgrade_your_plan_to_use_video_covers">Führe ein Tarif-Upgrade durch, um Video-Cover zu verwenden</string>
     <string name="gutenberg_native_problem_displaying_block_tap_to_attempt_block_recovery">Bei der Anzeige des Blocks ist ein Problem aufgetreten. \nTippe, um die Wiederherstellung des Blocks zu versuchen.</string>
     <string name="weekly_roundup_notification_text_views_and_comments">Letzte Woche hattest du %1$s Aufrufe und %2$s Kommentare</string>
@@ -44,11 +45,7 @@ Language: de
     <string name="qrcode_auth_flow_done_subtitle">Tippe auf „Verwerfen“ und navigiere zu deinem Webbrowser zurück, um fortzufahren.</string>
     <string name="qrcode_auth_flow_dismiss">Verwerfen</string>
     <string name="qrcode_auth_flow_validated_title">Versuchst du dich in der Nähe von %2$s in %1$s anzumelden?</string>
-    <string name="stats_revamp_v2_intro_secondary_button_text">Später daran erinnern</string>
-    <string name="stats_revamp_v2_intro_content_note">Weitere Informationen unter „Meine Website &gt; Statistiken &gt; Einsichten“</string>
-    <string name="stats_revamp_v2_intro_content">Anhand von Einsichten kannst du nachvollziehen, wie deine Inhalte ankommen und was deinem Publikum gefällt.</string>
     <string name="stats_revamp_v2_intro_header_title">Einsichten-Update</string>
-    <string name="stats_revamp_v2_intro_primary_button_text">Jetzt versuchen</string>
     <string name="stats_insights_followers_guide_card">💡Andere Blogs zu kommentieren ist ein guter Weg, Aufmerksamkeit zu erregen und Follower für deine neue Website zu gewinnen.</string>
     <string name="stats_insights_comments_guide_card">💡Tippe auf „MEHR ANZEIGEN“, um dir deine Top-Kommentatoren anzeigen zu lassen.</string>
     <string name="stats_insights_latest_post_empty">Schau nochmal vorbei, wenn du deinen ersten Beitrag veröffentlicht hast!</string>

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

@@ -26,10 +26,6 @@ Language: en_CA
     <string name="qrcode_auth_flow_validated_subtitle">Only scan QR codes taken directly from your web browser. Never scan a code sent to you by anyone else.</string>
     <string name="qrcode_auth_flow_validated_default_title">Are you trying to log in to your web browser near %1$s?</string>
     <string name="qrcode_auth_flow_validated_title">Are you trying to log in to %1$s near %2$s?</string>
-    <string name="stats_revamp_v2_intro_secondary_button_text">Remind me later</string>
-    <string name="stats_revamp_v2_intro_primary_button_text">Try it now</string>
-    <string name="stats_revamp_v2_intro_content_note">Learn more in My Site &gt; Stats &gt; Insights</string>
-    <string name="stats_revamp_v2_intro_content">Insights help you understand how your content is performing and what\'s resonating with your audience.</string>
     <string name="stats_revamp_v2_intro_header_title">Insights update</string>
     <string name="stats_insights_followers_guide_card">💡Commenting on other blogs is a great way to build attention and followers for your new site.</string>
     <string name="stats_insights_comments_guide_card">💡Tap \'VIEW MORE\' to see your top commenters.</string>

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

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2022-07-26 11:10:59+0000
+Translation-Revision-Date: 2022-08-10 09:05:34+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/4.0.0-alpha.1
 Language: en_GB
 -->
 <resources>
+    <string name="wp_jetpack_powered_features">The new Jetpack app has Stats, Reader, Notifications, and more that make your WordPress better.</string>
+    <string name="wp_jetpack_powered_better_with_jetpack">WordPress is better with Jetpack</string>
     <string name="wp_jetpack_continue_to_notifications">Continue to Notifications</string>
     <string name="wp_jetpack_continue_to_reader">Continue to Reader</string>
     <string name="wp_jetpack_continue_to_stats">Continue to Stats</string>
     <string name="wp_jetpack_get_new_jetpack_app">Get the new Jetpack app</string>
     <string name="gutenberg_native_gradient">Gradient</string>
     <string name="gutenberg_native_invalid_url">Invalid URL.</string>
     <string name="gutenberg_native_jetpack_powered">Jetpack powered</string>
-    <string name="wp_jetpack_powered_features">Stats, Reader, Notifications, and other features are powered by Jetpack.</string>
     <string name="gutenberg_native_upgrade_your_plan_to_upload_audio">Upgrade your plan to upload audio</string>
     <string name="gutenberg_native_upgrade_your_plan_to_use_video_covers">Upgrade your plan to use video covers</string>
     <string name="gutenberg_native_problem_displaying_block_tap_to_attempt_block_recovery">Problem displaying block. \nTap to attempt block recovery.</string>
@@ -44,10 +45,6 @@ Language: en_GB
     <string name="qrcode_auth_flow_validated_subtitle">Only scan QR codes taken directly from your web browser. Never scan a code sent to you by anyone else.</string>
     <string name="qrcode_auth_flow_validated_default_title">Are you trying to log in to your web browser near %1$s?</string>
     <string name="qrcode_auth_flow_validated_title">Are you trying to log in to %1$s near %2$s?</string>
-    <string name="stats_revamp_v2_intro_secondary_button_text">Remind me later</string>
-    <string name="stats_revamp_v2_intro_primary_button_text">Try it now</string>
-    <string name="stats_revamp_v2_intro_content_note">Learn more in My Site &gt; Stats &gt; Insights</string>
-    <string name="stats_revamp_v2_intro_content">Insights help you understand how your content is performing and what\'s resonating with your audience.</string>
     <string name="stats_revamp_v2_intro_header_title">Insights update</string>
     <string name="stats_insights_followers_guide_card">💡Commenting on other blogs is a great way to build attention and followers for your new site.</string>
     <string name="stats_insights_comments_guide_card">💡Tap \'VIEW MORE\' to see your top commenters.</string>

WordPress/src/main/res/values-es-rCO/strings.xml

@@ -34,10 +34,6 @@ Language: es_CO
     <string name="qrcode_auth_flow_validated_subtitle">Escanea solo los códigos QR que has cogido directamente del navegador web. No escanees nunca un código que te haya enviado alguien.</string>
     <string name="qrcode_auth_flow_validated_default_title">¿Estás intentando acceder a tu navegador web cerca de %1$s?</string>
     <string name="qrcode_auth_flow_validated_title">¿Estás intentando acceder a %1$s cerca de %2$s?</string>
-    <string name="stats_revamp_v2_intro_secondary_button_text">Recuérdamelo más tarde</string>
-    <string name="stats_revamp_v2_intro_primary_button_text">Pruébalo ahora</string>
-    <string name="stats_revamp_v2_intro_content_note">Más información en Mi sitio &gt; Estadísticas &gt; Detalles</string>
-    <string name="stats_revamp_v2_intro_content">Detalles te ayuda a entender cómo es el rendimiento de tu contenido y qué tiene impacto en tu público.</string>
     <string name="stats_revamp_v2_intro_header_title">Actualización de Detalles</string>
     <string name="stats_insights_followers_guide_card">💡Comentar en otros blogs es una buena forma de llamar la atención y tener más seguidores en tu nuevo sitio.</string>
     <string name="stats_insights_comments_guide_card">💡Toca \"VER MÁS\" para ver los principales comentaristas.</string>

WordPress/src/main/res/values-es-rVE/strings.xml

@@ -34,10 +34,6 @@ Language: es_VE
     <string name="qrcode_auth_flow_validated_subtitle">Escanea solo los códigos QR que has cogido directamente del navegador web. No escanees nunca un código que te haya enviado alguien.</string>
     <string name="qrcode_auth_flow_validated_default_title">¿Estás intentando acceder a tu navegador web cerca de %1$s?</string>
     <string name="qrcode_auth_flow_validated_title">¿Estás intentando acceder a %1$s cerca de %2$s?</string>
-    <string name="stats_revamp_v2_intro_secondary_button_text">Recuérdamelo más tarde</string>
-    <string name="stats_revamp_v2_intro_primary_button_text">Pruébalo ahora</string>
-    <string name="stats_revamp_v2_intro_content_note">Más información en Mi sitio &gt; Estadísticas &gt; Detalles</string>
-    <string name="stats_revamp_v2_intro_content">Detalles te ayuda a entender cómo es el rendimiento de tu contenido y qué tiene impacto en tu público.</string>
     <string name="stats_revamp_v2_intro_header_title">Actualización de Detalles</string>
     <string name="stats_insights_followers_guide_card">💡Comentar en otros blogs es una buena forma de llamar la atención y tener más seguidores en tu nuevo sitio.</string>
     <string name="stats_insights_comments_guide_card">💡Toca \"VER MÁS\" para ver los principales comentaristas.</string>

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

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2022-07-26 17:49:42+0000
+Translation-Revision-Date: 2022-08-10 11:08:39+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/4.0.0-alpha.1
 Language: es
 -->
 <resources>
+    <string name="wp_jetpack_powered_better_with_jetpack">WordPress es mejor con Jetpack</string>
+    <string name="wp_jetpack_powered_features">La nueva app de Jetpack tiene estadísticas, lector, avisos, y más para mejorar tu WordPress.</string>
     <string name="gutenberg_native_upgrade_your_plan_to_use_video_covers">Actualiza tu plan para usar fondos de vídeo </string>
     <string name="gutenberg_native_upgrade_your_plan_to_upload_audio">Actualiza tu plan para subir audio</string>
     <string name="gutenberg_native_jetpack_powered">Funciona gracias a Jetpack</string>
@@ -15,7 +17,6 @@ Language: es
     <string name="wp_jetpack_continue_to_stats">Continuar a las estadísticas</string>
     <string name="wp_jetpack_continue_to_reader">Continuar al lector</string>
     <string name="wp_jetpack_get_new_jetpack_app">Consigue la nueva aplicación Jetpack</string>
-    <string name="wp_jetpack_powered_features">Estadísticas, lector, avisos y otras características que funcionan gracias a Jetpack.</string>
     <string name="gutenberg_native_problem_displaying_block_tap_to_attempt_block_recovery">Problema al mostrar el bloque. \nToca para intentar la recuperación del bloque.</string>
     <string name="weekly_roundup_notification_text_views_and_comments">La semana pasada tuviste %1$s visitas y %2$s comentarios</string>
     <string name="weekly_roundup_notification_text_views_only">La semana pasada tuviste %1$s visitas.</string>
@@ -44,10 +45,6 @@ Language: es
     <string name="qrcode_auth_flow_validated_subtitle">Escanea solo los códigos QR que has cogido directamente del navegador web. No escanees nunca un código que te haya enviado alguien.</string>
     <string name="qrcode_auth_flow_validated_default_title">¿Estás intentando acceder a tu navegador web cerca de %1$s?</string>
     <string name="qrcode_auth_flow_validated_title">¿Estás intentando acceder a %1$s cerca de %2$s?</string>
-    <string name="stats_revamp_v2_intro_secondary_button_text">Recuérdamelo más tarde</string>
-    <string name="stats_revamp_v2_intro_primary_button_text">Pruébalo ahora</string>
-    <string name="stats_revamp_v2_intro_content_note">Más información en Mi sitio &gt; Estadísticas &gt; Detalles</string>
-    <string name="stats_revamp_v2_intro_content">Detalles te ayuda a entender cómo es el rendimiento de tu contenido y qué tiene impacto en tu público.</string>
     <string name="stats_revamp_v2_intro_header_title">Actualización de Detalles</string>
     <string name="stats_insights_followers_guide_card">💡Comentar en otros blogs es una buena forma de llamar la atención y tener más seguidores en tu nuevo sitio.</string>
     <string name="stats_insights_comments_guide_card">💡Toca \"VER MÁS\" para ver los principales comentaristas.</string>