diff --git a/core/templates/core/truck_register.html b/core/templates/core/truck_register.html
index 3e8f942..a8ab514 100644
--- a/core/templates/core/truck_register.html
+++ b/core/templates/core/truck_register.html
@@ -84,19 +84,19 @@
                             </div>
                             
                             <div class="col-md-6">
-                                <h5 class="mb-3 text-success">{% trans "التفاصيل باللغة العربية" %}</h5>
+                                <h5 class="mb-3 text-success">{% trans "Arabic Details" %}</h5>
                                 <div class="mb-3">
-                                    <label class="form-label">{% trans "الموديل" %}</label>
+                                    <label class="form-label">{% trans "Model (AR)" %}</label>
                                     {{ form.model_ar }}
                                     {{ form.model_ar.errors }}
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">{% trans "الحمولة" %}</label>
+                                    <label class="form-label">{% trans "Load Capacity (AR)" %}</label>
                                     {{ form.load_capacity_ar }}
                                     {{ form.load_capacity_ar.errors }}
                                 </div>
                                 <div class="mb-3">
-                                    <label class="form-label">{% trans "اللون" %}</label>
+                                    <label class="form-label">{% trans "Color (AR)" %}</label>
                                     {{ form.color_ar }}
                                     {{ form.color_ar.errors }}
                                 </div>
diff --git a/locale/ar/LC_MESSAGES/django.mo b/locale/ar/LC_MESSAGES/django.mo
index 98ad9ea..075d78e 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 efb1d72..9d94438 100644
--- a/locale/ar/LC_MESSAGES/django.po
+++ b/locale/ar/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-24 03:44+0000\n"
+"POT-Creation-Date: 2026-01-24 08:46+0000\n"
 "PO-Revision-Date: 2026-01-23 10:45+0000\n"
 "Last-Translator: Gemini\n"
 "Language-Team: Arabic\n"
@@ -13,43 +13,128 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3  "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: config/settings.py:196
+#: config/settings.py:198
 msgid "English"
 msgstr "الإنجليزية"
 
-#: config/settings.py:197
+#: config/settings.py:199
 msgid "Arabic"
 msgstr "العربية"
 
-#: core/admin.py:79
-msgid "Test message sent successfully!"
-msgstr "تم نشر الشحنة بنجاح!"
+#: core/admin.py:37
+msgid "No Plan"
+msgstr "بدون خطة"
 
-#: core/admin.py:81
-msgid "Failed to send test message. Check your API credentials and logs."
-msgstr ""
+#: core/admin.py:40
+msgid "Expired"
+msgstr "منتهي"
 
-#: core/admin.py:86
-msgid "Send Test WhatsApp Message"
-msgstr ""
+#: core/admin.py:47
+#, fuzzy
+#| msgid "Expired"
+msgid "No Expiry"
+msgstr "منتهي"
 
-#: core/admin.py:96 core/templates/core/shipment_detail.html:134
-msgid "Contact Information"
-msgstr "معلومات الاتصال"
+#: core/admin.py:51
+msgid "Expiring soon"
+msgstr "تنتهي قريبا"
 
-#: core/admin.py:97
-msgid "Legal"
-msgstr "قانوني"
+#: core/admin.py:51
+msgid "days"
+msgstr "أيام"
 
-#: core/admin.py:98
+#: core/admin.py:53 core/templates/core/shipper_dashboard.html:52
+#: core/templates/core/truck_owner_dashboard.html:48
+msgid "Active"
+msgstr "نشط"
+
+#: core/admin.py:55 core/admin.py:170
 msgid "Subscription Status"
 msgstr "حالة الاشتراك"
 
+#: core/admin.py:68
+#, fuzzy
+#| msgid "Truck Picture"
+msgid "Truck Picture Preview"
+msgstr "صورة الشاحنة"
+
+#: core/admin.py:78
+msgid "View PDF Document"
+msgstr "عرض مستند PDF"
+
+#: core/admin.py:79
+#, fuzzy
+#| msgid "View Details"
+msgid "View File"
+msgstr "عرض التفاصيل"
+
+#: core/admin.py:83
+#, fuzzy
+#| msgid "Registration (Front Face)"
+msgid "Registration Front Preview"
+msgstr "واجهة استمارة السيارة"
+
+#: core/admin.py:87
+#, fuzzy
+#| msgid "Registration (Back Face)"
+msgid "Registration Back Preview"
+msgstr "خلفية استمارة السيارة"
+
+#: core/admin.py:91
+#, fuzzy
+#| msgid "Driver License (Front Face)"
+msgid "Driver License Front Preview"
+msgstr "واجهة رخصة القيادة"
+
+#: core/admin.py:95
+#, fuzzy
+#| msgid "Driver License (Back Face)"
+msgid "Driver License Back Preview"
+msgstr "خلفية رخصة القيادة"
+
 #: core/admin.py:99
+#, fuzzy
+#| msgid "Details"
+msgid "Details (EN)"
+msgstr "التفاصيل"
+
+#: core/admin.py:100
+#, fuzzy
+#| msgid "Details"
+msgid "Details (AR)"
+msgstr "التفاصيل"
+
+#: core/admin.py:101
+#, fuzzy
+#| msgid "Secure Documentation"
+msgid "Pictures & Documents"
+msgstr "توثيق آمن"
+
+#: core/admin.py:151
+msgid "Test message sent successfully!"
+msgstr "تم نشر الشحنة بنجاح!"
+
+#: core/admin.py:153
+msgid "Failed to send test message. Check your API credentials and logs."
+msgstr "فشل إرسال رسالة الاختبار. تحقق من بيانات اعتماد واجهة برمجة التطبيقات والسجلات."
+
+#: core/admin.py:158
+msgid "Send Test WhatsApp Message"
+msgstr "إرسال رسالة واتساب تجريبية"
+
+#: core/admin.py:168 core/templates/core/shipment_detail.html:134
+msgid "Contact Information"
+msgstr "معلومات الاتصال"
+
+#: core/admin.py:169
+msgid "Legal"
+msgstr "قانوني"
+
+#: core/admin.py:171
 msgid "Shipper Subscription Fees"
 msgstr "رسوم اشتراك الشاحن"
 
-#: core/admin.py:100
+#: core/admin.py:172
 msgid "Truck Owner Subscription Fees"
 msgstr "رسوم اشتراك صاحب الشاحنة"
 
@@ -57,17 +142,15 @@ msgstr "رسوم اشتراك صاحب الشاحنة"
 msgid "Confirm Email"
 msgstr "تأكيد البريد الإلكتروني"
 
-#: core/forms.py:13 core/models.py:57
-#: core/templates/registration/register.html:112
+#: core/forms.py:13 core/models.py:61
 msgid "Monthly"
 msgstr "شهري"
 
-#: core/forms.py:13 core/models.py:58
-#: core/templates/registration/register.html:113
+#: core/forms.py:13 core/models.py:62
 msgid "Annual"
 msgstr "سنوي"
 
-#: core/forms.py:13
+#: core/forms.py:13 core/forms.py:167
 msgid "Subscription Plan"
 msgstr "خطة الاشتراك"
 
@@ -75,11 +158,13 @@ msgstr "خطة الاشتراك"
 msgid "I have read and agree to the Terms and Conditions and Privacy Policy"
 msgstr "لقد قرأت وأوافق على الشروط والأحكام وسياسة الخصوصية"
 
-#: core/forms.py:38
+#: core/forms.py:38 core/forms.py:165
+#: core/templates/registration/register.html:109
 msgid "Monthly Plan"
 msgstr "الخطة الشهرية"
 
-#: core/forms.py:39
+#: core/forms.py:39 core/forms.py:165
+#: core/templates/registration/register.html:110
 msgid "Annual Plan"
 msgstr "الخطة السنوية"
 
@@ -99,8 +184,8 @@ msgstr "حقلا البريد الإلكتروني غير متطابقين."
 msgid "OTP Code"
 msgstr "رمز التحقق"
 
-#: core/forms.py:104 core/forms.py:128 core/models.py:40
-#: core/templates/core/post_shipment.html:49
+#: core/forms.py:104 core/forms.py:128 core/models.py:44
+#: core/templates/core/post_shipment.html:65
 #: core/templates/core/truck_register.html:58
 msgid "Truck Type"
 msgstr "نوع الشاحنة"
@@ -109,374 +194,503 @@ msgstr "نوع الشاحنة"
 msgid "You must have an approved truck to place a bid."
 msgstr "يجب أن يكون لديك شاحنة معتمدة لتقديم عرض."
 
-#: core/forms.py:150 core/models.py:165
-#: core/templates/core/post_shipment.html:37
+#: core/forms.py:150 core/models.py:230
+#: core/templates/core/post_shipment.html:53
 msgid "Goods Description"
 msgstr "وصف البضائع"
 
-#: core/forms.py:151 core/models.py:166
-#: core/templates/core/post_shipment.html:44
+#: core/forms.py:151 core/models.py:231
+#: core/templates/core/post_shipment.html:60
 msgid "Weight/Volume"
 msgstr "الوزن/الحجم"
 
-#: core/forms.py:152 core/models.py:169
+#: core/forms.py:152 core/models.py:234
 #: core/templates/core/shipment_detail.html:45
 msgid "Required Truck Type"
 msgstr "نوع الشاحنة"
 
-#: core/forms.py:159 core/models.py:179
+#: core/forms.py:159 core/models.py:244
 #: core/templates/core/shipment_detail.html:55
 msgid "Requested Delivery Date"
 msgstr "تاريخ التسليم المطلوب"
 
-#: core/forms.py:160 core/models.py:210
-#: core/templates/core/truck_owner_dashboard.html:45
+#: core/forms.py:160 core/models.py:275
+#: core/templates/core/truck_owner_dashboard.html:73
 msgid "Offer Amount"
 msgstr "قيمة العرض"
 
-#: core/forms.py:161 core/models.py:211
+#: core/forms.py:161 core/models.py:276
 msgid "Comments"
 msgstr "تعليقات"
 
