diff --git a/locale/ar/LC_MESSAGES/django.mo b/locale/ar/LC_MESSAGES/django.mo
index bd3012c..84665f9 100644
Binary files a/locale/ar/LC_MESSAGES/django.mo and b/locale/ar/LC_MESSAGES/django.mo differ
diff --git a/locale/ar/LC_MESSAGES/django.po b/locale/ar/LC_MESSAGES/django.po
index 9248e31..8de27b9 100644
--- a/locale/ar/LC_MESSAGES/django.po
+++ b/locale/ar/LC_MESSAGES/django.po
@@ -22,8 +22,7 @@ msgid "Arabic"
 msgstr "العربية"
 
 #: core/admin.py:79
-#, fuzzy
-#| msgid "Shipment posted successfully!"
+
 msgid "Test message sent successfully!"
 msgstr "تم نشر الشحنة بنجاح!"
 
@@ -41,11 +40,11 @@ msgstr "تأكيد البريد الإلكتروني"
 
 #: core/forms.py:39
 msgid "This email is already in use."
-msgstr ""
+msgstr "هذا البريد الإلكتروني مستخدم بالفعل."
 
 #: core/forms.py:47
 msgid "This phone number is already in use."
-msgstr ""
+msgstr "رقم الهاتف هذا مستخدم بالفعل."
 
 #: core/forms.py:56
 msgid "The two email fields didn't match."
@@ -77,8 +76,7 @@ msgstr "الوزن/الحجم"
 
 #: core/forms.py:139 core/models.py:161
 #: core/templates/core/shipment_detail.html:25
-#, fuzzy
-#| msgid "Truck Type"
+
 msgid "Required Truck Type"
 msgstr "نوع الشاحنة"
 
@@ -98,53 +96,49 @@ msgstr "تعليقات"
 
 #: core/models.py:12
 msgid "Country Name"
-msgstr ""
+msgstr "اسم الدولة"
 
 #: core/models.py:13
 msgid "Country Code"
-msgstr ""
+msgstr "رمز الدولة"
 
 #: core/models.py:14
 msgid "Is Default"
-msgstr ""
+msgstr "افتراضي"
 
 #: core/models.py:17
-#, fuzzy
-#| msgid "Amount"
+
 msgid "Country"
 msgstr "المبلغ"
 
 #: core/models.py:18
 msgid "Countries"
-msgstr ""
+msgstr "الدول"
 
 #: core/models.py:25
 msgid "City Name"
-msgstr ""
+msgstr "اسم المدينة"
 
 #: core/models.py:28
 msgid "City"
-msgstr ""
+msgstr "المدينة"
 
 #: core/models.py:29
 msgid "Cities"
-msgstr ""
+msgstr "المدن"
 
 #: core/models.py:36
-#, fuzzy
-#| msgid "Model (EN)"
+
 msgid "Name (EN)"
 msgstr "الموديل (بالإنجليزية)"
 
 #: core/models.py:37
-#, fuzzy
-#| msgid "Model (AR)"
+
 msgid "Name (AR)"
 msgstr "الموديل"
 
 #: core/models.py:41
-#, fuzzy
-#| msgid "Truck Type"
+
 msgid "Truck Types"
 msgstr "نوع الشاحنة"
 
@@ -161,8 +155,7 @@ msgid "Administrator"
 msgstr "مدير النظام"
 
 #: core/models.py:90
-#, fuzzy
-#| msgid "Truck Type (EN)"
+
 msgid "Truck Type (New)"
 msgstr "نوع الشاحنة (بالإنجليزية)"
 
@@ -221,29 +214,25 @@ msgstr "صورة الشاحنة"
 
 #: core/models.py:110 core/templates/core/admin_dashboard.html:228
 #: core/templates/core/truck_register.html:141
-#, fuzzy
-#| msgid "Registration Front"
+
 msgid "Registration (Front Face)"
 msgstr "واجهة استمارة السيارة"
 
 #: core/models.py:111 core/templates/core/admin_dashboard.html:237
 #: core/templates/core/truck_register.html:151
-#, fuzzy
-#| msgid "Registration Back"
+
 msgid "Registration (Back Face)"
 msgstr "خلفية استمارة السيارة"
 
 #: core/models.py:112 core/templates/core/admin_dashboard.html:246
 #: core/templates/core/truck_register.html:118
