Skip to content

Commit 4d6fc13

Browse files
AliSoftwareAliSoftware
authored
Merge pull request #17320 from wordpress-mobile/merge/20.9-rc-3
Merge release/20.9 after 20.9-rc-3
2 parents 5beb2d3 + 076befb commit 4d6fc13

File tree

37 files changed

+1204
-797
lines changed

37 files changed

+1204
-797
lines changed

‎WordPress/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ android {
122122
buildConfigField "boolean", "JETPACK_POWERED_BOTTOM_SHEET", "false"
123123
buildConfigField "boolean", "JETPACK_SHARED_LOGIN", "false"
124124
buildConfigField "boolean", "JETPACK_LOCAL_USER_FLAGS", "false"
125+
buildConfigField "boolean", "JETPACK_PROVIDER_SYNC", "false"
125126

126127
// Override these constants in jetpack product flavor to enable/ disable features
127128
buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"

‎WordPress/src/jetpack/res/values-ar/strings.xml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-07-11 15:54:02+0000
3+
Translation-Revision-Date: 2022-10-05 11:54:03+0000
44
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;
55
Generator: GlotPress/2.4.0-alpha
66
Language: ar
77
-->
88
<resources>
9+
<string name="me_btn_share">مشاركة Jetpack مع صديق</string>
10+
<string name="login_prologue_revamped_jetpack_feature_text_12">إضافة مؤلف</string>
11+
<string name="login_prologue_revamped_jetpack_feature_text_11">نشر صورة</string>
12+
<string name="login_prologue_revamped_jetpack_feature_text_10">إصلاح مشكلة الأمان</string>
13+
<string name="login_prologue_revamped_jetpack_feature_text_9">شارك على فيسبوك</string>
14+
<string name="login_prologue_revamped_jetpack_feature_text_8">البحث عن الإضافات</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_7">استعادة نسخة احتياطية</string>
16+
<string name="login_prologue_revamped_jetpack_feature_text_6">الرد على التعليقات</string>
17+
<string name="login_prologue_revamped_jetpack_feature_text_5">التحقُّق من الإشعارات</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_4">رصد إحصاءاتك</string>
19+
<string name="login_prologue_revamped_jetpack_feature_text_3">كتابة مدونة</string>
20+
<string name="login_prologue_revamped_jetpack_feature_text_2">إنشاء موقع</string>
21+
<string name="login_prologue_revamped_jetpack_feature_text_1">تحديث إضافة</string>
22+
<string name="login_prologue_revamped_content_description_top_bg">تلاشي الخلفية العلوية في Jetpack</string>
23+
<string name="login_prologue_revamped_content_description_bg">خلفية Jetpack</string>
24+
<string name="login_prologue_revamped_content_description_jetpack_logo">شعار Jetpack</string>
925
<string name="me_btn_about">نبذة عن Jetpack</string>
1026
<string name="sign_out_wpcom_confirm_with_no_changes">هل ترغب في تسجيل الخروج من Jetpack؟</string>
1127
<string name="me_disconnect_from_wordpress_com">تسجيل الخروج من Jetpack</string>
1228
<string name="support_ticket_subject">دعم Jetpack الخاص بنظام تشغيل Android</string>
1329
<string name="login_magic_links_sent_label">تحقَّق من بريدك الإلكتروني على هذا الجهاز، واضغط على الرابط في رسالة البريد الإلكتروني التي تلقيتها من Jetpack.com.</string>
30+
<string name="continue_with_wpcom_no_signup">الاستمرار في ووردبريس.كوم</string>
1431
<string name="app_tagline">أمان الموقع وأداؤه من جيبك</string>
1532
<string name="post_signup_interstitial_title">مرحبًا بك في Jetpack</string>
1633
<string name="app_title">Jetpack الخاص بنظام تشغيل Android</string>

‎WordPress/src/jetpack/res/values-de/strings.xml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-07-11 15:54:02+0000
3+
Translation-Revision-Date: 2022-10-06 15:54:03+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/2.4.0-alpha
66
Language: de
77
-->
88
<resources>
9+
<string name="me_btn_share">Jetpack mit einem Freund teilen</string>
10+
<string name="login_prologue_revamped_jetpack_feature_text_12">Einen Autor hinzufügen</string>
11+
<string name="login_prologue_revamped_jetpack_feature_text_11">Ein Foto veröffentlichen</string>
12+
<string name="login_prologue_revamped_jetpack_feature_text_10">Ein Sicherheitsproblem beheben</string>
13+
<string name="login_prologue_revamped_jetpack_feature_text_9">Auf Facebook teilen</string>
14+
<string name="login_prologue_revamped_jetpack_feature_text_8">Plugins suchen</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_7">Ein Backup wiederherstellen</string>
16+
<string name="login_prologue_revamped_jetpack_feature_text_6">Kommentare beantworten</string>
17+
<string name="login_prologue_revamped_jetpack_feature_text_5">Benachrichtigungen ansehen</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_4">Statistiken überprüfen</string>
19+
<string name="login_prologue_revamped_jetpack_feature_text_3">Ein Blog schreiben</string>
20+
<string name="login_prologue_revamped_jetpack_feature_text_2">Eine Website erstellen</string>
21+
<string name="login_prologue_revamped_jetpack_feature_text_1">Ein Plugin aktualisieren</string>
22+
<string name="login_prologue_revamped_content_description_top_bg">Oberen Hintergrund in Jetpack ausblenden</string>
23+
<string name="login_prologue_revamped_content_description_bg">Jetpack-Hintergrund</string>
24+
<string name="login_prologue_revamped_content_description_jetpack_logo">Jetpack-Logo</string>
925
<string name="me_btn_about">Über Jetpack</string>
1026
<string name="sign_out_wpcom_confirm_with_no_changes">Von Jetpack abmelden?</string>
1127
<string name="me_disconnect_from_wordpress_com">Von Jetpack abmelden?</string>
1228
<string name="support_ticket_subject">Support für Jetpack für Android</string>
1329
<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>
30+
<string name="continue_with_wpcom_no_signup">Weiter mit WordPress.com</string>
1431
<string name="app_tagline">Website-Sicherheit und -Performance immer dabei</string>
1532
<string name="post_signup_interstitial_title">Willkommen bei Jetpack</string>
1633
<string name="app_title">Jetpack für Android</string>

‎WordPress/src/jetpack/res/values-es/strings.xml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-07-11 11:54:18+0000
3+
Translation-Revision-Date: 2022-10-05 11:54:03+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/2.4.0-alpha
66
Language: es
77
-->
88
<resources>
9+
<string name="me_btn_share">Compartir Jetpack con un amigo</string>
10+
<string name="login_prologue_revamped_jetpack_feature_text_12">Añadir un autor</string>
11+
<string name="login_prologue_revamped_jetpack_feature_text_11">Publicar una foto</string>
12+
<string name="login_prologue_revamped_jetpack_feature_text_10">Solucionar un problema de seguridad</string>
13+
<string name="login_prologue_revamped_jetpack_feature_text_9">Compartir en Facebook</string>
14+
<string name="login_prologue_revamped_jetpack_feature_text_8">Buscar plugins</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_7">Restaurar una copia de seguridad</string>
16+
<string name="login_prologue_revamped_jetpack_feature_text_6">Responder a comentarios</string>
17+
<string name="login_prologue_revamped_jetpack_feature_text_5">Consultar notificaciones</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_4">Ver las estadísticas</string>
19+
<string name="login_prologue_revamped_jetpack_feature_text_3">Escribir un blog</string>
20+
<string name="login_prologue_revamped_jetpack_feature_text_2">Crear un sitio</string>
21+
<string name="login_prologue_revamped_jetpack_feature_text_1">Actualizar un plugin</string>
22+
<string name="login_prologue_revamped_content_description_top_bg">Fundido del fondo superior de Jetpack</string>
23+
<string name="login_prologue_revamped_content_description_bg">Fondo de Jetpack</string>
24+
<string name="login_prologue_revamped_content_description_jetpack_logo">Logotipo de Jetpack</string>
925
<string name="me_btn_about">Sobre Jetpack</string>
1026
<string name="sign_out_wpcom_confirm_with_no_changes">¿Cerrar sesión en Jetpack?</string>
1127
<string name="me_disconnect_from_wordpress_com">Salir de Jetpack</string>
1228
<string name="support_ticket_subject">Jetpack para Ayuda de Android</string>
1329
<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>
30+
<string name="continue_with_wpcom_no_signup">Continuar con WordPress.com</string>
1431
<string name="app_tagline">Seguridad y rendimiento del sitio en la palma de tu mano</string>
1532
<string name="post_signup_interstitial_title">Te damos la bienvenida a Jetpack</string>
1633
<string name="app_title">Jetpack para Android</string>

‎WordPress/src/jetpack/res/values-fr/strings.xml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-07-12 09:54:03+0000
3+
Translation-Revision-Date: 2022-10-06 13:54:03+0000
44
Plural-Forms: nplurals=2; plural=n > 1;
55
Generator: GlotPress/2.4.0-alpha
66
Language: fr
77
-->
88
<resources>
9+
<string name="me_btn_share">Partager Jetpack avec un ami</string>
10+
<string name="login_prologue_revamped_jetpack_feature_text_12">Ajouter un auteur</string>
11+
<string name="login_prologue_revamped_jetpack_feature_text_11">Publier une photo</string>
12+
<string name="login_prologue_revamped_jetpack_feature_text_10">Résoudre un incident de sécurité</string>
13+
<string name="login_prologue_revamped_jetpack_feature_text_9">Partager sur Facebook</string>
14+
<string name="login_prologue_revamped_jetpack_feature_text_8">Rechercher des extensions</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_7">Rétablir une sauvegarde</string>
16+
<string name="login_prologue_revamped_jetpack_feature_text_6">Répondre aux commentaires</string>
17+
<string name="login_prologue_revamped_jetpack_feature_text_5">Vérifier vos notifications</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_4">Consulter vos statistiques</string>
19+
<string name="login_prologue_revamped_jetpack_feature_text_3">Tenir un blog</string>
20+
<string name="login_prologue_revamped_jetpack_feature_text_2">Construire un site</string>
21+
<string name="login_prologue_revamped_jetpack_feature_text_1">Mettre à jour une extension</string>
22+
<string name="login_prologue_revamped_content_description_top_bg">Fondu sur le dessus de l\'arrière-plan de Jetpack</string>
23+
<string name="login_prologue_revamped_content_description_bg">Arrière-plan de Jetpack</string>
24+
<string name="login_prologue_revamped_content_description_jetpack_logo">Logo de Jetpack</string>
925
<string name="me_btn_about">À propos de Jetpack</string>
1026
<string name="sign_out_wpcom_confirm_with_no_changes">Se déconnecter de Jetpack ?</string>
1127
<string name="me_disconnect_from_wordpress_com">Se déconnecter de Jetpack</string>
1228
<string name="support_ticket_subject">Prise en charge de Jetpack pour Android</string>
1329
<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>
30+
<string name="continue_with_wpcom_no_signup">Continuer avec WordPress.com</string>
1431
<string name="app_tagline">Sécurité et performances du site\nde votre poche</string>
1532
<string name="post_signup_interstitial_title">Bienvenue sur Jetpack</string>
1633
<string name="app_title">Jetpack pour Android</string>

‎WordPress/src/jetpack/res/values-he/strings.xml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-07-12 15:54:03+0000
3+
Translation-Revision-Date: 2022-10-06 13:54:03+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/2.4.0-alpha
66
Language: he_IL
77
-->
88
<resources>
9+
<string name="me_btn_share">לשתף את Jetpack עם חברים</string>
10+
<string name="login_prologue_revamped_jetpack_feature_text_12">להוסיף מחבר</string>
11+
<string name="login_prologue_revamped_jetpack_feature_text_11">לפרסם תמונה</string>
12+
<string name="login_prologue_revamped_jetpack_feature_text_10">לתקן בעיית אבטחה</string>
13+
<string name="login_prologue_revamped_jetpack_feature_text_9">Share on Facebook</string>
14+
<string name="login_prologue_revamped_jetpack_feature_text_8">לחפש תוספים</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_7">לשחזר גיבוי</string>
16+
<string name="login_prologue_revamped_jetpack_feature_text_6">לענות לתגובות</string>
17+
<string name="login_prologue_revamped_jetpack_feature_text_5">לבדוק הודעות</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_4">לצפות בנתונים הסטטיסטיים שלך</string>
19+
<string name="login_prologue_revamped_jetpack_feature_text_3">לכתוב בלוג</string>
20+
<string name="login_prologue_revamped_jetpack_feature_text_2">לבנות אתר</string>
21+
<string name="login_prologue_revamped_jetpack_feature_text_1">יש לעדכן תוסף </string>
22+
<string name="login_prologue_revamped_content_description_top_bg">Jetpack top background fade</string>
23+
<string name="login_prologue_revamped_content_description_bg">Jetpack background</string>
24+
<string name="login_prologue_revamped_content_description_jetpack_logo">הלוגו של Jetpack</string>
925
<string name="me_btn_about">אודות Jetpack</string>
1026
<string name="sign_out_wpcom_confirm_with_no_changes">האם להתנתק מ-Jetpack?</string>
1127
<string name="me_disconnect_from_wordpress_com">להתנתק מ-Jetpack</string>
1228
<string name="support_ticket_subject">תמיכה ב-Jetpack ל-Android</string>
1329
<string name="login_magic_links_sent_label">עליך לבדוק את האימייל ממכשיר זה ולהקיש על הקישור בהודעה שקיבלת מ-Jetpack.com.</string>
30+
<string name="continue_with_wpcom_no_signup">להמשיך עם WordPress.com</string>
1431
<string name="app_tagline">האבטחה והביצועים של האתר ישירות מהמכשיר הנייד</string>
1532
<string name="post_signup_interstitial_title">ברוך בואך אל Jetpack</string>
1633
<string name="app_title">Jetpack ל-Android</string>

‎WordPress/src/jetpack/res/values-id/strings.xml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-07-12 09:54:03+0000
3+
Translation-Revision-Date: 2022-10-06 13:54:03+0000
44
Plural-Forms: nplurals=2; plural=n > 1;
55
Generator: GlotPress/2.4.0-alpha
66
Language: id
77
-->
88
<resources>
9+
<string name="me_btn_share">Rekomendasikan Jetpack kepada teman</string>
10+
<string name="login_prologue_revamped_jetpack_feature_text_12">Tambahkan penulis</string>
11+
<string name="login_prologue_revamped_jetpack_feature_text_11">Kirim foto</string>
12+
<string name="login_prologue_revamped_jetpack_feature_text_10">Perbaiki masalah keamanan</string>
13+
<string name="login_prologue_revamped_jetpack_feature_text_9">Bagikan ke Facebook</string>
14+
<string name="login_prologue_revamped_jetpack_feature_text_8">Cari plugin</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_7">Pulihkan cadangan</string>
16+
<string name="login_prologue_revamped_jetpack_feature_text_6">Tanggapi komentar</string>
17+
<string name="login_prologue_revamped_jetpack_feature_text_5">Periksa pemberitahuan</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_4">Pantau statistik Anda</string>
19+
<string name="login_prologue_revamped_jetpack_feature_text_3">Tulis blog</string>
20+
<string name="login_prologue_revamped_jetpack_feature_text_2">Buat situs</string>
21+
<string name="login_prologue_revamped_jetpack_feature_text_1">Perbarui plugin</string>
22+
<string name="login_prologue_revamped_content_description_top_bg">Latar belakang teratas Jetpack memudar</string>
23+
<string name="login_prologue_revamped_content_description_bg">Latar belakang Jetpack</string>
24+
<string name="login_prologue_revamped_content_description_jetpack_logo">Logo Jetpack</string>
925
<string name="me_btn_about">Tentang Jetpack</string>
1026
<string name="sign_out_wpcom_confirm_with_no_changes">Logout dari Jetpack?</string>
1127
<string name="me_disconnect_from_wordpress_com">Logout dari Jetpack</string>
1228
<string name="support_ticket_subject">Jetpack untuk Dukungan Android</string>
1329
<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>
30+
<string name="continue_with_wpcom_no_signup">Lanjutkan dengan WordPress.com</string>
1431
<string name="app_tagline">Keamanan dan performa situs dari saku Anda</string>
1532
<string name="post_signup_interstitial_title">Selamat datang di Jetpack</string>
1633
<string name="app_title">Jetpack untuk Android</string>

‎WordPress/src/jetpack/res/values-it/strings.xml‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2022-07-11 15:54:02+0000
3+
Translation-Revision-Date: 2022-10-05 16:54:03+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/2.4.0-alpha
66
Language: it
77
-->
88
<resources>
9+
<string name="me_btn_share">Condividi Jetpack con un amico</string>
10+
<string name="login_prologue_revamped_jetpack_feature_text_12">Aggiungi un autore</string>
11+
<string name="login_prologue_revamped_jetpack_feature_text_11">Pubblica una foto</string>
12+
<string name="login_prologue_revamped_jetpack_feature_text_10">Risolvi un problema di sicurezza</string>
13+
<string name="login_prologue_revamped_jetpack_feature_text_9">Condividi su Facebook</string>
14+
<string name="login_prologue_revamped_jetpack_feature_text_8">Cerca i plugin</string>
15+
<string name="login_prologue_revamped_jetpack_feature_text_7">Ripristina un backup</string>
16+
<string name="login_prologue_revamped_jetpack_feature_text_6">Rispondi ai commenti</string>
17+
<string name="login_prologue_revamped_jetpack_feature_text_5">Verifica le notifiche</string>
18+
<string name="login_prologue_revamped_jetpack_feature_text_4">Guarda le tue statistiche</string>
19+
<string name="login_prologue_revamped_jetpack_feature_text_3">Scrivi un blog</string>
20+
<string name="login_prologue_revamped_jetpack_feature_text_2">Crea un sito</string>
21+
<string name="login_prologue_revamped_jetpack_feature_text_1">Aggiorna un plugin</string>
22+
<string name="login_prologue_revamped_content_description_top_bg">Dissolvenza sfondo superiore Jetpack</string>
23+
<string name="login_prologue_revamped_content_description_bg">Sfondo Jetpack</string>
24+
<string name="login_prologue_revamped_content_description_jetpack_logo">Logo Jetpack</string>
925
<string name="me_btn_about">Informazioni su Jetpack</string>
1026
<string name="sign_out_wpcom_confirm_with_no_changes">Uscire da Jetpack?</string>
1127
<string name="me_disconnect_from_wordpress_com">Esci da Jetpack</string>
1228
<string name="support_ticket_subject">Supporto Jetpack per Android</string>
1329
<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>
30+
<string name="continue_with_wpcom_no_signup">Continua con WordPress.com</string>
1431
<string name="app_tagline">Sicurezza e prestazioni del sito dalla tua tasca</string>
1532
<string name="post_signup_interstitial_title">Sei su Jetpack</string>
1633
<string name="app_title">Jetpack per Android</string>

0 commit comments

Comments
 (0)