-#: core/models.py:12
+#: core/forms.py:197 core/templates/core/contact.html:62
+#| msgid "Country Name"
+msgid "Your Name"
+msgstr "اسم الدولة"
+
+#: core/forms.py:198
+#, fuzzy
+#| msgid "Confirm Email"
+msgid "Your Email"
+msgstr "تأكيد البريد الإلكتروني"
+
+#: core/forms.py:199 core/models.py:482 core/templates/core/contact.html:76
+#| msgid "Reject"
+msgid "Subject"
+msgstr "رفض"
+
+#: core/forms.py:200
+#, fuzzy
+#| msgid "Message"
+msgid "Your Message"
+msgstr "الرسالة"
+
+#: core/management/commands/check_subscriptions.py:28
+#, python-format
+msgid ""
+"Hello %(user)s, your MASAR CARGO subscription (%(plan)s) will expire in "
+"%(days)s days on %(date)s. Please renew to avoid account suspension."
+msgstr ""
+
+#: core/management/commands/check_subscriptions.py:49
+#, python-format
+msgid ""
+"Hello %(user)s, your MASAR CARGO subscription has EXPIRED today. Your "
+"account is now suspended. Please contact support to renew."
+msgstr ""
+
+#: core/models.py:16
 msgid "Country Name"
 msgstr "اسم الدولة"
 
-#: core/models.py:13
+#: core/models.py:17
 msgid "Country Code"
 msgstr "رمز الدولة"
 
-#: core/models.py:14
+#: core/models.py:18
 msgid "Is Default"
 msgstr "افتراضي"
 
-#: core/models.py:17
+#: core/models.py:21
 msgid "Country"
 msgstr "المبلغ"
 
-#: core/models.py:18
+#: core/models.py:22
 msgid "Countries"
 msgstr "الدول"
 
-#: core/models.py:25
+#: core/models.py:29
 msgid "City Name"
 msgstr "اسم المدينة"
 
-#: core/models.py:28
+#: core/models.py:32
 msgid "City"
 msgstr "المدينة"
 
-#: core/models.py:29
+#: core/models.py:33
 msgid "Cities"
 msgstr "المدن"
 
-#: core/models.py:36
+#: core/models.py:40
 msgid "Name (EN)"
 msgstr "الموديل (بالإنجليزية)"
 
-#: core/models.py:37
+#: core/models.py:41
 msgid "Name (AR)"
 msgstr "الموديل"
 
-#: core/models.py:41
+#: core/models.py:45
 msgid "Truck Types"
 msgstr "نوع الشاحنة"
 
-#: core/models.py:50
+#: core/models.py:54
 msgid "Shipper (Need Goods Moved)"
 msgstr "شاحن (بحاجة لنقل بضائع)"
 
-#: core/models.py:51
+#: core/models.py:55
 msgid "Truck Owner (Service Provider)"
 msgstr "صاحب شاحنة (مزود خدمة)"
 
-#: core/models.py:52
+#: core/models.py:56
 msgid "Administrator"
 msgstr "مدير النظام"
 
-#: core/models.py:59 core/templates/core/shipper_dashboard.html:127
+#: core/models.py:63 core/templates/core/shipper_dashboard.html:157
 msgid "None"
 msgstr "لا يوجد"
 
-#: core/models.py:98
+#: core/models.py:114
 msgid "Truck Type (New)"
 msgstr "نوع الشاحنة (بالإنجليزية)"
 
-#: core/models.py:101
+#: core/models.py:117
 msgid "Truck Type (EN)"
 msgstr "نوع الشاحنة (بالإنجليزية)"
 
-#: core/models.py:102
+#: core/models.py:118
 msgid "Model (EN)"
 msgstr "الموديل (بالإنجليزية)"
 
-#: core/models.py:103
+#: core/models.py:119
 msgid "Load Capacity (EN)"
 msgstr "الحمولة (بالإنجليزية)"
 
-#: core/models.py:104
+#: core/models.py:120
 msgid "Color (EN)"
 msgstr "اللون (بالإنجليزية)"
 
-#: core/models.py:107
+#: core/models.py:123
 msgid "Truck Type (AR)"
 msgstr "نوع الشاحنة"
 
-#: core/models.py:108
+#: core/models.py:124
 msgid "Model (AR)"
 msgstr "الموديل"
 
-#: core/models.py:109
+#: core/models.py:125
 msgid "Load Capacity (AR)"
 msgstr "الحمولة"
 
-#: core/models.py:110
+#: core/models.py:126
 msgid "Color (AR)"
 msgstr "اللون"
 
-#: core/models.py:112 core/templates/core/admin_dashboard.html:204
+#: core/models.py:128 core/templates/core/admin_dashboard.html:222
 #: core/templates/core/marketplace.html:48
 #: core/templates/core/truck_register.html:110
 msgid "Year"
 msgstr "السنة"
 
-#: core/models.py:113 core/templates/core/admin_dashboard.html:76
-#: core/templates/core/admin_dashboard.html:135
-#: core/templates/core/admin_dashboard.html:208
+#: core/models.py:129 core/templates/core/admin_dashboard.html:94
+#: core/templates/core/admin_dashboard.html:153
+#: core/templates/core/admin_dashboard.html:226
 #: core/templates/core/truck_register.html:115
 msgid "Plate No"
 msgstr "رقم اللوحة"
 
-#: core/models.py:114 core/templates/core/truck_register.html:120
+#: core/models.py:130 core/templates/core/truck_register.html:120
 msgid "Registration Expiry Date"
 msgstr "تاريخ انتهاء الاستمارة"
 
-#: core/models.py:117 core/templates/core/truck_register.html:131
+#: core/models.py:133 core/templates/core/truck_register.html:132
 msgid "Truck Picture"
 msgstr "صورة الشاحنة"
 
-#: core/models.py:118 core/templates/core/admin_dashboard.html:241
-#: core/templates/core/truck_register.html:167
+#: core/models.py:134 core/templates/core/admin_dashboard.html:259
+#: core/templates/core/truck_register.html:184
 msgid "Registration (Front Face)"
 msgstr "واجهة استمارة السيارة"
 
-#: core/models.py:119 core/templates/core/admin_dashboard.html:250
-#: core/templates/core/truck_register.html:177
+#: core/models.py:135 core/templates/core/admin_dashboard.html:268
+#: core/templates/core/truck_register.html:202
 msgid "Registration (Back Face)"
 msgstr "خلفية استمارة السيارة"
 
-#: core/models.py:120 core/templates/core/admin_dashboard.html:259
-#: core/templates/core/truck_register.html:144
+#: core/models.py:136 core/templates/core/admin_dashboard.html:277
+#: core/templates/core/truck_register.html:145
 msgid "Driver License (Front Face)"
 msgstr "واجهة رخصة القيادة"
 
-#: core/models.py:121 core/templates/core/admin_dashboard.html:268
-#: core/templates/core/truck_register.html:154
+#: core/models.py:137 core/templates/core/admin_dashboard.html:286
+#: core/templates/core/truck_register.html:163
 msgid "Driver License (Back Face)"
 msgstr "خلفية رخصة القيادة"
 
-#: core/models.py:123
+#: core/models.py:139
 msgid "Is Approved"
 msgstr "معتمد"
 
-#: core/models.py:159
+#: core/models.py:224
 msgid "Open for Bids"
 msgstr "مفتوح للعروض"
 
-#: core/models.py:160
+#: core/models.py:225
 msgid "In Progress"
 msgstr "قيد التنفيذ"
 
-#: core/models.py:161
+#: core/models.py:226 core/models.py:445
 msgid "Completed"
 msgstr "مكتمل"
 
-#: core/models.py:162
+#: core/models.py:227 core/models.py:447
 msgid "Cancelled"
 msgstr "ملغي"
 
-#: core/models.py:176
+#: core/models.py:241
 msgid "Origin (Legacy)"
 msgstr "المصدر (قديم)"
 
-#: core/models.py:177
+#: core/models.py:242
 msgid "Destination (Legacy)"
 msgstr "الوجهة"
 
-#: core/models.py:203 core/templates/core/shipper_dashboard.html:68
-#: core/templates/core/truck_owner_dashboard.html:62
-#: core/templates/core/truck_owner_dashboard.html:128
+#: core/models.py:268 core/models.py:444
+#: core/templates/core/shipper_dashboard.html:98
+#: core/templates/core/truck_owner_dashboard.html:90
+#: core/templates/core/truck_owner_dashboard.html:156
 msgid "Pending"
 msgstr "قيد الانتظار"
 
-#: core/models.py:204 core/templates/core/shipper_dashboard.html:70
-#: core/templates/core/truck_owner_dashboard.html:64
+#: core/models.py:269 core/templates/core/shipper_dashboard.html:100
+#: core/templates/core/truck_owner_dashboard.html:92
 msgid "Accepted"
 msgstr "مقبول"
 
-#: core/models.py:205 core/templates/core/shipper_dashboard.html:72
-#: core/templates/core/truck_owner_dashboard.html:66
+#: core/models.py:270 core/templates/core/shipper_dashboard.html:102
+#: core/templates/core/truck_owner_dashboard.html:94
 msgid "Rejected"
 msgstr "مرفوض"
 
-#: core/models.py:229
+#: core/models.py:294
 msgid "Wablas API Token"
 msgstr "رمز Wablas API"
 
-#: core/models.py:230
+#: core/models.py:295
 msgid "Wablas Secret Key"
 msgstr "مفتاح Wablas السري"
 
-#: core/models.py:231 core/models.py:275 core/models.py:313
+#: core/models.py:296 core/models.py:341 core/models.py:379
 msgid "Is Active"
 msgstr "نشط"
 
-#: core/models.py:234 core/models.py:235 core/models.py:238
+#: core/models.py:299 core/models.py:300 core/models.py:303
 msgid "WhatsApp Configuration"
 msgstr "تكامل واتساب"
 
-#: core/models.py:241
+#: core/models.py:306
 msgid "App Name"
 msgstr "اسم التطبيق"
 
-#: core/models.py:242
+#: core/models.py:307
 msgid "Logo"
 msgstr "الشعار"
 
