Skip to content

Commit

Permalink
Merge pull request #12650 from woocommerce/merge/release-20.4-into-trunk
Browse files Browse the repository at this point in the history
Merge release/20.4 into trunk
  • Loading branch information
ThomazFB committed Sep 20, 2024
2 parents d6c8879 + c4853f7 commit b9d489d
Show file tree
Hide file tree
Showing 50 changed files with 1,249 additions and 1,056 deletions.
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
-----
- [**] Users can now scan their tracking number when adding it to the order [https://github.com/woocommerce/woocommerce-android/pull/12533]
- [*] Fixed an issue where shipping labels were incorrectly calculating the weight for packages containing multiple quantities of the same product [https://github.com/woocommerce/woocommerce-android/pull/12602]
- [**] [WEAR] Introduces three new complications for the Wear app: Orders Total, Orders Count, and Visitors [https://github.com/woocommerce/woocommerce-android/pull/12558]

20.3
-----
Expand Down
11 changes: 10 additions & 1 deletion WooCommerce/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2024-09-09 20:54:04+0000
Translation-Revision-Date: 2024-09-19 12:54:04+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/2.4.0-alpha
Language: ar
-->
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="custom_fields_editor_key_error_underscore">مفتاح غير صالح: يرجى إزالة رمز \"_\" من البداية.</string>
<string name="custom_fields_editor_key_error_duplicate">هذا المفتاح مستخدم بالفعل لحقل مخصص آخر.\nلا يدعم التطبيق حاليًا إنشاء مفاتيح مكررة. يرجى استخدام مسؤول ووردبريس لتكرار مفتاح إذا لزم الأمر.</string>
<string name="custom_fields_add_button">إضافة حقول مخصصة</string>
<string name="custom_fields_list_field_deleted">تم حذف الحقل المخصص</string>
<string name="custom_fields_list_saving_failed">فشل حفظ التغييرات، يرجى المحاولة مجددًا</string>
<string name="custom_fields_list_saving_succeeded">تم حفظ التغييرات</string>
<string name="custom_fields_list_progress_dialog_title">حفظ التغييرات</string>
<string name="woopos_no_internet_message">يبدو أنك غير متصل بالإنترنت. تأكد من تشغيل شبكة Wi-Fi الخاصة بك. إذا كنت تستخدم بيانات الهاتف المحمول، فتأكد من تمكينها ضمن إعدادات الجهاز لديك.</string>
<string name="order_shipment_tracking_barcode_scanning_failed">فشل الفحص. يرجى المحاولة مجددًا في وقت لاحق</string>
<string name="custom_fields_editor_value_label">القيمة</string>
<string name="custom_fields_editor_key_label">المفتاح</string>
<string name="woopos_dialog_products_info_secondary_message">أما أنواع المنتجات الأخرى، مثل: المنتجات المتغيرة والظاهرية، ستتوفر في التحديثات المستقبلية.</string>
Expand Down
11 changes: 10 additions & 1 deletion WooCommerce/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2024-09-11 09:54:03+0000
Translation-Revision-Date: 2024-09-19 16:54:03+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="custom_fields_editor_key_error_underscore">Ungültiger Schlüssel: Bitte entferne „_“ vom Anfang des Schlüssels.</string>
<string name="custom_fields_editor_key_error_duplicate">Dieser Schlüssel wird bereits für ein anderes individuelles Feld verwendet.\nDie App unterstützt derzeit nicht das Erstellen von doppelten Schlüsseln. Bitte verwende wp-admin, um einen Schlüssel zu duplizieren, falls dies erforderlich ist.</string>
<string name="custom_fields_add_button">Individuelle Felder hinzufügen</string>
<string name="custom_fields_list_field_deleted">Individuelles Feld gelöscht</string>
<string name="custom_fields_list_saving_failed">Die Änderungen konnten nicht gespeichert werden, bitte versuche es erneut</string>
<string name="custom_fields_list_saving_succeeded">Änderungen gespeichert</string>
<string name="custom_fields_list_progress_dialog_title">Änderungen werden gespeichert</string>
<string name="woopos_no_internet_message">Du bist anscheinend nicht mit dem Internet verbunden. Stelle sicher, dass dein WLAN eingeschaltet ist. Falls du mobile Daten verwendest, solltest du prüfen, ob sie in deinen Geräteeinstellungen aktiviert sind.</string>
<string name="order_shipment_tracking_barcode_scanning_failed">Scannen fehlgeschlagen. Bitte versuche es später erneut</string>
<string name="custom_fields_editor_value_label">Wert</string>
<string name="custom_fields_editor_key_label">Schlüssel</string>
<string name="woopos_dialog_products_info_secondary_message">Weitere Produkttypen, wie variable und virtuelle, werden in künftigen Updates bereitgestellt.</string>
Expand Down
27 changes: 18 additions & 9 deletions WooCommerce/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2024-09-10 17:54:04+0000
Translation-Revision-Date: 2024-09-19 16:54:07+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="custom_fields_editor_key_error_underscore">Clave no válida: elimina el carácter «_» del principio.</string>
<string name="custom_fields_editor_key_error_duplicate">Esta clave ya se utiliza para otro campo personalizado.\nActualmente, la aplicación no permite crear claves duplicadas. Utiliza wp-admin para duplicar una clave si es necesario.</string>
<string name="custom_fields_add_button">Añadir campos personalizados</string>
<string name="custom_fields_list_field_deleted">Campo personalizado borrado</string>
<string name="custom_fields_list_saving_failed">No se han podido guardar los cambios; inténtalo de nuevo</string>
<string name="custom_fields_list_saving_succeeded">Cambios guardados</string>
<string name="custom_fields_list_progress_dialog_title">Guardando cambios</string>
<string name="woopos_no_internet_message">Parece que no estás conectado a Internet. Comprueba que tienes activado el wifi. Si te vas a conectar con datos móviles, asegúrate de que estén activados en los ajustes de tu dispositivo.</string>
<string name="order_shipment_tracking_barcode_scanning_failed">No se ha podido realizar la exploración. Inténtalo de nuevo más tarde</string>
<string name="custom_fields_editor_value_label">Valor</string>
<string name="custom_fields_editor_key_label">Clave</string>
<string name="woopos_dialog_products_info_secondary_message">Otros tipos de productos, como los variables y los virtuales, estarán disponibles en futuras actualizaciones.</string>
Expand Down Expand Up @@ -201,7 +210,7 @@ Language: es
<string name="product_stock_status_low_stock">Pocas existencias</string>
<string name="order_detail_shipping_header">ENVÍO</string>
<string name="order_creation_feedback_action">Comparte tu opinión</string>
<string name="order_creation_shipping_feedback_message">¿Se compra fácilmente en Woo?</string>
<string name="order_creation_shipping_feedback_message">¿Es fácil gestionar envíos con Woo?</string>
<string name="order_creation_shipping_feedback_title">¡Se ha añadido el envío!</string>
<string name="order_creation_shipping_edit">Editar envío</string>
<string name="order_creation_shipping_title_edit">Editar envío</string>
Expand Down Expand Up @@ -261,7 +270,7 @@ Language: es
<string name="analytics_session_no_available_description">Los análisis de sesiones se basan en los recuentos de visitantes únicos, que no están disponibles para rangos de fechas personalizados</string>
<string name="analytics_session_no_available">Datos de la sesión no disponibles</string>
<string name="my_store_widget_unavailable">No disponible</string>
<string name="my_store_widget_stats_title">Rendimiento</string>
<string name="my_store_widget_stats_title">Estadísticas</string>
<string name="dashboard_stats_custom_range_label">Personalizado</string>
<string name="dashboard_stats_edit_granularity_content_description">Botón de cambio de rango de fechas</string>
<string name="images_unavailable_notice">Las imágenes no están disponibles porque tu sitio está marcado como privado. Puedes modificar este ajuste cambiando al modo Próximamente.\n</string>
Expand Down Expand Up @@ -303,7 +312,7 @@ Language: es
<string name="analytics_bundles_list_header_title">Paquetes</string>
<string name="analytics_bundles_list_items_sold">Paquetes vendidos</string>
<string name="my_store_widget_blaze_title">Campañas de Blaze</string>
<string name="my_store_widget_top_products_title">Mejor rendimiento</string>
<string name="my_store_widget_top_products_title">Productos más vendidos</string>
<string name="product_list_unsaved_product_unselected_message">¿Seguro que deseas descartar los cambios realizados a este producto?</string>
<string name="product_list_unsaved_product_unselected_title">Vas a descartar los cambios en %s</string>
<string name="my_store_custom_range_visitors_stats_unavailable_message">La función de estadísticas no admite la visualización de los datos de visitantes y conversiones para rangos de fechas arbitrarios.\n\nSin embargo, puedes pulsar un valor del gráfico para consultar los visitantes y las conversiones de ese rango específico.</string>
Expand Down Expand Up @@ -758,8 +767,8 @@ Language: es
<string name="tax_rate_selector_auto_rate_subtitle">Esto no afectará a los pedidos en línea</string>
<string name="tax_rate_selector_auto_rate_label">Añadir este tipo a todos los pedidos creados</string>
<string name="tax_rate_selector_empty_list_button_alt">Editar tipos impositivos</string>
<string name="tax_rate_selector_empty_list_button">Editar tipos impositivos en el escritorio</string>
<string name="tax_rate_selector_empty_list_message">Añade tipos impositivos al escritorio. Solo se mostrarán aquí los tipos impositivos con información sobre la ubicación.</string>
<string name="tax_rate_selector_empty_list_button">Editar tipos impositivos en wp-admin</string>
<string name="tax_rate_selector_empty_list_message">Añade tipos impositivos en wp-admin. Solo se mostrarán aquí los tipos impositivos con información sobre la ubicación.</string>
<string name="tax_rate_selector_empty_list_title">No hemos encontrado tipos impositivos</string>
<string name="store_onboarding_payments_setup_description">Descubre otros proveedores de pago y \nelige un proveedor de pago.</string>
<string name="store_onboarding_payments_pre_setup_title_generic">Métodos de pago</string>
Expand Down Expand Up @@ -1070,7 +1079,7 @@ Language: es
<string name="more_menu_button_coupons_description">Aumentar las ventas con ofertas especiales</string>
<string name="more_menu_button_store_description">Ver tu tienda</string>
<string name="more_menu_button_inbox_description">Mantengase actualizado</string>
<string name="more_menu_button_wc_admin_description">Gestionar más en la administración</string>
<string name="more_menu_button_wc_admin_description">Gestionar más en wp-admin</string>
<string name="more_menu_general_section_title">General</string>
<string name="more_menu_settings_section_title">Ajustes</string>
<string name="bundled_products_info_notice">Puedes editar productos agrupados en el escritorio del sitio web.</string>
Expand Down Expand Up @@ -2357,7 +2366,7 @@ Language: es
<string name="settings_store">Ajustes de la tienda</string>
<string name="product_attributes">Atributos</string>
<string name="order_refunds_shipping_refund_variable_notice">Puedes reembolsar %1$s</string>
<string name="orderdetail_collect_payment_button">Recepción de pago</string>
<string name="orderdetail_collect_payment_button">Recibir pago</string>
<string name="and">y</string>
<string name="product_attribute_remove">¿Eliminar este atributo?</string>
<string name="product_any_attribute_hint">Cualquiera</string>
Expand Down Expand Up @@ -3369,7 +3378,7 @@ Language: es
<string name="logviewer_share_error">No se ha podido compartir el registro</string>
<string name="logviewer_error_copy_to_clipboard">Se ha producido un error al copiar en el portapapeles</string>
<string name="logviewer_copied_to_clipboard">Se ha copiado el registro en el portapapeles</string>
<string name="logviewer_activity_title">Registro de solicitud</string>
<string name="logviewer_activity_title">Ver logs de la aplicación</string>
<string name="support_push_notification_message">Nuevo mensaje de \"Ayuda y soporte técnico\"</string>
<string name="support_push_notification_title">WooCommerce</string>
<string name="support_contact_email_not_set">No se ha configurado</string>
Expand Down
11 changes: 10 additions & 1 deletion WooCommerce/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2024-09-11 09:54:04+0000
Translation-Revision-Date: 2024-09-19 09:54:03+0000
Plural-Forms: nplurals=2; plural=n > 1;
Generator: GlotPress/2.4.0-alpha
Language: fr
-->
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="custom_fields_editor_key_error_underscore">Clé non valide : veuillez supprimer le caractère « _ » se trouvant au début.</string>
<string name="custom_fields_editor_key_error_duplicate">Cette clé est déjà utilisée pour un autre champ personnalisé.\nL’application ne prend actuellement pas en charge la création de clés dupliquées. Veuillez utiliser WP Admin pour dupliquer une clé si nécessaire.</string>
<string name="custom_fields_add_button">Ajouter des champs personnalisés</string>
<string name="custom_fields_list_field_deleted">Champ personnalisé supprimé</string>
<string name="custom_fields_list_saving_failed">Échec de l’enregistrement des modifications, veuillez réessayer</string>
<string name="custom_fields_list_saving_succeeded">Modifications enregistrées</string>
<string name="custom_fields_list_progress_dialog_title">Enregistrement des modifications</string>
<string name="woopos_no_internet_message">Il semblerait que vous ne soyez pas connecté(e) à Internet. Assurez-vous que votre Wi-Fi est activé. Si vous utilisez des données mobiles, assurez-vous qu’elles sont activées dans les réglages de votre appareil.</string>
<string name="order_shipment_tracking_barcode_scanning_failed">Échec du scan. Veuillez réessayer plus tard</string>
<string name="custom_fields_editor_value_label">Valeur</string>
<string name="custom_fields_editor_key_label">Clé</string>
<string name="woopos_dialog_products_info_secondary_message">D’autres types de produits, tels que les produits virtuels et variables, seront disponibles dans les prochaines mises à jour.</string>
Expand Down
11 changes: 10 additions & 1 deletion WooCommerce/src/main/res/values-he/strings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2024-09-10 15:54:04+0000
Translation-Revision-Date: 2024-09-19 14:54:04+0000
Plural-Forms: nplurals=2; plural=n != 1;
Generator: GlotPress/2.4.0-alpha
Language: he_IL
-->
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="custom_fields_editor_key_error_underscore">מפתח לא תקין: יש להסיר את התו \"_\" מההתחלה.</string>
<string name="custom_fields_editor_key_error_duplicate">כבר השתמשת במפתח הזה בשדה מותאם אחר.\nהאפליקציה לא תומכת כרגע ביצירה של מפתחות כפולים. אם צריך, יש להשתמש ב\'ניהול WP\' כדי לשכפל מפתח.</string>
<string name="custom_fields_add_button">להוסיף שדה מותאם</string>
<string name="custom_fields_list_field_deleted">השדה המותאם נמחק</string>
<string name="custom_fields_list_saving_failed">שמירת השינויים נכשלה, יש לנסות שוב</string>
<string name="custom_fields_list_saving_succeeded">השינויים נשמרו</string>
<string name="custom_fields_list_progress_dialog_title">שומר שינויים</string>
<string name="woopos_no_internet_message">נראה שהחיבור לאינטרנט לא פעיל אצלך. יש לוודא שהחיבור ל-Wi-Fi הופעל. אם ברצונך להשתמש בנתונים הניידים, עליך לוודא שהאפשרות הופעלה בהגדרות המכשיר.</string>
<string name="order_shipment_tracking_barcode_scanning_failed">הסריקה נכשלה. יש לנסות שוב מאוחר יותר</string>
<string name="custom_fields_editor_value_label">ערך</string>
<string name="custom_fields_editor_key_label">מפתח</string>
<string name="woopos_dialog_products_info_secondary_message">סוגי מוצרים אחרים, כמו מוצרים עם סוגים או מוצרים וירטואליים, יהיו זמינים בעדכונים בעתיד.</string>
Expand Down
11 changes: 10 additions & 1 deletion WooCommerce/src/main/res/values-id/strings.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Translation-Revision-Date: 2024-09-10 09:54:04+0000
Translation-Revision-Date: 2024-09-17 12:54:03+0000
Plural-Forms: nplurals=2; plural=n > 1;
Generator: GlotPress/2.4.0-alpha
Language: id
-->
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="custom_fields_editor_key_error_underscore">Kunci tidak valid: hapus karakter \"_\" dari awal.</string>
<string name="custom_fields_editor_key_error_duplicate">Kunci ini sudah digunakan untuk kolom kustom yang lain. \nSaat ini aplikasi tidak mendukung pembuatan kunci duplikat. Bila perlu, gunakan wp-admin untuk membuat duplikat kunci. </string>
<string name="custom_fields_add_button">Tambahkan kolom khusus</string>
<string name="custom_fields_list_saving_succeeded">Perubahan tersimpan</string>
<string name="custom_fields_list_progress_dialog_title">Menyimpan perubahan</string>
<string name="woopos_no_internet_message">Tampaknya Anda tidak terhubung ke internet. Pastikan Wi-Fi Anda aktif. Jika Anda menggunakan data seluler, aktifkan di pengaturan perangkat Anda.</string>
<string name="order_shipment_tracking_barcode_scanning_failed">Pemindaian gagal. Coba lagi nanti</string>
<string name="custom_fields_list_field_deleted">Kolom Kustom telah dihapus</string>
<string name="custom_fields_list_saving_failed">Gagal menyimpan perubahan, coba lagi</string>
<string name="custom_fields_editor_value_label">Nilai</string>
<string name="custom_fields_editor_key_label">Kunci</string>
<string name="woopos_dialog_products_info_secondary_message">Jenis produk lain, seperti variabel dan virtual, akan tersedia dalam pembaruan mendatang.</string>
Expand Down
Loading

0 comments on commit b9d489d

Please sign in to comment.