Merge branch 'trunk' of github.com:woocommerce/woocommerce-android in…

…to deps/update-kotlin-to-2.0.21
woocommerce · Nov 11, 2024 · f871a73 · f871a73
2 parents 79cd3c3 + 7e3c448
commit f871a73
Show file tree

Hide file tree

Showing 22 changed files with 2,133 additions and 1,816 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 21.1
+Our latest update brings key enhancements to streamline your WooCommerce experience! We’ve fixed editing permissions for orders in different currencies, optimized the payments hub view, enabled easy receipt sharing via Google SMS, and fixed date range selection to correctly use your timezone. Enjoy smoother operations!
+
 ## 21.0
 Enjoy a smoother experience with improved design throughout the app. Plus, now your product images load faster and look even better with new AVIF format support. Update now for a cleaner, sharper WooCommerce app experience!
 

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,6 +1,10 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** Use [*****] to indicate smoke tests of all critical flows should be run on the final APK before release (e.g. major library or targetSdk updates).
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
+21.2
+-----
+
+
 21.1
 -----
 - [*] Disable Edit option for orders whose currency does not match with store currency [https://github.com/woocommerce/woocommerce-android/pull/12880]

diff --git a/WooCommerce/src/main/res/values-ar/strings.xml b/WooCommerce/src/main/res/values-ar/strings.xml
@@ -1,11 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-10-21 23:54:05+0000
+Translation-Revision-Date: 2024-11-05 18:54:03+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="shipping_label_shipping_service_title">خدمة الشحن</string>
+    <string name="shipping_label_shipping_rates_sort_option_fastest">الأسرع</string>
+    <string name="shipping_label_shipping_rates_sort_option_cheapest">الأرخص</string>
+    <string name="shipping_label_shipment_details_purchase_label_disabled">ملصق الشراء</string>
+    <string name="shipping_label_shipment_details_purchase_label">ملصق الشراء · ⁦%1$s⁩ </string>
+    <string name="shipping_label_shipment_details_mark_order_complete">وضع علامة على هذا الطلب على أنه مكتمل وإخطار العميل</string>
+    <string name="shipping_label_shipment_details_shipment_cost">تكلفة الشحنة</string>
+    <string name="shipping_label_shipment_details_order_details">تفاصيل الطلب</string>
+    <string name="shipping_label_shipment_details_title">تفاصيل الشحنة</string>
+    <string name="shipping_label_select_package_description">أدخل أبعاد الطرد الخاص بك أو استلم خيار الطرد الخاص بشركة النقل للاطلاع على أسعار الشحن المتاحة.</string>
+    <string name="shipping_label_select_package_title">تحديد طرد للحصول على أسعار الشحن</string>
+    <string name="shipping_label_select_package_button">تحديد طرد</string>
+    <string name="shipping_label_hazmat_title">هل تشحن بضائع خطيرة أو مواد خطرة؟</string>
+    <string name="shipping_label_package_details_items_expand_content_description">طي/توسيع بطاقة المنتجات</string>
+    <string name="shipping_label_package_details_items_weight_price">%1$s  ·  %2$s</string>
+    <string name="sorted_by">تم الفرز حسب 1%s</string>
+    <string name="no">لا</string>
     <string name="blaze_campaign_objective_save_selection_switch_label">حفظ التحديد الخاص بي للحملات المستقبلية</string>
     <string name="blaze_campaign_objective_good_for">&lt;b&gt;مناسب لـ:&lt;/b&gt; %s</string>
     <string name="blaze_campaign_objective_select_objective_label">تحديد هدف %s</string>
@@ -3637,6 +3654,7 @@ Language: ar
     <string name="taxes">الضرائب</string>
     <string name="payment">السداد</string>
     <string name="shipping">الشحن</string>
+    <string name="total">الإجمالي</string>
     <string name="currency_total_negative">-%1$s%2$s</string>
     <string name="currency_total">%1$s%2$s</string>
     <string name="orders">الطلبات</string>

diff --git a/WooCommerce/src/main/res/values-de/strings.xml b/WooCommerce/src/main/res/values-de/strings.xml
diff --git a/WooCommerce/src/main/res/values-es/strings.xml b/WooCommerce/src/main/res/values-es/strings.xml
@@ -1,11 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-10-22 13:54:03+0000
+Translation-Revision-Date: 2024-11-06 09:54:04+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="shipping_label_shipping_service_title">Servicio de envío</string>
+    <string name="shipping_label_shipping_rates_sort_option_fastest">Más rápida</string>
+    <string name="shipping_label_shipping_rates_sort_option_cheapest">Más barata</string>
+    <string name="shipping_label_shipment_details_purchase_label_disabled">Etiqueta de compra</string>
+    <string name="shipping_label_shipment_details_purchase_label">Etiqueta de compra %1$s </string>
+    <string name="shipping_label_shipment_details_mark_order_complete">Marcar este pedido como completado y avisar al cliente</string>
+    <string name="shipping_label_shipment_details_shipment_cost">Coste de envío</string>
+    <string name="shipping_label_shipment_details_order_details">Detalles del pedido</string>
+    <string name="shipping_label_shipment_details_title">Detalles del envío</string>
+    <string name="shipping_label_select_package_description">Introduce las dimensiones de tu paquete o elige una opción de paquete de empresa de transporte para ver las tarifas de envío disponibles.</string>
+    <string name="shipping_label_select_package_title">Elige un paquete para obtener las tarifas de envío</string>
+    <string name="shipping_label_select_package_button">Elige un paquete</string>
+    <string name="shipping_label_hazmat_title">¿Vas a enviar mercancías peligrosas?</string>
+    <string name="shipping_label_package_details_items_expand_content_description">Contraer/ampliar tarjeta de elementos</string>
+    <string name="shipping_label_package_details_items_weight_price">%1$s  ·  %2$s</string>
+    <string name="sorted_by">Ordenado por 1%s</string>
+    <string name="no">No</string>
     <string name="blaze_campaign_objective_save_selection_switch_label">Guardar mi selección para futuras campañas</string>
     <string name="blaze_campaign_objective_good_for">&lt;b&gt;Ideal para:&lt;/b&gt; %s</string>
     <string name="blaze_campaign_objective_select_objective_label">Elegir objetivo %s</string>
@@ -3637,6 +3654,7 @@ Language: es
     <string name="taxes">Impuestos</string>
     <string name="payment">Pago</string>
     <string name="shipping">Envío</string>
+    <string name="total">Total</string>
     <string name="currency_total_negative">-%1$s%2$s</string>
     <string name="currency_total">%1$s%2$s</string>
     <string name="orders">Pedidos</string>

diff --git a/WooCommerce/src/main/res/values-fr/strings.xml b/WooCommerce/src/main/res/values-fr/strings.xml
@@ -1,11 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-10-22 13:54:03+0000
+Translation-Revision-Date: 2024-11-05 15: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="shipping_label_shipping_service_title">Service d’expédition</string>
+    <string name="shipping_label_shipping_rates_sort_option_fastest">Le plus rapide</string>
+    <string name="shipping_label_shipping_rates_sort_option_cheapest">Le moins cher</string>
+    <string name="shipping_label_shipment_details_purchase_label_disabled">Acheter une étiquette</string>
+    <string name="shipping_label_shipment_details_purchase_label">Acheter une étiquette · %1$s </string>
+    <string name="shipping_label_shipment_details_mark_order_complete">Marquer cette commande comme terminée et informer le client</string>
+    <string name="shipping_label_shipment_details_shipment_cost">Frais d’expédition</string>
+    <string name="shipping_label_shipment_details_order_details">Détails de la commande</string>
+    <string name="shipping_label_shipment_details_title">Détails de l’expédition</string>
+    <string name="shipping_label_select_package_description">Saisissez les dimensions de votre colis ou sélectionnez une option de colis du transporteur pour voir les tarifs d’expédition disponibles.</string>
+    <string name="shipping_label_select_package_title">Sélectionner un colis pour obtenir les tarifs d’expédition</string>
+    <string name="shipping_label_select_package_button">Sélectionner un colis</string>
+    <string name="shipping_label_hazmat_title">Expédiez-vous des marchandises ou matières dangereuses ?</string>
+    <string name="shipping_label_package_details_items_expand_content_description">Réduire / développer l’affichage de la fiche d’articles</string>
+    <string name="shipping_label_package_details_items_weight_price">%1$s  ·  %2$s</string>
+    <string name="sorted_by">Trié par 1%s</string>
+    <string name="no">Non</string>
     <string name="blaze_campaign_objective_save_selection_switch_label">Enregistrer ma sélection pour de futures campagnes</string>
     <string name="blaze_campaign_objective_good_for">&lt;b&gt;Idéal pour :&lt;/b&gt; %s</string>
     <string name="blaze_campaign_objective_select_objective_label">Sélectionner un objectif %s</string>
@@ -3637,6 +3654,7 @@ Language: fr
     <string name="taxes">Taxes</string>
     <string name="payment">Paiement</string>
     <string name="shipping">Expédition</string>
+    <string name="total">Total</string>
     <string name="currency_total_negative">-%1$s%2$s</string>
     <string name="currency_total">%1$s%2$s</string>
     <string name="orders">Commandes</string>

diff --git a/WooCommerce/src/main/res/values-he/strings.xml b/WooCommerce/src/main/res/values-he/strings.xml
@@ -1,11 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-10-23 09:54:04+0000
+Translation-Revision-Date: 2024-11-06 15: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="shipping_label_shipping_service_title">שירות משלוחים</string>
+    <string name="shipping_label_shipping_rates_sort_option_fastest">המהיר ביותר</string>
+    <string name="shipping_label_shipping_rates_sort_option_cheapest">הזול ביותר</string>
+    <string name="shipping_label_shipment_details_purchase_label_disabled">לרכוש תווית</string>
+    <string name="shipping_label_shipment_details_purchase_label">לרכוש תווית   ⁦%1$s⁩ </string>
+    <string name="shipping_label_shipment_details_mark_order_complete">לסמן את ההזמנה כ\'הושלמה\' ולהודיע ללקוח</string>
+    <string name="shipping_label_shipment_details_shipment_cost">עלות משלוח</string>
+    <string name="shipping_label_shipment_details_order_details">פרטי הזמנה</string>
+    <string name="shipping_label_shipment_details_title">פרטי המשלוח</string>
+    <string name="shipping_label_select_package_description">יש להזין את ממדי החבילה או לבחור אפשרות של חבילת ספק כדי להציג את תעריפי המשלוח.</string>
+    <string name="shipping_label_select_package_title">יש לבחור חבילה כדי להציג את תעריפי המשלוח</string>
+    <string name="shipping_label_select_package_button">יש לבחור חבילה</string>
+    <string name="shipping_label_hazmat_title">המשלוח שלך כולל סחורות מסוכנות או חומרים מסוכנים?</string>
+    <string name="shipping_label_package_details_items_expand_content_description">לכווץ/להרחיב את כרטיס הפריטים</string>
+    <string name="shipping_label_package_details_items_weight_price">%1$s  ·  %2$s</string>
+    <string name="sorted_by">ממוין לפי 1%s</string>
+    <string name="no">לא</string>
     <string name="blaze_campaign_objective_save_selection_switch_label">לשמור את הבחירה שלי עבור קמפיינים עתידיים</string>
     <string name="blaze_campaign_objective_good_for">&lt;b&gt;מומלץ עבור:&lt;/b&gt; %s</string>
     <string name="blaze_campaign_objective_select_objective_label">לבחור מטרה %s</string>
@@ -3637,6 +3654,7 @@ Language: he_IL
     <string name="taxes">מיסים</string>
     <string name="payment">תשלום</string>
     <string name="shipping">משלוח</string>
+    <string name="total">סה\"כ</string>
     <string name="currency_total_negative">-%1$s%2$s</string>
     <string name="currency_total">%1$s%2$s</string>
     <string name="orders">הזמנות</string>

diff --git a/WooCommerce/src/main/res/values-id/strings.xml b/WooCommerce/src/main/res/values-id/strings.xml
@@ -1,11 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-10-22 09:54:04+0000
+Translation-Revision-Date: 2024-11-05 11: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="shipping_label_shipping_service_title">Layanan pengiriman</string>
+    <string name="shipping_label_shipping_rates_sort_option_fastest">Tercepat</string>
+    <string name="shipping_label_shipping_rates_sort_option_cheapest">Termurah</string>
+    <string name="shipping_label_shipment_details_purchase_label_disabled">Beli Label</string>
+    <string name="shipping_label_shipment_details_purchase_label">Beli Label · %1$s </string>
+    <string name="shipping_label_shipment_details_mark_order_complete">Tandai pesanan ini selesai dan kirim pemberitahuan ke pelanggan</string>
+    <string name="shipping_label_shipment_details_shipment_cost">Biaya pengiriman</string>
+    <string name="shipping_label_shipment_details_order_details">Rincian pesanan</string>
+    <string name="shipping_label_shipment_details_title">Rincian pengiriman</string>
+    <string name="shipping_label_select_package_description">Masukkan dimensi paket Anda atau pilih opsi paket operator untuk melihat tarif pengiriman yang tersedia.</string>
+    <string name="shipping_label_select_package_title">Pilih paket untuk melihat tarif pengiriman</string>
+    <string name="shipping_label_select_package_button">Pilih Paket</string>
+    <string name="shipping_label_hazmat_title">Apakah Anda mengirim barang berisiko atau bahan berbahaya?</string>
+    <string name="shipping_label_package_details_items_weight_price">%1$s  ·  %2$s</string>
+    <string name="shipping_label_package_details_items_expand_content_description">Ciutkan/perluas kartu item</string>
+    <string name="no">Tidak</string>
+    <string name="sorted_by">Diurutkan berdasarkan 1%s</string>
     <string name="blaze_campaign_objective_save_selection_switch_label">Simpan pilihan saya untuk kampanye mendatang.</string>
     <string name="blaze_campaign_objective_good_for">&lt;b&gt;Cocok untuk:&lt;/b&gt; %s</string>
     <string name="blaze_campaign_objective_select_objective_label">Pilih tujuan %s</string>
@@ -3631,6 +3648,7 @@ Language: id
     <string name="taxes">Pajak</string>
     <string name="payment">Pembayaran</string>
     <string name="shipping">Pengiriman</string>
+    <string name="total">Total</string>
     <string name="currency_total_negative">-%1$s%2$s</string>
     <string name="currency_total">%1$s%2$s</string>
     <string name="orders">Pesanan</string>

diff --git a/WooCommerce/src/main/res/values-it/strings.xml b/WooCommerce/src/main/res/values-it/strings.xml
@@ -1,11 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2024-10-22 09:54:04+0000
+Translation-Revision-Date: 2024-11-05 15:54:03+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: it
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="shipping_label_shipping_service_title">Servizio di spedizione</string>
+    <string name="shipping_label_shipping_rates_sort_option_fastest">Più veloce</string>
+    <string name="shipping_label_shipping_rates_sort_option_cheapest">Più economico</string>
+    <string name="shipping_label_shipment_details_purchase_label_disabled">Acquista etichetta</string>
+    <string name="shipping_label_shipment_details_purchase_label">Acquista etichetta · %1$s </string>
+    <string name="shipping_label_shipment_details_mark_order_complete">Contrassegna questo ordine come completato e invia una notifica al cliente</string>
+    <string name="shipping_label_shipment_details_shipment_cost">Costo spedizione</string>
+    <string name="shipping_label_shipment_details_order_details">Dettagli ordine</string>
+    <string name="shipping_label_shipment_details_title">Dettagli spedizione</string>
+    <string name="shipping_label_select_package_description">Immetti le dimensioni del tuo pacchetto o scegli un\'opzione di pacchetto del corriere per visualizzare le tariffe di spedizione disponibili.</string>
+    <string name="shipping_label_select_package_title">Seleziona un pacchetto per ottenere le tariffe di spedizione</string>
+    <string name="shipping_label_select_package_button">Seleziona un pacchetto</string>
+    <string name="shipping_label_hazmat_title">Stai spedendo beni pericolosi o materiale nocivo?</string>
+    <string name="shipping_label_package_details_items_expand_content_description">Comprimi/espandi la scheda degli articoli</string>
+    <string name="shipping_label_package_details_items_weight_price">%1$s  ·  %2$s</string>
+    <string name="no">No</string>
+    <string name="sorted_by">Ordinamento per 1%s</string>
     <string name="blaze_campaign_objective_save_selection_switch_label">Salva la mia selezione per le campagne future</string>
     <string name="blaze_campaign_objective_good_for">&lt;b&gt;Ottimo per:&lt;/b&gt; %s</string>
     <string name="blaze_campaign_objective_select_objective_label">Seleziona obiettivo %s</string>
@@ -3630,6 +3647,7 @@ Language: it
     <string name="taxes">Tasse</string>
     <string name="payment">Pagamento</string>
     <string name="shipping">Spedizione</string>
+    <string name="total">Totale</string>
     <string name="currency_total_negative">-%1$s%2$s</string>
     <string name="currency_total">%1$s%2$s</string>
     <string name="orders">Ordini</string>