Skip to content
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

Merge release/20.3 (20.3-rc-2) #16932

Merged
merged 11 commits into from
Jul 22, 2022
Merged

Merge release/20.3 (20.3-rc-2) #16932

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
84e822d
Release script: Update build.gradle gutenbergMobileVersion to ref
dcalhoun Jul 19, 2022
a398404
docs: Add release note
dcalhoun Jul 19, 2022
5a989bd
build: Update Gutenberg ref
dcalhoun Jul 19, 2022
bb7952a
build: Update Gutenberg ref
dcalhoun Jul 20, 2022
7bedc3c
Merge pull request #16925 from wordpress-mobile/gutenberg/integrate_r…
dcalhoun Jul 20, 2022
d1dbc88
Update translations
ParaskP7 Jul 21, 2022
f281a2c
Update translations
ParaskP7 Jul 21, 2022
5593a91
Update translation fallbacks for Jetpack
ParaskP7 Jul 21, 2022
2d235a0
Bump version number
ParaskP7 Jul 21, 2022
7ac2b68
Merge branch 'trunk' into merge/release-20.3
ParaskP7 Jul 21, 2022
332594d
Merge branch 'trunk' of github.com:wordpress-mobile/WordPress-Android…
ParaskP7 Jul 22, 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 RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* [*] Block Editor: Add 'Insert from URL' option to Video block [https://github.com/WordPress/gutenberg/pull/41493]
* [*] Block Editor: Image block copies the alt text from the media library when selecting an item [https://github.com/WordPress/gutenberg/pull/41839]
* [*] Block Editor: Introduce "block recovery" option for invalid blocks [https://github.com/WordPress/gutenberg/pull/41988]
* [**] Block Editor: Fix a crash when scrolling posts containing Embed blocks [https://github.com/wordpress-mobile/gutenberg-mobile/pull/5033]

20.2
-----
Expand Down
18 changes: 18 additions & 0 deletions WordPress/src/jetpack/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-07-11 15:54:02+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_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>
</resources>
29 changes: 29 additions & 0 deletions WordPress/src/jetpack/res/values-az/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Jetpack</string>
<string name="widgets_enabled" translatable="false">false</string>

<!-- About View -->
<string name="app_title">Jetpack for Android</string>

<!-- Post-Signup Interstitial -->
<string name="post_signup_interstitial_title">Welcome to Jetpack</string>

<!-- Login Prologue -->
<string name="app_tagline">Site security and performance from your pocket</string>
<string name="continue_with_wpcom_no_signup">Log in with WordPress.com</string>

<!-- Login Magic Link -->
<string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from Jetpack.com.</string>

<!-- Contact us -->
<!--Note: Support ticket subject, only visible to the end users of the Zendesk support portal, doesn't need a translation -->
<string name="support_ticket_subject">Jetpack for Android Support</string>

<!-- Log out actions in Me -->
<string name="me_disconnect_from_wordpress_com">Log out of Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Log out of Jetpack?</string>

<!-- About button in Me -->
<string name="me_btn_about">About Jetpack</string>
</resources>
29 changes: 29 additions & 0 deletions WordPress/src/jetpack/res/values-bg/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Jetpack</string>
<string name="widgets_enabled" translatable="false">false</string>

<!-- About View -->
<string name="app_title">Jetpack for Android</string>

<!-- Post-Signup Interstitial -->
<string name="post_signup_interstitial_title">Welcome to Jetpack</string>

<!-- Login Prologue -->
<string name="app_tagline">Site security and performance from your pocket</string>
<string name="continue_with_wpcom_no_signup">Log in with WordPress.com</string>

<!-- Login Magic Link -->
<string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from Jetpack.com.</string>

<!-- Contact us -->
<!--Note: Support ticket subject, only visible to the end users of the Zendesk support portal, doesn't need a translation -->
<string name="support_ticket_subject">Jetpack for Android Support</string>

<!-- Log out actions in Me -->
<string name="me_disconnect_from_wordpress_com">Log out of Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Log out of Jetpack?</string>

<!-- About button in Me -->
<string name="me_btn_about">About Jetpack</string>
</resources>
29 changes: 29 additions & 0 deletions WordPress/src/jetpack/res/values-cs/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Jetpack</string>
<string name="widgets_enabled" translatable="false">false</string>

<!-- About View -->
<string name="app_title">Jetpack for Android</string>

<!-- Post-Signup Interstitial -->
<string name="post_signup_interstitial_title">Welcome to Jetpack</string>

<!-- Login Prologue -->
<string name="app_tagline">Site security and performance from your pocket</string>
<string name="continue_with_wpcom_no_signup">Log in with WordPress.com</string>

<!-- Login Magic Link -->
<string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from Jetpack.com.</string>

<!-- Contact us -->
<!--Note: Support ticket subject, only visible to the end users of the Zendesk support portal, doesn't need a translation -->
<string name="support_ticket_subject">Jetpack for Android Support</string>

<!-- Log out actions in Me -->
<string name="me_disconnect_from_wordpress_com">Log out of Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Log out of Jetpack?</string>

<!-- About button in Me -->
<string name="me_btn_about">About Jetpack</string>
</resources>
29 changes: 29 additions & 0 deletions WordPress/src/jetpack/res/values-cy/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Jetpack</string>
<string name="widgets_enabled" translatable="false">false</string>

<!-- About View -->
<string name="app_title">Jetpack for Android</string>

<!-- Post-Signup Interstitial -->
<string name="post_signup_interstitial_title">Welcome to Jetpack</string>

<!-- Login Prologue -->
<string name="app_tagline">Site security and performance from your pocket</string>
<string name="continue_with_wpcom_no_signup">Log in with WordPress.com</string>

<!-- Login Magic Link -->
<string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from Jetpack.com.</string>

<!-- Contact us -->
<!--Note: Support ticket subject, only visible to the end users of the Zendesk support portal, doesn't need a translation -->
<string name="support_ticket_subject">Jetpack for Android Support</string>

<!-- Log out actions in Me -->
<string name="me_disconnect_from_wordpress_com">Log out of Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Log out of Jetpack?</string>

<!-- About button in Me -->
<string name="me_btn_about">About Jetpack</string>
</resources>
29 changes: 29 additions & 0 deletions WordPress/src/jetpack/res/values-da/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Jetpack</string>
<string name="widgets_enabled" translatable="false">false</string>

<!-- About View -->
<string name="app_title">Jetpack for Android</string>

<!-- Post-Signup Interstitial -->
<string name="post_signup_interstitial_title">Welcome to Jetpack</string>

<!-- Login Prologue -->
<string name="app_tagline">Site security and performance from your pocket</string>
<string name="continue_with_wpcom_no_signup">Log in with WordPress.com</string>

<!-- Login Magic Link -->
<string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from Jetpack.com.</string>

<!-- Contact us -->
<!--Note: Support ticket subject, only visible to the end users of the Zendesk support portal, doesn't need a translation -->
<string name="support_ticket_subject">Jetpack for Android Support</string>

<!-- Log out actions in Me -->
<string name="me_disconnect_from_wordpress_com">Log out of Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Log out of Jetpack?</string>

<!-- About button in Me -->
<string name="me_btn_about">About Jetpack</string>
</resources>
18 changes: 18 additions & 0 deletions WordPress/src/jetpack/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-07-11 15:54:02+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: de
-->
<resources>
<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">Mit WordPress.com anmelden</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>
</resources>
29 changes: 29 additions & 0 deletions WordPress/src/jetpack/res/values-el/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Jetpack</string>
<string name="widgets_enabled" translatable="false">false</string>

<!-- About View -->
<string name="app_title">Jetpack for Android</string>

<!-- Post-Signup Interstitial -->
<string name="post_signup_interstitial_title">Welcome to Jetpack</string>

<!-- Login Prologue -->
<string name="app_tagline">Site security and performance from your pocket</string>
<string name="continue_with_wpcom_no_signup">Log in with WordPress.com</string>

<!-- Login Magic Link -->
<string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from Jetpack.com.</string>

<!-- Contact us -->
<!--Note: Support ticket subject, only visible to the end users of the Zendesk support portal, doesn't need a translation -->
<string name="support_ticket_subject">Jetpack for Android Support</string>

<!-- Log out actions in Me -->
<string name="me_disconnect_from_wordpress_com">Log out of Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Log out of Jetpack?</string>

<!-- About button in Me -->
<string name="me_btn_about">About Jetpack</string>
</resources>
29 changes: 29 additions & 0 deletions WordPress/src/jetpack/res/values-en-rAU/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Jetpack</string>
<string name="widgets_enabled" translatable="false">false</string>

<!-- About View -->
<string name="app_title">Jetpack for Android</string>

<!-- Post-Signup Interstitial -->
<string name="post_signup_interstitial_title">Welcome to Jetpack</string>

<!-- Login Prologue -->
<string name="app_tagline">Site security and performance from your pocket</string>
<string name="continue_with_wpcom_no_signup">Log in with WordPress.com</string>

<!-- Login Magic Link -->
<string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from Jetpack.com.</string>

<!-- Contact us -->
<!--Note: Support ticket subject, only visible to the end users of the Zendesk support portal, doesn't need a translation -->
<string name="support_ticket_subject">Jetpack for Android Support</string>

<!-- Log out actions in Me -->
<string name="me_disconnect_from_wordpress_com">Log out of Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Log out of Jetpack?</string>

<!-- About button in Me -->
<string name="me_btn_about">About Jetpack</string>
</resources>
29 changes: 29 additions & 0 deletions WordPress/src/jetpack/res/values-en-rCA/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Jetpack</string>
<string name="widgets_enabled" translatable="false">false</string>

<!-- About View -->
<string name="app_title">Jetpack for Android</string>

<!-- Post-Signup Interstitial -->
<string name="post_signup_interstitial_title">Welcome to Jetpack</string>

<!-- Login Prologue -->
<string name="app_tagline">Site security and performance from your pocket</string>
<string name="continue_with_wpcom_no_signup">Log in with WordPress.com</string>

<!-- Login Magic Link -->
<string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from Jetpack.com.</string>

<!-- Contact us -->
<!--Note: Support ticket subject, only visible to the end users of the Zendesk support portal, doesn't need a translation -->
<string name="support_ticket_subject">Jetpack for Android Support</string>

<!-- Log out actions in Me -->
<string name="me_disconnect_from_wordpress_com">Log out of Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Log out of Jetpack?</string>

<!-- About button in Me -->
<string name="me_btn_about">About Jetpack</string>
</resources>
29 changes: 29 additions & 0 deletions WordPress/src/jetpack/res/values-en-rGB/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name" translatable="false">Jetpack</string>
<string name="widgets_enabled" translatable="false">false</string>

<!-- About View -->
<string name="app_title">Jetpack for Android</string>

<!-- Post-Signup Interstitial -->
<string name="post_signup_interstitial_title">Welcome to Jetpack</string>

<!-- Login Prologue -->
<string name="app_tagline">Site security and performance from your pocket</string>
<string name="continue_with_wpcom_no_signup">Log in with WordPress.com</string>

<!-- Login Magic Link -->
<string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from Jetpack.com.</string>

<!-- Contact us -->
<!--Note: Support ticket subject, only visible to the end users of the Zendesk support portal, doesn't need a translation -->
<string name="support_ticket_subject">Jetpack for Android Support</string>

<!-- Log out actions in Me -->
<string name="me_disconnect_from_wordpress_com">Log out of Jetpack</string>
<string name="sign_out_wpcom_confirm_with_no_changes">Log out of Jetpack?</string>

<!-- About button in Me -->
<string name="me_btn_about">About Jetpack</string>
</resources>
18 changes: 18 additions & 0 deletions WordPress/src/jetpack/res/values-es-rCL/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-07-11 11:54:18+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: es
-->
<resources>
<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">Accede 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>
</resources>
18 changes: 18 additions & 0 deletions WordPress/src/jetpack/res/values-es-rCO/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-07-11 11:54:18+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: es
-->
<resources>
<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">Accede 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>
</resources>
18 changes: 18 additions & 0 deletions WordPress/src/jetpack/res/values-es-rMX/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-07-11 11:54:18+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: es
-->
<resources>
<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">Accede 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>
</resources>
18 changes: 18 additions & 0 deletions WordPress/src/jetpack/res/values-es-rVE/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-07-11 11:54:18+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: es
-->
<resources>
<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">Accede 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>
</resources>
Loading