-#, fuzzy
-#| msgid "Driver License"
+
 msgid "Driver License (Front Face)"
 msgstr "واجهة رخصة القيادة"
 
 #: core/models.py:113 core/templates/core/admin_dashboard.html:255
 #: core/templates/core/truck_register.html:128
-#, fuzzy
-#| msgid "Driver License"
+
 msgid "Driver License (Back Face)"
 msgstr "خلفية رخصة القيادة"
 
@@ -269,11 +258,10 @@ msgstr "ملغي"
 
 #: core/models.py:168
 msgid "Origin (Legacy)"
-msgstr ""
+msgstr "المصدر (قديم)"
 
 #: core/models.py:169
-#, fuzzy
-#| msgid "Destination"
+
 msgid "Destination (Legacy)"
 msgstr "الوجهة"
 
@@ -295,21 +283,19 @@ msgstr "مرفوض"
 
 #: core/models.py:221
 msgid "Wablas API Token"
-msgstr ""
+msgstr "رمز Wablas API"
 
 #: core/models.py:222
 msgid "Wablas Secret Key"
-msgstr ""
+msgstr "مفتاح Wablas السري"
 
 #: core/models.py:223
-#, fuzzy
-#| msgid "My Active Bids"
+
 msgid "Is Active"
 msgstr "عروضي النشطة"
 
 #: core/models.py:226 core/models.py:227 core/models.py:230
-#, fuzzy
-#| msgid "WhatsApp Integration"
+
 msgid "WhatsApp Configuration"
 msgstr "تكامل واتساب"
 
@@ -344,8 +330,7 @@ msgstr ""
 
 #: core/templates/admin/core/whatsapp_test.html:35
 #: core/templates/core/place_bid.html:104
-#, fuzzy
-#| msgid "Cancelled"
+
 msgid "Cancel"
 msgstr "ملغي"
 
@@ -491,8 +476,7 @@ msgstr "الموديل"
 
 #: core/templates/core/admin_dashboard.html:199
 #: core/templates/core/marketplace.html:29
-#, fuzzy
-#| msgid "Capacity:"
+
 msgid "Capacity"
 msgstr "الحمولة:"
 
@@ -506,8 +490,7 @@ msgid "Expiry Date"
 msgstr "تاريخ الانتهاء"
 
 #: core/templates/core/admin_dashboard.html:217
-#, fuzzy
-#| msgid "Truck Type"
+
 msgid "Truck Image"
 msgstr "صورة الشاحنة"
 
@@ -516,8 +499,7 @@ msgid "No image provided"
 msgstr "لم يتم توفير صورة"
 
 #: core/templates/core/admin_dashboard.html:225
-#, fuzzy
-#| msgid "Submit Registration"
+
 msgid "Documents & Registration"
 msgstr "المستندات والاستمارة"
 
@@ -694,8 +676,7 @@ msgid "Join Now"
 msgstr "انضم الآن"
 
 #: core/templates/core/marketplace.html:7
-#, fuzzy
-#| msgid "Marketplace"
+
 msgid "Truck Marketplace"
 msgstr "السوق"
 
@@ -706,41 +687,35 @@ msgid ""
 msgstr ""
 
 #: core/templates/core/marketplace.html:23
-#, fuzzy
-#| msgid "Not available"
+
 msgid "Available"
 msgstr "غير متوفر"
 
 #: core/templates/core/marketplace.html:24
 #: core/templates/core/place_bid.html:25
-#, fuzzy
-#| msgid "Plate No"
+
 msgid "Plate"
 msgstr "رقم اللوحة"
 
 #: core/templates/core/marketplace.html:35
 #: core/templates/core/place_bid.html:10
-#, fuzzy
-#| msgid "Start Shipping"
+
 msgid "Send Shipping Offer"
 msgstr "ابدأ الشحن"
 
 #: core/templates/core/marketplace.html:44
-#, fuzzy
-#| msgid "No approved trucks yet."
+
 msgid "No approved trucks are currently available."
 msgstr "لا توجد شاحنات معتمدة بعد."
 
 #: core/templates/core/place_bid.html:14
-#, fuzzy
-#| msgid "Select Truck"
+
 msgid "Target Truck"
 msgstr "اختر الشاحنة"
 
 #: core/templates/core/place_bid.html:34
 #: core/templates/core/shipment_detail.html:17
