diff --git a/src/components/profile/OrdersTab.js b/src/components/profile/OrdersTab.js
index 29e3976..cb9106d 100644
--- a/src/components/profile/OrdersTab.js
+++ b/src/components/profile/OrdersTab.js
@@ -33,22 +33,35 @@ import {
 } from "../../utils/wireGirocodeEligibility.js";
 
 // Constants
-const getStatusTranslation = (status, t) => {
+const getStatusTranslation = (status, deliveryMethod, t) => {
   const statusMap = {
     new: t ? t('orders.status.new') : "in Bearbeitung",
     pending: t ? t('orders.status.pending') : "Neu", 
     processing: t ? t('orders.status.processing') : "in Bearbeitung",
     paid: t ? t('orders.status.paid') : "Bezahlt",
     cancelled: t ? t('orders.status.cancelled') : "Storniert",
-    shipped: t ? t('orders.status.shipped') : "Verschickt",
-    delivered: t ? t('orders.status.delivered') : "Geliefert",
+    shipped: deliveryMethod === "Abholung"
+      ? (t ? t('orders.status.picked_up') : "Abgeholt")
+      : (t ? t('orders.status.shipped') : "Verschickt"),
+    delivered: deliveryMethod === "Abholung"
+      ? (t ? t('orders.status.picked_up') : "Abgeholt")
+      : (t ? t('orders.status.delivered') : "Geliefert"),
     awaiting_tracking: t ? t('orders.status.awaiting_tracking') : "Wird gepackt",
     ready_for_pickup: t ? t('orders.status.ready_for_pickup') : "Abholbereit",
   };
   return statusMap[status] || status;
 };
 
-const statusEmojis = {
+const getStatusEmoji = (status, deliveryMethod) => {
+  if (deliveryMethod === "Abholung" && status === "shipped") {
+    return "✅";
+  }
+
+  if (deliveryMethod === "Abholung" && status === "delivered") {
+    return "✅";
+  }
+
+  const statusEmojis = {
   new: "⚙️",
   pending: "⏳",
   processing: "🔄",
@@ -59,6 +72,8 @@ const statusEmojis = {
   awaiting_tracking: "📦",
   ready_for_pickup: "🏪",
 };
+  return statusEmojis[status] || "❓";
+};
 
 const statusColors = {
   new: "#ed6c02", // orange
@@ -140,12 +155,8 @@ const OrdersTab = ({ orderIdFromHash, t }) => {
     }
   }, [orderIdFromHash, orders, handleViewDetails]);
 
-  const getStatusDisplay = (status) => {
-    return getStatusTranslation(status, t);
-  };
-
-  const getStatusEmoji = (status) => {
-    return statusEmojis[status] || "❓";
+  const getStatusDisplay = (status, deliveryMethod) => {
+    return getStatusTranslation(status, deliveryMethod, t);
   };
 
   const getStatusColor = (status) => {
@@ -232,7 +243,7 @@ const OrdersTab = ({ orderIdFromHash, t }) => {
             </TableHead>
             <TableBody>
               {orders.map((order) => {
-                const displayStatus = getStatusDisplay(order.status);
+                const displayStatus = getStatusDisplay(order.status, order.delivery_method);
                 const total = order.items.reduce(
                   (acc, item) => acc + item.price * item.quantity_ordered,
                   0
@@ -254,7 +265,7 @@ const OrdersTab = ({ orderIdFromHash, t }) => {
                           }}
                         >
                           <span style={{ fontSize: "1.2rem" }}>
-                            {getStatusEmoji(order.status)}
+                            {getStatusEmoji(order.status, order.delivery_method)}
                           </span>
                           <Typography
                             variant="body2"
diff --git a/src/i18n/locales/ar/orders.js b/src/i18n/locales/ar/orders.js
index c752b66..95383c4 100644
--- a/src/i18n/locales/ar/orders.js
+++ b/src/i18n/locales/ar/orders.js
@@ -1,17 +1,18 @@
 export default {
   "status": {
-    "new": "قيد التنفيذ",
+    "new": "جاري المعالجة",
     "pending": "جديد",
-    "processing": "قيد التنفيذ",
+    "processing": "جاري المعالجة",
     "paid": "مدفوع",
-    "cancelled": "ملغي",
+    "cancelled": "تم الإلغاء",
     "shipped": "تم الشحن",
-    "delivered": "تم التوصيل",
+    "delivered": "تم التسليم",
+    "picked_up": "تم الاستلام",
     "return": "إرجاع",
     "partialReturn": "إرجاع جزئي",
-    "partialDelivered": "تم التوصيل جزئياً",
-    "awaiting_tracking": "جاري التعبئة",
-    "ready_for_pickup": "جاهز للاستلام من المتجر"
+    "partialDelivered": "تم التسليم جزئيًا",
+    "awaiting_tracking": "جاري التجهيز",
+    "ready_for_pickup": "جاهز للاستلام"
   },
   "table": {
     "orderNumber": "رقم الطلب",
@@ -26,14 +27,14 @@ export default {
     "viewDetails": "عرض التفاصيل",
     "cancelOrder": "إلغاء الطلب"
   },
-  "noOrders": "لم تقم بوضع أي طلبات بعد.",
+  "noOrders": "أنت لم تقم بأي طلبات لسه.",
   "trackShipment": "تتبع الشحنة",
   "girocode": {
-    "hint": "امسح الرمز بتطبيق البنك للدفع.",
-    "alt": "رمز Girocode للتحويل البنكي",
-    "error": "تعذر إنشاء رمز الاستجابة السريعة.",
-    "paymentPending": "هذا الطلب في انتظار التحويل البنكي.",
-    "payToAccount": "يرجى تحويل المبلغ إلى الحساب التالي:",
+    "hint": "امسح بالكاميرا من تطبيق البنك عشان تدفع.",
+    "alt": "Girocode للتحويل",
+    "error": "تعذر إنشاء رمز QR.",
+    "paymentPending": "الطلب ده مستني التحويل البنكي بتاعك.",
+    "payToAccount": "من فضلك حوّل المبلغ إلى الحساب التالي:",
     "holder": "صاحب الحساب: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
@@ -41,10 +42,10 @@ export default {
     "purpose": "المرجع: {{orderId}}"
   },
   "readyForPickup": {
-    "line1": "طلبك {{orderId}} جاهز معبأ وينتظرك.",
-    "line2": "يمكنك استلامه الآن من متجرنا:",
+    "line1": "طلبك {{orderId}} متجهز ومستنيك.",
+    "line2": "تقدر تستلمه من المتجر بتاعنا من دلوقتي:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
@@ -56,7 +57,7 @@ export default {
     "paymentMethod": "طريقة الدفع:",
     "notSpecified": "غير محدد",
     "orderedItems": "العناصر المطلوبة",
-    "item": "العنصر",
+    "item": "عنصر",
     "quantity": "الكمية",
     "price": "السعر",
     "total": "الإجمالي",
@@ -64,9 +65,9 @@ export default {
   },
   "cancelConfirm": {
     "title": "إلغاء الطلب",
-    "message": "هل أنت متأكد أنك تريد إلغاء هذا الطلب؟",
+    "message": "هل أنت متأكد إنك عايز تلغي الطلب ده؟",
     "confirm": "إلغاء",
-    "cancelling": "جارٍ الإلغاء..."
+    "cancelling": "جاري الإلغاء..."
   },
-  "processing": "يتم إكمال الطلب..."
+  "processing": "جاري إكمال الطلب..."
 };
diff --git a/src/i18n/locales/bg/orders.js b/src/i18n/locales/bg/orders.js
index 958303f..76b1f0b 100644
--- a/src/i18n/locales/bg/orders.js
+++ b/src/i18n/locales/bg/orders.js
@@ -1,40 +1,41 @@
 export default {
   "status": {
-    "new": "в процес", 
-    "pending": "Ново", 
-    "processing": "в процес", 
-    "paid": "Платено", 
-    "cancelled": "Отменено", 
-    "shipped": "Изпратено", 
-    "delivered": "Доставено", 
-    "return": "Връщане", 
-    "partialReturn": "Частично връщане", 
+    "new": "Обработка",
+    "pending": "Ново",
+    "processing": "Обработка",
+    "paid": "Платено",
+    "cancelled": "Отменено",
+    "shipped": "Изпратено",
+    "delivered": "Доставено",
+    "picked_up": "Получено",
+    "return": "Връщане",
+    "partialReturn": "Частично връщане",
     "partialDelivered": "Частично доставено",
     "awaiting_tracking": "Опакова се",
-    "ready_for_pickup": "Готова за вземане"
+    "ready_for_pickup": "Готово за вземане"
   },
   "table": {
-    "orderNumber": "Номер на поръчка", 
-    "date": "Дата", 
-    "status": "Статус", 
-    "items": "Артикули", 
-    "total": "Общо", 
-    "actions": "Действия", 
-    "viewDetails": "Виж подробности" 
+    "orderNumber": "Номер на поръчката",
+    "date": "Дата",
+    "status": "Статус",
+    "items": "Артикули",
+    "total": "Общо",
+    "actions": "Действия",
+    "viewDetails": "Вижте подробностите"
   },
   "tooltips": {
-    "viewDetails": "Виж подробности", 
-    "cancelOrder": "Отмени поръчката" 
+    "viewDetails": "Вижте подробностите",
+    "cancelOrder": "Отказване на поръчката"
   },
-  "noOrders": "Все още не сте направили поръчки.", 
-  "trackShipment": "Проследи пратката",
+  "noOrders": "Все още не сте направили никакви поръчки.",
+  "trackShipment": "Проследяване на пратката",
   "girocode": {
     "hint": "Сканирайте с банковото си приложение, за да платите.",
-    "alt": "Girocode за банков превод",
+    "alt": "Girocode за превода",
     "error": "QR кодът не можа да бъде генериран.",
     "paymentPending": "Тази поръчка очаква вашия банков превод.",
     "payToAccount": "Моля, преведете сумата по следната сметка:",
-    "holder": "Титуляр: {{name}}",
+    "holder": "Титуляр на сметката: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Сума: {{amount}}",
@@ -42,31 +43,31 @@ export default {
   },
   "readyForPickup": {
     "line1": "Вашата поръчка {{orderId}} е опакована и ви очаква.",
-    "line2": "Можете да я вземете от нашия магазин:",
+    "line2": "Можете да я вземете от нашия магазин от сега нататък:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
-    "title": "Подробности за поръчка: {{orderId}}", 
-    "deliveryAddress": "Адрес за доставка", 
-    "invoiceAddress": "Адрес за фактура", 
-    "orderDetails": "Подробности за поръчката", 
-    "deliveryMethod": "Начин на доставка:", 
-    "paymentMethod": "Начин на плащане:", 
-    "notSpecified": "Не е посочено", 
-    "orderedItems": "Поръчани артикули", 
-    "item": "Артикул", 
-    "quantity": "Количество", 
-    "price": "Цена", 
-    "total": "Общо", 
-    "cancelOrder": "Отмени поръчката" 
+    "title": "Подробности за поръчката: {{orderId}}",
+    "deliveryAddress": "Адрес за доставка",
+    "invoiceAddress": "Адрес за фактуриране",
+    "orderDetails": "Подробности за поръчката",
+    "deliveryMethod": "Метод на доставка:",
+    "paymentMethod": "Начин на плащане:",
+    "notSpecified": "Не е посочено",
+    "orderedItems": "Поръчани артикули",
+    "item": "Артикул",
+    "quantity": "Количество",
+    "price": "Цена",
+    "total": "Общо",
+    "cancelOrder": "Отказване на поръчката"
   },
   "cancelConfirm": {
-    "title": "Отмени поръчката", 
-    "message": "Сигурни ли сте, че искате да отмените тази поръчка?", 
-    "confirm": "Отмени", 
-    "cancelling": "Отмяна..." 
+    "title": "Отказване на поръчката",
+    "message": "Сигурни ли сте, че искате да отмените тази поръчка?",
+    "confirm": "Отказване",
+    "cancelling": "Отменя се..."
   },
-  "processing": "Поръчката се обработва..." 
+  "processing": "Поръчката се завършва..."
 };
diff --git a/src/i18n/locales/cs/orders.js b/src/i18n/locales/cs/orders.js
index 08e84cf..2a6e285 100644
--- a/src/i18n/locales/cs/orders.js
+++ b/src/i18n/locales/cs/orders.js
@@ -1,16 +1,17 @@
 export default {
   "status": {
-    "new": "probíhá",
+    "new": "Zpracovává se",
     "pending": "Nové",
-    "processing": "probíhá",
+    "processing": "Zpracovává se",
     "paid": "Zaplaceno",
     "cancelled": "Zrušeno",
     "shipped": "Odesláno",
     "delivered": "Doručeno",
+    "picked_up": "Vyzvednuto",
     "return": "Vrácení",
     "partialReturn": "Částečné vrácení",
     "partialDelivered": "Částečně doručeno",
-    "awaiting_tracking": "Balí se",
+    "awaiting_tracking": "Balení probíhá",
     "ready_for_pickup": "Připraveno k vyzvednutí"
   },
   "table": {
@@ -26,25 +27,25 @@ export default {
     "viewDetails": "Zobrazit detaily",
     "cancelOrder": "Zrušit objednávku"
   },
-  "noOrders": "Ještě jste neprovedli žádné objednávky.",
+  "noOrders": "Zatím jste nevytvořili žádné objednávky.",
   "trackShipment": "Sledovat zásilku",
   "girocode": {
-    "hint": "Naskenujte bankovní aplikací a zaplaťte.",
-    "alt": "Girocode pro bankovní převod",
+    "hint": "Pro zaplacení naskenujte pomocí své bankovní aplikace.",
+    "alt": "Girocode pro převod",
     "error": "QR kód se nepodařilo vygenerovat.",
     "paymentPending": "Tato objednávka čeká na váš bankovní převod.",
-    "payToAccount": "Prosím převeďte částku na následující účet:",
+    "payToAccount": "Převod prosím odešlete na následující účet:",
     "holder": "Majitel účtu: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Částka: {{amount}}",
-    "purpose": "Zpráva pro příjemce: {{orderId}}"
+    "purpose": "Variabilní symbol: {{orderId}}"
   },
   "readyForPickup": {
-    "line1": "Vaše objednávka {{orderId}} je zabalená a čeká na vás.",
-    "line2": "Můžete si ji hned vyzvednout v našem obchodě:",
+    "line1": "Vaše objednávka {{orderId}} je zabalena a čeká na vás.",
+    "line2": "Můžete si ji od nynějška vyzvednout v našem obchodě:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
@@ -54,7 +55,7 @@ export default {
     "orderDetails": "Detaily objednávky",
     "deliveryMethod": "Způsob doručení:",
     "paymentMethod": "Způsob platby:",
-    "notSpecified": "Nespecifikováno",
+    "notSpecified": "Neuvedeno",
     "orderedItems": "Objednané položky",
     "item": "Položka",
     "quantity": "Množství",
@@ -66,7 +67,7 @@ export default {
     "title": "Zrušit objednávku",
     "message": "Opravdu chcete tuto objednávku zrušit?",
     "confirm": "Zrušit",
-    "cancelling": "Rušení..."
+    "cancelling": "Ruší se..."
   },
-  "processing": "Objednávka se dokončuje..."
+  "processing": "Dokončování objednávky..."
 };
diff --git a/src/i18n/locales/de/orders.js b/src/i18n/locales/de/orders.js
index 8ef3963..4f66d05 100644
--- a/src/i18n/locales/de/orders.js
+++ b/src/i18n/locales/de/orders.js
@@ -7,6 +7,7 @@ export default {
     "cancelled": "Storniert",
     "shipped": "Verschickt",
     "delivered": "Geliefert",
+    "picked_up": "Abgeholt",
     "return": "Retoure",
     "partialReturn": "Teil Retoure",
     "partialDelivered": "Teil geliefert",
@@ -69,4 +70,4 @@ export default {
     "cancelling": "Wird storniert..."
   },
   "processing": "Bestellung wird abgeschlossen..."
-}; 
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/i18n/locales/el/orders.js b/src/i18n/locales/el/orders.js
index bd743a0..9d0104f 100644
--- a/src/i18n/locales/el/orders.js
+++ b/src/i18n/locales/el/orders.js
@@ -1,16 +1,17 @@
 export default {
   "status": {
-    "new": "σε εξέλιξη",
+    "new": "Επεξεργασία",
     "pending": "Νέο",
-    "processing": "σε εξέλιξη",
-    "paid": "Πληρωμένο",
+    "processing": "Επεξεργασία",
+    "paid": "Πληρώθηκε",
     "cancelled": "Ακυρώθηκε",
-    "shipped": "Απεσταλμένο",
+    "shipped": "Απεστάλη",
     "delivered": "Παραδόθηκε",
+    "picked_up": "Παραλήφθηκε",
     "return": "Επιστροφή",
     "partialReturn": "Μερική επιστροφή",
     "partialDelivered": "Μερικώς παραδόθηκε",
-    "awaiting_tracking": "Σε συσκευασία",
+    "awaiting_tracking": "Συσκευάζεται",
     "ready_for_pickup": "Έτοιμο για παραλαβή"
   },
   "table": {
@@ -26,35 +27,35 @@ export default {
     "viewDetails": "Προβολή λεπτομερειών",
     "cancelOrder": "Ακύρωση παραγγελίας"
   },
-  "noOrders": "Δεν έχετε κάνει ακόμα καμία παραγγελία.",
+  "noOrders": "Δεν έχετε πραγματοποιήσει ακόμα καμία παραγγελία.",
   "trackShipment": "Παρακολούθηση αποστολής",
   "girocode": {
-    "hint": "Σαρώστε με την εφαρμογή της τράπεζάς σας για πληρωμή.",
-    "alt": "Girocode για τραπεζική μεταφορά",
-    "error": "Δεν ήταν δυνατή η δημιουργία QR.",
-    "paymentPending": "Η παραγγελία περιμένει την τραπεζική σας μεταφορά.",
-    "payToAccount": "Μεταφέρετε το ποσό στον ακόλουθο λογαριασμό:",
-    "holder": "Δικαιούχος: {{name}}",
+    "hint": "Σαρώστε με την εφαρμογή της τράπεζάς σας για να πληρώσετε.",
+    "alt": "Girocode για τη μεταφορά",
+    "error": "Το QR code δεν ήταν δυνατό να δημιουργηθεί.",
+    "paymentPending": "Αυτή η παραγγελία αναμένει την τραπεζική σας μεταφορά.",
+    "payToAccount": "Παρακαλούμε μεταφέρετε το ποσό στον ακόλουθο λογαριασμό:",
+    "holder": "Κάτοχος λογαριασμού: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Ποσό: {{amount}}",
     "purpose": "Αιτιολογία: {{orderId}}"
   },
   "readyForPickup": {
-    "line1": "Η παραγγελία σας {{orderId}} είναι συσκευασμένη και σας περιμένει.",
-    "line2": "Μπορείτε να την παραλάβετε τώρα από το κατάστημά μας:",
+    "line1": "Η παραγγελία σας {{orderId}} έχει συσκευαστεί και σας περιμένει.",
+    "line2": "Μπορείτε να την παραλάβετε από το κατάστημά μας από τώρα:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
     "title": "Λεπτομέρειες παραγγελίας: {{orderId}}",
     "deliveryAddress": "Διεύθυνση παράδοσης",
-    "invoiceAddress": "Διεύθυνση τιμολογίου",
+    "invoiceAddress": "Διεύθυνση χρέωσης",
     "orderDetails": "Λεπτομέρειες παραγγελίας",
     "deliveryMethod": "Τρόπος παράδοσης:",
     "paymentMethod": "Τρόπος πληρωμής:",
-    "notSpecified": "Δεν έχει οριστεί",
+    "notSpecified": "Δεν έχει καθοριστεί",
     "orderedItems": "Παραγγελθέντα είδη",
     "item": "Είδος",
     "quantity": "Ποσότητα",
@@ -64,9 +65,9 @@ export default {
   },
   "cancelConfirm": {
     "title": "Ακύρωση παραγγελίας",
-    "message": "Είστε σίγουροι ότι θέλετε να ακυρώσετε αυτή την παραγγελία;",
+    "message": "Είστε βέβαιοι ότι θέλετε να ακυρώσετε αυτήν την παραγγελία;",
     "confirm": "Ακύρωση",
-    "cancelling": "Ακύρωση σε εξέλιξη..."
+    "cancelling": "Γίνεται ακύρωση..."
   },
-  "processing": "Η παραγγελία ολοκληρώνεται..."
+  "processing": "Ολοκλήρωση παραγγελίας..."
 };
diff --git a/src/i18n/locales/en/orders.js b/src/i18n/locales/en/orders.js
index 3f5ab1d..63eaeeb 100644
--- a/src/i18n/locales/en/orders.js
+++ b/src/i18n/locales/en/orders.js
@@ -1,12 +1,13 @@
 export default {
   "status": {
-    "new": "in progress", // in Bearbeitung
+    "new": "Processing", // in Bearbeitung
     "pending": "New", // Neu
-    "processing": "in progress", // in Bearbeitung
+    "processing": "Processing", // in Bearbeitung
     "paid": "Paid", // Bezahlt
     "cancelled": "Cancelled", // Storniert
     "shipped": "Shipped", // Verschickt
     "delivered": "Delivered", // Geliefert
+    "picked_up": "Picked up", // Abgeholt
     "return": "Return", // Retoure
     "partialReturn": "Partial return", // Teil Retoure
     "partialDelivered": "Partially delivered", // Teil geliefert
@@ -29,28 +30,28 @@ export default {
   "noOrders": "You have not placed any orders yet.", // Sie haben noch keine Bestellungen aufgegeben.
   "trackShipment": "Track shipment", // Sendung verfolgen
   "girocode": {
-    "hint": "Scan with your banking app to pay.", // Mit Ihrer Banking-App scannen...
-    "alt": "Girocode for bank transfer", // Girocode für die Überweisung
-    "error": "Could not generate QR code.", // QR-Code konnte nicht erzeugt werden.
-    "paymentPending": "This order is awaiting your bank transfer.", // Diese Bestellung wartet...
-    "payToAccount": "Please transfer the amount to the following account:", // Bitte überweisen...
-    "holder": "Account holder: {{name}}", // Kontoinhaber
-    "iban": "IBAN: {{iban}}",
-    "bic": "BIC: {{bic}}",
-    "amount": "Amount: {{amount}}", // Betrag
-    "purpose": "Payment reference: {{orderId}}" // Verwendungszweck
+    "hint": "Scan with your banking app to pay.", // Mit Ihrer Banking-App scannen, um zu bezahlen.
+    "alt": "Girocode for the transfer", // Girocode für die Überweisung
+    "error": "QR code could not be generated.", // QR-Code konnte nicht erzeugt werden.
+    "paymentPending": "This order is awaiting your bank transfer.", // Diese Bestellung wartet auf Ihre Überweisung.
+    "payToAccount": "Please transfer the amount to the following account:", // Bitte überweisen Sie den Betrag auf folgendes Konto:
+    "holder": "Account holder: {{name}}", // Kontoinhaber: {{name}}
+    "iban": "IBAN: {{iban}}", // IBAN: {{iban}}
+    "bic": "BIC: {{bic}}", // BIC: {{bic}}
+    "amount": "Amount: {{amount}}", // Betrag: {{amount}}
+    "purpose": "Reference: {{orderId}}" // Verwendungszweck: {{orderId}}
   },
   "readyForPickup": {
-    "line1": "Your order {{orderId}} is packed and waiting for you.",
-    "line2": "You can pick it up at our store now:",
-    "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
-    "addressLine2": "01129 Dresden"
+    "line1": "Your order {{orderId}} is packed and waiting for you.", // Deine Bestellung {{orderId}} ist gepackt und wartet auf dich.
+    "line2": "You can pick it up from our store starting now:", // Du kannst sie ab sofort bei uns im Store abholen:
+    "storeName": "Growheads", // Growheads
+    "addressLine1": "Trachenberger Street 14", // Trachenberger Straße 14
+    "addressLine2": "01129 Dresden" // 01129 Dresden
   },
   "details": {
     "title": "Order details: {{orderId}}", // Bestelldetails: {{orderId}}
     "deliveryAddress": "Delivery address", // Lieferadresse
-    "invoiceAddress": "Invoice address", // Rechnungsadresse
+    "invoiceAddress": "Billing address", // Rechnungsadresse
     "orderDetails": "Order details", // Bestelldetails
     "deliveryMethod": "Delivery method:", // Lieferart:
     "paymentMethod": "Payment method:", // Zahlungsart:
@@ -68,5 +69,5 @@ export default {
     "confirm": "Cancel", // Stornieren
     "cancelling": "Cancelling..." // Wird storniert...
   },
-  "processing": "Order is being completed..." // Bestellung wird abgeschlossen...
+  "processing": "Completing order..." // Bestellung wird abgeschlossen...
 };
diff --git a/src/i18n/locales/es/orders.js b/src/i18n/locales/es/orders.js
index eb8104a..4ff8974 100644
--- a/src/i18n/locales/es/orders.js
+++ b/src/i18n/locales/es/orders.js
@@ -1,16 +1,17 @@
 export default {
   "status": {
-    "new": "en progreso",
+    "new": "Procesando",
     "pending": "Nuevo",
-    "processing": "en progreso",
+    "processing": "Procesando",
     "paid": "Pagado",
     "cancelled": "Cancelado",
     "shipped": "Enviado",
     "delivered": "Entregado",
+    "picked_up": "Recogido",
     "return": "Devolución",
     "partialReturn": "Devolución parcial",
-    "partialDelivered": "Entregado parcialmente",
-    "awaiting_tracking": "En preparación",
+    "partialDelivered": "Parcialmente entregado",
+    "awaiting_tracking": "Siendo empaquetado",
     "ready_for_pickup": "Listo para recoger"
   },
   "table": {
@@ -26,25 +27,25 @@ export default {
     "viewDetails": "Ver detalles",
     "cancelOrder": "Cancelar pedido"
   },
-  "noOrders": "Aún no has realizado ningún pedido.",
+  "noOrders": "Todavía no has realizado ningún pedido.",
   "trackShipment": "Rastrear envío",
   "girocode": {
-    "hint": "Escanee con la app de su banco para pagar.",
-    "alt": "Girocode para transferencia bancaria",
+    "hint": "Escanea con tu aplicación bancaria para pagar.",
+    "alt": "Girocode para la transferencia",
     "error": "No se pudo generar el código QR.",
-    "paymentPending": "Este pedido está pendiente de su transferencia bancaria.",
-    "payToAccount": "Transfiera el importe a la siguiente cuenta:",
+    "paymentPending": "Este pedido está esperando tu transferencia bancaria.",
+    "payToAccount": "Por favor transfiere el importe a la siguiente cuenta:",
     "holder": "Titular de la cuenta: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Importe: {{amount}}",
-    "purpose": "Concepto: {{orderId}}"
+    "purpose": "Referencia: {{orderId}}"
   },
   "readyForPickup": {
     "line1": "Tu pedido {{orderId}} está empaquetado y te espera.",
-    "line2": "Puedes recogerlo ahora en nuestra tienda:",
+    "line2": "Puedes recogerlo en nuestra tienda a partir de ahora:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
@@ -64,9 +65,9 @@ export default {
   },
   "cancelConfirm": {
     "title": "Cancelar pedido",
-    "message": "¿Está seguro de que desea cancelar este pedido?",
+    "message": "¿Estás seguro de que quieres cancelar este pedido?",
     "confirm": "Cancelar",
     "cancelling": "Cancelando..."
   },
-  "processing": "El pedido se está completando..."
+  "processing": "Completando pedido..."
 };
diff --git a/src/i18n/locales/fr/orders.js b/src/i18n/locales/fr/orders.js
index 9418996..8915e8b 100644
--- a/src/i18n/locales/fr/orders.js
+++ b/src/i18n/locales/fr/orders.js
@@ -1,17 +1,18 @@
 export default {
   "status": {
-    "new": "en cours",
+    "new": "Traitement",
     "pending": "Nouveau",
-    "processing": "en cours",
+    "processing": "Traitement",
     "paid": "Payé",
     "cancelled": "Annulé",
     "shipped": "Expédié",
     "delivered": "Livré",
+    "picked_up": "Retiré",
     "return": "Retour",
     "partialReturn": "Retour partiel",
     "partialDelivered": "Partiellement livré",
     "awaiting_tracking": "En cours d'emballage",
-    "ready_for_pickup": "Prêt à être retiré"
+    "ready_for_pickup": "Prêt à retirer"
   },
   "table": {
     "orderNumber": "Numéro de commande",
@@ -26,25 +27,25 @@ export default {
     "viewDetails": "Voir les détails",
     "cancelOrder": "Annuler la commande"
   },
-  "noOrders": "Vous n'avez pas encore passé de commandes.",
+  "noOrders": "Vous n'avez encore passé aucune commande.",
   "trackShipment": "Suivre l'envoi",
   "girocode": {
-    "hint": "Scannez avec l'application de votre banque pour payer.",
-    "alt": "Girocode pour virement bancaire",
-    "error": "Impossible de générer le code QR.",
+    "hint": "Scannez avec votre application bancaire pour payer.",
+    "alt": "Girocode pour le virement",
+    "error": "Le code QR n'a pas pu être généré.",
     "paymentPending": "Cette commande attend votre virement bancaire.",
-    "payToAccount": "Veuillez virer le montant sur le compte suivant :",
+    "payToAccount": "Veuillez transférer le montant sur le compte suivant :",
     "holder": "Titulaire du compte : {{name}}",
     "iban": "IBAN : {{iban}}",
     "bic": "BIC : {{bic}}",
     "amount": "Montant : {{amount}}",
-    "purpose": "Libellé : {{orderId}}"
+    "purpose": "Référence : {{orderId}}"
   },
   "readyForPickup": {
     "line1": "Votre commande {{orderId}} est emballée et vous attend.",
-    "line2": "Vous pouvez la retirer dès maintenant dans notre magasin :",
+    "line2": "Vous pouvez la retirer dans notre magasin dès maintenant :",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
@@ -52,8 +53,8 @@ export default {
     "deliveryAddress": "Adresse de livraison",
     "invoiceAddress": "Adresse de facturation",
     "orderDetails": "Détails de la commande",
-    "deliveryMethod": "Méthode de livraison :",
-    "paymentMethod": "Méthode de paiement :",
+    "deliveryMethod": "Mode de livraison :",
+    "paymentMethod": "Mode de paiement :",
     "notSpecified": "Non spécifié",
     "orderedItems": "Articles commandés",
     "item": "Article",
@@ -66,7 +67,7 @@ export default {
     "title": "Annuler la commande",
     "message": "Êtes-vous sûr de vouloir annuler cette commande ?",
     "confirm": "Annuler",
-    "cancelling": "Annulation en cours..."
+    "cancelling": "Annulation..."
   },
-  "processing": "La commande est en cours de traitement..."
+  "processing": "Finalisation de la commande..."
 };
diff --git a/src/i18n/locales/hr/orders.js b/src/i18n/locales/hr/orders.js
index aa4733f..8130634 100644
--- a/src/i18n/locales/hr/orders.js
+++ b/src/i18n/locales/hr/orders.js
@@ -1,56 +1,57 @@
 export default {
   "status": {
-    "new": "u tijeku",
+    "new": "Obrađuje se",
     "pending": "Novo",
-    "processing": "u tijeku",
+    "processing": "Obrađuje se",
     "paid": "Plaćeno",
     "cancelled": "Otkazano",
     "shipped": "Poslano",
-    "delivered": "Isporučeno",
+    "delivered": "Dostavljeno",
+    "picked_up": "Preuzeto",
     "return": "Povrat",
     "partialReturn": "Djelomični povrat",
-    "partialDelivered": "Djelomično isporučeno",
-    "awaiting_tracking": "U pripremi",
+    "partialDelivered": "Djelomično dostavljeno",
+    "awaiting_tracking": "Pakira se",
     "ready_for_pickup": "Spremno za preuzimanje"
   },
   "table": {
     "orderNumber": "Broj narudžbe",
     "date": "Datum",
     "status": "Status",
-    "items": "Artikli",
+    "items": "Stavke",
     "total": "Ukupno",
     "actions": "Radnje",
-    "viewDetails": "Pogledaj detalje"
+    "viewDetails": "Prikaži detalje"
   },
   "tooltips": {
-    "viewDetails": "Pogledaj detalje",
+    "viewDetails": "Prikaži detalje",
     "cancelOrder": "Otkaži narudžbu"
   },
-  "noOrders": "Još niste izvršili nijednu narudžbu.",
+  "noOrders": "Još niste napravili nijednu narudžbu.",
   "trackShipment": "Prati pošiljku",
   "girocode": {
-    "hint": "Skenirajte bankovnom aplikacijom za plaćanje.",
-    "alt": "Girocode za bankovni prijenos",
-    "error": "QR kod nije moguće generirati.",
+    "hint": "Skenirajte aplikacijom svoje banke za plaćanje.",
+    "alt": "Girocode za prijenos",
+    "error": "QR kod nije mogao biti generiran.",
     "paymentPending": "Ova narudžba čeka vaš bankovni prijenos.",
     "payToAccount": "Molimo uplatite iznos na sljedeći račun:",
     "holder": "Vlasnik računa: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Iznos: {{amount}}",
-    "purpose": "Svrha plaćanja: {{orderId}}"
+    "purpose": "Poziv na broj: {{orderId}}"
   },
   "readyForPickup": {
-    "line1": "Vaša narudžba {{orderId}} je spakirana i čeka vas.",
-    "line2": "Možete je odmah preuzeti u našoj trgovini:",
+    "line1": "Vaša narudžba {{orderId}} je zapakirana i čeka vas.",
+    "line2": "Možete je preuzeti u našoj trgovini od sada:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
     "title": "Detalji narudžbe: {{orderId}}",
     "deliveryAddress": "Adresa dostave",
-    "invoiceAddress": "Adresa za račun",
+    "invoiceAddress": "Adresa naplate",
     "orderDetails": "Detalji narudžbe",
     "deliveryMethod": "Način dostave:",
     "paymentMethod": "Način plaćanja:",
@@ -68,5 +69,5 @@ export default {
     "confirm": "Otkaži",
     "cancelling": "Otkazivanje..."
   },
-  "processing": "Narudžba se obrađuje..."
+  "processing": "Dovršavanje narudžbe..."
 };
diff --git a/src/i18n/locales/hu/orders.js b/src/i18n/locales/hu/orders.js
index 5a09fad..282535b 100644
--- a/src/i18n/locales/hu/orders.js
+++ b/src/i18n/locales/hu/orders.js
@@ -1,39 +1,40 @@
 export default {
   "status": {
-    "new": "feldolgozás alatt",
+    "new": "Feldolgozás alatt",
     "pending": "Új",
-    "processing": "feldolgozás alatt",
+    "processing": "Feldolgozás alatt",
     "paid": "Fizetve",
     "cancelled": "Törölve",
     "shipped": "Feladva",
-    "delivered": "Kiszállítva",
+    "delivered": "Kézbesítve",
+    "picked_up": "Átvéve",
     "return": "Visszaküldés",
     "partialReturn": "Részleges visszaküldés",
-    "partialDelivered": "Részben kiszállítva",
+    "partialDelivered": "Részben kézbesítve",
     "awaiting_tracking": "Csomagolás alatt",
-    "ready_for_pickup": "Átvehető az üzletben"
+    "ready_for_pickup": "Átvételre kész"
   },
   "table": {
     "orderNumber": "Rendelésszám",
     "date": "Dátum",
     "status": "Állapot",
-    "items": "Termékek",
+    "items": "Tételek",
     "total": "Összesen",
     "actions": "Műveletek",
     "viewDetails": "Részletek megtekintése"
   },
   "tooltips": {
     "viewDetails": "Részletek megtekintése",
-    "cancelOrder": "Rendelés törlése"
+    "cancelOrder": "Rendelés lemondása"
   },
   "noOrders": "Még nem adott le rendelést.",
-  "trackShipment": "Szállítmány követése",
+  "trackShipment": "Küldemény követése",
   "girocode": {
-    "hint": "Olvasd be a banki alkalmazásoddal a fizetéshez.",
-    "alt": "Girocode átutaláshoz",
+    "hint": "Fizetéshez szkennelje be a banki alkalmazásával.",
+    "alt": "Girokód az utaláshoz",
     "error": "A QR-kód nem hozható létre.",
-    "paymentPending": "A rendelés a banki átutalásodra vár.",
-    "payToAccount": "Kérjük, utald át az összeget a következő számlára:",
+    "paymentPending": "Ez a rendelés az Ön banki átutalására vár.",
+    "payToAccount": "Kérjük, utalja az összeget a következő számlára:",
     "holder": "Számlatulajdonos: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
@@ -41,10 +42,10 @@ export default {
     "purpose": "Közlemény: {{orderId}}"
   },
   "readyForPickup": {
-    "line1": "A(z) {{orderId}} rendelésed becsomagolva vár rád.",
-    "line2": "Most már átveheted üzletünkben:",
+    "line1": "Az Ön {{orderId}} rendelése becsomagolva, és Önre vár.",
+    "line2": "Mostantól átveheti az üzletünkben:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger utca 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
@@ -52,21 +53,21 @@ export default {
     "deliveryAddress": "Szállítási cím",
     "invoiceAddress": "Számlázási cím",
     "orderDetails": "Rendelés részletei",
-    "deliveryMethod": "Szállítás módja:",
+    "deliveryMethod": "Szállítási mód:",
     "paymentMethod": "Fizetési mód:",
     "notSpecified": "Nincs megadva",
-    "orderedItems": "Megrendelt termékek",
-    "item": "Termék",
+    "orderedItems": "Rendelt tételek",
+    "item": "Tétel",
     "quantity": "Mennyiség",
     "price": "Ár",
     "total": "Összesen",
-    "cancelOrder": "Rendelés törlése"
+    "cancelOrder": "Rendelés lemondása"
   },
   "cancelConfirm": {
-    "title": "Rendelés törlése",
-    "message": "Biztosan törölni szeretné ezt a rendelést?",
-    "confirm": "Törlés",
-    "cancelling": "Törlés folyamatban..."
+    "title": "Rendelés lemondása",
+    "message": "Biztosan le szeretné mondani ezt a rendelést?",
+    "confirm": "Lemondás",
+    "cancelling": "Lemondás..."
   },
-  "processing": "A rendelés feldolgozása folyamatban..."
+  "processing": "Rendelés véglegesítése..."
 };
diff --git a/src/i18n/locales/it/orders.js b/src/i18n/locales/it/orders.js
index 569fb6a..1909f0b 100644
--- a/src/i18n/locales/it/orders.js
+++ b/src/i18n/locales/it/orders.js
@@ -1,12 +1,13 @@
 export default {
   "status": {
-    "new": "in lavorazione",
+    "new": "In elaborazione",
     "pending": "Nuovo",
-    "processing": "in lavorazione",
+    "processing": "In elaborazione",
     "paid": "Pagato",
     "cancelled": "Annullato",
     "shipped": "Spedito",
     "delivered": "Consegnato",
+    "picked_up": "Ritirato",
     "return": "Reso",
     "partialReturn": "Reso parziale",
     "partialDelivered": "Parzialmente consegnato",
@@ -26,26 +27,26 @@ export default {
     "viewDetails": "Visualizza dettagli",
     "cancelOrder": "Annulla ordine"
   },
-  "noOrders": "Non hai ancora effettuato ordini.",
+  "noOrders": "Non hai ancora effettuato alcun ordine.",
   "trackShipment": "Traccia spedizione",
   "girocode": {
-    "hint": "Scansiona con l'app della tua banca per pagare.",
-    "alt": "Girocode per bonifico bancario",
+    "hint": "Scansiona con la tua app bancaria per pagare.",
+    "alt": "Girocode per il trasferimento",
     "error": "Impossibile generare il codice QR.",
-    "paymentPending": "Questo ordine è in attesa del bonifico bancario.",
-    "payToAccount": "Trasferisci l'importo sul seguente conto:",
-    "holder": "Intestatario: {{name}}",
+    "paymentPending": "Questo ordine è in attesa del tuo bonifico bancario.",
+    "payToAccount": "Si prega di trasferire l'importo al seguente conto:",
+    "holder": "Intestatario del conto: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Importo: {{amount}}",
-    "purpose": "Causale: {{orderId}}"
+    "purpose": "Riferimento: {{orderId}}"
   },
   "readyForPickup": {
-    "line1": "Il tuo ordine {{orderId}} è imballato e ti aspetta.",
-    "line2": "Puoi ritirarlo subito nel nostro store:",
+    "line1": "Il tuo ordine {{orderId}} è pronto e ti sta aspettando.",
+    "line2": "Puoi ritirarlo nel nostro negozio da ora:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
-    "addressLine2": "01129 Dresden"
+    "addressLine1": "Trachenberger Street 14",
+    "addressLine2": "01129 Dresda"
   },
   "details": {
     "title": "Dettagli ordine: {{orderId}}",
@@ -68,5 +69,5 @@ export default {
     "confirm": "Annulla",
     "cancelling": "Annullamento in corso..."
   },
-  "processing": "Ordine in fase di completamento..."
+  "processing": "Completamento ordine..."
 };
diff --git a/src/i18n/locales/pl/orders.js b/src/i18n/locales/pl/orders.js
index ce40662..15c436c 100644
--- a/src/i18n/locales/pl/orders.js
+++ b/src/i18n/locales/pl/orders.js
@@ -1,24 +1,25 @@
 export default {
   "status": {
-    "new": "w trakcie realizacji",
+    "new": "Przetwarzanie",
     "pending": "Nowe",
-    "processing": "w trakcie realizacji",
+    "processing": "Przetwarzanie",
     "paid": "Opłacone",
     "cancelled": "Anulowane",
     "shipped": "Wysłane",
     "delivered": "Dostarczone",
+    "picked_up": "Odebrane",
     "return": "Zwrot",
     "partialReturn": "Częściowy zwrot",
     "partialDelivered": "Częściowo dostarczone",
-    "awaiting_tracking": "W trakcie pakowania",
+    "awaiting_tracking": "Pakowanie",
     "ready_for_pickup": "Gotowe do odbioru"
   },
   "table": {
     "orderNumber": "Numer zamówienia",
     "date": "Data",
     "status": "Status",
-    "items": "Produkty",
-    "total": "Razem",
+    "items": "Artykuły",
+    "total": "Suma",
     "actions": "Akcje",
     "viewDetails": "Pokaż szczegóły"
   },
@@ -32,19 +33,19 @@ export default {
     "hint": "Zeskanuj aplikacją bankową, aby zapłacić.",
     "alt": "Girocode do przelewu",
     "error": "Nie udało się wygenerować kodu QR.",
-    "paymentPending": "To zamówienie oczekuje na przelew.",
-    "payToAccount": "Przelej kwotę na następujące konto:",
-    "holder": "Właściciel konta: {{name}}",
+    "paymentPending": "To zamówienie czeka na Twój przelew bankowy.",
+    "payToAccount": "Proszę przelać kwotę na następujące konto:",
+    "holder": "Posiadacz konta: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Kwota: {{amount}}",
-    "purpose": "Tytuł: {{orderId}}"
+    "purpose": "Tytuł przelewu: {{orderId}}"
   },
   "readyForPickup": {
     "line1": "Twoje zamówienie {{orderId}} jest spakowane i czeka na Ciebie.",
-    "line2": "Możesz je odebrać od razu w naszym sklepie:",
+    "line2": "Możesz je odebrać w naszym sklepie od teraz:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
@@ -52,14 +53,14 @@ export default {
     "deliveryAddress": "Adres dostawy",
     "invoiceAddress": "Adres do faktury",
     "orderDetails": "Szczegóły zamówienia",
-    "deliveryMethod": "Metoda dostawy:",
+    "deliveryMethod": "Sposób dostawy:",
     "paymentMethod": "Metoda płatności:",
     "notSpecified": "Nie określono",
-    "orderedItems": "Zamówione produkty",
-    "item": "Produkt",
+    "orderedItems": "Zamówione artykuły",
+    "item": "Artykuł",
     "quantity": "Ilość",
     "price": "Cena",
-    "total": "Razem",
+    "total": "Suma",
     "cancelOrder": "Anuluj zamówienie"
   },
   "cancelConfirm": {
@@ -68,5 +69,5 @@ export default {
     "confirm": "Anuluj",
     "cancelling": "Anulowanie..."
   },
-  "processing": "Zamówienie jest realizowane..."
+  "processing": "Finalizowanie zamówienia..."
 };
diff --git a/src/i18n/locales/ro/orders.js b/src/i18n/locales/ro/orders.js
index c3d11ae..b11ee86 100644
--- a/src/i18n/locales/ro/orders.js
+++ b/src/i18n/locales/ro/orders.js
@@ -1,72 +1,73 @@
 export default {
   "status": {
-    "new": "în curs", 
-    "pending": "Nou", 
-    "processing": "în curs", 
-    "paid": "Plătit", 
-    "cancelled": "Anulat", 
-    "shipped": "Expediat", 
-    "delivered": "Livrat", 
-    "return": "Returnare", 
-    "partialReturn": "Returnare parțială", 
+    "new": "În procesare",
+    "pending": "Nou",
+    "processing": "În procesare",
+    "paid": "Plătit",
+    "cancelled": "Anulat",
+    "shipped": "Expediat",
+    "delivered": "Livrat",
+    "picked_up": "Ridicat",
+    "return": "Returnare",
+    "partialReturn": "Returnare parțială",
     "partialDelivered": "Livrat parțial",
     "awaiting_tracking": "Se ambalează",
-    "ready_for_pickup": "Gata pentru ridicare"
+    "ready_for_pickup": "Pregătit pentru ridicare"
   },
   "table": {
-    "orderNumber": "Număr comandă", 
-    "date": "Data", 
-    "status": "Status", 
-    "items": "Articole", 
-    "total": "Total", 
-    "actions": "Acțiuni", 
-    "viewDetails": "Vezi detalii" 
+    "orderNumber": "Numărul comenzii",
+    "date": "Dată",
+    "status": "Stare",
+    "items": "Articole",
+    "total": "Total",
+    "actions": "Acțiuni",
+    "viewDetails": "Vezi detalii"
   },
   "tooltips": {
-    "viewDetails": "Vezi detalii", 
-    "cancelOrder": "Anulează comanda" 
+    "viewDetails": "Vezi detalii",
+    "cancelOrder": "Anulează comanda"
   },
-  "noOrders": "Nu ați plasat încă nicio comandă.", 
+  "noOrders": "Nu ați plasat încă nicio comandă.",
   "trackShipment": "Urmărește expedierea",
   "girocode": {
-    "hint": "Scanează cu aplicația băncii pentru a plăti.",
-    "alt": "Girocode pentru transfer bancar",
+    "hint": "Scanați cu aplicația dvs. bancară pentru a plăti.",
+    "alt": "Girocode pentru transfer",
     "error": "Codul QR nu a putut fi generat.",
-    "paymentPending": "Comanda așteaptă transferul bancar.",
-    "payToAccount": "Vă rugăm să transferați suma în contul următor:",
+    "paymentPending": "Această comandă așteaptă transferul dvs. bancar.",
+    "payToAccount": "Vă rugăm să transferați suma în următorul cont:",
     "holder": "Titular cont: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Sumă: {{amount}}",
-    "purpose": "Detalii plată: {{orderId}}"
+    "purpose": "Referință: {{orderId}}"
   },
   "readyForPickup": {
-    "line1": "Comanda ta {{orderId}} este ambalată și te așteaptă.",
-    "line2": "O poți ridica acum din magazinul nostru:",
+    "line1": "Comanda dvs. {{orderId}} este ambalată și vă așteaptă.",
+    "line2": "O puteți ridica din magazinul nostru chiar de acum:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
-    "title": "Detalii comandă: {{orderId}}", 
-    "deliveryAddress": "Adresa de livrare", 
-    "invoiceAddress": "Adresa de facturare", 
-    "orderDetails": "Detalii comandă", 
-    "deliveryMethod": "Metoda de livrare:", 
-    "paymentMethod": "Metoda de plată:", 
-    "notSpecified": "Nespecificat", 
-    "orderedItems": "Articole comandate", 
-    "item": "Articol", 
-    "quantity": "Cantitate", 
-    "price": "Preț", 
-    "total": "Total", 
-    "cancelOrder": "Anulează comanda" 
+    "title": "Detalii comandă: {{orderId}}",
+    "deliveryAddress": "Adresă de livrare",
+    "invoiceAddress": "Adresă de facturare",
+    "orderDetails": "Detalii comandă",
+    "deliveryMethod": "Metoda de livrare:",
+    "paymentMethod": "Metoda de plată:",
+    "notSpecified": "Nespecificat",
+    "orderedItems": "Articole comandate",
+    "item": "Articol",
+    "quantity": "Cantitate",
+    "price": "Preț",
+    "total": "Total",
+    "cancelOrder": "Anulează comanda"
   },
   "cancelConfirm": {
-    "title": "Anulează comanda", 
-    "message": "Sigur doriți să anulați această comandă?", 
-    "confirm": "Anulează", 
-    "cancelling": "Se anulează..." 
+    "title": "Anulează comanda",
+    "message": "Sigur doriți să anulați această comandă?",
+    "confirm": "Anulează",
+    "cancelling": "Se anulează..."
   },
-  "processing": "Comanda este în curs de finalizare..." 
+  "processing": "Se finalizează comanda..."
 };
diff --git a/src/i18n/locales/ru/orders.js b/src/i18n/locales/ru/orders.js
index 4ecae31..69dd060 100644
--- a/src/i18n/locales/ru/orders.js
+++ b/src/i18n/locales/ru/orders.js
@@ -1,17 +1,18 @@
 export default {
   "status": {
-    "new": "в процессе",
+    "new": "В обработке",
     "pending": "Новый",
-    "processing": "в процессе",
+    "processing": "В обработке",
     "paid": "Оплачено",
     "cancelled": "Отменено",
     "shipped": "Отправлено",
     "delivered": "Доставлено",
+    "picked_up": "Получено",
     "return": "Возврат",
     "partialReturn": "Частичный возврат",
     "partialDelivered": "Частично доставлено",
     "awaiting_tracking": "Упаковывается",
-    "ready_for_pickup": "Готово к выдаче"
+    "ready_for_pickup": "Готово к самовывозу"
   },
   "table": {
     "orderNumber": "Номер заказа",
@@ -20,21 +21,21 @@ export default {
     "items": "Товары",
     "total": "Итого",
     "actions": "Действия",
-    "viewDetails": "Просмотреть детали"
+    "viewDetails": "Показать детали"
   },
   "tooltips": {
-    "viewDetails": "Просмотреть детали",
+    "viewDetails": "Показать детали",
     "cancelOrder": "Отменить заказ"
   },
-  "noOrders": "Вы еще не сделали ни одного заказа.",
+  "noOrders": "Вы ещё не сделали ни одного заказа.",
   "trackShipment": "Отследить отправление",
   "girocode": {
-    "hint": "Отсканируйте в приложении банка для оплаты.",
-    "alt": "Girocode для банковского перевода",
+    "hint": "Сканируйте с помощью банковского приложения, чтобы оплатить.",
+    "alt": "Girocode для перевода",
     "error": "Не удалось создать QR-код.",
-    "paymentPending": "Заказ ожидает банковского перевода.",
-    "payToAccount": "Переведите сумму на следующий счёт:",
-    "holder": "Получатель: {{name}}",
+    "paymentPending": "Этот заказ ожидает вашего банковского перевода.",
+    "payToAccount": "Пожалуйста, переведите сумму на следующий счёт:",
+    "holder": "Владелец счёта: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Сумма: {{amount}}",
@@ -42,15 +43,15 @@ export default {
   },
   "readyForPickup": {
     "line1": "Ваш заказ {{orderId}} упакован и ждёт вас.",
-    "line2": "Вы можете забрать его в нашем магазине:",
+    "line2": "Вы можете забрать его в нашем магазине уже сейчас:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
     "title": "Детали заказа: {{orderId}}",
     "deliveryAddress": "Адрес доставки",
-    "invoiceAddress": "Адрес для счета",
+    "invoiceAddress": "Адрес для выставления счёта",
     "orderDetails": "Детали заказа",
     "deliveryMethod": "Способ доставки:",
     "paymentMethod": "Способ оплаты:",
@@ -68,5 +69,5 @@ export default {
     "confirm": "Отменить",
     "cancelling": "Отмена..."
   },
-  "processing": "Заказ обрабатывается..."
+  "processing": "Завершение заказа..."
 };
diff --git a/src/i18n/locales/sk/orders.js b/src/i18n/locales/sk/orders.js
index 34ebbc8..4bf3119 100644
--- a/src/i18n/locales/sk/orders.js
+++ b/src/i18n/locales/sk/orders.js
@@ -1,16 +1,17 @@
 export default {
   "status": {
-    "new": "v procese",
+    "new": "Spracováva sa",
     "pending": "Nové",
-    "processing": "v procese",
+    "processing": "Spracováva sa",
     "paid": "Zaplatené",
     "cancelled": "Zrušené",
     "shipped": "Odoslané",
     "delivered": "Doručené",
+    "picked_up": "Vyzdvihnuté",
     "return": "Vrátenie",
     "partialReturn": "Čiastočné vrátenie",
     "partialDelivered": "Čiastočne doručené",
-    "awaiting_tracking": "Balí sa",
+    "awaiting_tracking": "Balenie prebieha",
     "ready_for_pickup": "Pripravené na vyzdvihnutie"
   },
   "table": {
@@ -18,43 +19,43 @@ export default {
     "date": "Dátum",
     "status": "Stav",
     "items": "Položky",
-    "total": "Celkom",
+    "total": "Spolu",
     "actions": "Akcie",
-    "viewDetails": "Zobraziť detaily"
+    "viewDetails": "Zobraziť podrobnosti"
   },
   "tooltips": {
-    "viewDetails": "Zobraziť detaily",
+    "viewDetails": "Zobraziť podrobnosti",
     "cancelOrder": "Zrušiť objednávku"
   },
-  "noOrders": "Ešte ste neuskutočnili žiadne objednávky.",
+  "noOrders": "Zatiaľ ste nevykonali žiadnu objednávku.",
   "trackShipment": "Sledovať zásielku",
   "girocode": {
-    "hint": "Naskenujte bankovou aplikáciou a zaplaťte.",
-    "alt": "Girocode pre bankový prevod",
+    "hint": "Naskenujte pomocou svojej bankovej aplikácie na zaplatenie.",
+    "alt": "Girocode pre prevod",
     "error": "QR kód sa nepodarilo vygenerovať.",
     "paymentPending": "Táto objednávka čaká na váš bankový prevod.",
-    "payToAccount": "Prosím preveďte sumu na nasledujúci účet:",
+    "payToAccount": "Prosím, prevod sumy pošlite na nasledujúci účet:",
     "holder": "Majiteľ účtu: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Suma: {{amount}}",
-    "purpose": "Správa pre príjemcu: {{orderId}}"
+    "purpose": "Referencia: {{orderId}}"
   },
   "readyForPickup": {
     "line1": "Vaša objednávka {{orderId}} je zabalená a čaká na vás.",
-    "line2": "Môžete si ju hneď vyzdvihnúť v našom obchode:",
+    "line2": "Môžete si ju vyzdvihnúť v našom obchode už teraz:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
-    "title": "Detaily objednávky: {{orderId}}",
+    "title": "Podrobnosti objednávky: {{orderId}}",
     "deliveryAddress": "Dodacia adresa",
     "invoiceAddress": "Fakturačná adresa",
-    "orderDetails": "Detaily objednávky",
+    "orderDetails": "Podrobnosti objednávky",
     "deliveryMethod": "Spôsob doručenia:",
     "paymentMethod": "Spôsob platby:",
-    "notSpecified": "Nie je uvedené",
+    "notSpecified": "Nie je špecifikované",
     "orderedItems": "Objednané položky",
     "item": "Položka",
     "quantity": "Množstvo",
@@ -64,9 +65,9 @@ export default {
   },
   "cancelConfirm": {
     "title": "Zrušiť objednávku",
-    "message": "Ste si istý, že chcete zrušiť túto objednávku?",
+    "message": "Ste si istí, že chcete zrušiť túto objednávku?",
     "confirm": "Zrušiť",
-    "cancelling": "Zrušovanie..."
+    "cancelling": "Ruší sa..."
   },
-  "processing": "Objednávka sa spracováva..."
+  "processing": "Dokončuje sa objednávka..."
 };
diff --git a/src/i18n/locales/sl/orders.js b/src/i18n/locales/sl/orders.js
index 08d69e1..3666533 100644
--- a/src/i18n/locales/sl/orders.js
+++ b/src/i18n/locales/sl/orders.js
@@ -1,23 +1,24 @@
 export default {
   "status": {
-    "new": "v teku",
+    "new": "Obdelava",
     "pending": "Novo",
-    "processing": "v teku",
+    "processing": "Obdelava",
     "paid": "Plačano",
     "cancelled": "Preklicano",
-    "shipped": "Poslano",
+    "shipped": "Odposlano",
     "delivered": "Dostavljeno",
-    "return": "Vrnitev",
-    "partialReturn": "Delna vrnitev",
+    "picked_up": "Prevzeto",
+    "return": "Vračilo",
+    "partialReturn": "Delno vračilo",
     "partialDelivered": "Delno dostavljeno",
-    "awaiting_tracking": "V pripravi",
+    "awaiting_tracking": "Pakiranje poteka",
     "ready_for_pickup": "Pripravljeno za prevzem"
   },
   "table": {
     "orderNumber": "Številka naročila",
     "date": "Datum",
     "status": "Status",
-    "items": "Izdelki",
+    "items": "Predmeti",
     "total": "Skupaj",
     "actions": "Dejanja",
     "viewDetails": "Poglej podrobnosti"
@@ -29,8 +30,8 @@ export default {
   "noOrders": "Še niste oddali nobenega naročila.",
   "trackShipment": "Sledi pošiljki",
   "girocode": {
-    "hint": "Skenirajte z bančno aplikacijo za plačilo.",
-    "alt": "Girocode za bančno nakazilo",
+    "hint": "Za plačilo skenirajte z bančno aplikacijo.",
+    "alt": "Girocode za nakazilo",
     "error": "QR kode ni bilo mogoče ustvariti.",
     "paymentPending": "To naročilo čaka na vaše bančno nakazilo.",
     "payToAccount": "Prosimo, nakažite znesek na naslednji račun:",
@@ -38,13 +39,13 @@ export default {
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Znesek: {{amount}}",
-    "purpose": "Namen plačila: {{orderId}}"
+    "purpose": "Sklic: {{orderId}}"
   },
   "readyForPickup": {
-    "line1": "Vaše naročilo {{orderId}} je zapakirano in vas čaka.",
-    "line2": "Prevzamete ga lahko takoj v naši trgovini:",
+    "line1": "Vaše naročilo {{orderId}} je pripravljeno in vas čaka.",
+    "line2": "Prevzamete ga lahko v naši trgovini od zdaj naprej:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
@@ -55,8 +56,8 @@ export default {
     "deliveryMethod": "Način dostave:",
     "paymentMethod": "Način plačila:",
     "notSpecified": "Ni določeno",
-    "orderedItems": "Naročeni izdelki",
-    "item": "Izdelek",
+    "orderedItems": "Naročeni predmeti",
+    "item": "Predmet",
     "quantity": "Količina",
     "price": "Cena",
     "total": "Skupaj",
@@ -64,9 +65,9 @@ export default {
   },
   "cancelConfirm": {
     "title": "Prekliči naročilo",
-    "message": "Ste prepričani, da želite preklicati to naročilo?",
+    "message": "Ali ste prepričani, da želite preklicati to naročilo?",
     "confirm": "Prekliči",
-    "cancelling": "Preklicujem..."
+    "cancelling": "Preklicevanje..."
   },
-  "processing": "Naročilo se zaključuje..."
+  "processing": "Naročilo se dokončuje..."
 };
diff --git a/src/i18n/locales/sq/orders.js b/src/i18n/locales/sq/orders.js
index 219bb19..774c653 100644
--- a/src/i18n/locales/sq/orders.js
+++ b/src/i18n/locales/sq/orders.js
@@ -1,16 +1,17 @@
 export default {
   "status": {
-    "new": "në proces",
-    "pending": "E re",
-    "processing": "në proces",
-    "paid": "E paguar",
+    "new": "Po përpunohet",
+    "pending": "I ri",
+    "processing": "Po përpunohet",
+    "paid": "Paguar",
     "cancelled": "Anuluar",
     "shipped": "Dërguar",
     "delivered": "Dorëzuar",
+    "picked_up": "Marrë",
     "return": "Kthim",
     "partialReturn": "Kthim i pjesshëm",
     "partialDelivered": "Dorëzuar pjesërisht",
-    "awaiting_tracking": "Po përgatitet",
+    "awaiting_tracking": "Po paketohet",
     "ready_for_pickup": "Gati për marrje"
   },
   "table": {
@@ -27,36 +28,36 @@ export default {
     "cancelOrder": "Anulo porosinë"
   },
   "noOrders": "Nuk keni bërë ende asnjë porosi.",
-  "trackShipment": "Ndjek dërgesën",
+  "trackShipment": "Ndiq dërgesën",
   "girocode": {
-    "hint": "Skanoni me aplikacionin e bankës për të paguar.",
-    "alt": "Girocode për transfertë bankare",
+    "hint": "Skano me aplikacionin tuaj bankar për të paguar.",
+    "alt": "Girocode për transferimin",
     "error": "Kodi QR nuk mund të gjenerohej.",
-    "paymentPending": "Ky porosi pret transfertën tuaj bankare.",
+    "paymentPending": "Kjo porosi është në pritje të transferimit tuaj bankar.",
     "payToAccount": "Ju lutemi transferoni shumën në llogarinë e mëposhtme:",
-    "holder": "Titullari i llogarisë: {{name}}",
+    "holder": "Mbajtësi i llogarisë: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Shuma: {{amount}}",
-    "purpose": "Qëllimi i pagesës: {{orderId}}"
+    "purpose": "Referenca: {{orderId}}"
   },
   "readyForPickup": {
-    "line1": "Porosia juaj {{orderId}} është paketuar dhe ju pret.",
-    "line2": "Mund ta merrni tani në dyqanin tonë:",
+    "line1": "Porosia juaj {{orderId}} është paketuar dhe po ju pret.",
+    "line2": "Mund ta merrni nga dyqani ynë duke filluar nga tani:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
     "title": "Detajet e porosisë: {{orderId}}",
     "deliveryAddress": "Adresa e dorëzimit",
-    "invoiceAddress": "Adresa e faturës",
+    "invoiceAddress": "Adresa e faturimit",
     "orderDetails": "Detajet e porosisë",
     "deliveryMethod": "Mënyra e dorëzimit:",
     "paymentMethod": "Mënyra e pagesës:",
     "notSpecified": "Nuk është specifikuar",
     "orderedItems": "Artikujt e porositur",
-    "item": "Artikulli",
+    "item": "Artikull",
     "quantity": "Sasia",
     "price": "Çmimi",
     "total": "Totali",
@@ -64,9 +65,9 @@ export default {
   },
   "cancelConfirm": {
     "title": "Anulo porosinë",
-    "message": "A jeni i sigurt që dëshironi të anuloni këtë porosi?",
+    "message": "A jeni të sigurt që dëshironi ta anuloni këtë porosi?",
     "confirm": "Anulo",
-    "cancelling": "Duke anuluar..."
+    "cancelling": "Po anulohet..."
   },
-  "processing": "Porosia po përpunohet..."
+  "processing": "Porosia po përfundohet..."
 };
diff --git a/src/i18n/locales/sr/orders.js b/src/i18n/locales/sr/orders.js
index 82b4840..de15ca8 100644
--- a/src/i18n/locales/sr/orders.js
+++ b/src/i18n/locales/sr/orders.js
@@ -1,58 +1,59 @@
 export default {
   "status": {
-    "new": "u toku",
+    "new": "Obrađuje se",
     "pending": "Novo",
-    "processing": "u toku",
+    "processing": "Obrađuje se",
     "paid": "Plaćeno",
     "cancelled": "Otkazano",
     "shipped": "Poslato",
     "delivered": "Isporučeno",
-    "return": "Povrat",
-    "partialReturn": "Delimični povrat",
+    "picked_up": "Preuzeto",
+    "return": "Povraćaj",
+    "partialReturn": "Delimičan povraćaj",
     "partialDelivered": "Delimično isporučeno",
-    "awaiting_tracking": "U pripremi",
+    "awaiting_tracking": "Pakuje se",
     "ready_for_pickup": "Spremno za preuzimanje"
   },
   "table": {
     "orderNumber": "Broj porudžbine",
     "date": "Datum",
     "status": "Status",
-    "items": "Artikli",
+    "items": "Stavke",
     "total": "Ukupno",
-    "actions": "Akcije",
-    "viewDetails": "Pogledaj detalje"
+    "actions": "Radnje",
+    "viewDetails": "Prikaži detalje"
   },
   "tooltips": {
-    "viewDetails": "Pogledaj detalje",
+    "viewDetails": "Prikaži detalje",
     "cancelOrder": "Otkaži porudžbinu"
   },
   "noOrders": "Još niste napravili nijednu porudžbinu.",
   "trackShipment": "Prati pošiljku",
   "girocode": {
-    "hint": "Skenirajte bankovnom aplikacijom da platite.",
-    "alt": "Girocode za bankovni transfer",
-    "error": "QR kod nije moguće generisati.",
-    "paymentPending": "Ova porudžbina čeka vaš bankovni transfer.",
-    "payToAccount": "Molimo uplatite iznos na sledeći račun:",
+    "hint": "Skenirajte pomoću bankarske aplikacije da biste platili.",
+    "alt": "Girocode za prenos",
+    "error": "QR kod nije mogao biti generisan.",
+    "paymentPending": "Ova porudžbina čeka vašu bankovnu uplatu.",
+    "payToAccount": "Molimo vas da iznos prenesete na sledeći račun:",
     "holder": "Vlasnik računa: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Iznos: {{amount}}",
-    "purpose": "Svrha uplate: {{orderId}}"
+    "purpose": "Poziv na broj: {{orderId}}"
   },
   "readyForPickup": {
     "line1": "Vaša porudžbina {{orderId}} je spakovana i čeka vas.",
-    "line2": "Možete je odmah preuzeti u našoj prodavnici:",
+    "line2": "Možete je preuzeti u našoj prodavnici od sada:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
     "title": "Detalji porudžbine: {{orderId}}",
-    "deliveryAddress": "Adresa za isporuku",
-    "invoiceAddress": "Adresa za fakturu",
+    "deliveryAddress": "Adresa za dostavu",
+    "invoiceAddress": "Adresa za naplatu",
     "orderDetails": "Detalji porudžbine",
-    "deliveryMethod": "Način isporuke:",
+    "deliveryMethod": "Način dostave:",
     "paymentMethod": "Način plaćanja:",
     "notSpecified": "Nije navedeno",
     "orderedItems": "Poručeni artikli",
@@ -66,7 +67,7 @@ export default {
     "title": "Otkaži porudžbinu",
     "message": "Da li ste sigurni da želite da otkažete ovu porudžbinu?",
     "confirm": "Otkaži",
-    "cancelling": "Otkaživanje..."
+    "cancelling": "Otkazivanje..."
   },
-  "processing": "Porudžbina se obrađuje..."
+  "processing": "Završavanje porudžbine..."
 };
diff --git a/src/i18n/locales/sv/orders.js b/src/i18n/locales/sv/orders.js
index d8921c2..8d47c7c 100644
--- a/src/i18n/locales/sv/orders.js
+++ b/src/i18n/locales/sv/orders.js
@@ -1,12 +1,13 @@
 export default {
   "status": {
-    "new": "pågående",
+    "new": "Bearbetas",
     "pending": "Ny",
-    "processing": "pågående",
+    "processing": "Bearbetas",
     "paid": "Betald",
     "cancelled": "Avbruten",
     "shipped": "Skickad",
     "delivered": "Levererad",
+    "picked_up": "Upphämtad",
     "return": "Retur",
     "partialReturn": "Delvis retur",
     "partialDelivered": "Delvis levererad",
@@ -24,49 +25,49 @@ export default {
   },
   "tooltips": {
     "viewDetails": "Visa detaljer",
-    "cancelOrder": "Avbryt order"
+    "cancelOrder": "Avbryt beställning"
   },
   "noOrders": "Du har inte lagt några beställningar än.",
   "trackShipment": "Spåra försändelse",
   "girocode": {
     "hint": "Skanna med din bankapp för att betala.",
-    "alt": "Girocode för banköverföring",
+    "alt": "Girocode för överföringen",
     "error": "QR-koden kunde inte genereras.",
-    "paymentPending": "Denna beställning väntar på din banköverföring.",
-    "payToAccount": "Överför beloppet till följande konto:",
+    "paymentPending": "Denna beställning inväntar din banköverföring.",
+    "payToAccount": "Vänligen överför beloppet till följande konto:",
     "holder": "Kontoinnehavare: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Belopp: {{amount}}",
-    "purpose": "Meddelande: {{orderId}}"
+    "purpose": "Referens: {{orderId}}"
   },
   "readyForPickup": {
     "line1": "Din beställning {{orderId}} är packad och väntar på dig.",
-    "line2": "Du kan hämta den nu i vår butik:",
+    "line2": "Du kan hämta den i vår butik från och med nu:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
     "title": "Orderdetaljer: {{orderId}}",
     "deliveryAddress": "Leveransadress",
-    "invoiceAddress": "Fakturaadress",
+    "invoiceAddress": "Faktureringsadress",
     "orderDetails": "Orderdetaljer",
-    "deliveryMethod": "Leveransmetod:",
+    "deliveryMethod": "Leveranssätt:",
     "paymentMethod": "Betalningsmetod:",
-    "notSpecified": "Ej angivet",
+    "notSpecified": "Inte specificerat",
     "orderedItems": "Beställda artiklar",
     "item": "Artikel",
     "quantity": "Antal",
     "price": "Pris",
     "total": "Totalt",
-    "cancelOrder": "Avbryt order"
+    "cancelOrder": "Avbryt beställning"
   },
   "cancelConfirm": {
-    "title": "Avbryt order",
-    "message": "Är du säker på att du vill avbryta denna order?",
+    "title": "Avbryt beställning",
+    "message": "Är du säker på att du vill avbryta denna beställning?",
     "confirm": "Avbryt",
     "cancelling": "Avbryter..."
   },
-  "processing": "Ordern behandlas..."
+  "processing": "Slutför beställning..."
 };
diff --git a/src/i18n/locales/tr/orders.js b/src/i18n/locales/tr/orders.js
index d05c0a6..6b1def7 100644
--- a/src/i18n/locales/tr/orders.js
+++ b/src/i18n/locales/tr/orders.js
@@ -1,17 +1,18 @@
 export default {
   "status": {
-    "new": "işlemde",
+    "new": "İşleniyor",
     "pending": "Yeni",
-    "processing": "işlemde",
+    "processing": "İşleniyor",
     "paid": "Ödendi",
     "cancelled": "İptal edildi",
     "shipped": "Gönderildi",
     "delivered": "Teslim edildi",
+    "picked_up": "Teslim alındı",
     "return": "İade",
     "partialReturn": "Kısmi iade",
     "partialDelivered": "Kısmen teslim edildi",
     "awaiting_tracking": "Paketleniyor",
-    "ready_for_pickup": "Mağazadan teslim alınabilir"
+    "ready_for_pickup": "Teslime hazır"
   },
   "table": {
     "orderNumber": "Sipariş numarası",
@@ -26,14 +27,14 @@ export default {
     "viewDetails": "Detayları görüntüle",
     "cancelOrder": "Siparişi iptal et"
   },
-  "noOrders": "Henüz sipariş vermediniz.",
+  "noOrders": "Henüz hiç sipariş vermediniz.",
   "trackShipment": "Gönderiyi takip et",
   "girocode": {
-    "hint": "Ödemek için banka uygulamanızla taratın.",
-    "alt": "Banka havalesi için Girocode",
-    "error": "QR kodu oluşturulamadı.",
-    "paymentPending": "Bu sipariş banka havalesini bekliyor.",
-    "payToAccount": "Lütfen tutarı aşağıdaki hesaba gönderin:",
+    "hint": "Ödemek için bankacılık uygulamanızla tarayın.",
+    "alt": "Havale için Girocode",
+    "error": "QR kod oluşturulamadı.",
+    "paymentPending": "Bu sipariş banka havalenizi bekliyor.",
+    "payToAccount": "Lütfen tutarı aşağıdaki hesaba transfer edin:",
     "holder": "Hesap sahibi: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
@@ -41,10 +42,10 @@ export default {
     "purpose": "Açıklama: {{orderId}}"
   },
   "readyForPickup": {
-    "line1": "{{orderId}} numaralı siparişiniz paketlendi ve sizi bekliyor.",
-    "line2": "Şimdi mağazamızdan teslim alabilirsiniz:",
+    "line1": "Siparişiniz {{orderId}} paketlendi ve sizi bekliyor.",
+    "line2": "Bunu şimdi mağazamızdan alabilirsiniz:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
@@ -54,7 +55,7 @@ export default {
     "orderDetails": "Sipariş detayları",
     "deliveryMethod": "Teslimat yöntemi:",
     "paymentMethod": "Ödeme yöntemi:",
-    "notSpecified": "Belirtilmedi",
+    "notSpecified": "Belirtilmemiş",
     "orderedItems": "Sipariş edilen ürünler",
     "item": "Ürün",
     "quantity": "Miktar",
diff --git a/src/i18n/locales/uk/orders.js b/src/i18n/locales/uk/orders.js
index 3ba1a98..2679721 100644
--- a/src/i18n/locales/uk/orders.js
+++ b/src/i18n/locales/uk/orders.js
@@ -1,24 +1,25 @@
 export default {
   "status": {
-    "new": "в процесі",
-    "pending": "Новий",
-    "processing": "в процесі",
+    "new": "Обробляється",
+    "pending": "Нове",
+    "processing": "Обробляється",
     "paid": "Оплачено",
     "cancelled": "Скасовано",
     "shipped": "Відправлено",
     "delivered": "Доставлено",
+    "picked_up": "Забрано",
     "return": "Повернення",
     "partialReturn": "Часткове повернення",
     "partialDelivered": "Частково доставлено",
-    "awaiting_tracking": "Упаковується",
-    "ready_for_pickup": "Готово до видачі"
+    "awaiting_tracking": "Пакується",
+    "ready_for_pickup": "Готово до самовивозу"
   },
   "table": {
     "orderNumber": "Номер замовлення",
     "date": "Дата",
     "status": "Статус",
     "items": "Товари",
-    "total": "Всього",
+    "total": "Разом",
     "actions": "Дії",
     "viewDetails": "Переглянути деталі"
   },
@@ -26,31 +27,31 @@ export default {
     "viewDetails": "Переглянути деталі",
     "cancelOrder": "Скасувати замовлення"
   },
-  "noOrders": "Ви ще не робили замовлень.",
+  "noOrders": "Ви ще не зробили жодного замовлення.",
   "trackShipment": "Відстежити відправлення",
   "girocode": {
-    "hint": "Відскануйте в додатку банку для оплати.",
-    "alt": "Girocode для банківського переказу",
-    "error": "Не вдалося згенерувати QR-код.",
-    "paymentPending": "Замовлення очікує на банківський переказ.",
-    "payToAccount": "Перекажіть суму на такий рахунок:",
+    "hint": "Скануйте за допомогою свого банківського додатка, щоб оплатити.",
+    "alt": "Girocode для переказу",
+    "error": "QR-код не вдалося згенерувати.",
+    "paymentPending": "Це замовлення очікує на ваш банківський переказ.",
+    "payToAccount": "Будь ласка, перерахуйте суму на такий рахунок:",
     "holder": "Власник рахунку: {{name}}",
     "iban": "IBAN: {{iban}}",
     "bic": "BIC: {{bic}}",
     "amount": "Сума: {{amount}}",
-    "purpose": "Призначення платежу: {{orderId}}"
+    "purpose": "Призначення: {{orderId}}"
   },
   "readyForPickup": {
-    "line1": "Ваше замовлення {{orderId}} упаковане і чекає на вас.",
-    "line2": "Забрати його можна в нашому магазині:",
+    "line1": "Ваше замовлення {{orderId}} упаковано і чекає на вас.",
+    "line2": "Ви можете забрати його в нашому магазині вже зараз:",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
     "title": "Деталі замовлення: {{orderId}}",
     "deliveryAddress": "Адреса доставки",
-    "invoiceAddress": "Адреса для рахунку",
+    "invoiceAddress": "Платіжна адреса",
     "orderDetails": "Деталі замовлення",
     "deliveryMethod": "Спосіб доставки:",
     "paymentMethod": "Спосіб оплати:",
@@ -59,14 +60,14 @@ export default {
     "item": "Товар",
     "quantity": "Кількість",
     "price": "Ціна",
-    "total": "Всього",
+    "total": "Разом",
     "cancelOrder": "Скасувати замовлення"
   },
   "cancelConfirm": {
     "title": "Скасувати замовлення",
     "message": "Ви впевнені, що хочете скасувати це замовлення?",
     "confirm": "Скасувати",
-    "cancelling": "Скасовується..."
+    "cancelling": "Скасування..."
   },
-  "processing": "Замовлення обробляється..."
+  "processing": "Завершення замовлення..."
 };
diff --git a/src/i18n/locales/zh/orders.js b/src/i18n/locales/zh/orders.js
index 1a028b2..007393e 100644
--- a/src/i18n/locales/zh/orders.js
+++ b/src/i18n/locales/zh/orders.js
@@ -1,24 +1,25 @@
 export default {
   "status": {
-    "new": "进行中",
-    "pending": "新订单",
-    "processing": "进行中",
-    "paid": "已付款",
+    "new": "处理中",
+    "pending": "新建",
+    "processing": "处理中",
+    "paid": "已支付",
     "cancelled": "已取消",
     "shipped": "已发货",
     "delivered": "已送达",
+    "picked_up": "已取货",
     "return": "退货",
     "partialReturn": "部分退货",
-    "partialDelivered": "部分送达",
-    "awaiting_tracking": "打包中",
-    "ready_for_pickup": "可到店取货"
+    "partialDelivered": "部分已送达",
+    "awaiting_tracking": "正在打包",
+    "ready_for_pickup": "可取货"
   },
   "table": {
     "orderNumber": "订单号",
     "date": "日期",
     "status": "状态",
     "items": "商品",
-    "total": "总计",
+    "total": "合计",
     "actions": "操作",
     "viewDetails": "查看详情"
   },
@@ -26,40 +27,40 @@ export default {
     "viewDetails": "查看详情",
     "cancelOrder": "取消订单"
   },
-  "noOrders": "您还没有下过任何订单。",
-  "trackShipment": "跟踪发货",
+  "noOrders": "您尚未下过任何订单。",
+  "trackShipment": "追踪发货",
   "girocode": {
-    "hint": "使用银行应用扫码付款。",
-    "alt": "银行转账 Girocode",
+    "hint": "使用您的银行应用扫描以付款。",
+    "alt": "转账用 Girocode",
     "error": "无法生成二维码。",
-    "paymentPending": "此订单等待您完成银行转账。",
-    "payToAccount": "请将款项汇至以下账户：",
+    "paymentPending": "该订单正在等待您的银行转账。",
+    "payToAccount": "请将金额转账至以下账户：",
     "holder": "账户持有人：{{name}}",
     "iban": "IBAN：{{iban}}",
     "bic": "BIC：{{bic}}",
     "amount": "金额：{{amount}}",
-    "purpose": "备注/用途：{{orderId}}"
+    "purpose": "备注：{{orderId}}"
   },
   "readyForPickup": {
-    "line1": "您的订单 {{orderId}} 已备好，等待您来取。",
-    "line2": "您现在可以到我们门店取货：",
+    "line1": "您的订单 {{orderId}} 已打包，正等待您领取。",
+    "line2": "您现在即可前往我们的门店取货：",
     "storeName": "Growheads",
-    "addressLine1": "Trachenberger Straße 14",
+    "addressLine1": "Trachenberger Street 14",
     "addressLine2": "01129 Dresden"
   },
   "details": {
-    "title": "订单详情: {{orderId}}",
+    "title": "订单详情：{{orderId}}",
     "deliveryAddress": "收货地址",
-    "invoiceAddress": "发票地址",
+    "invoiceAddress": "账单地址",
     "orderDetails": "订单详情",
     "deliveryMethod": "配送方式：",
     "paymentMethod": "支付方式：",
     "notSpecified": "未指定",
-    "orderedItems": "订购商品",
+    "orderedItems": "已订商品",
     "item": "商品",
     "quantity": "数量",
     "price": "价格",
-    "total": "总计",
+    "total": "合计",
     "cancelOrder": "取消订单"
   },
   "cancelConfirm": {
@@ -68,5 +69,5 @@ export default {
     "confirm": "取消",
     "cancelling": "正在取消..."
   },
-  "processing": "订单正在处理..."
+  "processing": "订单正在完成..."
 };
diff --git a/translate-i18n.js b/translate-i18n.js
index 80e9c58..b190961 100755
--- a/translate-i18n.js
+++ b/translate-i18n.js
@@ -55,7 +55,7 @@ const LEGAL_FILES = [
 
 // Model configuration
 const GERMAN_TO_ENGLISH_MODEL = 'gpt-5.4'; // High-quality model for German -> English (critical step)
-const ENGLISH_TO_OTHER_MODEL = 'gpt-4.1-mini'; // Faster/cheaper model for English -> Other languages
+const ENGLISH_TO_OTHER_MODEL = 'gpt-5.4-mini'; // Faster/cheaper model for English -> Other languages
 
 // Supported languages for translation
 const TARGET_LANGUAGES = {
@@ -379,7 +379,7 @@ async function translateContent(content, systemPrompt, targetLanguage = null, mo
 }
 
 // Function to translate English to other languages (optimized for caching)
-async function translateToTargetLanguage(englishContent, targetLanguage, model = 'gpt-4.1-mini', isLegalFile = false) {
+async function translateToTargetLanguage(englishContent, targetLanguage, model = 'gpt-5.4-mini', isLegalFile = false) {
   try {
     // Choose appropriate system prompt based on file type
     const promptTemplate = isLegalFile 
@@ -396,9 +396,7 @@ async function translateToTargetLanguage(englishContent, targetLanguage, model =
       messages: [
         { role: 'system', content: systemPrompt },
         { role: 'user', content: `Please translate to ${targetLanguage}` }
-      ],
-      temperature: 0.1,
-      max_tokens: 4000
+      ]
     });
 
     return response.choices[0].message.content;