-#: core/models.py:243
+#: core/models.py:308
 msgid "Slogan"
 msgstr "الشعار اللفظي"
 
-#: core/models.py:244
+#: core/models.py:309
 msgid "Registration Number"
 msgstr "رقم السجل التجاري"
 
-#: core/models.py:245
+#: core/models.py:310
 msgid "Tax Number"
 msgstr "الرقم الضريبي"
 
-#: core/models.py:246
+#: core/models.py:311
 msgid "Contact Phone"
 msgstr "هاتف التواصل"
 
-#: core/models.py:247
+#: core/models.py:312
 msgid "Contact Email"
 msgstr "بريد التواصل"
 
-#: core/models.py:248
+#: core/models.py:313
 msgid "Contact Address"
 msgstr "عنوان التواصل"
 
-#: core/models.py:249 core/templates/base.html:158
-#: core/templates/registration/register.html:67 core/views.py:425
+#: core/models.py:314 core/templates/base.html:161
+#: core/templates/registration/register.html:67 core/views.py:461
 msgid "Terms of Service"
 msgstr "شروط الخدمة"
 
-#: core/models.py:250 core/templates/base.html:157
-#: core/templates/registration/register.html:69 core/views.py:415
+#: core/models.py:315 core/templates/base.html:160
+#: core/templates/registration/register.html:69 core/views.py:451
 msgid "Privacy Policy"
 msgstr "سياسة الخصوصية"
 
-#: core/models.py:251
+#: core/models.py:316
 msgid "Enable Subscription Fee"
 msgstr "تفعيل رسوم الاشتراك"
 
-#: core/models.py:254
+#: core/models.py:317
+msgid "Enable Thawani Payment"
+msgstr "تفعيل دفع ثواني"
+
+#: core/models.py:320
 msgid "Shipper Monthly Fee"
 msgstr "رسوم الشاحن الشهرية"
 
-#: core/models.py:255
+#: core/models.py:321
 msgid "Shipper Annual Fee"
 msgstr "رسوم الشاحن السنوية"
 
-#: core/models.py:258
+#: core/models.py:324
 msgid "Truck Owner Monthly Fee"
 msgstr "رسوم صاحب الشاحنة الشهرية"
 
-#: core/models.py:259
+#: core/models.py:325
 msgid "Truck Owner Annual Fee"
 msgstr "رسوم صاحب الشاحنة السنوية"
 
-#: core/models.py:262
+#: core/models.py:328
 msgid "App Setting"
 msgstr "إعداد التطبيق"
 
-#: core/models.py:263
+#: core/models.py:329
 msgid "App Settings"
 msgstr "إعدادات التطبيق"
 
-#: core/models.py:269 core/models.py:305
+#: core/models.py:335 core/models.py:371
 msgid "Title (EN)"
 msgstr "العنوان (بالإنجليزية)"
 
-#: core/models.py:270 core/models.py:306
+#: core/models.py:336 core/models.py:372
 msgid "Title (AR)"
 msgstr "العنوان (بالعربية)"
 
-#: core/models.py:271 core/models.py:307
+#: core/models.py:337 core/models.py:373
 msgid "Subtitle (EN)"
 msgstr "العنوان الفرعي (بالإنجليزية)"
 
-#: core/models.py:272 core/models.py:308
+#: core/models.py:338 core/models.py:374
 msgid "Subtitle (AR)"
 msgstr "العنوان الفرعي (بالعربية)"
 
-#: core/models.py:273
+#: core/models.py:339
 msgid "Banner Image"
 msgstr "صورة البانر"
 
-#: core/models.py:274
+#: core/models.py:340
 msgid "Link URL"
 msgstr "رابط"
 
-#: core/models.py:274
+#: core/models.py:340
 msgid "Internal or external URL"
 msgstr "رابط داخلي أو خارجي"
 
-#: core/models.py:276 core/models.py:312
+#: core/models.py:342 core/models.py:378
 msgid "Order"
 msgstr "الترتيب"
 
-#: core/models.py:280
+#: core/models.py:346
 msgid "Banner"
 msgstr "بانر"
 
-#: core/models.py:281
+#: core/models.py:347
 msgid "Banners"
 msgstr "البانرات"
 
-#: core/models.py:301
+#: core/models.py:367
 msgid "Simple Text & Image"
 msgstr "نص بسيط وصورة"
 
-#: core/models.py:302
+#: core/models.py:368
 msgid "Features List"
 msgstr "قائمة المميزات"
 
-#: core/models.py:303
+#: core/models.py:369
 msgid "Call to Action"
 msgstr "دعوة لاتخاذ إجراء"
 
-#: core/models.py:309
+#: core/models.py:375
 msgid "Content (EN)"
 msgstr "المحتوى (بالإنجليزية)"
 
-#: core/models.py:310
+#: core/models.py:376
 msgid "Content (AR)"
 msgstr "المحتوى (بالعربية)"
 
-#: core/models.py:311
+#: core/models.py:377
 msgid "Image"
 msgstr "صورة"
 
-#: core/models.py:318
+#: core/models.py:384
 msgid "Home Section"
 msgstr "قسم في الصفحة الرئيسية"
 
-#: core/models.py:319
+#: core/models.py:385
 msgid "Home Sections"
 msgstr "أقسام الصفحة الرئيسية"
 
+#: core/models.py:440 core/templates/core/financial_history.html:37
+msgid "Payment"
+msgstr "دفع"
+
+#: core/models.py:441 core/templates/core/financial_history.html:39
+msgid "Refund"
+msgstr "استرداد"
+
+#: core/models.py:446
+msgid "Failed"
+msgstr "فشل"
+
+#: core/models.py:450 core/templates/core/admin_financials.html:30
+#: core/templates/core/financial_history.html:24
+#: core/templates/core/shipment_detail.html:73
+#: core/templates/core/shipper_dashboard.html:76
+msgid "Amount"
+msgstr "المبلغ"
+
+#: core/models.py:453 core/templates/core/financial_history.html:22
+#: core/templates/core/receipt.html:48
+#: core/templates/core/shipper_dashboard.html:134
+msgid "Description"
+msgstr "الوصف"
+
+#: core/models.py:454 core/templates/core/receipt.html:39
+msgid "Payment Method"
+msgstr "طريقة الدفع"
+
+#: core/models.py:455
+#, fuzzy
+#| msgid "Phone Number"
+msgid "Reference Number"
+msgstr "رقم الهاتف"
+
+#: core/models.py:456
+#, fuzzy
+#| msgid "Registration Number"
+msgid "Receipt Number"
+msgstr "رقم السجل التجاري"
+
+#: core/models.py:457
+msgid "Session ID"
+msgstr "معرف الجلسة"
+
+#: core/models.py:458
+#, fuzzy
+#| msgid "Status"
+msgid "Payment Status"
+msgstr "الحالة"
+
+#: core/models.py:464
+msgid "Transaction"
+msgstr "معاملة"
+
+#: core/models.py:465
+#, fuzzy
+#| msgid "Actions"
+msgid "Transactions"
+msgstr "الإجراءات"
+
+#: core/models.py:480
+#, fuzzy
+#| msgid "App Name"
+msgid "Name"
+msgstr "اسم التطبيق"
+
+#: core/models.py:481 core/templates/core/contact.html:36
+msgid "Email"
+msgstr "البريد الإلكتروني"
+
+#: core/models.py:483 core/templates/admin/core/whatsapp_test.html:28
+#: core/templates/core/contact.html:83
+msgid "Message"
+msgstr "الرسالة"
+
+#: core/models.py:488
+#, fuzzy
+#| msgid "Contact Address"
+msgid "Contact Message"
+msgstr "عنوان التواصل"
+
+#: core/models.py:489
+#, fuzzy
+#| msgid "Contact Address"
+msgid "Contact Messages"
+msgstr "عنوان التواصل"
+
 #: core/templates/admin/core/whatsapp_test.html:6 core/templates/base.html:57
 #: core/templates/core/admin_dashboard.html:11
 #: core/templates/core/article_detail.html:11
@@ -502,20 +716,17 @@ msgstr "رقم هاتف التجربة"
 msgid "Enter the phone number in international format without the + sign."
 msgstr "أدخل رقم الهاتف بالتنسيق الدولي بدون علامة +"
 
-#: core/templates/admin/core/whatsapp_test.html:28
-msgid "Message"
-msgstr "الرسالة"
-
 #: core/templates/admin/core/whatsapp_test.html:29
 msgid "This is a test message from your Logistics App."
 msgstr "هذه رسالة تجريبية من تطبيق اللوجستيات الخاص بك."
 
 #: core/templates/admin/core/whatsapp_test.html:34
+#: core/templates/core/contact.html:91
 msgid "Send Message"
 msgstr "إرسال الرسالة"
 
 #: core/templates/admin/core/whatsapp_test.html:35
-#: core/templates/core/place_bid.html:125
+#: core/templates/core/place_bid.html:147
 msgid "Cancel"
 msgstr "إلغاء"
 
@@ -534,45 +745,46 @@ msgstr "لوحة التحكم"
 msgid "Marketplace"
 msgstr "السوق"
 
-#: core/templates/base.html:102
+#: core/templates/base.html:70 core/templates/base.html:166
+msgid "Contact"
+msgstr "اتصال"
+
+#: core/templates/base.html:105
 msgid "Admin Panel"
 msgstr "لوحة التحكم"
 
-#: core/templates/base.html:108
+#: core/templates/base.html:111
+#: core/templates/core/subscription_expired.html:73
 msgid "Logout"
 msgstr "تسجيل الخروج"
 
-#: core/templates/base.html:115 core/templates/registration/login.html:16
+#: core/templates/base.html:118 core/templates/registration/login.html:16
 #: core/templates/registration/login.html:27
 #: core/templates/registration/register.html:96
 msgid "Login"
 msgstr "تسجيل الدخول"
 
-#: core/templates/base.html:118 core/templates/core/index.html:109
+#: core/templates/base.html:121 core/templates/core/index.html:109
 msgid "Get Started"
 msgstr "ابدأ الآن"
 
