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/19.7 (19.7-rc-3) #16406

Merged
merged 7 commits into from
Apr 26, 2022
Merged

Merge release/19.7 (19.7-rc-3) #16406

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
32deea0
Release script: Update build.gradle gutenbergMobileVersion to ref
Apr 26, 2022
3272538
Update Gutenberg ref
Apr 26, 2022
8c7f504
Update Gutenberg ref
Apr 26, 2022
b04bb23
Merge pull request #16401 from wordpress-mobile/gutenberg/integrate_r…
Apr 26, 2022
ffd7c91
Update translations
AliSoftware Apr 26, 2022
fd22ee1
Bump version number
AliSoftware Apr 26, 2022
5ae289b
Merge branch 'trunk' into merge/release-19.7
AliSoftware Apr 26, 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
3 changes: 2 additions & 1 deletion WordPress/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-04-21 09:54:08+0000
Translation-Revision-Date: 2022-04-25 16:54:07+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/3.0.0
Language: ar
-->
<resources>
<string name="hpp_choose_and_create_site">إنشاء موقع</string>
<string name="gutenberg_native_add_blocks_11d0841f">إضافة مكوِّنات</string>
<string name="initial_screen">الشاشة الأولى</string>
<string name="blogging_prompts_onboarding_notification_action">معرفة المزيد</string>
Expand Down
7 changes: 6 additions & 1 deletion WordPress/src/main/res/values-en-rCA/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-04-19 07:26:32+0000
Translation-Revision-Date: 2022-04-24 13:01:03+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/3.0.0
Language: en_CA
-->
<resources>
<string name="dialog_button_ok">OK</string>
<string name="dialog_edit_hint">http(s)://</string>
<string name="stop_save_dialog_ok_button">OK</string>
<string name="stop_save_dialog_message">Please wait until all files have been saved</string>
<string name="dialog_title">Insert link</string>
<string name="editor_title_beta">Beta</string>
<string name="toast_content_info_editor_not_ready">Editor is still loading</string>
<string name="stop_save_dialog_title">Files saving</string>
<string name="post_content">Content</string>
<string name="blogging_prompts_onboarding_card_prompt">Cast the movie of your life.</string>
Expand Down
3 changes: 2 additions & 1 deletion WordPress/src/main/res/values-en-rGB/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-04-19 17:31:41+0000
Translation-Revision-Date: 2022-04-22 22:01:43+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/3.0.0
Language: en_GB
-->
<resources>
<string name="hpp_choose_and_create_site">Create site</string>
<string name="gutenberg_native_add_blocks_11d0841f">Add blocks</string>
<string name="initial_screen">Initial Screen</string>
<string name="blogging_prompts_onboarding_notification_action">Learn more</string>
Expand Down
8 changes: 4 additions & 4 deletions WordPress/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-04-22 09:19:02+0000
Translation-Revision-Date: 2022-04-23 04:46:18+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/3.0.0
Language: es
Expand All @@ -10,12 +10,12 @@ Language: es
<string name="gutenberg_native_add_blocks_11d0841f">Añadir bloques</string>
<string name="initial_screen">Pantalla inicial</string>
<string name="blogging_prompts_onboarding_notification_action">Más información</string>
<string name="blogging_prompts_onboarding_notification_text">Conviértete en un mejor escritor al crear el hábito de escribir. Pulsa para obtener más información.</string>
<string name="new_site_creation_site_name_header_title">Dale a tu web %s un nombre</string>
<string name="blogging_prompts_onboarding_notification_text">Conviértete en un mejor escritor creando un hábito de escritura. Toca para más información.</string>
<string name="new_site_creation_site_name_title">Nombre del sitio</string>
<string name="my_site_todays_stats_get_more_views_message">¿Estás interesado en crear una audiencia? Revisa nuestros &lt;a href=\"%1$s\"&gt;mejores consejos&lt;/a&gt;.</string>
<string name="blogging_prompts_onboarding_notification_title">Nuevo en la aplicación móvil de WordPress: Mensajes</string>
<string name="new_site_creation_site_name_header_subtitle">Un buen nombre es corto y fácil de recordar.\nPuedes cambiarlo más adelante.</string>
<string name="my_site_todays_stats_get_more_views_message">¿Te interesa crear tu audiencia? Echa un vistazo a nuestros &lt;a href=\"%1$s\"&gt;mejores consejos&lt;/a&gt;.</string>
<string name="new_site_creation_site_name_header_title">Dale un nombre a tu web %s</string>
<string name="stats_insights_views_and_visitors">Visitas y visitantes</string>
<string name="stats_insights_views_and_visitors_message">Las visitas de las últimas semanas son %1$s %2$s que las de la semana anterior.</string>
<string name="featured_image_removed_notice">Eliminada como imagen destacada</string>
Expand Down
3 changes: 2 additions & 1 deletion WordPress/src/main/res/values-fr-rCA/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-04-21 15:54:08+0000
Translation-Revision-Date: 2022-04-25 21:54:22+0000
Plural-Forms: nplurals=2; plural=n > 1;
Generator: GlotPress/3.0.0
Language: fr
-->
<resources>
<string name="hpp_choose_and_create_site">Créer un site</string>
<string name="gutenberg_native_add_blocks_11d0841f">Ajouter des blocs</string>
<string name="initial_screen">Écran initial</string>
<string name="blogging_prompts_onboarding_notification_action">Lire la suite</string>
Expand Down
3 changes: 2 additions & 1 deletion WordPress/src/main/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-04-21 15:54:08+0000
Translation-Revision-Date: 2022-04-25 21:54:22+0000
Plural-Forms: nplurals=2; plural=n > 1;
Generator: GlotPress/3.0.0
Language: fr
-->
<resources>
<string name="hpp_choose_and_create_site">Créer un site</string>
<string name="gutenberg_native_add_blocks_11d0841f">Ajouter des blocs</string>
<string name="initial_screen">Écran initial</string>
<string name="blogging_prompts_onboarding_notification_action">Lire la suite</string>
Expand Down
3 changes: 2 additions & 1 deletion WordPress/src/main/res/values-gl/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2022-04-21 19:49:12+0000
Translation-Revision-Date: 2022-04-23 10:18:39+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/3.0.0
Language: gl_ES
-->
<resources>
<string name="hpp_choose_and_create_site">Crear sitio</string>
<string name="gutenberg_native_add_blocks_11d0841f">Engadir bloques</string>
<string name="initial_screen">Pantalla inicial</string>
<string name="blogging_prompts_onboarding_notification_action">Aprender máis</string>
Expand Down
Loading