From cd48f5f65dcca35a7f43bd246036cc6fb6c3418a Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Fri, 10 Jan 2025 06:35:25 -0500
Subject: [PATCH 1/7] Bump version number

---
 version.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.properties b/version.properties
index f237b6f207f..4331910c152 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
-versionName=21.3
-versionCode=633
\ No newline at end of file
+versionName=21.4-rc-1
+versionCode=634
\ No newline at end of file

From 5697a1453ab90bf4a8c0f0f924d833069fe9f082 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Fri, 10 Jan 2025 06:35:25 -0500
Subject: [PATCH 2/7] Update draft release notes for 21.4.

---
 .../metadata/android/en-US/changelogs/default.txt    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/fastlane/metadata/android/en-US/changelogs/default.txt b/fastlane/metadata/android/en-US/changelogs/default.txt
index c1fbc316c05..2ddde0c7fb4 100644
--- a/fastlane/metadata/android/en-US/changelogs/default.txt
+++ b/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1,3 +1,11 @@
-In this update, we've improved the WooCommerce app with several fixes and enhancements. The "One-time shipping" label now correctly matches its availability in Product Subscriptions, and issues with product conversion have been resolved. We've also streamlined the card reader payment flow for faster transactions, fixed a barcode scanner crash, and improved login error handling. Plus, if your site has no products, the Blaze Campaign screen now offers an easy way to create one.
+- [*] Fix Dashboard card menu sizing to fit bigger font sizes and longer text. [https://github.com/woocommerce/woocommerce-android/pull/13184]
+- [*] Fixed overlap issue in Settings > WooCommerce Version  [https://github.com/woocommerce/woocommerce-android/pull/13183]
+- [*] Removed Tap To Pay usage survey [https://github.com/woocommerce/woocommerce-android/pull/13207]
+- [**] Fixed a crash when a shop manager was trying to install or activate plugin in the POS onboarding [https://github.com/woocommerce/woocommerce-android/pull/13203]
+- [***] Orders: Merchants can now bulk update the status of their orders [https://github.com/woocommerce/woocommerce-android/pull/13245]
+- [*] Fixed a crash on the order details [https://github.com/woocommerce/woocommerce-android/pull/13191]
+- [**] Introduced fallback logic for the barcode scanner to use the front-facing camera when a back-facing camera is unavailable [https://github.com/woocommerce/woocommerce-android/pull/13230]
+- [*] It possible to quickly open plugins page from the plugins list in the up to update an outdated plugin [https://github.com/woocommerce/woocommerce-android/pull/13246]
+- [**] Fixed a bug when refunded items were displayed on the refund screen [https://github.com/woocommerce/woocommerce-android/pull/13212]
+- [**] Enable hiding and disabling push notification for sites from site picker [https://github.com/woocommerce/woocommerce-android/issues/13107]
 
------

From 9e3aca0985a5e66b9230c3fcfa96a26cfa194685 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Fri, 10 Jan 2025 06:35:25 -0500
Subject: [PATCH 3/7] Release Notes: add new section for next version (21.5)

---
 RELEASE-NOTES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 202fbfe54bf..97728c780ba 100644
--- 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.5
+-----
+
+
 21.4
 -----
 - [*] Fix Dashboard card menu sizing to fit bigger font sizes and longer text. [https://github.com/woocommerce/woocommerce-android/pull/13184]

From 1eea365f1d803f9b5f4ec877a2ae65ac001fd63c Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Fri, 10 Jan 2025 12:48:55 +0100
Subject: [PATCH 4/7] Bump fluxc

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 729b4032ddc..69547e56710 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -87,7 +87,7 @@ stripe-terminal = '3.7.1'
 tinder-statemachine = '0.2.0'
 wiremock = '2.26.3'
 wordpress-aztec = 'v2.1.4'
-wordpress-fluxc = 'trunk-8555e9eeea7c95dd5f96c900b62fdc5a7465a44b'
+wordpress-fluxc = '2.102.0'
 wordpress-login = '1.19.0'
 wordpress-libaddressinput = '0.0.2'
 wordpress-mediapicker = '0.3.1'

From f10dfe88eb8efc711af04640097b396fe642088a Mon Sep 17 00:00:00 2001
From: Hicham Boushaba <hicham.boushaba@gmail.com>
Date: Fri, 10 Jan 2025 12:53:53 +0100
Subject: [PATCH 5/7] Update release notes

---
 CHANGELOG.md                                         |  2 ++
 .../metadata/android/en-US/changelogs/default.txt    | 12 +-----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a353b61522a..595646d816b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 21.4
+This update brings several improvements to the WooCommerce mobile app. Dashboard menus now adapt better to larger fonts, and we've resolved layout issues in Settings. You'll also experience fewer crashes, with fixes for order details, plugin activation, and refunds. Merchants can now bulk update order statuses, barcode scanning is more reliable, and accessing plugin updates is quicker than ever. Additionally, sites can now be hidden from the site picker.
 
 ## 21.3
 In this update, we've improved the WooCommerce app with several fixes and enhancements. The "One-time shipping" label now correctly matches its availability in Product Subscriptions, and issues with product conversion have been resolved. We've also streamlined the card reader payment flow for faster transactions, fixed a barcode scanner crash, and improved login error handling. Plus, if your site has no products, the Blaze Campaign screen now offers an easy way to create one.
diff --git a/fastlane/metadata/android/en-US/changelogs/default.txt b/fastlane/metadata/android/en-US/changelogs/default.txt
index 2ddde0c7fb4..d112fbba67d 100644
--- a/fastlane/metadata/android/en-US/changelogs/default.txt
+++ b/fastlane/metadata/android/en-US/changelogs/default.txt
@@ -1,11 +1 @@
-- [*] Fix Dashboard card menu sizing to fit bigger font sizes and longer text. [https://github.com/woocommerce/woocommerce-android/pull/13184]
-- [*] Fixed overlap issue in Settings > WooCommerce Version  [https://github.com/woocommerce/woocommerce-android/pull/13183]
-- [*] Removed Tap To Pay usage survey [https://github.com/woocommerce/woocommerce-android/pull/13207]
-- [**] Fixed a crash when a shop manager was trying to install or activate plugin in the POS onboarding [https://github.com/woocommerce/woocommerce-android/pull/13203]
-- [***] Orders: Merchants can now bulk update the status of their orders [https://github.com/woocommerce/woocommerce-android/pull/13245]
-- [*] Fixed a crash on the order details [https://github.com/woocommerce/woocommerce-android/pull/13191]
-- [**] Introduced fallback logic for the barcode scanner to use the front-facing camera when a back-facing camera is unavailable [https://github.com/woocommerce/woocommerce-android/pull/13230]
-- [*] It possible to quickly open plugins page from the plugins list in the up to update an outdated plugin [https://github.com/woocommerce/woocommerce-android/pull/13246]
-- [**] Fixed a bug when refunded items were displayed on the refund screen [https://github.com/woocommerce/woocommerce-android/pull/13212]
-- [**] Enable hiding and disabling push notification for sites from site picker [https://github.com/woocommerce/woocommerce-android/issues/13107]
-
+This update brings several improvements to the WooCommerce mobile app. Dashboard menus now adapt better to larger fonts, and we've resolved layout issues in Settings. You'll also experience fewer crashes, with fixes for order details, plugin activation, and refunds. Merchants can now bulk update order statuses, barcode scanning is more reliable, and accessing plugin updates is quicker than ever. Additionally, sites can now be hidden from the site picker.

From 2fdbcb5c4c80e50ce14a47de0f9124ffcf0222d5 Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Fri, 10 Jan 2025 08:27:19 -0500
Subject: [PATCH 6/7] Update `PlayStoreStrings.po` for 21.4

---
 fastlane/metadata/PlayStoreStrings.pot               | 12 ++++++------
 fastlane/metadata/android/ar/changelogs/default.txt  |  4 ----
 .../metadata/android/iw-IL/changelogs/default.txt    |  4 ----
 .../metadata/android/ja-JP/changelogs/default.txt    |  4 ----
 .../metadata/android/ko-KR/changelogs/default.txt    |  4 ----
 .../metadata/android/zh-CN/changelogs/default.txt    |  4 ----
 .../metadata/android/zh-TW/changelogs/default.txt    |  4 ----
 7 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 fastlane/metadata/android/ar/changelogs/default.txt
 delete mode 100644 fastlane/metadata/android/iw-IL/changelogs/default.txt
 delete mode 100644 fastlane/metadata/android/ja-JP/changelogs/default.txt
 delete mode 100644 fastlane/metadata/android/ko-KR/changelogs/default.txt
 delete mode 100644 fastlane/metadata/android/zh-CN/changelogs/default.txt
 delete mode 100644 fastlane/metadata/android/zh-TW/changelogs/default.txt

diff --git a/fastlane/metadata/PlayStoreStrings.pot b/fastlane/metadata/PlayStoreStrings.pot
index bfda8db4b86..9618310eeaa 100644
--- a/fastlane/metadata/PlayStoreStrings.pot
+++ b/fastlane/metadata/PlayStoreStrings.pot
@@ -16,6 +16,12 @@ msgid "In this update, we’ve made a few small bug fixes and enhancements to en
 msgstr ""
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_214"
+msgid ""
+"21.4:\n"
+"This update brings several improvements to the WooCommerce mobile app. Dashboard menus now adapt better to larger fonts, and we've resolved layout issues in Settings. You'll also experience fewer crashes, with fixes for order details, plugin activation, and refunds. Merchants can now bulk update order statuses, barcode scanning is more reliable, and accessing plugin updates is quicker than ever. Additionally, sites can now be hidden from the site picker.\n"
+msgstr ""
+
 msgctxt "release_note_213"
 msgid ""
 "21.3:\n"
@@ -24,12 +30,6 @@ msgid ""
 "-----\n"
 msgstr ""
 
-msgctxt "release_note_212"
-msgid ""
-"21.2:\n"
-"Seamless updates are here! Smoother Jetpack activation with new account creation. Say goodbye to bugs: order refresh, shipping edits, and receipt fetch issues are fixed. We've renamed Deposits to Payouts and improved media uploads for Jetpack sites. Update now for a better WooCommerce experience!\n"
-msgstr ""
-
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!
 msgctxt "play_store_promo"
 msgid "Manage orders, get sales notifications, and view key metrics — wherever you are."
diff --git a/fastlane/metadata/android/ar/changelogs/default.txt b/fastlane/metadata/android/ar/changelogs/default.txt
deleted file mode 100644
index 4c6d9819bd9..00000000000
--- a/fastlane/metadata/android/ar/changelogs/default.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-21.3:
-في هذا التحديث، قمنا بتحسين تطبيق WooCommerce من خلال العديد من الإصلاحات والتحسينات. يتوافق الآن ملصق "الشحن لمرة واحدة" بشكل صحيح مع توفره ضمن اشتراكات المنتجات، وقد تم حل المشكلات في تحويل المنتجات. قمنا أيضًا بتبسيط تدفق مدفوعات قارئ البطاقات لتسريع المعاملات، وإصلاح عطل أداة مسح الرمز الشريطي ضوئيًا، وتحسين معالجة خطأ تسجيل الدخول. إضافة إلى ذلك، في حال عدم وجود منتجات في موقعك، توفر الآن شاشة حملة Blaze طريقة سهلة لإنشاء واحد.
-
------
diff --git a/fastlane/metadata/android/iw-IL/changelogs/default.txt b/fastlane/metadata/android/iw-IL/changelogs/default.txt
deleted file mode 100644
index ad605b2ea28..00000000000
--- a/fastlane/metadata/android/iw-IL/changelogs/default.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-21.3:
-בעדכון הזה, ליטשנו את אפליקציית WooCommerce עם כמה תיקונים ושיפורים. התווית של 'משלוח חד פעמי' תואמת כעת לזמינות שלה ב'מינויי מוצר', ופתרנו בעיות עם המרות המוצרים. שיפרנו גם את היעילות של תהליך התשלום עם קורא כרטיסים כדי לאפשר עסקאות מהירות יותר, תיקנו קריסה בסורק הברקוד ושיפרנו את הטיפול בשגיאות התחברות. בנוסף, אם באתר שלך אין מוצרים, המסך 'הקמפיין של Blaze' כעת מציע דרך קלה יותר ליצוא אותם.
-
------
diff --git a/fastlane/metadata/android/ja-JP/changelogs/default.txt b/fastlane/metadata/android/ja-JP/changelogs/default.txt
deleted file mode 100644
index c8dc96b687e..00000000000
--- a/fastlane/metadata/android/ja-JP/changelogs/default.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-21.3:
-今回のアップデートでは、WooCommerce アプリに複数の修正と機能強化を行っています。「1回限りの配送」ラベルが商品のサブスクリプションの在庫状況と正確に一致するようになり、商品のコンバージョンに関する問題が解決しました。取引の迅速化に向けてカードリーダーによる支払いフローを効率化し、バーコードスキャナーのクラッシュが起きる問題を修正するとともに、ログインエラー処理も改善しました。さらに、サイトに商品がない場合は、Blaze キャンペーン画面で簡単に商品を作成できるようになりました。
-
------
diff --git a/fastlane/metadata/android/ko-KR/changelogs/default.txt b/fastlane/metadata/android/ko-KR/changelogs/default.txt
deleted file mode 100644
index 73c3d11b173..00000000000
--- a/fastlane/metadata/android/ko-KR/changelogs/default.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-21.3:
-이번 업데이트에서는 여러 수정 및 개선 사항을 통해 우커머스 앱이 개선되었습니다. 이제 '일회 배송' 레이블이 상품 구독에서의 사용 가능 여부와 올바르게 일치하도록 수정되어 상품 전환 관련 문제가 해결되었습니다. 더 빠른 거래를 위해 카드 리더 결제 흐름을 간소화했고, 바코드 스캐너 충돌을 해결했으며, 로그인 오류 처리를 개선했습니다. 또한 사이트에 상품이 없는 경우, 이제 Blaze 캠페인 화면에서 쉽게 상품을 생성할 수 있습니다.
-
------
diff --git a/fastlane/metadata/android/zh-CN/changelogs/default.txt b/fastlane/metadata/android/zh-CN/changelogs/default.txt
deleted file mode 100644
index d64cf230b44..00000000000
--- a/fastlane/metadata/android/zh-CN/changelogs/default.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-21.3：
-在本次更新中，我们对 WooCommerce 应用程序进行了多项修复和优化改进。“一次性配送”标签现在能正确匹配其在产品订阅中的可用性，并且产品转换问题也已得到解决。我们还简化了读卡器付款流程以加快交易速度，修复了条形码扫描程序崩溃的问题，并改进了登录错误的处理方式。此外，如果您的站点没有产品，“Blaze 广告活动”界面现在提供一种创建产品的简便方法。
-
------
diff --git a/fastlane/metadata/android/zh-TW/changelogs/default.txt b/fastlane/metadata/android/zh-TW/changelogs/default.txt
deleted file mode 100644
index 61d0f3513e4..00000000000
--- a/fastlane/metadata/android/zh-TW/changelogs/default.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-21.3:
-在此次更新中，我們為 WooCommerce 應用程式修正了幾項問題，也推出了幾項強化功能。「商品訂閱」中的「單次運費」標籤現已正確符合可供應情況，也解決了商品轉換率的問題。我們也簡化了讀卡機付款工作流程，讓交易過程更快速，並且修正了條碼掃描器的當機問題，以及改善了登入錯誤處理方式。此外，如果你的網站沒有商品，Blaze 行銷活動畫面現在會顯示如何輕鬆建立商品。
-
------

From 059dbdaef0ead1303e48644032b1bb735e66067c Mon Sep 17 00:00:00 2001
From: Automattic Release Bot <mobile+wpmobilebot@automattic.com>
Date: Fri, 10 Jan 2025 08:27:21 -0500
Subject: [PATCH 7/7] Freeze strings for translation

---
 fastlane/resources/values/strings.xml | 43 +++++++++++++++++++--------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml
index dcf992ef667..4b2aae8fc2e 100644
--- a/fastlane/resources/values/strings.xml
+++ b/fastlane/resources/values/strings.xml
@@ -365,6 +365,7 @@
     <!--
         Site picker
     -->
+    <string name="site_picker_select_store_list_header_with_hidden_sites">Select store to connect (%d hidden)</string>
     <string name="login_site_picker_enter_site_address">Enter a site address</string>
     <string name="login_site_picker_add_a_store">Connect another store</string>
     <string name="site_picker_create_new_store">Create a new store</string>
@@ -372,7 +373,11 @@
     <string name="login_site_picker_new_to_woo">New to WooCommerce</string>
     <string name="site_picker_edit_store_list">Edit Stores</string>
     <string name="site_picker_edit_store_list_title">Visible Stores</string>
-    <string name="site_picker_edit_store_list_footer">Unselected stores won\'t be shown in the app site\'s picker and won\'t receive push notifications for new orders</string>
+    <string name="site_picker_edit_store_list_footer">Unselected stores won\'t be shown in the app site\'s picker and won\'t receive push notifications for new orders or product reviews</string>
+    <string name="site_picker_edit_store_current_site_header">Current Store</string>
+    <string name="site_picker_edit_store_current_site_footer">Please switch to another store if you want to hide this one</string>
+    <string name="site_picker_edit_store_list_header">Other Stores</string>
+    <string name="site_picker_edit_store_list_error_title">There was an error when updating notification settings. Please try again</string>
 
     <!--
         My Store View
@@ -612,6 +617,8 @@
     <string name="orderlist_selection_count">%d orders selected</string>
     <string name="orderlist_selection_count_single">%d order selected</string>
     <string name="orderlist_selection_menu_update_status">Update status</string>
+    <string name="orderlist_bulk_update_status_updated">Status updated!</string>
+    <string name="orderlist_bulk_update_maximum_reached">Maximum selection count (%d) is reached.</string>
 
     <!--
          Simple Payments
@@ -1286,8 +1293,12 @@
     <string name="shipping_label_shipping_rates_sort_option_cheapest">Cheapest</string>
     <string name="shipping_label_shipping_rates_sort_option_fastest">Fastest</string>
     <string name="shipping_label_shipping_service_title">Shipping service</string>
-    <string name="shipping_label_purchased_title">Your shipping label is ready to print</string>
-    <string name="shipping_label_purchased_message">From here you can print the shipping label again or change the paper size of the label.</string>
+    <string name="shipping_label_purchased_success_title">Your shipping label is ready to print</string>
+    <string name="shipping_label_purchased_success_message">From here you can print the shipping label again or change the paper size of the label.</string>
+    <string name="shipping_label_purchased_in_progress_title">Your shipping label is being processed</string>
+    <string name="shipping_label_purchased_in_progress_message">Once it\'s finished, you will be able to print the shipping label with a selected paper size</string>
+    <string name="shipping_label_purchased_failure_title">We couldn\'t process your shipping label</string>
+    <string name="shipping_label_purchased_failure_message">Please try again later</string>
     <string name="shipping_label_purchased_note">Note: Reusing a printed label is a violation of our terms of service and may result in criminal charges.</string>
     <string name="shipping_label_purchased_learn_how_to_print">Learn how to print from your mobile device</string>
     <string name="shipping_label_purchased_track_shipment">Track shipment</string>
@@ -1297,6 +1308,9 @@
     <string name="shipping_label_purchased_pickup_error">We currently do not support Pick ups for this carrier</string>
     <string name="shipping_label_purchased_tracking_error">We currently do not support Tracking for this carrier</string>
     <string name="shipping_label_purchased_print_error">Something went wrong with this Shipping Label, try again later</string>
+    <string name="shipping_label_purchased_purchase_failed_error">We can\'t confirm the Shipping Label purchase right now, try again later</string>
+    <string name="shipping_label_select_origin_default_address">%s (default)</string>
+    <string name="shipping_label_select_origin_address">Address</string>
 
 
     <!--
@@ -1557,7 +1571,6 @@
     <string name="card_reader_tap_to_pay_header">TAP TO PAY</string>
     <string name="card_reader_about_tap_to_pay">About Tap to Pay</string>
     <string name="card_reader_tap_to_pay_description">Use your phone to accept card\npayments. Try it now.</string>
-    <string name="card_reader_tap_to_pay_share_feedback">Share Feedback</string>
     <string name="card_reader_tap_to_pay_not_available_error_check_requirements_button">Check Requirements</string>
     <string name="card_reader_tap_to_pay_not_available_error_title">Tap to Pay is not available</string>
     <string name="card_reader_tap_to_pay_not_available_error_nfc">To use Tap To Pay on Android, your device needs an NFC chip. To accept in-person payments, please purchase a Bluetooth card reader.</string>
@@ -4258,20 +4271,20 @@
     <string name="woopos_cart_title">Cart</string>
     <string name="woopos_clear_cart_button">Clear</string>
 
-    <string name="woopos_banner_simple_products_only_title">Showing simple and variable products only</string>
-    <string name="woopos_banner_simple_products_only_message">Only simple physical and variable products are compatible with POS right now. Other product types, such as virtual, will become available in future updates. </string>
+    <string name="woopos_banner_simple_products_only_title">Showing simple, variable and virtual products only</string>
+    <string name="woopos_banner_simple_products_only_message">Only simple physical, variable and virtual products are compatible with POS right now. Other product types will become available in future updates. </string>
     <string name="woopos_banner_simple_products_only_message_learn_more">Learn\u00A0more</string>
     <string name="woopos_banner_simple_products_close_content_description">Close</string>
     <string name="woopos_banner_simple_products_info_content_description">Info</string>
-    <string name="woopos_banner_simple_products_content_description">Simple and variable products only banner</string>
+    <string name="woopos_banner_simple_products_content_description">Simple, variable and virtual products only banner</string>
     <string name="woopos_banner_simple_products_learn_more_content_description">Double tap to learn more</string>
-    <string name="woopos_banner_simple_products_dialog_content_description">Simple and variable products only dialog</string>
+    <string name="woopos_banner_simple_products_dialog_content_description">Simple, variable and virtual products only dialog</string>
     <string name="woopos_banner_simple_products_dialog_primary_button_content_description">Double tap to dismiss the dialog</string>
 
     <string name="woopos_dialog_products_info_heading">Why can\'t I see my products?</string>
-    <string name="woopos_dialog_products_info_primary_message">Only simple physical and variable products can be used with POS right now.</string>
-    <string name="woopos_dialog_products_info_secondary_message">Other product types, such as virtual, will be available in future updates.</string>
-    <string name="woopos_dialog_products_info_tertiary_message">To take payment for a non-simple product, exit POS and create a new order from the orders tab.</string>
+    <string name="woopos_dialog_products_info_primary_message">Only simple physical, variable and virtual products can be used with POS right now.</string>
+    <string name="woopos_dialog_products_info_secondary_message">Other product types will be available in future updates.</string>
+    <string name="woopos_dialog_products_info_tertiary_message">To take payment for other products, exit POS and create a new order from the orders tab.</string>
     <string name="woopos_dialog_products_info_secondary_message_action_label">+ Create an order in store management</string>
     <string name="woopos_dialog_products_info_button_label">OK</string>
     <string name="woopos_dialog_products_info_background_content_description">Dimmed background. Tap to dismiss the dialog.</string>
@@ -4315,7 +4328,8 @@
     <string name="woopos_error_icon_content_description">Error indication icon</string>
     <string name="woopos_products_loading_error_retry_button">Retry</string>
     <string name="woopos_totals_order_creation_error">Couldn\'t create order</string>
-    <string name="woopos_success_screen_total">A payment of %1$s was successfully made</string>
+    <string name="woopos_totals_success_payment_cash">A cash payment of %1$s was successfully made</string>
+    <string name="woopos_totals_success_payment_card">A card payment of %1$s was successfully made</string>
 
     <string name="woopos_success_totals_error_reader_not_connected_title">Reader not connected</string>
     <string name="woopos_success_totals_error_reader_not_connected_subtitle">To process this payment, please connect your reader.</string>
@@ -4351,6 +4365,7 @@
     <string name="woopos_items_pagination_error_description">"An error occurred while loading products."</string>
     <string name="woopos_items_pagination_error_content_description">"Failed to load more items. Double tap to try again."</string>
     <string name="woopos_variations_loading_error_title">Error loading variations</string>
+    <string name="woopos_variations_options_available_text">Options available</string>
 
     <string name="woopos_cash_payment_title">Cash payment</string>
     <string name="woopos_complete_cash_order_button">Mark payment as complete</string>
@@ -4436,5 +4451,9 @@
     <string name="woo_shipping_labels_package_creation_error">Failed to load the package data</string>
     <string name="woo_shipping_labels_package_creation_box_type">Box</string>
     <string name="woo_shipping_labels_package_creation_envelope_type">Envelope</string>
+    <string name="woo_shipping_labels_package_creation_error_title">We couldn\'t save the package as template</string>
+    <string name="woo_shipping_labels_package_creation_error_message">Do you want to proceed without saving it?</string>
+    <string name="woo_shipping_labels_package_creation_error_proceed">Proceed</string>
+    <string name="woo_shipping_labels_package_creation_error_cancel">Cancel</string>
     <string name="email_not_registered_wpcom">Hmm, we can\'t find a WordPress.com account connected to this email address.</string>
 </resources>