-#: core/templates/base.html:151
+#: core/templates/base.html:154
 msgid "Empowering logistics with smart technology. Locally and abroad."
 msgstr "تمكين الخدمات اللوجستية بتقنيات ذكية. محلياً ودولياً."
 
-#: core/templates/base.html:155
+#: core/templates/base.html:158
 msgid "Quick Links"
 msgstr "روابط سريعة"
 
-#: core/templates/base.html:159
+#: core/templates/base.html:162
 msgid "Contact Us"
 msgstr "اتصل بنا"
 
-#: core/templates/base.html:163
-msgid "Contact"
-msgstr "اتصال"
-
-#: core/templates/base.html:173
+#: core/templates/base.html:176
 msgid "CR No:"
 msgstr "رقم السجل التجاري:"
 
-#: core/templates/base.html:176
+#: core/templates/base.html:179
 msgid "VAT No:"
 msgstr "الرقم الضريبي:"
 
@@ -590,156 +802,307 @@ msgid "System overview and management"
 msgstr "نظرة عامة على النظام وإدارته"
 
 #: core/templates/core/admin_dashboard.html:28
+#, fuzzy
+#| msgid "Enable Subscription Fee"
+msgid "Manage Subscriptions"
+msgstr "تفعيل رسوم الاشتراك"
+
+#: core/templates/core/admin_dashboard.html:31
 msgid "Go to Django Admin"
 msgstr "اذهب إلى إدارة دجانغو"
 
-#: core/templates/core/admin_dashboard.html:38
+#: core/templates/core/admin_dashboard.html:42
 msgid "Total Users"
 msgstr "إجمالي المستخدمين"
 
-#: core/templates/core/admin_dashboard.html:45
-msgid "Registered Trucks"
-msgstr "الشاحنات المسجلة"
+#: core/templates/core/admin_dashboard.html:49
+#, fuzzy
+#| msgid "Truck"
+msgid "Trucks"
+msgstr "الشاحنة"
 
-#: core/templates/core/admin_dashboard.html:52
-msgid "Total Shipments"
+#: core/templates/core/admin_dashboard.html:56
+#, fuzzy
+#| msgid "Total Shipments"
+msgid "Shipments"
 msgstr "إجمالي الشحنات"
 
-#: core/templates/core/admin_dashboard.html:59
-msgid "Active Bids"
+#: core/templates/core/admin_dashboard.html:63
+msgid "Bids"
+msgstr "العروض"
+
+#: core/templates/core/admin_dashboard.html:70
+#, fuzzy
+#| msgid "Active Bids"
+msgid "Active Subs"
 msgstr "العروض النشطة"
 
-#: core/templates/core/admin_dashboard.html:67
+#: core/templates/core/admin_dashboard.html:77
+#, fuzzy
+#| msgid "Expired"
+msgid "Expired Subs"
+msgstr "منتهي"
+
+#: core/templates/core/admin_dashboard.html:85
 msgid "Pending Truck Approvals"
 msgstr "طلبات اعتماد الشاحنات المعلقة"
 
-#: core/templates/core/admin_dashboard.html:74
-#: core/templates/core/admin_dashboard.html:133
-#: core/templates/core/admin_dashboard.html:224
+#: core/templates/core/admin_dashboard.html:92
+#: core/templates/core/admin_dashboard.html:151
+#: core/templates/core/admin_dashboard.html:242
 #: core/templates/core/marketplace.html:52
 #: core/templates/core/place_bid.html:46
 msgid "Owner"
 msgstr "المالك"
 
-#: core/templates/core/admin_dashboard.html:75
-#: core/templates/core/admin_dashboard.html:134
-#: core/templates/core/admin_dashboard.html:187
+#: core/templates/core/admin_dashboard.html:93
+#: core/templates/core/admin_dashboard.html:152
+#: core/templates/core/admin_dashboard.html:205
 msgid "Truck Details"
 msgstr "تفاصيل الشاحنة"
 
-#: core/templates/core/admin_dashboard.html:77
-#: core/templates/core/admin_dashboard.html:136
+#: core/templates/core/admin_dashboard.html:95
+#: core/templates/core/admin_dashboard.html:154
 msgid "Actions"
 msgstr "الإجراءات"
 
-#: core/templates/core/admin_dashboard.html:105
-#: core/templates/core/admin_dashboard.html:164
+#: core/templates/core/admin_dashboard.html:123
+#: core/templates/core/admin_dashboard.html:182
 msgid "View"
 msgstr "عرض"
 
-#: core/templates/core/admin_dashboard.html:108
+#: core/templates/core/admin_dashboard.html:126
 msgid "Approve"
 msgstr "اعتماد"
 
-#: core/templates/core/admin_dashboard.html:114
+#: core/templates/core/admin_dashboard.html:132
 msgid "No trucks awaiting approval."
 msgstr "لا توجد شاحنات في انتظار الاعتماد."
 
-#: core/templates/core/admin_dashboard.html:126
+#: core/templates/core/admin_dashboard.html:144
 msgid "Manage Approved Trucks"
 msgstr "إدارة الشاحنات المعتمدة"
 
-#: core/templates/core/admin_dashboard.html:164
+#: core/templates/core/admin_dashboard.html:185
 msgid "Suspend"
 msgstr "تعليق"
 
-#: core/templates/core/admin_dashboard.html:173
+#: core/templates/core/admin_dashboard.html:191
 msgid "No approved trucks yet."
 msgstr "لا توجد شاحنات معتمدة بعد."
 
-#: core/templates/core/admin_dashboard.html:193
+#: core/templates/core/admin_dashboard.html:211
+#: core/templates/core/app_settings.html:18
 #: core/templates/core/truck_register.html:107
 msgid "General Information"
 msgstr "معلومات عامة"
 
-#: core/templates/core/admin_dashboard.html:196
+#: core/templates/core/admin_dashboard.html:214
+#: core/templates/core/financial_history.html:23
 msgid "Type"
 msgstr "النوع"
 
-#: core/templates/core/admin_dashboard.html:200
+#: core/templates/core/admin_dashboard.html:218
 #: core/templates/core/truck_register.html:70
 msgid "Model"
 msgstr "الموديل"
 
-#: core/templates/core/admin_dashboard.html:212
+#: core/templates/core/admin_dashboard.html:230
 #: core/templates/core/marketplace.html:49
 msgid "Capacity"
 msgstr "الحمولة:"
 
-#: core/templates/core/admin_dashboard.html:216
+#: core/templates/core/admin_dashboard.html:234
 #: core/templates/core/truck_register.html:80
 msgid "Color"
 msgstr "اللون"
 
-#: core/templates/core/admin_dashboard.html:220
+#: core/templates/core/admin_dashboard.html:238
 msgid "Expiry Date"
 msgstr "تاريخ الانتهاء"
 
-#: core/templates/core/admin_dashboard.html:230
+#: core/templates/core/admin_dashboard.html:248
 msgid "Truck Image"
 msgstr "صورة الشاحنة"
 
-#: core/templates/core/admin_dashboard.html:233
+#: core/templates/core/admin_dashboard.html:251
 msgid "No image provided"
 msgstr "لم يتم توفير صورة"
 
-#: core/templates/core/admin_dashboard.html:238
+#: core/templates/core/admin_dashboard.html:256
 msgid "Documents & Registration"
 msgstr "المستندات والاستمارة"
 
-#: core/templates/core/admin_dashboard.html:246
-#: core/templates/core/admin_dashboard.html:255
 #: core/templates/core/admin_dashboard.html:264
 #: core/templates/core/admin_dashboard.html:273
+#: core/templates/core/admin_dashboard.html:282
+#: core/templates/core/admin_dashboard.html:291
 msgid "Not available"
 msgstr "غير متوفر"
 
-#: core/templates/core/admin_dashboard.html:279
+#: core/templates/core/admin_dashboard.html:297
 msgid "Close"
 msgstr "إغلاق"
 
-#: core/templates/core/admin_dashboard.html:286
+#: core/templates/core/admin_dashboard.html:304
 msgid "Quick Actions"
 msgstr "إجراءات سريعة"
 
-#: core/templates/core/admin_dashboard.html:295
+#: core/templates/core/admin_dashboard.html:313
+#: core/templates/core/admin_financials.html:8
+msgid "Financial Overview"
+msgstr "نظرة عامة مالية"
+
+#: core/templates/core/admin_dashboard.html:314
+msgid "Track payments and platform revenue"
+msgstr "تتبع المدفوعات وإيرادات المنصة"
+
+#: core/templates/core/admin_dashboard.html:326
 msgid "View Landing Page"
 msgstr "عرض الصفحة الرئيسية"
 
-#: core/templates/core/admin_dashboard.html:296
+#: core/templates/core/admin_dashboard.html:327
 msgid "See how the site looks to visitors"
 msgstr "شاهد كيف يبدو الموقع للزوار"
 
-#: core/templates/core/admin_dashboard.html:308
+#: core/templates/core/admin_dashboard.html:339
 msgid "Manage Shipments"
 msgstr "إدارة الشحنات"
 
-#: core/templates/core/admin_dashboard.html:309
+#: core/templates/core/admin_dashboard.html:340
 msgid "Approve or moderate shipments"
 msgstr "اعتماد أو مراقبة الشحنات"
 
-#: core/templates/core/admin_dashboard.html:321
+#: core/templates/core/admin_dashboard.html:352
 msgid "Manage Users"
 msgstr "إدارة المستخدمين"
 
-#: core/templates/core/admin_dashboard.html:322
+#: core/templates/core/admin_dashboard.html:353
 msgid "Review registered profiles"
 msgstr "مراجعة الملفات الشخصية المسجلة"
 
-#: core/templates/core/admin_dashboard.html:346
+#: core/templates/core/admin_dashboard.html:365
+#: core/templates/core/app_settings.html:9
+#, fuzzy
+#| msgid "App Settings"
+msgid "Application Settings"
+msgstr "إعدادات التطبيق"
+
+#: core/templates/core/admin_dashboard.html:366
+msgid "Control fees, logo, and legal text"
+msgstr "التحكم في الرسوم والشعار والنصوص القانونية"
+
+#: core/templates/core/admin_dashboard.html:390
 msgid "N/A"
 msgstr "غير متوفر"
 