-#, fuzzy
-#| msgid "Edit Details"
+
 msgid "Shipment Details"
 msgstr "تعديل التفاصيل"
 
@@ -764,8 +739,7 @@ msgid "Pricing & Terms"
 msgstr ""
 
 #: core/templates/core/place_bid.html:102
-#, fuzzy
-#| msgid "I am a Truck Owner"
+
 msgid "Send Offer to Truck Owner"
 msgstr "أنا صاحب شاحنة"
 
@@ -783,32 +757,27 @@ msgid "Delivery Date"
 msgstr "تاريخ التسليم"
 
 #: core/templates/core/post_shipment.html:42
-#, fuzzy
-#| msgid "View Details"
+
 msgid "Route Details"
 msgstr "عرض التفاصيل"
 
 #: core/templates/core/post_shipment.html:47
-#, fuzzy
-#| msgid "Origin"
+
 msgid "Origin Country"
 msgstr "المصدر"
 
 #: core/templates/core/post_shipment.html:50
-#, fuzzy
-#| msgid "Origin"
+
 msgid "Origin City"
 msgstr "المصدر"
 
 #: core/templates/core/post_shipment.html:56
-#, fuzzy
-#| msgid "Destination"
+
 msgid "Destination Country"
 msgstr "الوجهة"
 
 #: core/templates/core/post_shipment.html:59
-#, fuzzy
-#| msgid "Destination"
+
 msgid "Destination City"
 msgstr "الوجهة"
 
@@ -817,8 +786,7 @@ msgid "Post Shipment"
 msgstr "نشر الشحنة"
 
 #: core/templates/core/shipment_detail.html:21
-#, fuzzy
-#| msgid "Weight/Volume"
+
 msgid "Weight / Volume"
 msgstr "الوزن/الحجم"
 
@@ -827,8 +795,7 @@ msgid "Any"
 msgstr ""
 
 #: core/templates/core/shipment_detail.html:45
-#, fuzzy
-#| msgid "View Details"
+
 msgid "Offer Details"
 msgstr "عرض التفاصيل"
 
@@ -864,14 +831,12 @@ msgstr "قبول"
 
 #: core/templates/core/shipment_detail.html:75
 #: core/templates/core/truck_owner_dashboard.html:60
-#, fuzzy
-#| msgid "Rejected"
+
 msgid "Reject"
 msgstr "مرفوض"
 
 #: core/templates/core/shipment_detail.html:78
-#, fuzzy
-#| msgid "Not available"
+
 msgid "No action available"
 msgstr "غير متوفر"
 
@@ -893,8 +858,7 @@ msgstr "معلومات الاتصال"
 
 #: core/templates/core/shipment_detail.html:116
 #: core/templates/core/truck_owner_dashboard.html:31
-#, fuzzy
-#| msgid "Shipper:"
+
 msgid "Shipper"
 msgstr "الشاحن:"
 
@@ -903,14 +867,12 @@ msgid "Truck Owner"
 msgstr "صاحب الشاحنة"
 
 #: core/templates/core/shipment_detail.html:142
-#, fuzzy
-#| msgid "WhatsApp Integration"
+
 msgid "WhatsApp Driver"
 msgstr "تكامل واتساب"
 
 #: core/templates/core/shipment_detail.html:146
-#, fuzzy
-#| msgid "WhatsApp Integration"
+
 msgid "WhatsApp Shipper"
 msgstr "تكامل واتساب"
 
@@ -919,8 +881,7 @@ msgid "Shipper Dashboard"
 msgstr "لوحة تحكم الشاحن"
 
 #: core/templates/core/shipper_dashboard.html:9
-#, fuzzy
-#| msgid "Manage your fleet and active bids."
+
 msgid "Manage your shipping offers and active shipments."
 msgstr "إدارة أسطولك وعروضك النشطة."
 
@@ -929,20 +890,17 @@ msgid "Add A Bid"
 msgstr ""
 
 #: core/templates/core/shipper_dashboard.html:16
-#, fuzzy
-#| msgid "My Approved Trucks"
+
 msgid "Browse Trucks"
 msgstr "شاحناتي المعتمدة"
 
 #: core/templates/core/shipper_dashboard.html:24
