Skip to content

Commit 1a67bc0

Browse files
oguzkoceroguzkocer
authored
Merge pull request #20389 from wordpress-mobile/merge/24.3-final-to-trunk
Merge 24.3 final to trunk
2 parents 4dfebc9 + 2e4fee0 commit 1a67bc0

File tree

92 files changed

+1894
-1452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1894
-1452
lines changed

‎RELEASE-NOTES.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
-----
1414
* [**] Added support to use third-party passkey providers and other devices passkeys as a WordPress.com login option [https://github.com/wordpress-mobile/WordPress-Android/pull/20174]
1515
* [*] [Jetpack-only] Fix the visibility issue with the menu button on the stats [https://github.com/wordpress-mobile/WordPress-Android/pull/20175]
16+
* [*] [internal][WordPress-only] Updates Jetpack banners and badges copy for consistency [https://github.com/wordpress-mobile/WordPress-Android/pull/20123]
1617

1718
24.2
1819
-----

‎WordPress/src/main/java/org/wordpress/android/ui/jetpackoverlay/JetpackFeatureRemovalBrandingUtil.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class JetpackFeatureRemovalBrandingUtil @Inject constructor(
6060

6161
fun getBrandingTextByPhase(screen: JetpackPoweredScreen): UiString {
6262
return when (jetpackFeatureRemovalPhaseHelper.getCurrentPhase()) {
63-
PhaseStaticPosters -> UiStringRes(R.string.wp_jetpack_feature_removal_static_posters_phase)
63+
PhaseStaticPosters -> UiStringRes(R.string.wp_jetpack_powered)
6464
PhaseThree -> (screen as? JetpackPoweredScreen.WithDynamicText)?.let { screenWithDynamicText ->
6565
getDynamicBrandingForScreen(screenWithDynamicText)
6666
} ?: UiStringRes(JetpackBrandingUiState.RES_JP_POWERED)

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2024-02-14 13:54:08+0000
3+
Translation-Revision-Date: 2024-02-21 22:54:09+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))));
5-
Generator: GlotPress/4.0.0-beta.2
5+
Generator: GlotPress/4.0.0-beta.3
66
Language: ar
77
-->
88
<resources>
9+
<string name="qrcode_media_deeplink_error">الموقع غير موجود. تحقق من تسجيلك الدخول إلى الحساب الصحيح.</string>
10+
<string name="gravatar_info_sync_done_button">تم</string>
11+
<string name="gravatar_info_sync_message">قد تستغرق مزامنة التحديثات مع ملفك الشخصي على جرافتار بعض الوقت.</string>
12+
<string name="gravatar_info_learn_more_link">ما المقصود بخدمة جرافتار؟</string>
13+
<string name="gravatar_info_description">سيؤدي أيضًا تحديث الأفاتار الخاص بك واسمك والمعلومات حولك هنا إلى تحديثها عبر كل المواقع التي تستخدم ملفات جرافتار الشخصية.</string>
14+
<string name="gravatar_info_title">يكون ملفك الشخصي على ووردبريس.كوم مدعومًا من خدمة جرافتار</string>
915
<string name="error_media_could_not_share_media_from_device">يتعذر تحميل الوسائط للمشاركة. يرجى التحقق من صلاحيات التطبيق\n أو استخدم مكتبة وسائط التطبيق.</string>
1016
<string name="site_monitoring_cannot_be_started">يتعذر علينا فتح مراقبة الموقع في الوقت الحالي. يرجى المحاولة مجددًا في وقت لاحق</string>
1117
<string name="site_monitoring_tab_title_web_server_logs">سجلات خادم الويب</string>

‎WordPress/src/main/res/values-az/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
Translation-Revision-Date: 2015-12-08 01:00:08+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
5-
Generator: GlotPress/4.0.0-beta.2
5+
Generator: GlotPress/4.0.0-beta.3
66
Language: az
77
-->
88
<resources>

‎WordPress/src/main/res/values-bg/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
Translation-Revision-Date: 2018-12-10 19:56:03+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
5-
Generator: GlotPress/4.0.0-beta.2
5+
Generator: GlotPress/4.0.0-beta.3
66
Language: bg
77
-->
88
<resources>

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2023-12-13 09:55:25+0000
3+
Translation-Revision-Date: 2024-02-29 12:55:08+0000
44
Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n >= 2 && n <= 4) ? 1 : 2);
5-
Generator: GlotPress/4.0.0-beta.2
5+
Generator: GlotPress/4.0.0-beta.3
66
Language: cs_CZ
77
-->
88
<resources>
9+
<string name="site_monitoring_cannot_be_started">V současné době nemůžeme spustit monitorování webu. Zkuste to prosím později</string>
10+
<string name="site_monitoring_tab_title_web_server_logs">Protokoly webového serveru</string>
11+
<string name="site_monitoring_tab_title_php_logs">Protokoly PHP</string>
12+
<string name="site_monitoring">Monitorování webu</string>
13+
<string name="gutenberg_native_waiting_for_connection">Čekání na připojení</string>
14+
<string name="gutenberg_native_font_size_1_s">Velikost písma, %1$s</string>
15+
<string name="gutenberg_native_network_connection_lost_working_offline">Ztráta síťového připojení, práce v režimu offline</string>
16+
<string name="gutenberg_native_network_connection_re_established">Obnovení síťového připojení</string>
17+
<string name="gutenberg_native_working_offline">Práce v režimu offline</string>
18+
<string name="domains_site_domain">%s</string>
19+
<string name="bloganuary_dashboard_nudge_overlay_action_dismiss">Jdeme na to!</string>
920
<string name="blaze_campaigns_card_footer_label">Vytvořit kampaň</string>
1021
<string name="privacy_banner_save">Uložit</string>
1122
<string name="privacy_banner_settings">Nastavení</string>
@@ -1377,6 +1388,7 @@ Language: cs_CZ
13771388
<string name="status_and_visibility">Stav &amp; Viditelnost</string>
13781389
<string name="update_now">Aktualizovat nyní</string>
13791390
<string name="ccpa_privacy_notice_header">Oznámení o ochraně osobních údajů pro uživatele Kalifornie</string>
1391+
<string name="pages_item_subtitle">%1$s ·</string>
13801392
<string name="gutenberg_native_open_block_actions_menu">Otevřete nabídku blokovat akce</string>
13811393
<string name="gutenberg_native_move_to_top">Přesunout nahoru</string>
13821394
<string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Dvojitým klepnutím otevřete akční list s dostupnými možnostmi</string>