+#: core/templates/core/admin_financials.html:9
+msgid "Manage all platform transactions, payments, and revenue."
+msgstr "إدارة جميع معاملات المنصة والمدفوعات والإيرادات."
+
+#: core/templates/core/admin_financials.html:12
+msgid "Total Revenue"
+msgstr "إجمالي الإيرادات"
+
+#: core/templates/core/admin_financials.html:19
+msgid "Recent Transactions"
+msgstr "المعاملات الأخيرة"
+
+#: core/templates/core/admin_financials.html:26
+#, fuzzy
+#| msgid "Username"
+msgid "User"
+msgstr "اسم المستخدم"
+
+#: core/templates/core/admin_financials.html:27
+msgid "Role"
+msgstr "الدور"
+
+#: core/templates/core/admin_financials.html:28
+#: core/templates/core/financial_history.html:20
+#: core/templates/core/receipt.html:24
+msgid "Receipt #"
+msgstr "رقم الإيصال #"
+
+#: core/templates/core/admin_financials.html:29
+#: core/templates/core/financial_history.html:21
+#: core/templates/core/receipt.html:25
+#, fuzzy
+#| msgid "Date Sent"
+msgid "Date"
+msgstr "تاريخ الإرسال"
+
+#: core/templates/core/admin_financials.html:31
+#: core/templates/core/financial_history.html:25
+#: core/templates/core/shipment_detail.html:74
+#: core/templates/core/shipper_dashboard.html:78
+#: core/templates/core/shipper_dashboard.html:137
+#: core/templates/core/truck_owner_dashboard.html:74
+msgid "Status"
+msgstr "الحالة"
+
+#: core/templates/core/admin_financials.html:32
+#: core/templates/core/financial_history.html:26
+#: core/templates/core/shipment_detail.html:75
+#: core/templates/core/shipper_dashboard.html:79
+#: core/templates/core/shipper_dashboard.html:139
+#: core/templates/core/truck_owner_dashboard.html:75
+msgid "Action"
+msgstr "الإجراء"
+
+#: core/templates/core/admin_financials.html:54
+msgid "View Receipt"
+msgstr "عرض الإيصال"
+
+#: core/templates/core/admin_financials.html:58
+msgid "Are you sure you want to issue a refund?"
+msgstr "هل أنت متأكد أنك تريد إصدار استرداد؟"
+
+#: core/templates/core/admin_financials.html:58
+msgid "Issue Refund"
+msgstr "إصدار استرداد"
+
+#: core/templates/core/app_settings.html:11
+#: core/templates/core/financial_history.html:9
+#: core/templates/core/marketplace.html:23
+#: core/templates/core/post_shipment.html:22
+#: core/templates/core/shipment_detail.html:22
+#: core/templates/core/truck_register.html:29
+msgid "Back to Dashboard"
+msgstr "العودة للوحة التحكم"
+
+#: core/templates/core/app_settings.html:42
+#, fuzzy
+#| msgid "Contact Email"
+msgid "Contact & Legal"
+msgstr "بريد التواصل"
+
+#: core/templates/core/app_settings.html:66
+#, fuzzy
+#| msgid "Shipper Subscription Fees"
+msgid "Subscription Fees"
+msgstr "رسوم اشتراك الشاحن"
+
+#: core/templates/core/app_settings.html:80
+#, fuzzy
+#| msgid "Shipper"
+msgid "Shipper Fees"
+msgstr "الشاحن"
+
+#: core/templates/core/app_settings.html:93
+#, fuzzy
+#| msgid "Truck Owner"
+msgid "Truck Owner Fees"
+msgstr "صاحب الشاحنة"
+
+#: core/templates/core/app_settings.html:107
+msgid "Policies"
+msgstr "السياسات"
+
+#: core/templates/core/app_settings.html:121
+msgid "Save All Changes"
+msgstr "حفظ جميع التغييرات"
+
 #: core/templates/core/article_detail.html:23
 #: core/templates/registration/login.html:9
 #: core/templates/registration/register.html:9
@@ -750,6 +1113,48 @@ msgstr "العودة للرئيسية"
 msgid "Published on"
 msgstr "نشر في"
 
+#: core/templates/core/contact.html:11
+msgid "Get in Touch"
+msgstr "اتصل بنا"
+
+#: core/templates/core/contact.html:13
+msgid ""
+"Have questions about our services or need assistance? Fill out the form and "
+"our team will get back to you shortly."
+msgstr "لديك أسئلة حول خدماتنا أو تحتاج إلى مساعدة؟ املأ النموذج وسيقوم فريقنا بالرد عليك قريباً."
+
+#: core/templates/core/contact.html:24
+msgid "Phone"
+msgstr "الهاتف"
+
+#: core/templates/core/contact.html:48
+#| msgid "Contact Address"
+msgid "Address"
+msgstr "عنوان التواصل"
+
+#: core/templates/core/contact.html:57
+#| msgid "Send Message"
+msgid "Send us a Message"
+msgstr "إرسال الرسالة"
+
+#: core/templates/core/contact.html:69
+#| msgid "Contact Address"
+msgid "Email Address"
+msgstr "عنوان التواصل"
+
+#: core/templates/core/financial_history.html:7
+msgid "Financial History"
+msgstr "السجل المالي"
+
+#: core/templates/core/financial_history.html:50
+#: core/templates/core/receipt.html:23
+msgid "Receipt"
+msgstr "إيصال"
+
+#: core/templates/core/financial_history.html:61
+msgid "No transactions found."
+msgstr "لم يتم العثور على معاملات."
+
 #: core/templates/core/index.html:24 core/templates/core/index.html:33
 #: core/templates/core/index.html:68
 msgid "Learn More"
@@ -764,9 +1169,11 @@ msgid "Locally & Abroad"
 msgstr "محلياً ودولياً"
 
 #: core/templates/core/index.html:64
-msgid "The most reliable platform connecting shippers with truck owners across the "
+msgid ""
+"The most reliable platform connecting shippers with truck owners across the "
 "region. Transparent, fast, and secure."
-msgstr "المنصة الأكثر موثوقية لربط الشاحنين مع أسطول الشاحنات في جميع أنحاء المنطقة. "
+msgstr ""
+"المنصة الأكثر موثوقية لربط الشاحنين مع أسطول الشاحنات في جميع أنحاء المنطقة. "
 "شفافة، سريعة، وآمنة."
 
 #: core/templates/core/index.html:67
@@ -786,9 +1193,11 @@ msgid "I am a Shipper"
 msgstr "أنا شاحن"
 
 #: core/templates/core/index.html:140
-msgid "I need to move goods locally or abroad. Post your shipment, receive offers "
+msgid ""
+"I need to move goods locally or abroad. Post your shipment, receive offers "
 "from verified drivers, and track your cargo in real-time."
-msgstr "أريد نقل بضائع محلياً أو دولياً. انشر شحنتك، واستقبل عروضاً من سائقين موثقين، "
+msgstr ""
+"أريد نقل بضائع محلياً أو دولياً. انشر شحنتك، واستقبل عروضاً من سائقين موثقين، "
 "وتتبع شحنتك في الوقت الفعلي."
 
 #: core/templates/core/index.html:143
@@ -804,7 +1213,7 @@ msgid "Real-time tracking"
 msgstr "تتبع في الوقت الفعلي"
 
 #: core/templates/core/index.html:147
-#: core/templates/core/shipper_dashboard.html:84
+#: core/templates/core/shipper_dashboard.html:114
 msgid "Find a Truck"
 msgstr "ابحث عن شاحنة"
 
@@ -813,9 +1222,11 @@ msgid "I am a Truck Owner"
 msgstr "أنا صاحب شاحنة"
 
 #: core/templates/core/index.html:158
-msgid "I have trucks and want to find cargo to transport. Register your fleet, bid "
+msgid ""
+"I have trucks and want to find cargo to transport. Register your fleet, bid "
 "on available jobs, and grow your business."
-msgstr "لدي شاحنات وأريد العثور على بضائع لنقلها. سجل أسطولك، وقدم عروضك على الوظائف "
+msgstr ""
+"لدي شاحنات وأريد العثور على بضائع لنقلها. سجل أسطولك، وقدم عروضك على الوظائف "
 "المتاحة، ونمِ عملك."
 
 #: core/templates/core/index.html:161
@@ -874,21 +1285,16 @@ msgstr "انضم إلى آلاف الشاحنين والسائقين على مس
 msgid "Join Now"
 msgstr "انضم الآن"
 
-#: core/templates/core/marketplace.html:23
-#: core/templates/core/post_shipment.html:22
-#: core/templates/core/shipment_detail.html:22
-#: core/templates/core/truck_register.html:29
-msgid "Back to Dashboard"
-msgstr "العودة للوحة التحكم"
-
 #: core/templates/core/marketplace.html:27
 msgid "Truck Marketplace"
 msgstr "سوق الشاحنات"
 
 #: core/templates/core/marketplace.html:28
-msgid "Browse available trucks and send your shipping offers directly to truck "
+msgid ""
+"Browse available trucks and send your shipping offers directly to truck "
 "owners."
-msgstr "تصفح الشاحنات المتاحة وأرسل عروض الشحن الخاصة بك مباشرة إلى أصحاب الشاحنات."
+msgstr ""
+"تصفح الشاحنات المتاحة وأرسل عروض الشحن الخاصة بك مباشرة إلى أصحاب الشاحنات."
 
 #: core/templates/core/marketplace.html:43
 msgid "Available"
@@ -920,37 +1326,44 @@ msgstr "العودة للسوق"
 msgid "Target Truck"
 msgstr "الشاحنة المستهدفة"
 
