Skip to content

Merge release/20.9 after 20.9-rc-3 #17320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AliSoftware merged 7 commits into from
Oct 13, 2022
Merged

Merge release/20.9 after 20.9-rc-3 #17320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
08f12e6
Add feature flag to SharedLoginProvider
RenanLukas Oct 7, 2022
6fb9138
Merge pull request #17285 from wordpress-mobile/fix/add-feature-flag-…
RenanLukas Oct 10, 2022
410b353
Update translations
AliSoftware Oct 12, 2022
15bbc2b
Update translations
AliSoftware Oct 12, 2022
bcc0100
Bump version number
AliSoftware Oct 12, 2022
6907721
Merge branch 'trunk' into merge/20.9-rc-3
AliSoftware Oct 12, 2022
076befb
Add JetpackProviderSyncFeatureConfig import and injection to SharedLo…
RenanLukas Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions WordPress/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ android {
buildConfigField "boolean", "JETPACK_POWERED_BOTTOM_SHEET", "false"
buildConfigField "boolean", "JETPACK_SHARED_LOGIN", "false"
buildConfigField "boolean", "JETPACK_LOCAL_USER_FLAGS", "false"
buildConfigField "boolean", "JETPACK_PROVIDER_SYNC", "false"

// Override these constants in jetpack product flavor to enable/ disable features
buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"
Expand Down
19 changes: 18 additions & 1 deletion WordPress/src/jetpack/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-07-11 15:54:02+0000
Translation-Revision-Date: 2022-10-05 11:54:03+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
Language: ar
-->
<resources>
<string name="me_btn_share">مشاركة Jetpack مع صديق</string>
<string name="login_prologue_revamped_jetpack_feature_text_12">إضافة مؤلف</string>
<string name="login_prologue_revamped_jetpack_feature_text_11">نشر صورة</string>
<string name="login_prologue_revamped_jetpack_feature_text_10">إصلاح مشكلة الأمان</string>
<string name="login_prologue_revamped_jetpack_feature_text_9">شارك على فيسبوك</string>
<string name="login_prologue_revamped_jetpack_feature_text_8">البحث عن الإضافات</string>
<string name="login_prologue_revamped_jetpack_feature_text_7">استعادة نسخة احتياطية</string>
<string name="login_prologue_revamped_jetpack_feature_text_6">الرد على التعليقات</string>
<string name="login_prologue_revamped_jetpack_feature_text_5">التحقُّق من الإشعارات</string>
<string name="login_prologue_revamped_jetpack_feature_text_4">رصد إحصاءاتك</string>
<string name="login_prologue_revamped_jetpack_feature_text_3">كتابة مدونة</string>
<string name="login_prologue_revamped_jetpack_feature_text_2">إنشاء موقع</string>
<string name="login_prologue_revamped_jetpack_feature_text_1">تحديث إضافة</string>
<string name="login_prologue_revamped_content_description_top_bg">تلاشي الخلفية العلوية في Jetpack</string>
<string name="login_prologue_revamped_content_description_bg">خلفية Jetpack</string>
<string name="login_prologue_revamped_content_description_jetpack_logo">شعار Jetpack</string>
<string name="me_btn_about">نبذة عن Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">هل ترغب في تسجيل الخروج من Jetpack؟</string>
<string name="me_disconnect_from_wordpress_com">تسجيل الخروج من Jetpack</string>
<string name="support_ticket_subject">دعم Jetpack الخاص بنظام تشغيل Android</string>
<string name="login_magic_links_sent_label">تحقَّق من بريدك الإلكتروني على هذا الجهاز، واضغط على الرابط في رسالة البريد الإلكتروني التي تلقيتها من Jetpack.com.</string>
<string name="continue_with_wpcom_no_signup">الاستمرار في ووردبريس.كوم</string>
<string name="app_tagline">أمان الموقع وأداؤه من جيبك</string>
<string name="post_signup_interstitial_title">مرحبًا بك في Jetpack</string>
<string name="app_title">Jetpack الخاص بنظام تشغيل Android</string>
Expand Down
19 changes: 18 additions & 1 deletion WordPress/src/jetpack/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-07-11 15:54:02+0000
Translation-Revision-Date: 2022-10-06 15:54:03+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: de
-->
<resources>
<string name="me_btn_share">Jetpack mit einem Freund teilen</string>
<string name="login_prologue_revamped_jetpack_feature_text_12">Einen Autor hinzufügen</string>
<string name="login_prologue_revamped_jetpack_feature_text_11">Ein Foto veröffentlichen</string>
<string name="login_prologue_revamped_jetpack_feature_text_10">Ein Sicherheitsproblem beheben</string>
<string name="login_prologue_revamped_jetpack_feature_text_9">Auf Facebook teilen</string>
<string name="login_prologue_revamped_jetpack_feature_text_8">Plugins suchen</string>
<string name="login_prologue_revamped_jetpack_feature_text_7">Ein Backup wiederherstellen</string>
<string name="login_prologue_revamped_jetpack_feature_text_6">Kommentare beantworten</string>
<string name="login_prologue_revamped_jetpack_feature_text_5">Benachrichtigungen ansehen</string>
<string name="login_prologue_revamped_jetpack_feature_text_4">Statistiken überprüfen</string>
<string name="login_prologue_revamped_jetpack_feature_text_3">Ein Blog schreiben</string>
<string name="login_prologue_revamped_jetpack_feature_text_2">Eine Website erstellen</string>
<string name="login_prologue_revamped_jetpack_feature_text_1">Ein Plugin aktualisieren</string>
<string name="login_prologue_revamped_content_description_top_bg">Oberen Hintergrund in Jetpack ausblenden</string>
<string name="login_prologue_revamped_content_description_bg">Jetpack-Hintergrund</string>
<string name="login_prologue_revamped_content_description_jetpack_logo">Jetpack-Logo</string>
<string name="me_btn_about">Über Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Von Jetpack abmelden?</string>
<string name="me_disconnect_from_wordpress_com">Von Jetpack abmelden?</string>
<string name="support_ticket_subject">Support für Jetpack für Android</string>
<string name="login_magic_links_sent_label">Überprüfe deine E-Mails auf diesem Gerät und tippe auf den Link in der E-Mail, die du von Jetpack.com erhalten hast.</string>
<string name="continue_with_wpcom_no_signup">Weiter mit WordPress.com</string>
<string name="app_tagline">Website-Sicherheit und -Performance immer dabei</string>
<string name="post_signup_interstitial_title">Willkommen bei Jetpack</string>
<string name="app_title">Jetpack für Android</string>
Expand Down
19 changes: 18 additions & 1 deletion WordPress/src/jetpack/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-07-11 11:54:18+0000
Translation-Revision-Date: 2022-10-05 11:54:03+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: es
-->
<resources>
<string name="me_btn_share">Compartir Jetpack con un amigo</string>
<string name="login_prologue_revamped_jetpack_feature_text_12">Añadir un autor</string>
<string name="login_prologue_revamped_jetpack_feature_text_11">Publicar una foto</string>
<string name="login_prologue_revamped_jetpack_feature_text_10">Solucionar un problema de seguridad</string>
<string name="login_prologue_revamped_jetpack_feature_text_9">Compartir en Facebook</string>
<string name="login_prologue_revamped_jetpack_feature_text_8">Buscar plugins</string>
<string name="login_prologue_revamped_jetpack_feature_text_7">Restaurar una copia de seguridad</string>
<string name="login_prologue_revamped_jetpack_feature_text_6">Responder a comentarios</string>
<string name="login_prologue_revamped_jetpack_feature_text_5">Consultar notificaciones</string>
<string name="login_prologue_revamped_jetpack_feature_text_4">Ver las estadísticas</string>
<string name="login_prologue_revamped_jetpack_feature_text_3">Escribir un blog</string>
<string name="login_prologue_revamped_jetpack_feature_text_2">Crear un sitio</string>
<string name="login_prologue_revamped_jetpack_feature_text_1">Actualizar un plugin</string>
<string name="login_prologue_revamped_content_description_top_bg">Fundido del fondo superior de Jetpack</string>
<string name="login_prologue_revamped_content_description_bg">Fondo de Jetpack</string>
<string name="login_prologue_revamped_content_description_jetpack_logo">Logotipo de Jetpack</string>
<string name="me_btn_about">Sobre Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">¿Cerrar sesión en Jetpack?</string>
<string name="me_disconnect_from_wordpress_com">Salir de Jetpack</string>
<string name="support_ticket_subject">Jetpack para Ayuda de Android</string>
<string name="login_magic_links_sent_label">Consulta tu correo electrónico en este dispositivo y pulsa el enlace que encontrarás en el mensaje que has recibido de Jetpack.com.</string>
<string name="continue_with_wpcom_no_signup">Continuar con WordPress.com</string>
<string name="app_tagline">Seguridad y rendimiento del sitio en la palma de tu mano</string>
<string name="post_signup_interstitial_title">Te damos la bienvenida a Jetpack</string>
<string name="app_title">Jetpack para Android</string>
Expand Down
19 changes: 18 additions & 1 deletion WordPress/src/jetpack/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-07-12 09:54:03+0000
Translation-Revision-Date: 2022-10-06 13:54:03+0000
Plural-Forms: nplurals=2; plural=n > 1;
Generator: GlotPress/2.4.0-alpha
Language: fr
-->
<resources>
<string name="me_btn_share">Partager Jetpack avec un ami</string>
<string name="login_prologue_revamped_jetpack_feature_text_12">Ajouter un auteur</string>
<string name="login_prologue_revamped_jetpack_feature_text_11">Publier une photo</string>
<string name="login_prologue_revamped_jetpack_feature_text_10">Résoudre un incident de sécurité</string>
<string name="login_prologue_revamped_jetpack_feature_text_9">Partager sur Facebook</string>
<string name="login_prologue_revamped_jetpack_feature_text_8">Rechercher des extensions</string>
<string name="login_prologue_revamped_jetpack_feature_text_7">Rétablir une sauvegarde</string>
<string name="login_prologue_revamped_jetpack_feature_text_6">Répondre aux commentaires</string>
<string name="login_prologue_revamped_jetpack_feature_text_5">Vérifier vos notifications</string>
<string name="login_prologue_revamped_jetpack_feature_text_4">Consulter vos statistiques</string>
<string name="login_prologue_revamped_jetpack_feature_text_3">Tenir un blog</string>
<string name="login_prologue_revamped_jetpack_feature_text_2">Construire un site</string>
<string name="login_prologue_revamped_jetpack_feature_text_1">Mettre à jour une extension</string>
<string name="login_prologue_revamped_content_description_top_bg">Fondu sur le dessus de l\'arrière-plan de Jetpack</string>
<string name="login_prologue_revamped_content_description_bg">Arrière-plan de Jetpack</string>
<string name="login_prologue_revamped_content_description_jetpack_logo">Logo de Jetpack</string>
<string name="me_btn_about">À propos de Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Se déconnecter de Jetpack ?</string>
<string name="me_disconnect_from_wordpress_com">Se déconnecter de Jetpack</string>
<string name="support_ticket_subject">Prise en charge de Jetpack pour Android</string>
<string name="login_magic_links_sent_label">Consultez vos e-mails sur cet appareil et appuyez sur le lien dans l’e-mail que vous avez reçu de Jetpack.com.</string>
<string name="continue_with_wpcom_no_signup">Continuer avec WordPress.com</string>
<string name="app_tagline">Sécurité et performances du site\nde votre poche</string>
<string name="post_signup_interstitial_title">Bienvenue sur Jetpack</string>
<string name="app_title">Jetpack pour Android</string>
Expand Down
19 changes: 18 additions & 1 deletion WordPress/src/jetpack/res/values-he/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-07-12 15:54:03+0000
Translation-Revision-Date: 2022-10-06 13:54:03+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: he_IL
-->
<resources>
<string name="me_btn_share">לשתף את Jetpack עם חברים</string>
<string name="login_prologue_revamped_jetpack_feature_text_12">להוסיף מחבר</string>
<string name="login_prologue_revamped_jetpack_feature_text_11">לפרסם תמונה</string>
<string name="login_prologue_revamped_jetpack_feature_text_10">לתקן בעיית אבטחה</string>
<string name="login_prologue_revamped_jetpack_feature_text_9">Share on Facebook</string>
<string name="login_prologue_revamped_jetpack_feature_text_8">לחפש תוספים</string>
<string name="login_prologue_revamped_jetpack_feature_text_7">לשחזר גיבוי</string>
<string name="login_prologue_revamped_jetpack_feature_text_6">לענות לתגובות</string>
<string name="login_prologue_revamped_jetpack_feature_text_5">לבדוק הודעות</string>
<string name="login_prologue_revamped_jetpack_feature_text_4">לצפות בנתונים הסטטיסטיים שלך</string>
<string name="login_prologue_revamped_jetpack_feature_text_3">לכתוב בלוג</string>
<string name="login_prologue_revamped_jetpack_feature_text_2">לבנות אתר</string>
<string name="login_prologue_revamped_jetpack_feature_text_1">יש לעדכן תוסף </string>
<string name="login_prologue_revamped_content_description_top_bg">Jetpack top background fade</string>
<string name="login_prologue_revamped_content_description_bg">Jetpack background</string>
<string name="login_prologue_revamped_content_description_jetpack_logo">הלוגו של Jetpack</string>
<string name="me_btn_about">אודות Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">האם להתנתק מ-Jetpack?</string>
<string name="me_disconnect_from_wordpress_com">להתנתק מ-Jetpack</string>
<string name="support_ticket_subject">תמיכה ב-Jetpack ל-Android</string>
<string name="login_magic_links_sent_label">עליך לבדוק את האימייל ממכשיר זה ולהקיש על הקישור בהודעה שקיבלת מ-Jetpack.com.</string>
<string name="continue_with_wpcom_no_signup">להמשיך עם WordPress.com</string>
<string name="app_tagline">האבטחה והביצועים של האתר ישירות מהמכשיר הנייד</string>
<string name="post_signup_interstitial_title">ברוך בואך אל Jetpack</string>
<string name="app_title">Jetpack ל-Android</string>
Expand Down
19 changes: 18 additions & 1 deletion WordPress/src/jetpack/res/values-id/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-07-12 09:54:03+0000
Translation-Revision-Date: 2022-10-06 13:54:03+0000
Plural-Forms: nplurals=2; plural=n > 1;
Generator: GlotPress/2.4.0-alpha
Language: id
-->
<resources>
<string name="me_btn_share">Rekomendasikan Jetpack kepada teman</string>
<string name="login_prologue_revamped_jetpack_feature_text_12">Tambahkan penulis</string>
<string name="login_prologue_revamped_jetpack_feature_text_11">Kirim foto</string>
<string name="login_prologue_revamped_jetpack_feature_text_10">Perbaiki masalah keamanan</string>
<string name="login_prologue_revamped_jetpack_feature_text_9">Bagikan ke Facebook</string>
<string name="login_prologue_revamped_jetpack_feature_text_8">Cari plugin</string>
<string name="login_prologue_revamped_jetpack_feature_text_7">Pulihkan cadangan</string>
<string name="login_prologue_revamped_jetpack_feature_text_6">Tanggapi komentar</string>
<string name="login_prologue_revamped_jetpack_feature_text_5">Periksa pemberitahuan</string>
<string name="login_prologue_revamped_jetpack_feature_text_4">Pantau statistik Anda</string>
<string name="login_prologue_revamped_jetpack_feature_text_3">Tulis blog</string>
<string name="login_prologue_revamped_jetpack_feature_text_2">Buat situs</string>
<string name="login_prologue_revamped_jetpack_feature_text_1">Perbarui plugin</string>
<string name="login_prologue_revamped_content_description_top_bg">Latar belakang teratas Jetpack memudar</string>
<string name="login_prologue_revamped_content_description_bg">Latar belakang Jetpack</string>
<string name="login_prologue_revamped_content_description_jetpack_logo">Logo Jetpack</string>
<string name="me_btn_about">Tentang Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Logout dari Jetpack?</string>
<string name="me_disconnect_from_wordpress_com">Logout dari Jetpack</string>
<string name="support_ticket_subject">Jetpack untuk Dukungan Android</string>
<string name="login_magic_links_sent_label">Periksa email Anda di perangkat ini dan ketuk tautan di email yang Anda terima dari Jetpack.com.</string>
<string name="continue_with_wpcom_no_signup">Lanjutkan dengan WordPress.com</string>
<string name="app_tagline">Keamanan dan performa situs dari saku Anda</string>
<string name="post_signup_interstitial_title">Selamat datang di Jetpack</string>
<string name="app_title">Jetpack untuk Android</string>
Expand Down
19 changes: 18 additions & 1 deletion WordPress/src/jetpack/res/values-it/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-07-11 15:54:02+0000
Translation-Revision-Date: 2022-10-05 16:54:03+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: it
-->
<resources>
<string name="me_btn_share">Condividi Jetpack con un amico</string>
<string name="login_prologue_revamped_jetpack_feature_text_12">Aggiungi un autore</string>
<string name="login_prologue_revamped_jetpack_feature_text_11">Pubblica una foto</string>
<string name="login_prologue_revamped_jetpack_feature_text_10">Risolvi un problema di sicurezza</string>
<string name="login_prologue_revamped_jetpack_feature_text_9">Condividi su Facebook</string>
<string name="login_prologue_revamped_jetpack_feature_text_8">Cerca i plugin</string>
<string name="login_prologue_revamped_jetpack_feature_text_7">Ripristina un backup</string>
<string name="login_prologue_revamped_jetpack_feature_text_6">Rispondi ai commenti</string>
<string name="login_prologue_revamped_jetpack_feature_text_5">Verifica le notifiche</string>
<string name="login_prologue_revamped_jetpack_feature_text_4">Guarda le tue statistiche</string>
<string name="login_prologue_revamped_jetpack_feature_text_3">Scrivi un blog</string>
<string name="login_prologue_revamped_jetpack_feature_text_2">Crea un sito</string>
<string name="login_prologue_revamped_jetpack_feature_text_1">Aggiorna un plugin</string>
<string name="login_prologue_revamped_content_description_top_bg">Dissolvenza sfondo superiore Jetpack</string>
<string name="login_prologue_revamped_content_description_bg">Sfondo Jetpack</string>
<string name="login_prologue_revamped_content_description_jetpack_logo">Logo Jetpack</string>
<string name="me_btn_about">Informazioni su Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Uscire da Jetpack?</string>
<string name="me_disconnect_from_wordpress_com">Esci da Jetpack</string>
<string name="support_ticket_subject">Supporto Jetpack per Android</string>
<string name="login_magic_links_sent_label">Controlla la tua e-mail su questo dispositivo e tocca il link nell\'e-mail ricevuta da Jetpack.com.</string>
<string name="continue_with_wpcom_no_signup">Continua con WordPress.com</string>
<string name="app_tagline">Sicurezza e prestazioni del sito dalla tua tasca</string>
<string name="post_signup_interstitial_title">Sei su Jetpack</string>
<string name="app_title">Jetpack per Android</string>
Expand Down
Loading