Skip to content

Commit

Permalink
Merge release/25.7 into trunk (#21692)
Browse files Browse the repository at this point in the history
* Download store metadata when generating beta build (#21623)

* Download store metadata when generating beta build

This should provide earlier feedback on the metadata translation, at
least for the portion that has already been translated at the time a
beta is made.

This is consistent with what we do in iOS, see
https://github.com/wordpress-mobile/WordPress-iOS/blob/b9a0deaf091739f33051f20cffdbe9a2097f645e/fastlane/lanes/release.rb#L219

* Remove call to push changes in download translated metadata lane

Automatically pushing from lanes other than the root-release lanes (code
freeze, new beta, finalize release, etc.) can result in undesired
pushes, like it just happened to me in
edcd40a

* fix: Address editor crashes from null listeners (#21657)

* fix: Address editor crashes from null listeners

Setting the listeners within `instantiateItem` appears problematic as
this only runs for the initial launch, but not for other events that
destroy and recreate fragment--e.g., screen rotation events.

To address this, GutenbergKit now follow the pattern of the Aztec and
GutenbergMobile editors, invoking the `initializeEditorFragment` method.
This method is described as "requesting dependency injection," which
feels like an odd statement. There is likely further opportunity to
refactor this architecture for simplicity.

* docs: Add release note

* docs: Remove `TODO` comment

Apparently the linter prohibits this statement...

* Merge release_notes/25.7 into release/25.7 (#21691)

* Update 25.7 release notes

* Update WordPress `PlayStoreStrings.po` for version 25.7

* Update Jetpack `PlayStoreStrings.po` for version 25.7

---------

Co-authored-by: Oguz Kocer <oguz.kocer@automattic.com>

* Update translations

* Bump version number

* Update WordPress metadata translations for 25.7

* Update Jetpack metadata translations for 25.7

---------

Co-authored-by: Gio Lodi <gio.lodi@automattic.com>
Co-authored-by: David Calhoun <github@davidcalhoun.me>
Co-authored-by: Oguz Kocer <oguz.kocer@automattic.com>
  • Loading branch information
4 people authored Feb 19, 2025
1 parent 191c357 commit a0f2a5d
Show file tree
Hide file tree
Showing 79 changed files with 2,846 additions and 3,088 deletions.
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
-----
* [**] Send feedback from within the experimental editor "more" options menu. [#21586]
* [**] Support accessing the code editor within the experimental editor. [#21582]
* [*] Fix experimental editor crash when changing the device orienation. [#21657]

25.6
-----
Expand Down
18 changes: 8 additions & 10 deletions WordPress/jetpack_metadata/PlayStoreStrings.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ msgstr ""
"X-Generator: VsCode\n"
"Project-Id-Version: Jetpack - Apps - Android - Release Notes\n"

msgctxt "release_note_257"
msgid ""
"25.7:\n"
"Just two fixes to the experimental block editor this time:\n"
"1. You can send feedback about the editor while you're using it.\n"
"2. We fixed a bug where the code view didn't work properly\n"
msgstr ""

msgctxt "release_note_256"
msgid ""
"25.6:\n"
Expand All @@ -19,16 +27,6 @@ msgid ""
"- Uses a web-based approach for WordPress.com login. This should be more reliable for most users, but please contact support if you have any trouble!\n"
msgstr ""

msgctxt "release_note_255"
msgid ""
"25.5:\n"
"This month, we've:\n"
"- Fixed broken social media icons in Jetpack Social\n"
"- Fixed some Dark Mode bugs\n"
"- We've brought the experimental editor to Android – give it a try and let us know what you think!\n"
"- Adjusted how users log into WordPress.com – this fixes a long-standing issue where you couldn't log in if you used a Passkey.\n"
msgstr ""

#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
#. translators: Title to be displayed in the Play Store. Limit to 30 characters including spaces and commas!
msgctxt "play_store_app_title"
Expand Down
6 changes: 3 additions & 3 deletions WordPress/jetpack_metadata/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
* [**] Send feedback from within the experimental editor "more" options menu. [#21586]
* [**] Support accessing the code editor within the experimental editor. [#21582]

Just two fixes to the experimental block editor this time:
1. You can send feedback about the editor while you're using it.
2. We fixed a bug where the code view didn't work properly
17 changes: 8 additions & 9 deletions WordPress/metadata/PlayStoreStrings.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ msgstr ""
"X-Generator: VsCode\n"
"Project-Id-Version: Release Notes & Play Store Descriptions\n"

msgctxt "release_note_257"
msgid ""
"25.7:\n"
"Just two fixes to the experimental block editor this time:\n"
"1. You can send feedback about the editor while you're using it.\n"
"2. We fixed a bug where the code view didn't work properly\n"
msgstr ""

msgctxt "release_note_256"
msgid ""
"25.6:\n"
Expand All @@ -19,15 +27,6 @@ msgid ""
"- Uses a web-based approach for WordPress.com login. This should be more reliable for most users, but please contact support if you have any trouble!\n"
msgstr ""

msgctxt "release_note_255"
msgid ""
"25.5:\n"
"This month, we've:\n"
"- Fixed some Dark Mode bugs\n"
"- We've brought the experimental editor to Android – give it a try and let us know what you think!\n"
"- Adjusted how users log into WordPress.com – this fixes a long-standing issue where you couldn't log in if you used a Passkey.\n"
msgstr ""

#. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
#. translators: Shorter Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
msgctxt "sample_post_content"
Expand Down
6 changes: 3 additions & 3 deletions WordPress/metadata/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
* [**] Send feedback from within the experimental editor "more" options menu. [#21586]
* [**] Support accessing the code editor within the experimental editor. [#21582]

Just two fixes to the experimental block editor this time:
1. You can send feedback about the editor while you're using it.
2. We fixed a bug where the code view didn't work properly
12 changes: 5 additions & 7 deletions WordPress/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2024-12-19 09:54:11+0000
Translation-Revision-Date: 2025-02-03 15:54:08+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/4.0.1
Language: ar
-->
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="experimental_per_app_language_prefs">تفضيلات اللغات التجريبية لكل تطبيق</string>
<string name="avatar_update_email_unverified">لتحديث صورتك الرمزية، يتعين عليك التحقق من عنوان بريدك الإلكتروني أولاً.</string>
<string name="feedback_form_note_link_wordpress">المنتديات المجتمعية.</string>
<string name="default_web_client_id" a8c-src-lib="module:login">عنصر نائب</string>
<string name="personalization_screen_shortcuts_accessibility_label">تبديل اختصار %s</string>
<string name="personalization_screen_card_accessibility_label">تبديل بطاقة %s</string>
Expand All @@ -32,15 +33,14 @@ Language: ar
<string name="more_content_description_blogging_prompts">موجّهات أكثر</string>
<string name="more_content_description_promote_blaze">Blaze أكثر</string>
<string name="reader_toast_success_undo">تم إلغاء حظر التدوينة</string>
<string name="feedback_form_note_link">شاشة الاتصال بالدعم.</string>
<string name="feedback_form_note_text">يرجى ملاحظة أن هذا ليس نموذج دعم، ولن نتمكن من الرد. إذا كنت بحاجة إلى الدعم، فيرجى استخدام الدعم لدينا</string>
<string name="experimental_block_editor_theme_styles">أنماط محرر المكوِّن التجريبي</string>
<string name="experimental_block_editor">محرر المكوِّن التجريبي</string>
<string name="experimental_features_screen_title">الميزات التجريبية</string>
<string name="back">رجوع</string>
<string name="dialog_confirm_autosave_dont_restore_button">من هذا التطبيق</string>
<string name="dialog_confirm_autosave_restore_button">من جهاز آخر</string>
<string name="item_selected">محدد</string>
<string name="feedback_form_note_text">يرجى ملاحظة أن هذا ليس نموذج دعم، ولن نتمكن من الرد. إذا كنت تحتاج مساعدة، فيرجى استخدام \"</string>
<string name="media_pager_remove_item_content_description">إزالة العنصر ⁦%1$d⁩</string>
<string name="feedback_form_add_attachments">إضافة مرفقات</string>
<string name="feedback_form_unable_to_create_tempfile">يتعذر إنشاء ملف مؤقت</string>
Expand Down Expand Up @@ -1800,13 +1800,13 @@ Language: ar
<string name="prepublishing_nudges_publish_action">تاريخ النشر</string>
<string name="post_list_move_trashed_post_to_draft_dialog_negative">إلغاء</string>
<string name="post_list_move_trashed_post_to_draft_dialog_positive">نقل إلى المسودة</string>
<string name="prepublishing_tags_description">تساعد الوسوم على إخبار القراء بما تدور حوله المقالة.</string>
<string name="prepublishing_nudges_toolbar_title_tags">إضافة وسوم</string>
<string name="prepublishing_nudges_home_save_button">حفظ الآن</string>
<string name="prepublishing_nudges_home_submit_button">إرسال الآن</string>
<string name="prepublishing_nudges_tags_action">وسوم</string>
<string name="post_list_move_trashed_post_to_draft_dialog_message">يتعذر تحرير المقالات التي تمت إضافتها إلى سلة المهملات. هل ترغب في تغيير حالة هذه المقالة إلى \"مسودة\" حتى تتمكن من العمل عليها؟</string>
<string name="prepublishing_nudges_toolbar_title_publish">تاريخ النشر</string>
<string name="prepublishing_tags_description">تساعد الوسوم على إخبار القراء بما تدور حوله التدوينة</string>
<string name="publish_date">تاريخ النشر</string>
<string name="post_list_move_trashed_post_to_draft_dialog_title">هل تريد نقل المقالة إلى المسودات؟</string>
<string name="reader_btn_done">انتهى</string>
Expand Down Expand Up @@ -2152,7 +2152,6 @@ Language: ar
<string name="site_settings_performance">الأداء</string>
<string name="site_settings_site_accelerator_on">مفعل</string>
<string name="site_settings_site_accelerator">مُسرِّع الموقع</string>
<string name="site_settings_lazy_load_images_summary">حسِّن سرعة موقعك من خلال تحميل الصور المرئية فقط على الشاشة.</string>
<string name="stats_file_downloads_value_label">التنزيلات</string>
<string name="stats_file_downloads_title_label">ملف</string>
<string name="stats_file_downloads">تنزيلات الملفات</string>
Expand Down Expand Up @@ -2824,7 +2823,6 @@ Language: ar
<string name="plugin_needs_update">بحاجة إلى تحديث</string>
<string name="my_site_create_new_site">أنشئ موقعًا جديدًا لأعمالك أو مجلتك أو مدونتك الشخصية؛ أو اتصل بموقع ووردبريس الموجود.</string>
<string name="notifications_jetpack_connection_setup_info">للحصول على إشعارات مساعدة على جهازك من موقع ووردبريس الخاص بك، سيتعين عليك تنصيب إضافة Jetpack. هل ترغب في إعداد Jetpack؟</string>
<string name="site_settings_lazy_load_images">صور \"بطيئة التحميل\"</string>
<string name="stats_jetpack_connection_setup">تثبيت Jetpack</string>
<string name="plugin_chevron_icon_content_description">التبديل بين النصوص</string>
<string name="plugin_info_your_version">إصدار ووردبريس الخاص بك</string>
Expand Down
3 changes: 0 additions & 3 deletions WordPress/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,6 @@ Language: cs_CZ
<string name="prepublishing_nudges_home_header_publishing_to">Publikování do</string>
<string name="prepublishing_nudges_toolbar_title_tags">Přidat štítky</string>
<string name="prepublishing_nudges_toolbar_title_publish">Datum publikování</string>
<string name="prepublishing_tags_description">Štítky pomáhají čtenářům říct, o čem je příspěvek.</string>
<string name="post_status_post_published">Publikováno</string>
<string name="post_status_post_trashed">Smazáno</string>
<string name="post_status_post_scheduled">Naplánováno</string>
Expand Down Expand Up @@ -1614,7 +1613,6 @@ Language: cs_CZ
<string name="site_settings_improved_search">Vylepšené vyhledávání</string>
<string name="site_settings_improved_search_summary">Nahraďte integrované vyhledávání WordPress vylepšeným vyhledáváním</string>
<string name="site_settings_performance">Výkon</string>
<string name="site_settings_lazy_load_images_summary">Zvyšte rychlost svého webu pouze načítáním obrázků viditelných na obrazovce.</string>
<string name="site_settings_site_accelerator">Akcelerátor stránek</string>
<string name="site_settings_site_accelerator_on">Zapnout</string>
<string name="stats_file_downloads_value_label">Stahování</string>
Expand Down Expand Up @@ -2281,7 +2279,6 @@ Language: cs_CZ
<string name="my_site_create_new_site">Vytvořte nový web pro svůj podnik, časopis nebo osobní blog; nebo připojite existující stránky běžící na WordPress.</string>
<string name="site_settings_like_header">To se mi líbí</string>
<string name="notifications_jetpack_connection_setup_info">Chcete-li získat užitečná oznámení v zařízení z vašeho webu WordPress, musíte nainstalovat plugin Jetpack. Chcete nastavit Jetpack?</string>
<string name="site_settings_lazy_load_images">Postupné načítání obrázků \"Lazy-load\"</string>
<string name="stats_jetpack_connection_setup">Instalovat Jetpack</string>
<string name="plugin_chevron_icon_content_description">Přepnout text</string>
<string name="plugin_info_your_version">Verze WordPressu</string>
Expand Down
15 changes: 7 additions & 8 deletions WordPress/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2024-12-21 23:54:46+0000
Translation-Revision-Date: 2025-02-01 16:19:30+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/4.0.1
Language: de
-->
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="experimental_per_app_language_prefs">Experimentelle App-spezifische Spracheinstellungen</string>
<string name="avatar_update_email_unverified">Um deinen Avatar zu aktualisieren, musst du zuerst deine E-Mail-Adresse verifizieren.</string>
<string name="feedback_form_note_link_wordpress">Community-Foren.</string>
<string name="default_web_client_id" a8c-src-lib="module:login">Platzhalter</string>
<string name="personalization_screen_shortcuts_accessibility_label">%s-Tastaturkürzel umschalten</string>
<string name="personalization_screen_card_accessibility_label">%s-Karte umschalten</string>
Expand All @@ -16,7 +17,7 @@ Language: de
<string name="biographical_info">Biographische Angaben</string>
<string name="about_the_user">Über den Benutzer</string>
<string name="website">Website</string>
<string name="contact_info">Kontaktinformationen</string>
<string name="contact_info">Kontaktinfo</string>
<string name="nickname">Spitzname</string>
<string name="name">Name</string>
<string name="no_users">Keine Benutzer</string>
Expand All @@ -33,7 +34,7 @@ Language: de
<string name="more_content_description_blogging_prompts">Schreibanregungen ‒ mehr</string>
<string name="more_content_description_promote_blaze">Blaze ‒ mehr</string>
<string name="reader_toast_success_undo">Blockierung des Blogs aufgehoben</string>
<string name="feedback_form_note_link">Bildschirm „Support kontaktieren“.</string>
<string name="feedback_form_note_link_jetpack">Bildschirm „Support kontaktieren“.</string>
<string name="feedback_form_note_text">Bitte beachte, dass dies kein Supportformular ist. Wir können daher auf deine Anfrage nicht antworten. Wenn du Hilfe benötigst, nutze bitte unseren</string>
<string name="experimental_block_editor_theme_styles">Stile für den experimentellen Block-Editor</string>
<string name="experimental_block_editor">Experimenteller Block-Editor</string>
Expand Down Expand Up @@ -761,7 +762,7 @@ Language: de
<string name="gutenberg_native_upgrade_your_plan_to_use_video_covers" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Führe ein Tarif-Upgrade durch, um Video-Cover zu verwenden</string>
<string name="gutenberg_native_upgrade_your_plan_to_upload_audio" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Führe ein Tarif-Upgrade durch, um Audiodateien hochzuladen</string>
<string name="gutenberg_native_jetpack_powered" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Von Jetpack unterstützt</string>
<string name="gutenberg_native_invalid_url" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Ungültige URL.</string>
<string name="gutenberg_native_invalid_url" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Die URL ist ungültig.</string>
<string name="gutenberg_native_gradient" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Verlauf</string>
<string name="wp_jetpack_continue_to_notifications">Weiter zu Benachrichtigungen</string>
<string name="wp_jetpack_continue_to_stats">Weiter zu Statistiken</string>
Expand Down Expand Up @@ -894,7 +895,7 @@ Language: de
<string name="featured_image_replace_dialog_confirm" tools:ignore="UnusedResources" a8c-src-lib="module:editor">Beitragsbild ersetzen</string>
<string name="featured_image_replace_dialog_description" tools:ignore="UnusedResources" a8c-src-lib="module:editor">Es ist bereits ein Beitragsbild eingestellt. Möchtest du es mit einem neuen Bild ersetzen?</string>
<string name="featured_image_replace_dialog_title" tools:ignore="UnusedResources" a8c-src-lib="module:editor">Aktuelles Beitragsbild ersetzen?</string>
<string name="dialog_dismiss_try_block_editor" tools:ignore="UnusedResources" translatable="true" a8c-src-lib="module:editor">Schließen</string>
<string name="dialog_dismiss_try_block_editor" tools:ignore="UnusedResources" translatable="true" a8c-src-lib="module:editor">Verwerfen</string>
<string name="dialog_body_try_block_editor" tools:ignore="UnusedResources" translatable="true" a8c-src-lib="module:editor">Für neue Beiträge wird der klassische Editor bald nicht mehr verfügbar sein. Das betrifft jedoch nicht die Bearbeitung bestehender Beiträge oder Seiten. Du kannst den Block-Editor bereits jetzt in den Website-Einstellungen aktivieren.</string>
<string name="dialog_title_try_block_editor" tools:ignore="UnusedResources" translatable="true" a8c-src-lib="module:editor">Probiere den neuen Block-Editor aus</string>
<string name="menu_toolbar_title" tools:ignore="UnusedResources" a8c-src-lib="module:editor">%s-Block bearbeiten</string>
Expand Down Expand Up @@ -2153,7 +2154,6 @@ Language: de
<string name="site_settings_site_accelerator_off">Aus</string>
<string name="site_settings_site_accelerator_on">Ein</string>
<string name="site_settings_site_accelerator">Website-Beschleuniger</string>
<string name="site_settings_lazy_load_images_summary">Verbessere die Ladezeit deiner Website, indem du nur die auf dem Bildschirm sichtbaren Bilder lädst.</string>
<string name="site_settings_performance">Performance</string>
<string name="stats_file_downloads_value_label">Downloads</string>
<string name="stats_file_downloads_title_label">Datei</string>
Expand Down Expand Up @@ -2826,7 +2826,6 @@ Language: de
<string name="my_site_add_new_site">Neue Website hinzufügen</string>
<string name="my_site_create_new_site">Erstelle eine neue Website für dein Geschäft, dein Magazin oder deinen persönlichen Blog oder verbinde eine vorhandene WordPress-Installation.</string>
<string name="notifications_jetpack_connection_setup_info">Wenn du hilfreiche Benachrichtigungen deiner WordPress-Website auf deinem Gerät erhalten möchtest, musst du das Jetpack-Plugin installieren. Möchtest du Jetpack einrichten?</string>
<string name="site_settings_lazy_load_images">Verzögertes Laden von Bildern</string>
<string name="stats_jetpack_connection_setup">Jetpack installieren</string>
<string name="plugin_chevron_icon_content_description">Text umschalten</string>
<string name="plugin_info_your_version">Deine WordPress Version</string>
Expand Down
Loading

0 comments on commit a0f2a5d

Please sign in to comment.