-#: core/templates/core/place_bid.html:55
+#: core/templates/core/place_bid.html:54
+#: core/templates/core/post_shipment.html:35
+#, fuzzy
+#| msgid "Please correct the errors below."
+msgid "Please correct the following errors:"
+msgstr "يرجى تصحيح الأخطاء أدناه."
+
+#: core/templates/core/place_bid.html:71
 #: core/templates/core/shipment_detail.html:11
 #: core/templates/core/shipment_detail.html:37
 msgid "Shipment Details"
 msgstr "تفاصيل الشحنة"
 
-#: core/templates/core/place_bid.html:77
-#: core/templates/core/shipper_dashboard.html:45
-#: core/templates/core/shipper_dashboard.html:105
-#: core/templates/core/truck_owner_dashboard.html:42
+#: core/templates/core/place_bid.html:99
+#: core/templates/core/shipper_dashboard.html:75
+#: core/templates/core/shipper_dashboard.html:135
+#: core/templates/core/truck_owner_dashboard.html:70
 msgid "Route"
 msgstr "المسار"
 
-#: core/templates/core/place_bid.html:80
+#: core/templates/core/place_bid.html:102
 msgid "Origin"
 msgstr "المصدر"
 
-#: core/templates/core/place_bid.html:91
+#: core/templates/core/place_bid.html:113
 msgid "Destination"
 msgstr "الوجهة"
 
-#: core/templates/core/place_bid.html:104
+#: core/templates/core/place_bid.html:126
 msgid "Pricing & Terms"
 msgstr "التسعير والشروط"
 
-#: core/templates/core/place_bid.html:123
+#: core/templates/core/place_bid.html:145
 msgid "Send Offer to Truck Owner"
 msgstr "إرسال عرض لصاحب الشاحنة"
 
 #: core/templates/core/post_shipment.html:11
-#: core/templates/core/shipper_dashboard.html:26
+#: core/templates/core/shipper_dashboard.html:27
 msgid "Add A Bid"
 msgstr "إضافة عرض"
 
@@ -962,35 +1375,91 @@ msgstr "نشر شحنة جديدة"
 msgid "Enter shipment details to receive bids or send as an offer."
 msgstr "أدخل تفاصيل الشحنة لتلقي العروض أو إرسالها كعرض."
 
-#: core/templates/core/post_shipment.html:54
-#: core/templates/core/shipper_dashboard.html:106
+#: core/templates/core/post_shipment.html:70
+#: core/templates/core/shipper_dashboard.html:136
 msgid "Delivery Date"
 msgstr "تاريخ التسليم"
 
-#: core/templates/core/post_shipment.html:62
+#: core/templates/core/post_shipment.html:78
 msgid "Route Details"
 msgstr "تفاصيل المسار"
 
-#: core/templates/core/post_shipment.html:67
+#: core/templates/core/post_shipment.html:83
 msgid "Origin Country"
 msgstr "دولة المصدر"
 
-#: core/templates/core/post_shipment.html:70
+#: core/templates/core/post_shipment.html:87
 msgid "Origin City"
 msgstr "مدينة المصدر"
 
-#: core/templates/core/post_shipment.html:76
+#: core/templates/core/post_shipment.html:94
 msgid "Destination Country"
 msgstr "دولة الوجهة"
 
-#: core/templates/core/post_shipment.html:79
+#: core/templates/core/post_shipment.html:98
 msgid "Destination City"
 msgstr "مدينة الوجهة"
 
-#: core/templates/core/post_shipment.html:86
+#: core/templates/core/post_shipment.html:106
 msgid "Post Shipment"
 msgstr "نشر الشحنة"
 
+#: core/templates/core/receipt.html:18
+msgid "Phone:"
+msgstr "الهاتف:"
+
+#: core/templates/core/receipt.html:19
+msgid "Email:"
+msgstr "البريد الإلكتروني:"
+
+#: core/templates/core/receipt.html:33
+msgid "Bill To"
+msgstr "فاتورة إلى"
+
+#: core/templates/core/receipt.html:49
+#, fuzzy
+#| msgid "Total Users"
+msgid "Total"
+msgstr "إجمالي المستخدمين"
+
+#: core/templates/core/receipt.html:60
+msgid "Total Paid"
+msgstr "إجمالي المدفوع"
+
+#: core/templates/core/receipt.html:68
+msgid "Note:"
+msgstr "ملاحظة:"
+
+#: core/templates/core/receipt.html:68
+msgid ""
+"This is an electronically generated receipt and does not require a physical "
+"signature."
+msgstr ""
+
+#: core/templates/core/receipt.html:72
+msgid "Thank you for choosing MASAR CARGO!"
+msgstr "شكراً لاختيارك مسار للشحن!"
+
+#: core/templates/core/receipt.html:74
+#, fuzzy
+#| msgid "CR No:"
+msgid "CR:"
+msgstr "رقم السجل التجاري:"
+
+#: core/templates/core/receipt.html:74
+msgid "VAT:"
+msgstr "ضريبة القيمة المضافة:"
+
+#: core/templates/core/receipt.html:81
+msgid "Print Receipt"
+msgstr "طباعة الإيصال"
+
+#: core/templates/core/receipt.html:84
+#, fuzzy
+#| msgid "Back to Home"
+msgid "Back to History"
+msgstr "العودة للرئيسية"
+
 #: core/templates/core/shipment_detail.html:41
 msgid "Weight / Volume"
 msgstr "الوزن / الحجم"
@@ -1004,37 +1473,18 @@ msgid "Offer Details"
 msgstr "تفاصيل العرض"
 
 #: core/templates/core/shipment_detail.html:72
-#: core/templates/core/shipper_dashboard.html:44
-#: core/templates/core/truck_owner_dashboard.html:43
+#: core/templates/core/shipper_dashboard.html:74
+#: core/templates/core/truck_owner_dashboard.html:71
 msgid "Truck"
 msgstr "الشاحنة"
 
-#: core/templates/core/shipment_detail.html:73
-#: core/templates/core/shipper_dashboard.html:46
-msgid "Amount"
-msgstr "المبلغ"
-
-#: core/templates/core/shipment_detail.html:74
-#: core/templates/core/shipper_dashboard.html:48
-#: core/templates/core/shipper_dashboard.html:107
-#: core/templates/core/truck_owner_dashboard.html:46
-msgid "Status"
-msgstr "الحالة"
-
-#: core/templates/core/shipment_detail.html:75
-#: core/templates/core/shipper_dashboard.html:49
-#: core/templates/core/shipper_dashboard.html:109
-#: core/templates/core/truck_owner_dashboard.html:47
-msgid "Action"
-msgstr "الإجراء"
-
 #: core/templates/core/shipment_detail.html:94
-#: core/templates/core/truck_owner_dashboard.html:72
+#: core/templates/core/truck_owner_dashboard.html:100
 msgid "Accept"
 msgstr "قبول"
 
 #: core/templates/core/shipment_detail.html:95
-#: core/templates/core/truck_owner_dashboard.html:73
+#: core/templates/core/truck_owner_dashboard.html:101
 msgid "Reject"
 msgstr "رفض"
 
@@ -1055,7 +1505,7 @@ msgid "Assigned Truck:"
 msgstr "الشاحنة المعينة:"
 
 #: core/templates/core/shipment_detail.html:136
-#: core/templates/core/truck_owner_dashboard.html:44
+#: core/templates/core/truck_owner_dashboard.html:72
 msgid "Shipper"
 msgstr "الشاحن"
 
@@ -1079,46 +1529,141 @@ msgstr "لوحة تحكم الشاحن"
 msgid "Manage your shipping offers and active shipments."
 msgstr "إدارة عروض الشحن الخاصة بك والشحنات النشطة."
 
-#: core/templates/core/shipper_dashboard.html:29
+#: core/templates/core/shipper_dashboard.html:30
 msgid "Browse Trucks"
 msgstr "تصفح الشاحنات"
 
-#: core/templates/core/shipper_dashboard.html:37
+#: core/templates/core/shipper_dashboard.html:41
+#: core/templates/core/truck_owner_dashboard.html:37
+msgid "Financials"
+msgstr "المالية"
+
+#: core/templates/core/shipper_dashboard.html:42
+#: core/templates/core/truck_owner_dashboard.html:38
+#, fuzzy
+#| msgid "Comments"
+msgid "Payments"
+msgstr "تعليقات"
+
+#: core/templates/core/shipper_dashboard.html:43
+#: core/templates/core/truck_owner_dashboard.html:39
+msgid "View History"
+msgstr "عرض السجل"
+
+#: core/templates/core/shipper_dashboard.html:50
+#: core/templates/core/truck_owner_dashboard.html:46
+#, fuzzy
+#| msgid "Subscription Plan"
+msgid "Subscription"
+msgstr "خطة الاشتراك"
+
+#: core/templates/core/shipper_dashboard.html:53
+#: core/templates/core/truck_owner_dashboard.html:49
+#, fuzzy
+#| msgid "Expired"
+msgid "Expires:"
+msgstr "منتهي"
+
+#: core/templates/core/shipper_dashboard.html:55
+#: core/templates/core/truck_owner_dashboard.html:51
+#, fuzzy
+#| msgid "Active"
+msgid "Inactive"
+msgstr "نشط"
+
+#: core/templates/core/shipper_dashboard.html:56
+#: core/templates/core/truck_owner_dashboard.html:52
+msgid "Payment required"
+msgstr "الدفع مطلوب"
+
+#: core/templates/core/shipper_dashboard.html:58
+#: core/templates/core/truck_owner_dashboard.html:54
+#, fuzzy
+#| msgid "Manage Users"
+msgid "Manage"
+msgstr "إدارة المستخدمين"
+
+#: core/templates/core/shipper_dashboard.html:67
 msgid "My Shipping Offers"
 msgstr "عروض الشحن الخاصة بي"
 
-#: core/templates/core/shipper_dashboard.html:47
+#: core/templates/core/shipper_dashboard.html:77
 msgid "Date Sent"
 msgstr "تاريخ الإرسال"
 
-#: core/templates/core/shipper_dashboard.html:76
+#: core/templates/core/shipper_dashboard.html:106
 msgid "Details"
 msgstr "التفاصيل"
 