-#, fuzzy
-#| msgid "My Shipments"
+
 msgid "My Shipping Offers"
 msgstr "شحناتي"
 
 #: core/templates/core/shipper_dashboard.html:34
-#, fuzzy
-#| msgid "Date"
+
 msgid "Date Sent"
 msgstr "التاريخ"
 
@@ -955,8 +913,7 @@ msgid "You haven't sent any offers yet."
 msgstr ""
 
 #: core/templates/core/shipper_dashboard.html:84
-#, fuzzy
-#| msgid "Find Shipments"
+
 msgid "Active Shipments"
 msgstr "ابحث عن شحنات"
 
@@ -965,8 +922,7 @@ msgid "Description"
 msgstr "الوصف"
 
 #: core/templates/core/shipper_dashboard.html:95
-#, fuzzy
-#| msgid "Assigned Truck:"
+
 msgid "Assigned Truck"
 msgstr "الشاحنة المعينة:"
 
@@ -979,8 +935,7 @@ msgid "Track"
 msgstr ""
 
 #: core/templates/core/shipper_dashboard.html:123
-#, fuzzy
-#| msgid "Total Shipments"
+
 msgid "No active shipments."
 msgstr "إجمالي الشحنات"
 
@@ -989,14 +944,12 @@ msgid "Truck Owner Dashboard"
 msgstr "لوحة تحكم صاحب الشاحنة"
 
 #: core/templates/core/truck_owner_dashboard.html:10
-#, fuzzy
-#| msgid "Manage your fleet and active bids."
+
 msgid "Manage your fleet and incoming shipping offers."
 msgstr "إدارة أسطولك وعروضك النشطة."
 
 #: core/templates/core/truck_owner_dashboard.html:14
-#, fuzzy
-#| msgid "Find a Truck"
+
 msgid "Add New Truck"
 msgstr "ابحث عن شاحنة"
 
@@ -1009,8 +962,7 @@ msgid "View Details"
 msgstr "عرض التفاصيل"
 
 #: core/templates/core/truck_owner_dashboard.html:71
-#, fuzzy
-#| msgid "No bids received yet."
+
 msgid "No offers received yet."
 msgstr "لم يتم استلام عروض بعد."
 
@@ -1036,8 +988,7 @@ msgid "Edit Truck"
 msgstr "تعديل الشاحنة"
 
 #: core/templates/core/truck_owner_dashboard.html:118
-#, fuzzy
-#| msgid "Waiting for Admin Review"
+
 msgid "Waiting for admin approval..."
 msgstr "في انتظار مراجعة المسؤول"
 
@@ -1127,8 +1078,7 @@ msgid "Already have an account?"
 msgstr "لديك حساب بالفعل؟"
 
 #: core/templates/registration/verify_otp.html:10
-#, fuzzy
-#| msgid "Create your account"
+
 msgid "Verify Your Account"
 msgstr "التحقق من حسابك"
 
@@ -1199,8 +1149,7 @@ msgid "Invalid username or password."
 msgstr ""
 
 #: core/views.py:143
-#, fuzzy
-#| msgid "Bid placed successfully!"
+
 msgid "Logged in successfully!"
 msgstr "تم تقديم العرض بنجاح!"
 
@@ -1255,14 +1204,12 @@ msgstr ""
 "المبلغ: %(amount)s"
 
 #: core/views.py:324
-#, fuzzy
-#| msgid "Shipment posted successfully!"
+
 msgid "Offer sent successfully!"
 msgstr "تم نشر الشحنة بنجاح!"
 
 #: core/views.py:327
-#, fuzzy
-#| msgid "Error placing bid. Please check the form."
+
 msgid "Error sending offer. Please check the form."
 msgstr "خطأ في تقديم العرض. يرجى التحقق من النموذج."
 
@@ -1277,14 +1224,12 @@ msgid ""
 msgstr "تم قبول عرضك للشاحنة %(plate)s (%(origin)s إلى %(dest)s)!"
 
 #: core/views.py:367
-#, fuzzy
-#| msgid "Bid accepted! Shipment is now in progress."
+
 msgid "Offer accepted! Shipment is now in progress."
 msgstr "تم قبول العرض! الشحنة قيد التنفيذ الآن."
 
 #: core/views.py:379
-#, fuzzy
-#| msgid "Rejected"
+
 msgid "Offer rejected."
 msgstr "مرفوض"