Merge pull request #20389 from wordpress-mobile/merge/24.3-final-to-t…

…runk Merge 24.3 final to trunk
wordpress-mobile · Mar 2, 2024 · 1a67bc0 · 1a67bc0
2 parents 4dfebc9 + 2e4fee0
commit 1a67bc0
Show file tree

Hide file tree

Showing 92 changed files with 1,894 additions and 1,452 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -13,6 +13,7 @@
 -----
 * [**] Added support to use third-party passkey providers and other devices passkeys as a WordPress.com login option [https://github.com/wordpress-mobile/WordPress-Android/pull/20174]
 * [*] [Jetpack-only] Fix the visibility issue with the menu button on the stats [https://github.com/wordpress-mobile/WordPress-Android/pull/20175]
+* [*] [internal][WordPress-only] Updates Jetpack banners and badges copy for consistency [https://github.com/wordpress-mobile/WordPress-Android/pull/20123]
 
 24.2
 -----

diff --git a/...rc/main/java/org/wordpress/android/ui/jetpackoverlay/JetpackFeatureRemovalBrandingUtil.kt b/...rc/main/java/org/wordpress/android/ui/jetpackoverlay/JetpackFeatureRemovalBrandingUtil.kt
@@ -60,7 +60,7 @@ class JetpackFeatureRemovalBrandingUtil @Inject constructor(
 
     fun getBrandingTextByPhase(screen: JetpackPoweredScreen): UiString {
         return when (jetpackFeatureRemovalPhaseHelper.getCurrentPhase()) {
-            PhaseStaticPosters -> UiStringRes(R.string.wp_jetpack_feature_removal_static_posters_phase)
+            PhaseStaticPosters -> UiStringRes(R.string.wp_jetpack_powered)
             PhaseThree -> (screen as? JetpackPoweredScreen.WithDynamicText)?.let { screenWithDynamicText ->
                 getDynamicBrandingForScreen(screenWithDynamicText)
             } ?: UiStringRes(JetpackBrandingUiState.RES_JP_POWERED)

diff --git a/WordPress/src/main/res/values-ar/strings.xml b/WordPress/src/main/res/values-ar/strings.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-02-14 13:54:08+0000
+Translation-Revision-Date: 2024-02-21 22:54: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/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: ar
 -->
 <resources>
+    <string name="qrcode_media_deeplink_error">الموقع غير موجود. تحقق من تسجيلك الدخول إلى الحساب الصحيح.</string>
+    <string name="gravatar_info_sync_done_button">تم</string>
+    <string name="gravatar_info_sync_message">قد تستغرق مزامنة التحديثات مع ملفك الشخصي على جرافتار بعض الوقت.</string>
+    <string name="gravatar_info_learn_more_link">ما المقصود بخدمة جرافتار؟</string>
+    <string name="gravatar_info_description">سيؤدي أيضًا تحديث الأفاتار الخاص بك واسمك والمعلومات حولك هنا إلى تحديثها عبر كل المواقع التي تستخدم ملفات جرافتار الشخصية.</string>
+    <string name="gravatar_info_title">يكون ملفك الشخصي على ووردبريس.كوم مدعومًا من خدمة جرافتار</string>
     <string name="error_media_could_not_share_media_from_device">يتعذر تحميل الوسائط للمشاركة. يرجى التحقق من صلاحيات التطبيق\n        أو استخدم مكتبة وسائط التطبيق.</string>
     <string name="site_monitoring_cannot_be_started">يتعذر علينا فتح مراقبة الموقع في الوقت الحالي. يرجى المحاولة مجددًا في وقت لاحق</string>
     <string name="site_monitoring_tab_title_web_server_logs">سجلات خادم الويب</string>

diff --git a/WordPress/src/main/res/values-az/strings.xml b/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/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: az
 -->
 <resources>

diff --git a/WordPress/src/main/res/values-bg/strings.xml b/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/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: bg
 -->
 <resources>

diff --git a/WordPress/src/main/res/values-cs/strings.xml b/WordPress/src/main/res/values-cs/strings.xml
@@ -1,11 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2023-12-13 09:55:25+0000
+Translation-Revision-Date: 2024-02-29 12:55:08+0000
 Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n >= 2 && n <= 4) ? 1 : 2);
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: cs_CZ
 -->
 <resources>
+    <string name="site_monitoring_cannot_be_started">V současné době nemůžeme spustit monitorování webu. Zkuste to prosím později</string>
+    <string name="site_monitoring_tab_title_web_server_logs">Protokoly webového serveru</string>
+    <string name="site_monitoring_tab_title_php_logs">Protokoly PHP</string>
+    <string name="site_monitoring">Monitorování webu</string>
+    <string name="gutenberg_native_waiting_for_connection">Čekání na připojení</string>
+    <string name="gutenberg_native_font_size_1_s">Velikost písma, %1$s</string>
+    <string name="gutenberg_native_network_connection_lost_working_offline">Ztráta síťového připojení, práce v režimu offline</string>
+    <string name="gutenberg_native_network_connection_re_established">Obnovení síťového připojení</string>
+    <string name="gutenberg_native_working_offline">Práce v režimu offline</string>
+    <string name="domains_site_domain">%s</string>
+    <string name="bloganuary_dashboard_nudge_overlay_action_dismiss">Jdeme na to!</string>
     <string name="blaze_campaigns_card_footer_label">Vytvořit kampaň</string>
     <string name="privacy_banner_save">Uložit</string>
     <string name="privacy_banner_settings">Nastavení</string>
@@ -1377,6 +1388,7 @@ Language: cs_CZ
     <string name="status_and_visibility">Stav &amp; Viditelnost</string>
     <string name="update_now">Aktualizovat nyní</string>
     <string name="ccpa_privacy_notice_header">Oznámení o ochraně osobních údajů pro uživatele Kalifornie</string>
+    <string name="pages_item_subtitle">%1$s ·</string>
     <string name="gutenberg_native_open_block_actions_menu">Otevřete nabídku blokovat akce</string>
     <string name="gutenberg_native_move_to_top">Přesunout nahoru</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Dvojitým klepnutím otevřete akční list s dostupnými možnostmi</string>

diff --git a/WordPress/src/main/res/values-cy/strings.xml b/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/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: cy_GB
 -->
 <resources>

diff --git a/WordPress/src/main/res/values-da/strings.xml b/WordPress/src/main/res/values-da/strings.xml
@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2021-08-01 11:11:29+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: da_DK
 -->
 <resources>

diff --git a/WordPress/src/main/res/values-de/strings.xml b/WordPress/src/main/res/values-de/strings.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-02-13 14:29:51+0000
+Translation-Revision-Date: 2024-02-25 18:55:17+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: de
 -->
 <resources>
+    <string name="qrcode_media_deeplink_error">Die Website wurde nicht gefunden. Überprüfe, ob du im richtigen Konto angemeldet bist.</string>
+    <string name="gravatar_info_sync_done_button">Fertig</string>
+    <string name="gravatar_info_sync_message">Die Synchronisierung deines Gravatar-Profils mit den neuesten Updates kann einige Zeit in Anspruch nehmen.</string>
+    <string name="gravatar_info_learn_more_link">Was ist Gravatar?</string>
+    <string name="gravatar_info_description">Wenn du hier deinen Avatar, Namen und deine Informationen über dich aktualisierst, werden sie auch auf allen Websites aktualisiert, die Gravatar-Profile nutzen.</string>
+    <string name="gravatar_info_title">Dein WordPress.com-Profil wird unterstützt von Gravatar</string>
     <string name="error_media_could_not_share_media_from_device">Die Medien können nicht zum Teilen geladen werden. Bitte überprüfe die Berechtigungen der App\n    oder verwende die Mediathek der App.</string>
     <string name="site_monitoring_cannot_be_started">Wir können die Website-Überwachung im Moment nicht öffnen. Bitte versuche es später erneut</string>
     <string name="site_monitoring_tab_title_web_server_logs">Webserver-Protokolle</string>
@@ -3780,7 +3786,7 @@ Language: de
     <string name="error">Fehler</string>
     <string name="no">Nein</string>
     <string name="yes">Ja</string>
-    <string name="notification_settings">Benachrichtigungs-Einstellungen</string>
+    <string name="notification_settings">Benachrichtigungseinstellungen</string>
     <string name="add">Hinzufügen</string>
     <string name="save">Speichern</string>
     <string name="cancel">Abbrechen</string>

diff --git a/WordPress/src/main/res/values-el/strings.xml b/WordPress/src/main/res/values-el/strings.xml
@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2023-06-13 08:27:23+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: el_GR
 -->
 <resources>

diff --git a/WordPress/src/main/res/values-en-rCA/strings.xml b/WordPress/src/main/res/values-en-rCA/strings.xml
@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2023-11-25 14:38:02+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: en_CA
 -->
 <resources>

diff --git a/WordPress/src/main/res/values-en-rGB/strings.xml b/WordPress/src/main/res/values-en-rGB/strings.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-02-13 11:18:53+0000
+Translation-Revision-Date: 2024-02-20 09:01:27+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: en_GB
 -->
 <resources>
+    <string name="qrcode_media_deeplink_error">Site not found. Check that you are logged into the correct account.</string>
+    <string name="gravatar_info_sync_done_button">Done</string>
+    <string name="gravatar_info_sync_message">Updates might take some time to sync with your Gravatar profile.</string>
+    <string name="gravatar_info_learn_more_link">What is Gravatar?</string>
+    <string name="gravatar_info_description">Updating your avatar, name, and about info here will also update it across all sites that use Gravatar profiles.</string>
+    <string name="gravatar_info_title">Your WordPress.com profile is powered by Gravatar</string>
     <string name="error_media_could_not_share_media_from_device">Unable to load the media for sharing. Please check the app\'s permissions\n        or use the app\'s media library.</string>
     <string name="site_monitoring_cannot_be_started">We cannot open site monitoring at the moment. Please try again later</string>
     <string name="site_monitoring_tab_title_web_server_logs">Web Server Logs</string>

diff --git a/WordPress/src/main/res/values-es-rCL/strings.xml b/WordPress/src/main/res/values-es-rCL/strings.xml
@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2020-05-09 06:46:56+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: es_CL
 -->
 <resources>

diff --git a/WordPress/src/main/res/values-es-rCO/strings.xml b/WordPress/src/main/res/values-es-rCO/strings.xml
@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2024-02-04 03:07:22+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: es_CO
 -->
 <resources>

diff --git a/WordPress/src/main/res/values-es-rMX/strings.xml b/WordPress/src/main/res/values-es-rMX/strings.xml
@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2022-12-08 22:14:16+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: es_MX
 -->
 <resources>

diff --git a/WordPress/src/main/res/values-es-rVE/strings.xml b/WordPress/src/main/res/values-es-rVE/strings.xml
@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2022-08-22 17:29:07+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: es_VE
 -->
 <resources>

diff --git a/WordPress/src/main/res/values-es/strings.xml b/WordPress/src/main/res/values-es/strings.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-02-14 19:54:08+0000
+Translation-Revision-Date: 2024-02-21 08:24:17+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: es
 -->
 <resources>
+    <string name="qrcode_media_deeplink_error">Sitio no encontrado. Comprueba que has iniciado sesión con la cuenta correcta.</string>
+    <string name="gravatar_info_sync_done_button">Hecho</string>
+    <string name="gravatar_info_sync_message">Las actualizaciones pueden tardar algún tiempo en sincronizarse con tu perfil de Gravatar.</string>
+    <string name="gravatar_info_learn_more_link">¿Qué es Gravatar?</string>
+    <string name="gravatar_info_description">Si actualizas aquí tu avatar, nombre e información sobre ti, también se actualizarán en todos los sitios que utilicen perfiles Gravatar.</string>
+    <string name="gravatar_info_title">Tu perfil de WordPress.com funciona con Gravatar</string>
     <string name="error_media_could_not_share_media_from_device">No se pueden cargar los medios para compartir. Comprueba los permisos de la aplicación\n        o utiliza la biblioteca de medios.</string>
     <string name="site_monitoring_cannot_be_started">No podemos abrir las estadísticas en este momento. Por favor, inténtalo de nuevo más tarde</string>
     <string name="site_monitoring_tab_title_web_server_logs">Registros del servidor webs</string>

diff --git a/WordPress/src/main/res/values-eu/strings.xml b/WordPress/src/main/res/values-eu/strings.xml
@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2022-07-23 20:48:05+0000
 Plural-Forms: nplurals=2; plural=n != 1;
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: eu_ES
 -->
 <resources>

diff --git a/WordPress/src/main/res/values-fr-rCA/strings.xml b/WordPress/src/main/res/values-fr-rCA/strings.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-02-15 10:54:08+0000
+Translation-Revision-Date: 2024-02-21 18:54:09+0000
 Plural-Forms: nplurals=2; plural=n > 1;
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: fr
 -->
 <resources>
+    <string name="qrcode_media_deeplink_error">Site non trouvé. Vérifiez que vous êtes connecté(e) sur le bon compte.</string>
+    <string name="gravatar_info_sync_done_button">Terminé</string>
+    <string name="gravatar_info_sync_message">Il se peut que les mises à jour prennent un peu de temps pour se synchroniser avec votre profil Gravatar.</string>
+    <string name="gravatar_info_learn_more_link">Qu’est-ce que Gravatar ?</string>
+    <string name="gravatar_info_description">Mettre à jour votre avatar, votre nom et les informations vous concernant ici les mettra également à jour sur l’ensemble des sites qui utilisent les profils Gravatar.</string>
+    <string name="gravatar_info_title">Votre profil WordPress.com est propulsé par Gravatar</string>
     <string name="error_media_could_not_share_media_from_device">Impossible de charger le média pour le partage. Veuillez vérifier les droits de l’application\n        ou utilisez la bibliothèque de médias de l’application.</string>
     <string name="site_monitoring_cannot_be_started">Nous ne sommes pas en mesure d’ouvrir la surveillance du site actuellement. Veuillez réessayer plus tard</string>
     <string name="site_monitoring_tab_title_web_server_logs">Journaux du serveur Web</string>

diff --git a/WordPress/src/main/res/values-fr/strings.xml b/WordPress/src/main/res/values-fr/strings.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-02-15 10:54:08+0000
+Translation-Revision-Date: 2024-02-21 18:54:09+0000
 Plural-Forms: nplurals=2; plural=n > 1;
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: fr
 -->
 <resources>
+    <string name="qrcode_media_deeplink_error">Site non trouvé. Vérifiez que vous êtes connecté(e) sur le bon compte.</string>
+    <string name="gravatar_info_sync_done_button">Terminé</string>
+    <string name="gravatar_info_sync_message">Il se peut que les mises à jour prennent un peu de temps pour se synchroniser avec votre profil Gravatar.</string>
+    <string name="gravatar_info_learn_more_link">Qu’est-ce que Gravatar ?</string>
+    <string name="gravatar_info_description">Mettre à jour votre avatar, votre nom et les informations vous concernant ici les mettra également à jour sur l’ensemble des sites qui utilisent les profils Gravatar.</string>
+    <string name="gravatar_info_title">Votre profil WordPress.com est propulsé par Gravatar</string>
     <string name="error_media_could_not_share_media_from_device">Impossible de charger le média pour le partage. Veuillez vérifier les droits de l’application\n        ou utilisez la bibliothèque de médias de l’application.</string>
     <string name="site_monitoring_cannot_be_started">Nous ne sommes pas en mesure d’ouvrir la surveillance du site actuellement. Veuillez réessayer plus tard</string>
     <string name="site_monitoring_tab_title_web_server_logs">Journaux du serveur Web</string>

diff --git a/WordPress/src/main/res/values-gd/strings.xml b/WordPress/src/main/res/values-gd/strings.xml
@@ -2,7 +2,7 @@
 <!--
 Translation-Revision-Date: 2016-08-23 18:32:37+0000
 Plural-Forms: nplurals=4; plural=(n == 1 || n == 11) ? 0 : ((n == 2 || n == 12) ? 1 : ((n >= 3 && n <= 10 || n >= 13 && n <= 19) ? 2 : 3));
-Generator: GlotPress/4.0.0-beta.2
+Generator: GlotPress/4.0.0-beta.3
 Language: gd_GB
 -->
 <resources>