-#: core/templates/core/shipper_dashboard.html:83
+#: core/templates/core/shipper_dashboard.html:113
 msgid "You haven't sent any offers yet."
 msgstr "لم تقم بإرسال أي عروض بعد."
 
-#: core/templates/core/shipper_dashboard.html:97
+#: core/templates/core/shipper_dashboard.html:127
 msgid "Active Shipments"
 msgstr "الشحنات النشطة"
 
-#: core/templates/core/shipper_dashboard.html:104
-msgid "Description"
-msgstr "الوصف"
-
-#: core/templates/core/shipper_dashboard.html:108
+#: core/templates/core/shipper_dashboard.html:138
 msgid "Assigned Truck"
 msgstr "الشاحنة المعينة"
 
-#: core/templates/core/shipper_dashboard.html:131
+#: core/templates/core/shipper_dashboard.html:161
 msgid "Track"
 msgstr "تتبع"
 
-#: core/templates/core/shipper_dashboard.html:136
+#: core/templates/core/shipper_dashboard.html:166
 msgid "No active shipments."
 msgstr "لا توجد شحنات نشطة."
 
+#: core/templates/core/subscription_expired.html:13
+msgid "Subscription Expired"
+msgstr "انتهى الاشتراك"
+
+#: core/templates/core/subscription_expired.html:15
+#, fuzzy, python-format
+#| msgid "Hello %(name)s, your subscription to MASAR CARGO has expired."
+msgid ""
+"\n"
+"                    Hello %(name)s, your subscription to MASAR CARGO has "
+"expired.\n"
+"                    "
+msgstr "مرحباً %(name)s، لقد انتهى اشتراكك في مسار كارغو."
+
+#: core/templates/core/subscription_expired.html:21
+msgid "Expired on:"
+msgstr "انتهى في:"
+
+#: core/templates/core/subscription_expired.html:22
+msgid "Current Plan:"
+msgstr "الخطة الحالية:"
+
+#: core/templates/core/subscription_expired.html:29
+#, fuzzy
+#| msgid "Enable Subscription Fee"
+msgid "Renew Your Subscription"
+msgstr "تفعيل رسوم الاشتراك"
+
+#: core/templates/core/subscription_expired.html:39
+msgid "Fee to Pay:"
+msgstr "الرسوم المطلوب دفعها:"
+
+#: core/templates/core/subscription_expired.html:41
+msgid "SAR"
+msgstr "ريال سعودي"
+
+#: core/templates/core/subscription_expired.html:47
+msgid "Renew Now"
+msgstr "تجديد الآن"
+
+#: core/templates/core/subscription_expired.html:52
+msgid ""
+"Online payment is currently disabled. Please contact support for renewal."
+msgstr "الدفع عبر الإنترنت معطل حالياً. يرجى الاتصال بالدعم للتجديد."
+
+#: core/templates/core/subscription_expired.html:61
+msgid "Need Help?"
+msgstr "تحتاج مساعدة؟"
+
 #: core/templates/core/truck_owner_dashboard.html:22
 msgid "Truck Owner Dashboard"
 msgstr "لوحة تحكم صاحب الشاحنة"
@@ -1131,40 +1676,40 @@ msgstr "إدارة أسطولك وعروض الشحن المستلمة."
 msgid "Add New Truck"
 msgstr "إضافة شاحنة جديدة"
 
-#: core/templates/core/truck_owner_dashboard.html:35
+#: core/templates/core/truck_owner_dashboard.html:63
 msgid "Received Shipping Offers"
 msgstr "عروض الشحن المستلمة"
 
-#: core/templates/core/truck_owner_dashboard.html:76
+#: core/templates/core/truck_owner_dashboard.html:104
 msgid "View Details"
 msgstr "عرض التفاصيل"
 
-#: core/templates/core/truck_owner_dashboard.html:84
+#: core/templates/core/truck_owner_dashboard.html:112
 msgid "No offers received yet."
 msgstr "لم يتم استلام أي عروض بعد."
 
-#: core/templates/core/truck_owner_dashboard.html:95
+#: core/templates/core/truck_owner_dashboard.html:123
 msgid "My Fleet"
 msgstr "أسطولي"
 
-#: core/templates/core/truck_owner_dashboard.html:110
+#: core/templates/core/truck_owner_dashboard.html:138
 msgid "Approved"
 msgstr "معتمد"
 
-#: core/templates/core/truck_owner_dashboard.html:112
-#: core/templates/core/truck_owner_dashboard.html:130
+#: core/templates/core/truck_owner_dashboard.html:140
+#: core/templates/core/truck_owner_dashboard.html:158
 msgid "Plate No:"
 msgstr "رقم اللوحة:"
 
-#: core/templates/core/truck_owner_dashboard.html:113
+#: core/templates/core/truck_owner_dashboard.html:141
 msgid "Capacity:"
 msgstr "الحمولة:"
 
-#: core/templates/core/truck_owner_dashboard.html:115
+#: core/templates/core/truck_owner_dashboard.html:143
 msgid "Edit Truck"
 msgstr "تعديل الشاحنة"
 
-#: core/templates/core/truck_owner_dashboard.html:131
+#: core/templates/core/truck_owner_dashboard.html:159
 msgid "Waiting for admin approval..."
 msgstr "في انتظار اعتماد المسؤول..."
 
@@ -1184,7 +1729,7 @@ msgstr "تحديث بيانات الشاحنة"
 msgid "Register a Truck"
 msgstr "تسجيل شاحنة"
 
-#: core/templates/core/truck_register.html:47 core/views.py:67
+#: core/templates/core/truck_register.html:47 core/views.py:84
 msgid "Please correct the errors below."
 msgstr "يرجى تصحيح الأخطاء أدناه."
 
@@ -1220,11 +1765,26 @@ msgstr "اللون"
 msgid "Documents & Photos"
 msgstr "المستندات والصور"
 
+#: core/templates/core/truck_register.html:128
+msgid ""
+"Photos will be automatically resized for better performance. PDF files are "
+"accepted for documents."
+msgstr ""
+
+#: core/templates/core/truck_register.html:151
+#: core/templates/core/truck_register.html:169
 #: core/templates/core/truck_register.html:190
+#: core/templates/core/truck_register.html:208
+#, fuzzy
+#| msgid "View"
+msgid "View PDF"
+msgstr "عرض"
+
+#: core/templates/core/truck_register.html:223
 msgid "Update and Submit for Approval"
 msgstr "تحديث وإرسال للاعتماد"
 
-#: core/templates/core/truck_register.html:192
+#: core/templates/core/truck_register.html:225
 msgid "Submit Registration"
 msgstr "إرسال طلب التسجيل"
 
@@ -1278,16 +1838,19 @@ msgid "Verify Your Account"
 msgstr "التحقق من حسابك"
 
 #: core/templates/registration/verify_otp.html:18
-msgid "We have sent a verification code to your WhatsApp number. Please enter it "
+msgid ""
+"We have sent a verification code to your WhatsApp number. Please enter it "
 "below to complete your registration."
-msgstr "لقد أرسلنا رمز تحقق إلى رقم واتساب الخاص بك. يرجى إدخاله أدناه لإكمال "
-"عملية التسجيل."
+msgstr ""
+"لقد أرسلنا رمز تحقق إلى رقم واتساب الخاص بك. يرجى إدخاله أدناه لإكمال عملية "
+"التسجيل."
 
 #: core/templates/registration/verify_otp.html:20
-msgid "We have sent a verification code to your WhatsApp number. Please enter it "
+msgid ""
+"We have sent a verification code to your WhatsApp number. Please enter it "
 "below to log in."
-msgstr "لقد أرسلنا رمز تحقق إلى رقم واتساب الخاص بك. يرجى إدخاله أدناه لتسجيل "
-"الدخول."
+msgstr ""
+"لقد أرسلنا رمز تحقق إلى رقم واتساب الخاص بك. يرجى إدخاله أدناه لتسجيل الدخول."
 
 #: core/templates/registration/verify_otp.html:37
 msgid "Verify"
@@ -1301,163 +1864,210 @@ msgstr "لم تستلم الرمز؟"
 msgid "Try again"
 msgstr "حاول مرة أخرى"
 
-#: core/views.py:60
+#: core/views.py:77
 #, python-format
 msgid "Your verification code for MASAR CARGO is: %(code)s"
 msgstr "رمز التحقق الخاص بك لـ MASAR CARGO هو: %(code)s"
 
-#: core/views.py:62 core/views.py:138
+#: core/views.py:79 core/views.py:157
 msgid "A verification code has been sent to your WhatsApp."
 msgstr "تم إرسال رمز التحقق إلى واتساب الخاص بك."
 
-#: core/views.py:65
+#: core/views.py:82
 msgid "Failed to send verification code. Please check your phone number."
 msgstr "فشل إرسال رمز التحقق. يرجى التحقق من رقم هاتفك."
 
-#: core/views.py:111
+#: core/views.py:130
 msgid "Registration successful. Welcome!"
 msgstr "تم التسجيل بنجاح. مرحباً بك!"
 
-#: core/views.py:114 core/views.py:175
+#: core/views.py:133 core/views.py:194
 msgid "Invalid or expired verification code."
 msgstr "رمز تحقق غير صالح أو منتهي الصلاحية."
 
-#: core/views.py:127
+#: core/views.py:146
 msgid "Your account does not have a phone number. Please contact admin."
 msgstr "حسابك لا يحتوي على رقم هاتف. يرجى الاتصال بالمسؤول."
 
-#: core/views.py:136
+#: core/views.py:155
 #, python-format
 msgid "Your login verification code for MASAR CARGO is: %(code)s"
 msgstr "رمز التحقق الخاص بك لتسجيل الدخول لـ MASAR CARGO هو: %(code)s"
 
-#: core/views.py:143
+#: core/views.py:162
 msgid "Failed to send verification code. Please check your connection."
 msgstr "فشل إرسال رمز التحقق. يرجى التحقق من اتصالك."
 
-#: core/views.py:145
+#: core/views.py:164
 msgid "Invalid username or password."
 msgstr "اسم المستخدم أو كلمة المرور غير صالحة."
 