‎WordPress/src/main/res/values-cy/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
Translation-Revision-Date: 2017-03-25 17:35:05+0000
44
Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;
5-
Generator: GlotPress/4.0.0-beta.2
5+
Generator: GlotPress/4.0.0-beta.3
66
Language: cy_GB
77
-->
88
<resources>

‎WordPress/src/main/res/values-da/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
Translation-Revision-Date: 2021-08-01 11:11:29+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
5-
Generator: GlotPress/4.0.0-beta.2
5+
Generator: GlotPress/4.0.0-beta.3
66
Language: da_DK
77
-->
88
<resources>

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
Translation-Revision-Date: 2024-02-13 14:29:51+0000
3+
Translation-Revision-Date: 2024-02-25 18:55:17+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
5-
Generator: GlotPress/4.0.0-beta.2
5+
Generator: GlotPress/4.0.0-beta.3
66
Language: de
77
-->
88
<resources>
9+
<string name="qrcode_media_deeplink_error">Die Website wurde nicht gefunden. Überprüfe, ob du im richtigen Konto angemeldet bist.</string>
10+
<string name="gravatar_info_sync_done_button">Fertig</string>
11+
<string name="gravatar_info_sync_message">Die Synchronisierung deines Gravatar-Profils mit den neuesten Updates kann einige Zeit in Anspruch nehmen.</string>
12+
<string name="gravatar_info_learn_more_link">Was ist Gravatar?</string>
13+
<string name="gravatar_info_description">Wenn du hier deinen Avatar, Namen und deine Informationen über dich aktualisierst, werden sie auch auf allen Websites aktualisiert, die Gravatar-Profile nutzen.</string>
14+
<string name="gravatar_info_title">Dein WordPress.com-Profil wird unterstützt von Gravatar</string>
915
<string name="error_media_could_not_share_media_from_device">Die Medien können nicht zum Teilen geladen werden. Bitte überprüfe die Berechtigungen der App\n oder verwende die Mediathek der App.</string>
1016
<string name="site_monitoring_cannot_be_started">Wir können die Website-Überwachung im Moment nicht öffnen. Bitte versuche es später erneut</string>
1117
<string name="site_monitoring_tab_title_web_server_logs">Webserver-Protokolle</string>
@@ -3780,7 +3786,7 @@ Language: de
37803786
<string name="error">Fehler</string>
37813787
<string name="no">Nein</string>
37823788
<string name="yes">Ja</string>
3783-
<string name="notification_settings">Benachrichtigungs-Einstellungen</string>
3789+
<string name="notification_settings">Benachrichtigungseinstellungen</string>
37843790
<string name="add">Hinzufügen</string>
37853791
<string name="save">Speichern</string>
37863792
<string name="cancel">Abbrechen</string>

‎WordPress/src/main/res/values-el/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
Translation-Revision-Date: 2023-06-13 08:27:23+0000
44
Plural-Forms: nplurals=2; plural=n != 1;
5-
Generator: GlotPress/4.0.0-beta.2
5+
Generator: GlotPress/4.0.0-beta.3
66
Language: el_GR
77
-->
88
<resources>

0 commit comments

Comments
 (0)