Skip to content

Merge release/23.5 into trunk #14875

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

Closed
wants to merge 5 commits into from
Closed

Merge release/23.5 into trunk #14875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ceb6353
Fix issue with truncating logs to last entries
hichamboushaba Oct 28, 2025
72a98a9
Merge pull request #14842 from woocommerce/ensure-sending-last-encryp…
irfano Oct 28, 2025
a8c8583
Update translations
wpmobilebot Oct 31, 2025
b1fa5bb
Update metadata translations for WooCommerce 23.5
wpmobilebot Oct 31, 2025
8b2a6f4
Bump version number
wpmobilebot Oct 31, 2025
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
2 changes: 1 addition & 1 deletion ...ce/src/main/kotlin/com/woocommerce/android/util/crashlogging/EncryptedLogsFileProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class EncryptedLogsFileProvider @Inject constructor(
) {
suspend fun provide(): File {
return withContext(dispatchers.io) {
val logs = wooLog.getCurrentLogEntries().take(LOG_ENTRIES_LIMIT)
val logs = wooLog.getCurrentLogEntries().takeLast(LOG_ENTRIES_LIMIT)

File.createTempFile("log", "").apply {
appendText(logs.joinToString("\n"))
Expand Down
670 changes: 371 additions & 299 deletions WooCommerce/src/main/res/values-ar/strings.xml
View file
Open in desktop

Large diffs are not rendered by default.

76 changes: 74 additions & 2 deletions WooCommerce/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2025-10-10 09:54:04+0000
Translation-Revision-Date: 2025-10-22 10:54:05+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: de
-->
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="booking_cancel_dialog_confirm">Ja, bitte stornieren</string>
<string name="booking_cancel_dialog_keep">Nein, behalten</string>
<string name="booking_cancel_dialog_message">%1$s kann nicht mehr am %3$s um %4$s an „%2$s“ teilnehmen.</string>
<string name="booking_cancel_dialog_title">Buchung stornieren</string>
<string name="booking_fetch_error">Fehler beim Abrufen der Buchung</string>
<string name="bookings_filter_default">Alle</string>
<string name="bookings_filter_title_service_event">Service/Veranstaltung</string>
<string name="bookings_filter_title_date">Datum und Uhrzeit</string>
<string name="bookings_filter_location">Ort</string>
<string name="bookings_filter_customer_name">Kundenname</string>
<string name="bookings_filter_title_type">Buchungstyp</string>
<string name="bookings_filter_title_payment_status">Zahlungsstatus</string>
<string name="bookings_filter_title_attendance_status">Anwesenheitsstatus</string>
<string name="bookings_filter_title_team_member">Zugewiesenes Teammitglied</string>
<string name="bookings_filters_show_bookings">Buchungen anzeigen</string>
<string name="bookings_filters_count_title">Filter (%d)</string>
<string name="bookings_filters_default_title">Filter</string>
<string name="bookings_empty_state_clear_filters_button">Filter löschen</string>
<string name="bookings_empty_state_change_filters_button">Filter ändern</string>
<string name="bookings_empty_state_description_with_filters">Zu deinen Filtern gibt es keine Buchungen. Versuche, sie anzupassen, um weitere Ergebnisse zu erhalten.</string>
<string name="bookings_search_no_results_with_filters">Wir konnten keine Buchungen mit diesem Namen finden – passe deinen Suchbegriff oder deine Filter an, um weitere Ergebnisse zu erhalten.</string>
<string name="bookings_search_no_results_without_filters">Wir konnten keine Buchungen mit diesem Namen finden – passe deinen Suchbegriff an, um weitere Ergebnisse zu erhalten.</string>
<string name="bookings_empty_state_description_upcoming">Es sind noch keine zukünftigen Termine oder Veranstaltungen geplant.</string>
<string name="bookings_empty_state_description_today">Für heute sind keine Termine oder Veranstaltungen geplant.</string>
<string name="bookings_empty_state_description_default">Eingehende Buchungen werden hier angezeigt, wo du sie anzeigen und verwalten kannst.</string>
<string name="bookings_empty_state_title_upcoming">Keine bevorstehenden Buchungen</string>
<string name="bookings_empty_state_title_today">Keine Buchungen heute</string>
<string name="bookings_empty_state_title_default">Keine Buchungen gefunden</string>
<string name="bookings_sort_by_newest_to_oldest_short">Neueste</string>
<string name="bookings_sort_by_oldest_to_newest_short">Älteste</string>
<string name="bookings_sort_by_newest_to_oldest">Neu nach alt</string>
<string name="bookings_sort_by_oldest_to_newest">Alt nach neu</string>
<string name="bookings_search_with_filters_hint">Gefilterte Buchungen suchen</string>
<string name="bookings_search_hint">Buchungen suchen</string>
<string name="woopos_orders_status_refunded">Rückerstattet</string>
<string name="woopos_orders_status_completed">Abgeschlossen</string>
<string name="woopos_orders_status_cancelled">Storniert</string>
<string name="woopos_orders_status_failed">Fehlgeschlagen</string>
<string name="woopos_orders_status_on_hold">In Wartestellung</string>
<string name="woopos_orders_status_processing">In Bearbeitung</string>
<string name="woopos_orders_status_pending">Zahlung ausstehend</string>
<string name="woopos_orders_status_auto_draft">Entwurf</string>
<string name="woopos_orders_pagination_error_content_description">Bitte versuche es erneut.</string>
<string name="woopos_orders_pagination_error_title">Es konnten keine weiteren Bestellungen geladen werden</string>
<string name="woopos_orders_loading_error_message">Bitte überprüfe deine Verbindung und versuche es erneut.</string>
<string name="woopos_orders_loading_error_title">Bestellungen konnten nicht geladen werden</string>
<string name="woopos_orders_empty_list_image_description">Keine Bestellungen</string>
<string name="woopos_orders_empty_action_label">Weitere Informationen</string>
<string name="woopos_orders_empty_list_message">Erkundige dich, wie du deine Shop-Verkäufe steigern kannst.</string>
<string name="woopos_orders_empty_list_title">Keine Bestellungen gefunden</string>
<string name="woopos_date_yesterday_at">Gestern um %s</string>
<string name="woopos_date_today_at">Heute um %s</string>
<string name="woopos_date_just_now">Gerade eben</string>
<string name="woopos_date_never">Nie</string>
<string name="woopos_settings_local_catalog_refresh_button">Katalog aktualisieren</string>
<string name="woopos_settings_local_catalog_refresh_description">Verwende diese Aktualisierung nur, wenn etwas nicht zu funktionieren scheint – POS hält die Daten automatisch auf dem neuesten Stand.</string>
<string name="woopos_settings_local_catalog_actions">Manuelle Katalogaktualisierung</string>
<string name="woopos_settings_local_catalog_cellular_data_subtitle">Katalogaktualisierungen mit mobilen Daten herunterladen</string>
<string name="woopos_settings_local_catalog_cellular_data">Vollständige Aktualisierung über Mobilfunkdaten erlauben</string>
<string name="woopos_settings_local_catalog_settings">Datennutzung verwalten</string>
<string name="woopos_settings_local_catalog_last_full_update">Letzte vollständige Aktualisierung</string>
<string name="woopos_settings_local_catalog_last_update">Letzte Aktualisierung</string>
<string name="woopos_settings_local_catalog_size">Kataloggröße</string>
<string name="woopos_settings_local_catalog_status">Katalogstatus</string>
<string name="woopos_settings_local_catalog_category_subtitle">Katalogeinstellungen verwalten</string>
<string name="woopos_settings_local_catalog_category">Katalog</string>
<string name="local_notification_woo_pos_survey_current_user_description">Teile deine Erfahrungen in einer kurzen zweiminütigen Umfrage und hilf uns, uns zu verbessern.</string>
<string name="local_notification_woo_pos_survey_current_user_title">Wie funktioniert POS für dich?</string>
<string name="local_notification_woo_pos_survey_potential_user_description">Nimm an einer kurzen zweiminütigen Umfrage teil, um uns dabei zu helfen, deine Lieblingsfunktionen zu gestalten.</string>
<string name="local_notification_woo_pos_survey_potential_user_title">Du denkst über persönliche Verkäufe nach?</string>
<string name="product_type_booking">Buchbares Produkt</string>
<string name="date_time_connector">um</string>
<string name="booking_payment_view_order">Bestellung anzeigen</string>
<string name="booking_payment_mark_as_paid">Als bezahlt markieren</string>
<string name="booking_payment_label_service">Service</string>
<string name="booking_payment_header">ZAHLUNG</string>
<string name="booking_attendance_status_no_show_desc">Der Kunde hat den Termin nicht wahrgenommen, ohne im Voraus zu stornieren.</string>
<string name="booking_attendance_status_cancelled_desc">Der Kunde kann nicht mehr teilnehmen.</string>
<string name="booking_attendance_status_checked_in_desc">Der Kunde ist gekommen und die Sitzung hat wie geplant stattgefunden.</string>
<string name="booking_attendance_status_booked_desc">Der Termin ist geplant, hat aber noch nicht stattgefunden.</string>
<string name="booking_attendance_update_title">Teilnahmestatus aktualisieren</string>
Expand Down Expand Up @@ -284,6 +355,7 @@ Language: de
<string name="woo_shipping_labels_package_creation_starred">Diesen Artikel mit Stern markieren</string>
<string name="woopos_coupons_pagination_error_title">Es konnten keine weiteren Gutscheine geladen werden</string>
<string name="woopos_coupons_pagination_try_again_label">Erneut versuchen</string>
<string name="woopos_orders_loading_error_retry_button">Erneut versuchen</string>
<string name="woopos_coupons_empty_list_title">Keine Gutscheine gefunden</string>
<string name="woopos_coupons_empty_list_image_description">Keine Gutscheine</string>
<string name="woopos_coupons_loading_error_title">Gutscheine konnten nicht geladen werden</string>
Expand Down
76 changes: 74 additions & 2 deletions WooCommerce/src/main/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2025-10-08 09:54:10+0000
Translation-Revision-Date: 2025-10-21 13:54:05+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: es
-->
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="booking_cancel_dialog_confirm">Sí, quiero cancelarla</string>
<string name="booking_cancel_dialog_keep">No, quiero mantenerla</string>
<string name="booking_cancel_dialog_message">%1$s ya no podrá asistir a “%2$s” el día %3$s a las %4$s.</string>
<string name="booking_cancel_dialog_title">Cancelar reserva</string>
<string name="booking_fetch_error">Error al recuperar la reserva</string>
<string name="bookings_filter_default">Cualquiera</string>
<string name="bookings_filter_title_service_event">Servicio/Evento</string>
<string name="bookings_filter_title_date">Fecha y hora</string>
<string name="bookings_filter_location">Ubicación</string>
<string name="bookings_filter_customer_name">Nombre del cliente</string>
<string name="bookings_filter_title_type">Tipo de reserva</string>
<string name="bookings_filter_title_payment_status">Estado del pago</string>
<string name="bookings_filter_title_attendance_status">Estado de la asistencia</string>
<string name="bookings_filter_title_team_member">Miembro del equipo asignado</string>
<string name="bookings_filters_show_bookings">Mostrar reservas</string>
<string name="bookings_filters_count_title">Filtros (%d)</string>
<string name="bookings_filters_default_title">Filtros</string>
<string name="bookings_empty_state_clear_filters_button">Borrar filtros</string>
<string name="bookings_empty_state_change_filters_button">Cambiar filtros</string>
<string name="bookings_empty_state_description_with_filters">Ninguna reserva coincide con tus filtros. Prueba a ajustarlos para ver más resultados.</string>
<string name="bookings_search_no_results_with_filters">No hemos podido encontrar ninguna reserva con ese nombre. Prueba a ajustar el término de búsqueda o los filtros para ver más resultados.</string>
<string name="bookings_search_no_results_without_filters">No hemos podido encontrar ninguna reserva con ese nombre. Prueba a ajustar el término de búsqueda para ver más resultados.</string>
<string name="bookings_empty_state_description_upcoming">Todavía no has programado ninguna cita o evento.</string>
<string name="bookings_empty_state_description_today">No tienes ninguna cita o evento programado para hoy.</string>
<string name="bookings_empty_state_description_default">Las reservas entrantes aparecerán aquí, donde podrás verlas y gestionarlas.</string>
<string name="bookings_empty_state_title_upcoming">No hay reservas próximamente</string>
<string name="bookings_empty_state_title_today">No hay reservas hoy</string>
<string name="bookings_empty_state_title_default">No se han encontrado reservas</string>
<string name="bookings_sort_by_newest_to_oldest_short">Más recientes</string>
<string name="bookings_sort_by_oldest_to_newest_short">Más antiguas</string>
<string name="bookings_sort_by_newest_to_oldest">De más recientes a más antiguas</string>
<string name="bookings_sort_by_oldest_to_newest">De más antiguas a más recientes</string>
<string name="bookings_search_with_filters_hint">Buscar en las reservas filtradas</string>
<string name="bookings_search_hint">Buscar en las reservas</string>
<string name="woopos_orders_status_refunded">Reembolsadas</string>
<string name="woopos_orders_status_completed">Completadas</string>
<string name="woopos_orders_status_cancelled">Canceladas</string>
<string name="woopos_orders_status_failed">No completadas</string>
<string name="woopos_orders_status_on_hold">En espera</string>
<string name="woopos_orders_status_processing">En procesamiento</string>
<string name="woopos_orders_status_pending">Pendientes de pago</string>
<string name="woopos_orders_status_auto_draft">Borradores</string>
<string name="woopos_orders_pagination_error_content_description">Inténtalo de nuevo.</string>
<string name="woopos_orders_pagination_error_title">No se pueden cargar más pedidos</string>
<string name="woopos_orders_loading_error_message">Comprueba la conexión e inténtalo de nuevo.</string>
<string name="woopos_orders_loading_error_title">No se pueden cargar los pedidos</string>
<string name="woopos_orders_empty_list_image_description">No hay ningún pedido</string>
<string name="woopos_orders_empty_action_label">Más información</string>
<string name="woopos_orders_empty_list_message">Descubre cómo puedes aumentar las ventas de tu tienda.</string>
<string name="woopos_orders_empty_list_title">No se han encontrado pedidos</string>
<string name="woopos_date_yesterday_at">Ayer a las %s</string>
<string name="woopos_date_today_at">Hoy a las %s</string>
<string name="woopos_date_just_now">Justo ahora</string>
<string name="woopos_date_never">Nunca</string>
<string name="woopos_settings_local_catalog_refresh_button">Actualizar catálogo</string>
<string name="woopos_settings_local_catalog_refresh_description">Utiliza esta actualización solo cuando algo parezca estar desactivado: los datos del TPV se mantienen actualizados automáticamente.</string>
<string name="woopos_settings_local_catalog_actions">Actualización manual del catálogo</string>
<string name="woopos_settings_local_catalog_cellular_data_subtitle">Descarga actualizaciones del catálogo con datos móviles</string>
<string name="woopos_settings_local_catalog_cellular_data">Permitir la actualización completa de los datos móviles</string>
<string name="woopos_settings_local_catalog_settings">Gestionar el uso de datos</string>
<string name="woopos_settings_local_catalog_last_full_update">Última actualización completa</string>
<string name="woopos_settings_local_catalog_last_update">Última actualización</string>
<string name="woopos_settings_local_catalog_size">Tamaño del catálogo</string>
<string name="woopos_settings_local_catalog_status">Estado del catálogo</string>
<string name="woopos_settings_local_catalog_category_subtitle">Gestionar ajustes del catálogo</string>
<string name="woopos_settings_local_catalog_category">Catálogo</string>
<string name="local_notification_woo_pos_survey_current_user_description">Comparte tu experiencia en una rápida encuesta de 2 minutos y ayúdanos a mejorar.</string>
<string name="local_notification_woo_pos_survey_current_user_title">¿Cómo te va con el TPV?</string>
<string name="local_notification_woo_pos_survey_potential_user_description">Haz una breve encuesta de 2 minutos para ayudarnos a dar forma a funciones que te encantarán.</string>
<string name="local_notification_woo_pos_survey_potential_user_title">¿Estás pensando en las ventas presenciales?</string>
<string name="product_type_booking">Producto reservable</string>
<string name="date_time_connector">en</string>
<string name="booking_payment_view_order">Ver pedido</string>
<string name="booking_payment_mark_as_paid">Marcar como pagado</string>
<string name="booking_payment_label_service">Servicio</string>
<string name="booking_payment_header">PAGO</string>
<string name="booking_attendance_status_no_show_desc">El cliente faltó a la cita sin cancelar por adelantado.</string>
<string name="booking_attendance_status_cancelled_desc">El cliente ya no podrá asistir.</string>
<string name="booking_attendance_status_checked_in_desc">El cliente acudió y la sesión tuvo lugar según lo previsto.</string>
<string name="booking_attendance_status_booked_desc">La cita está programada, pero aún no ha tenido lugar.</string>
<string name="booking_attendance_update_title">Actualizar estado de asistencia</string>
Expand Down Expand Up @@ -284,6 +355,7 @@ Language: es
<string name="woo_shipping_labels_package_creation_starred">Marcar este elemento con estrella</string>
<string name="woopos_coupons_pagination_try_again_label">Reintentar</string>
<string name="woopos_coupons_pagination_error_title">No se pueden cargar más cupones</string>
<string name="woopos_orders_loading_error_retry_button">Reintentar</string>
<string name="woopos_coupons_empty_list_title">No se han encontrado cupones</string>
<string name="woopos_coupons_empty_list_image_description">No hay cupones</string>
<string name="woopos_coupons_loading_error_title">No se pueden cargar los cupones</string>
Expand Down
Loading
Loading