-#: core/views.py:172
+#: core/views.py:191
 msgid "Logged in successfully!"
 msgstr "تم تسجيل الدخول بنجاح!"
 
-#: core/views.py:229
+#: core/views.py:262
 msgid "Truck registered successfully! It will be visible after admin approval."
 msgstr "تم تسجيل الشاحنة بنجاح! ستكون مرئية بعد اعتماد المسؤول."
 
-#: core/views.py:232
+#: core/views.py:265
 msgid "There was an error in your registration. Please check the form."
 msgstr "حدث خطأ في التسجيل. يرجى التحقق من النموذج."
 
-#: core/views.py:248
+#: core/views.py:281
 msgid "Truck data updated successfully! It will be reviewed by admin again."
 msgstr "تم تحديث بيانات الشاحنة بنجاح! سيتم مراجعتها من قبل المسؤول مرة أخرى."
 
-#: core/views.py:251
+#: core/views.py:284
 msgid "There was an error updating your truck. Please check the form."
 msgstr "حدث خطأ أثناء تحديث شاحنتك. يرجى التحقق من النموذج."
 
-#: core/views.py:268
+#: core/views.py:301
 #, python-format
-msgid "Your truck (%(plate)s) has been approved! You can now receive offers for "
+msgid ""
+"Your truck (%(plate)s) has been approved! You can now receive offers for "
 "shipments."
 msgstr "تمت الموافقة على شاحنتك (%(plate)s)! يمكنك الآن تلقي عروض للشحنات."
 
-#: core/views.py:271
+#: core/views.py:304
 msgid "Truck approved successfully!"
 msgstr "تم اعتماد الشاحنة بنجاح!"
 
-#: core/views.py:282
+#: core/views.py:315
 msgid "Truck has been suspended."
 msgstr "تم تعليق الشاحنة."
 
-#: core/views.py:297
-msgid "Shipment posted successfully! It is now open for bids or you can browse "
+#: core/views.py:330
+msgid ""
+"Shipment posted successfully! It is now open for bids or you can browse "
 "trucks to send it as an offer."
-msgstr "تم نشر الشحنة بنجاح! هي الآن مفتوحة للعروض أو يمكنك تصفح الشاحنات لإرسالها كعرض."
+msgstr "تم نشر الشحنة بنجاح! هي الآن مفتوحة للمزايدة أو يمكنك تصفح الشاحنات لإرسالها كعرض."
+"تم نشر الشحنة بنجاح! هي الآن مفتوحة للعروض أو يمكنك تصفح الشاحنات لإرسالها "
+"كعرض."
 
-#: core/views.py:300
+#: core/views.py:334
 msgid "Please correct the errors in the form."
 msgstr "يرجى تصحيح الأخطاء في النموذج."
 
-#: core/views.py:350
+#: core/views.py:385
 #, python-format
-msgid "New offer received for your truck (%(plate)s)! Route: %(origin)s to "
+msgid ""
+"New offer received for your truck (%(plate)s)! Route: %(origin)s to "
 "%(dest)s. Amount: %(amount)s"
-msgstr "تم استلام عرض جديد لشاحنتك (%(plate)s)! المسار: %(origin)s إلى %(dest)s. "
+msgstr "تم استلام عرض جديد لشاحنتك (%(plate)s)! المسار: %(origin)s إلى %(dest)s. المبلغ: %(amount)s"
+"تم استلام عرض جديد لشاحنتك (%(plate)s)! المسار: %(origin)s إلى %(dest)s. "
 "المبلغ: %(amount)s"
 
-#: core/views.py:353
+#: core/views.py:388
 msgid "Offer sent successfully!"
 msgstr "تم إرسال العرض بنجاح!"
 
-#: core/views.py:356
+#: core/views.py:392
 msgid "Error sending offer. Please check the form."
 msgstr "خطأ في إرسال العرض. يرجى التحقق من النموذج."
 
-#: core/views.py:378
+#: core/views.py:414
 msgid "You are not authorized to accept this offer."
 msgstr "أنت غير مخول لقبول هذا العرض."
 
-#: core/views.py:393
+#: core/views.py:429
 #, python-format
-msgid "Your offer for truck %(plate)s (%(origin)s to %(dest)s) has been accepted!"
+msgid ""
+"Your offer for truck %(plate)s (%(origin)s to %(dest)s) has been accepted!"
 msgstr "تم قبول عرضك للشاحنة %(plate)s (%(origin)s إلى %(dest)s)!"
 
-#: core/views.py:396
+#: core/views.py:432
 msgid "Offer accepted! Shipment is now in progress."
 msgstr "تم قبول العرض! الشحنة قيد التنفيذ الآن."
 
-#: core/views.py:408
+#: core/views.py:444
 msgid "Offer rejected."
 msgstr "تم رفض العرض."
 
-#: core/views.py:416
+#: core/views.py:452
 msgid "Privacy policy is coming soon."
 msgstr "سياسة الخصوصية ستتوفر قريباً."
 
-#: core/views.py:426
-msgid "Terms of service are coming soon."
+#: core/views.py:462
+#| msgid "Terms of service are coming soon."
+msgid "Terms of service are soon."
 msgstr "شروط الخدمة ستتوفر قريباً."
-msgid "Subscription Expired"
-msgstr "انتهى الاشتراك"
 
-msgid "No Plan"
-msgstr "بدون خطة"
+#: core/views.py:509
+msgid "Online payment is currently disabled. Please contact support."
+msgstr "الدفع عبر الإنترنت معطل حالياً. يرجى الاتصال بالدعم."
 
-msgid "Expired"
-msgstr "منتهي"
+#: core/views.py:558
+msgid "Failed to initiate payment. Please try again later."
+msgstr "فشل بدء الدفع. يرجى المحاولة مرة أخرى لاحقاً."
 
-msgid "Expiring soon"
-msgstr "تنتهي قريبا"
+#: core/views.py:587
+#, fuzzy, python-format
+#| msgid ""
+#| "Your subscription for MASAR CARGO has been successfully renewed! Your new "
+#| "expiry date is %(date)s. Thank you for using our service."
+msgid ""
+"Your subscription for MASAR CARGO has been successfully renewed! Your new "
+"expiry date is %(date)s. You can view your receipt here: %(url)s"
+msgstr ""
+"تم تجديد اشتراكك في مسار للشحن بنجاح! تاريخ انتهاء اشتراكك الجديد هو "
+"%(date)s. شكراً لاستخدامك خدمتنا."
 
-msgid "days"
-msgstr "أيام"
-
-msgid "Active"
-msgstr "نشط"
-
-
-msgid "Hello %(name)s, your subscription to MASAR CARGO has expired."
-msgstr "مرحباً %(name)s، لقد انتهى اشتراكك في مسار كارغو."
-
-msgid "Expired on:"
-msgstr "انتهى في:"
-
-msgid "Current Plan:"
-msgstr "الخطة الحالية:"
-
-msgid "To continue using our services, please renew your subscription. You can contact our support team for renewal details."
-msgstr "لمواصلة استخدام خدماتنا، يرجى تجديد اشتراكك. يمكنك الاتصال بفريق الدعم لدينا للحصول على تفاصيل التجديد."
-
-msgid "Contact for Renewal"
-msgstr "الاتصال للتجديد"
-
-
-msgid "Your subscription for MASAR CARGO has been successfully renewed! Your new expiry date is %(date)s. Thank you for using our service."
-msgstr "تم تجديد اشتراكك في مسار للشحن بنجاح! تاريخ انتهاء اشتراكك الجديد هو %(date)s. شكراً لاستخدامك خدمتنا."
-
-msgid "Subscription Renewed - MASAR CARGO"
+#: core/views.py:597
+#, fuzzy
+#| msgid "Subscription Renewed - MASAR CARGO"
+msgid "Subscription Activated - MASAR CARGO"
 msgstr "تم تجديد الاشتراك - مسار للشحن"
+
+#: core/views.py:627
+msgid "Payment successful! Your subscription is now active."
+msgstr "تم الدفع بنجاح! اشتراكك نشط الآن."
+
+#: core/views.py:633
+#, python-format
+msgid "Payment was not successful. Status: %(status)s"
+msgstr "لم يكن الدفع ناجحاً. الحالة: %(status)s"
+
+#: core/views.py:635
+msgid "Failed to verify payment status."
+msgstr "فشل التحقق من حالة الدفع."
+
+#: core/views.py:641
+msgid "Payment was cancelled."
+msgstr "تم إلغاء الدفع."
+
+#: core/views.py:705
+#| msgid "This email is already in use."
+msgid "This is already a refund transaction."
+msgstr "هذا البريد الإلكتروني مستخدم بالفعل."
+
+#: core/views.py:718
+#, python-format
+msgid "Refund issued successfully! Receipt: %(receipt)s"
+msgstr "تم إصدار الاسترداد بنجاح! الإيصال: %(receipt)s"
+
+#: core/views.py:731
+msgid "Application settings updated successfully."
+msgstr "تم تحديث إعدادات التطبيق بنجاح."
+
+#: core/views.py:744
+msgid "Your message has been sent successfully! We will get back to you soon."
+msgstr "تم إرسال رسالتك بنجاح! سنقوم بالرد عليك قريباً."
+
+#: core/views.py:747
+#| msgid "There was an error updating your truck. Please check the form."
+msgid "There was an error in your form. Please check the fields below."
+msgstr "حدث خطأ أثناء تحديث شاحنتك. يرجى التحقق من النموذج."
+
+#~ msgid "Registered Trucks"
+#~ msgstr "الشاحنات المسجلة"
+
+#~ msgid ""
+#~ "To continue using our services, please renew your subscription. You can "
+#~ "contact our support team for renewal details."
+#~ msgstr ""
+#~ "لمواصلة استخدام خدماتنا، يرجى تجديد اشتراكك. يمكنك الاتصال بفريق الدعم "
+#~ "لدينا للحصول على تفاصيل التجديد."
+
+#~ msgid "Contact for Renewal"
+#~ msgstr "الاتصال للتجديد"