Skip to content

Commit ff72121

Browse files
authored
Merge pull request #20007 from wordpress-mobile/release/24.1
Merge 24.1-rc-2 to trunk
2 parents 2c6da28 + 2cae7c0 commit ff72121

File tree

28 files changed

+34
-38
lines changed

28 files changed

+34
-38
lines changed

RELEASE-NOTES.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66

77
24.1
88
-----
9+
10+
24.0.1
11+
-----
12+
* [**] Fix crash when RichText values are not defined [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6563]
13+
914
* [*] Block Editor: Fix missing custom color indicator for custom gradients [https://github.com/WordPress/gutenberg/pull/57605]
1015
* [**] Block Editor: Display a notice when a network connection is unavailable [https://github.com/WordPress/gutenberg/pull/56934]
1116
* [**] Block Editor: Image block media uploads display a custom error message when there is no internet connection [https://github.com/wordpress-mobile/WordPress-Android/pull/19878]

WordPress/src/main/res/values-ar/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,6 @@ Language: ar
399399
<string name="stats_timeframe_last_seven_days">آخر 7 أيام</string>
400400
<string name="weeks_quantity_other">%d من الأسابيع</string>
401401
<string name="weeks_quantity_one">أسبوع واحد</string>
402-
<string name="my_site_blogging_prompt_card_attribution_dayone">من &lt;b&gt;DayOne&lt;/b&gt;</string>
403402
<string name="jetpack_feature_card_menu_item_remind_me_later">ذكرني لاحقًا</string>
404403
<string name="wp_jetpack_feature_removal_overlay_switch_to_the_jetpack_app">التبديل إلى تطبيق Jetpack</string>
405404
<string name="wp_jetpack_feature_removal_overlay_learn_more_migration_text">معرفة المزيد على jetpack.com</string>

WordPress/src/main/res/values-cs/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ Language: cs_CZ
126126
<string name="stats_timeframe_last_seven_days">Posledních 7 dní</string>
127127
<string name="weeks_quantity_other">%d týdnů</string>
128128
<string name="weeks_quantity_one">1 týden</string>
129-
<string name="my_site_blogging_prompt_card_attribution_dayone">Od &lt;b&gt;prvního dne&lt;/b&gt;</string>
130129
<string name="jetpack_feature_card_menu_item_remind_me_later">Připomenout později</string>
131130
<string name="wp_jetpack_feature_removal_overlay_switch_to_the_jetpack_app">Přepněte do aplikace Jetpack</string>
132131
<string name="wp_jetpack_feature_removal_overlay_learn_more_migration_text">Více se dozvíte na jetpack.com</string>

WordPress/src/main/res/values-de/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,6 @@ Language: de
411411
<string name="stats_timeframe_last_seven_days">Letzte 7 Tage</string>
412412
<string name="weeks_quantity_other">%d Wochen</string>
413413
<string name="weeks_quantity_one">1 Woche</string>
414-
<string name="my_site_blogging_prompt_card_attribution_dayone">Von &lt;b&gt;DayOne&lt;/b&gt;</string>
415414
<string name="jetpack_feature_card_menu_item_remind_me_later">Später daran erinnern</string>
416415
<string name="jetpack_feature_card_content_phase_three">Die Statistiken, der Reader, die Benachrichtigungen und weitere Funktionen werden bald in die Jetpack-Mobil-App verschoben.</string>
417416
<string name="wp_jetpack_feature_removal_overlay_switch_to_the_jetpack_app">Zur Jetpack-App wechseln</string>

WordPress/src/main/res/values-en-rCA/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,6 @@ Language: en_CA
365365
<string name="weeks_quantity_one">1 week</string>
366366
<string name="weeks_quantity_other">%d weeks</string>
367367
<string name="wp_jetpack_powered_phase_2">Get the Jetpack app</string>
368-
<string name="my_site_blogging_prompt_card_attribution_dayone">From &lt;b&gt;DayOne&lt;/b&gt;</string>
369368
<string name="jetpack_feature_card_menu_item_remind_me_later">Remind me later</string>
370369
<string name="wp_jetpack_feature_removal_overlay_learn_more_migration_text">Learn more at jetpack.com</string>
371370
<string name="wp_jetpack_feature_removal_overlay_migration_helper_text">Switching is free and only takes a minute.</string>

WordPress/src/main/res/values-en-rGB/strings.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2024-01-09 21:29:55+0000
3+
Translation-Revision-Date: 2024-01-22 20:23:54+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/4.0.0-alpha.11
66
Language: en_GB
77
-->
88
<resources>
9+
<string name="gutenberg_native_waiting_for_connection">Waiting for connection</string>
10+
<string name="stats_traffic">Traffic</string>
911
<string name="gutenberg_native_working_offline">Working offline</string>
1012
<string name="gutenberg_native_network_connection_re_established">Network connection re-established</string>
1113
<string name="gutenberg_native_network_connection_lost_working_offline">Network connection lost, working offline</string>
@@ -411,7 +413,7 @@ Language: en_GB
411413
<string name="stats_timeframe_last_seven_days">Last 7 days</string>
412414
<string name="weeks_quantity_other">%d weeks</string>
413415
<string name="weeks_quantity_one">1 week</string>
414-
<string name="my_site_blogging_prompt_card_attribution_dayone">From &lt;b&gt;DayOne&lt;/b&gt;</string>
416+
<string name="my_site_blogging_prompt_card_attribution_day_one">From &lt;b&gt;Day One&lt;/b&gt;</string>
415417
<string name="jetpack_feature_card_menu_item_remind_me_later">Remind me later</string>
416418
<string name="jetpack_feature_card_content_phase_three">Stats, Reader, Notifications and other features will soon move to the Jetpack mobile app.</string>
417419
<string name="wp_jetpack_feature_removal_overlay_switch_to_the_jetpack_app">Switch to the Jetpack app</string>

WordPress/src/main/res/values-es/strings.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2024-01-09 22:02:26+0000
3+
Translation-Revision-Date: 2024-01-23 12:31:12+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
55
Generator: GlotPress/4.0.0-alpha.11
66
Language: es
77
-->
88
<resources>
9+
<string name="gutenberg_native_waiting_for_connection">Esperando conexión</string>
10+
<string name="stats_traffic">Tráfico</string>
911
<string name="gutenberg_native_working_offline">Trabajo sin conexión</string>
1012
<string name="gutenberg_native_network_connection_re_established">Conexión de red restablecida</string>
1113
<string name="gutenberg_native_network_connection_lost_working_offline">Conexión de red perdida, trabajando sin conexión</string>
@@ -411,7 +413,7 @@ Language: es
411413
<string name="stats_timeframe_last_seven_days">Últimos siete días</string>
412414
<string name="weeks_quantity_other">%d semanas</string>
413415
<string name="weeks_quantity_one">1 semana</string>
414-
<string name="my_site_blogging_prompt_card_attribution_dayone">Desde el &lt;b&gt;DayOne&lt;/b&gt;</string>
416+
<string name="my_site_blogging_prompt_card_attribution_day_one">Desde &lt;b&gt;Day One&lt;/b&gt;</string>
415417
<string name="jetpack_feature_card_menu_item_remind_me_later">Recuérdamelo más tarde</string>
416418
<string name="jetpack_feature_card_content_phase_three">Algunas funciones, como estadísticas, lector o avisos, se trasladarán pronto a la aplicación móvil de Jetpack.</string>
417419
<string name="wp_jetpack_feature_removal_overlay_switch_to_the_jetpack_app">Cambiar a la aplicación de Jetpack</string>

WordPress/src/main/res/values-fr-rCA/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,6 @@ Language: fr
402402
<string name="stats_timeframe_last_seven_days">7 derniers jours</string>
403403
<string name="weeks_quantity_other">%d semaines</string>
404404
<string name="weeks_quantity_one">1 semaine</string>
405-
<string name="my_site_blogging_prompt_card_attribution_dayone">Depuis le &lt;b&gt;jour 1&lt;/b&gt;</string>
406405
<string name="jetpack_feature_card_menu_item_remind_me_later">Me rappeler ultérieurement</string>
407406
<string name="jetpack_feature_card_content_phase_three">Les statistiques, le lecteur, les notifications et d’autres fonctionnalités seront bientôt transférées vers l’application mobile Jetpack.</string>
408407
<string name="wp_jetpack_feature_removal_overlay_switch_to_the_jetpack_app">Passer à l’application Jetpack</string>

WordPress/src/main/res/values-fr/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,6 @@ Language: fr
402402
<string name="stats_timeframe_last_seven_days">7 derniers jours</string>
403403
<string name="weeks_quantity_other">%d semaines</string>
404404
<string name="weeks_quantity_one">1 semaine</string>
405-
<string name="my_site_blogging_prompt_card_attribution_dayone">Depuis le &lt;b&gt;jour 1&lt;/b&gt;</string>
406405
<string name="jetpack_feature_card_menu_item_remind_me_later">Me rappeler ultérieurement</string>
407406
<string name="jetpack_feature_card_content_phase_three">Les statistiques, le lecteur, les notifications et d’autres fonctionnalités seront bientôt transférées vers l’application mobile Jetpack.</string>
408407
<string name="wp_jetpack_feature_removal_overlay_switch_to_the_jetpack_app">Passer à l’application Jetpack</string>

WordPress/src/main/res/values-gl/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,6 @@ Language: gl_ES
411411
<string name="stats_insights_views_and_visitors_seven_days_views_positive">As túas visitas nos últimos sete días son %1$s máis que nos sete días anteriores.</string>
412412
<string name="stats_insights_views_and_visitors_seven_days_visitors_negative">Os teus visitantes nos últimos sete días son %1$s menos que nos sete días anteriores.</string>
413413
<string name="stats_insights_views_and_visitors_seven_days_visitors_positive">Os teus visitantes nos últimos sete días son %1$s máis que nos sete días anteriores.</string>
414-
<string name="my_site_blogging_prompt_card_attribution_dayone">Desde o &lt;b&gt;DayOne&lt;/b&gt;</string>
415414
<string name="jetpack_feature_card_menu_item_remind_me_later">Recórdamo máis tarde</string>
416415
<string name="wp_jetpack_feature_removal_overlay_switch_to_the_jetpack_app">Cambiar á aplicación de Jetpack</string>
417416
<string name="wp_jetpack_feature_removal_overlay_learn_more_migration_text">Máis información en jetpack.com</string>

0 commit comments

Comments
 (0)