diff --git a/apps/callcenter/ui_views.py b/apps/callcenter/ui_views.py
index 14de302..55b3aa9 100644
--- a/apps/callcenter/ui_views.py
+++ b/apps/callcenter/ui_views.py
@@ -512,7 +512,7 @@ def get_departments_by_hospital(request):
     departments = Department.objects.filter(
         hospital_id=hospital_id,
         status='active'
-    ).values('id', 'name_en', 'name_ar')
+    ).values('id', 'name', 'name_ar')
     
     return JsonResponse({'departments': list(departments)})
 
@@ -527,14 +527,14 @@ def get_physicians_by_hospital(request):
     physicians = Physician.objects.filter(
         hospital_id=hospital_id,
         status='active'
-    ).values('id', 'first_name', 'last_name', 'specialty')
+    ).values('id', 'first_name', 'last_name', 'specialization')
     
     # Format physician names
     physicians_list = [
         {
             'id': str(p['id']),
             'name': f"Dr. {p['first_name']} {p['last_name']}",
-            'specialty': p['specialty']
+            'specialty': p['specialization']
         }
         for p in physicians
     ]
diff --git a/locale/ar/LC_MESSAGES/django.mo b/locale/ar/LC_MESSAGES/django.mo
index e551fc0..ce001a6 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 3f750a1..5276b50 100644
--- a/locale/ar/LC_MESSAGES/django.po
+++ b/locale/ar/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PX360 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-01-04 10:41+0300\n"
+"POT-Creation-Date: 2026-01-05 14:56+0300\n"
 "PO-Revision-Date: 2025-12-15 12:30+0300\n"
 "Last-Translator: PX360 Team\n"
 "Language-Team: Arabic\n"
@@ -23,6 +23,7 @@ msgstr "المعلومات الشخصية"
 
 #: apps/accounts/admin.py:22 templates/callcenter/complaint_form.html:128
 #: templates/callcenter/inquiry_form.html:132
+#: templates/complaints/complaint_form.html:76
 #: templates/complaints/inquiry_detail.html:139
 msgid "Organization"
 msgstr "المنظمة"
@@ -78,6 +79,7 @@ msgstr "العودة إلى الإجراءات"
 
 #: templates/actions/action_detail.html:227
 #: templates/appreciation/appreciation_detail.html:12
+#: templates/complaints/complaint_detail.html:181
 #: templates/observations/observation_detail.html:199
 msgid "Details"
 msgstr "التفاصيل"
@@ -129,6 +131,7 @@ msgstr "ملاحظة اختيارية..."
 
 #: templates/actions/action_detail.html:549
 #: templates/complaints/complaint_detail.html:493
+#: templates/complaints/complaint_detail.html:501
 #: templates/observations/observation_detail.html:420
 #: templates/observations/observation_detail.html:433
 msgid "Add Note"
@@ -146,6 +149,7 @@ msgstr "معلومات التعيين"
 
 #: templates/actions/action_detail.html:615
 #: templates/callcenter/complaint_form.html:245
+#: templates/complaints/complaint_form.html:203
 msgid "SLA Information"
 msgstr "معلومات اتفاقية مستوى الخدمة"
 
@@ -169,6 +173,7 @@ msgstr "اشرح سبب الحاجة إلى تصعيد هذا الإجراء..."
 #: templates/callcenter/complaint_form.html:274
 #: templates/callcenter/inquiry_form.html:233
 #: templates/complaints/complaint_detail.html:607
+#: templates/complaints/complaint_form.html:222
 #: templates/complaints/inquiry_form.html:108
 #: templates/observations/category_form.html:91
 #: templates/observations/convert_to_action.html:91
@@ -251,6 +256,7 @@ msgstr "العنوان، الوصف..."
 #: templates/callcenter/complaint_list.html:159
 #: templates/callcenter/inquiry_list.html:100
 #: templates/callcenter/inquiry_list.html:155
+#: templates/complaints/complaint_detail.html:564
 #: templates/complaints/complaint_list.html:188
 #: templates/complaints/complaint_list.html:340
 #: templates/complaints/inquiry_detail.html:36
@@ -302,6 +308,7 @@ msgstr "الخطورة"
 
 #: templates/actions/action_list.html:302
 #: templates/callcenter/complaint_form.html:231
+#: templates/complaints/complaint_detail.html:230
 #: templates/complaints/complaint_form.html:173
 #: templates/complaints/complaint_list.html:213
 #: templates/config/routing_rules.html:28
@@ -319,6 +326,7 @@ msgstr "الأولوية"
 #: templates/callcenter/inquiry_form.html:162
 #: templates/callcenter/inquiry_list.html:111
 #: templates/callcenter/inquiry_list.html:154
+#: templates/complaints/complaint_detail.html:214
 #: templates/complaints/complaint_form.html:128
 #: templates/complaints/complaint_list.html:225
 #: templates/complaints/complaint_list.html:339
@@ -341,6 +349,7 @@ msgstr "الفئة"
 
 #: templates/actions/action_list.html:329
 #: templates/actions/action_list.html:431
+#: templates/complaints/complaint_detail.html:223
 #: templates/complaints/complaint_form.html:184
 #: templates/dashboard/command_center.html:238
 msgid "Source"
@@ -357,6 +366,7 @@ msgstr "المصدر"
 #: templates/callcenter/inquiry_form.html:137
 #: templates/callcenter/inquiry_list.html:123
 #: templates/callcenter/inquiry_list.html:153
+#: templates/complaints/complaint_detail.html:145
 #: templates/complaints/complaint_form.html:81
 #: templates/complaints/complaint_list.html:240
 #: templates/complaints/complaint_list.html:342
@@ -393,6 +403,7 @@ msgstr "المستشفى"
 #: templates/appreciation/leaderboard.html:97
 #: templates/callcenter/complaint_form.html:143
 #: templates/callcenter/inquiry_form.html:147
+#: templates/complaints/complaint_detail.html:149
 #: templates/complaints/complaint_form.html:91
 #: templates/complaints/complaint_list.html:253
 #: templates/complaints/inquiry_detail.html:145
@@ -419,6 +430,7 @@ msgstr "القسم"
 #: templates/actions/action_list.html:368
 #: templates/actions/action_list.html:436
 #: templates/complaints/analytics.html:183
+#: templates/complaints/complaint_detail.html:514
 #: templates/complaints/complaint_list.html:266
 #: templates/complaints/complaint_list.html:343
 #: templates/complaints/inquiry_detail.html:149
@@ -449,6 +461,7 @@ msgstr "إلى التاريخ"
 #: templates/callcenter/complaint_list.html:153
 #: templates/callcenter/inquiry_list.html:150
 #: templates/complaints/analytics.html:178
+#: templates/complaints/complaint_detail.html:138
 #: templates/complaints/complaint_list.html:336
 #: templates/complaints/inquiry_list.html:116
 #: templates/feedback/feedback_list.html:319
@@ -477,6 +490,7 @@ msgstr "تاريخ الاستحقاق"
 #: templates/ai_engine/sentiment_detail.html:171
 #: templates/callcenter/complaint_list.html:160
 #: templates/callcenter/inquiry_list.html:156
+#: templates/complaints/complaint_detail.html:288
 #: templates/complaints/complaint_list.html:345
 #: templates/complaints/inquiry_detail.html:55
 #: templates/complaints/inquiry_list.html:122
@@ -514,6 +528,7 @@ msgstr "الإجراءات"
 #: templates/actions/action_list.html:502
 #: templates/appreciation/appreciation_list.html:91
 #: templates/appreciation/appreciation_list.html:160
+#: templates/complaints/complaint_detail.html:416
 #: templates/complaints/complaint_list.html:405
 #: templates/feedback/feedback_list.html:400
 #: templates/observations/observation_list.html:376
@@ -615,6 +630,7 @@ msgstr "محايد"
 #: templates/ai_engine/sentiment_detail.html:63
 #: templates/ai_engine/sentiment_list.html:124
 #: templates/ai_engine/tags/sentiment_card.html:19
+#: templates/complaints/complaint_detail.html:571
 #: templates/surveys/instance_list.html:66
 msgid "Score"
 msgstr "النتيجة"
@@ -820,6 +836,7 @@ msgid "Total Results"
 msgstr "إجمالي النتائج"
 
 #: templates/ai_engine/sentiment_list.html:69
+#: templates/complaints/complaint_list.html:168
 #: templates/complaints/inquiry_list.html:60
 #: templates/observations/observation_list.html:174
 msgid "Filters"
@@ -827,11 +844,13 @@ msgstr "عوامل التصفية"
 
 #: templates/ai_engine/sentiment_list.html:96
 #: templates/appreciation/leaderboard.html:75
+#: templates/complaints/complaint_list.html:299
 #: templates/observations/observation_list.html:279
 msgid "Apply Filters"
 msgstr "تطبيق الفلاتر"
 
 #: templates/ai_engine/sentiment_list.html:99
+#: templates/complaints/complaint_list.html:302
 #: templates/complaints/inquiry_form.html:209
 #: templates/complaints/inquiry_list.html:100
 #: templates/observations/observation_list.html:282
@@ -1111,6 +1130,7 @@ msgid "All Status"
 msgstr "جميع الحالات"
 
 #: templates/appreciation/appreciation_list.html:184
+#: templates/complaints/complaint_list.html:227
 #: templates/observations/observation_list.html:221
 msgid "All Categories"
 msgstr "جميع الفئات"
@@ -1149,6 +1169,7 @@ msgstr "مستخدم"
 
 #: templates/appreciation/appreciation_send_form.html:38
 #: templates/callcenter/complaint_form.html:152
+#: templates/complaints/complaint_detail.html:250
 #: templates/complaints/complaint_form.html:100
 #: templates/dashboard/command_center.html:144
 #: templates/feedback/feedback_form.html:266
@@ -1680,6 +1701,7 @@ msgstr "أظهر الابتكار"
 #: templates/callcenter/complaint_form.html:60
 #: templates/callcenter/complaint_form.html:271
 #: templates/callcenter/complaint_list.html:40
+#: templates/complaints/complaint_form.html:219
 #: templates/layouts/partials/sidebar.html:200
 msgid "Create Complaint"
 msgstr "إنشاء شكوى"
@@ -1690,6 +1712,7 @@ msgstr "إنشاء شكوى"
 #: templates/callcenter/inquiry_form.html:5
 #: templates/callcenter/inquiry_list.html:5
 #: templates/callcenter/inquiry_success.html:5
+#: templates/complaints/complaint_form.html:192
 #: templates/layouts/partials/sidebar.html:184
 msgid "Call Center"
 msgstr "مركز الاتصال"
@@ -1744,7 +1767,9 @@ msgstr "العلاقة"
 #: templates/callcenter/complaint_list.html:155
 #: templates/callcenter/inquiry_form.html:121
 #: templates/complaints/analytics.html:180
+#: templates/complaints/complaint_detail.html:141
 #: templates/complaints/complaint_form.html:58
+#: templates/complaints/complaint_form.html:187
 #: templates/complaints/complaint_list.html:337
 #: templates/complaints/inquiry_detail.html:109
 #: templates/complaints/inquiry_form.html:52
@@ -1756,6 +1781,7 @@ msgstr "المريض"
 
 #: templates/callcenter/complaint_form.html:118
 #: templates/callcenter/inquiry_form.html:122
+#: templates/complaints/complaint_form.html:188
 msgid "Family Member"
 msgstr "أحد أفراد العائلة"
 
@@ -1764,6 +1790,9 @@ msgstr "أحد أفراد العائلة"
 #: templates/callcenter/inquiry_form.html:123
 #: templates/callcenter/inquiry_form.html:169
 #: templates/callcenter/inquiry_list.html:118
+#: templates/complaints/complaint_form.html:137
+#: templates/complaints/complaint_form.html:195
+#: templates/complaints/complaint_list.html:234
 #: templates/complaints/inquiry_form.html:93
 #: templates/complaints/inquiry_list.html:86
 msgid "Other"
@@ -1787,6 +1816,7 @@ msgid "Select physician..."
 msgstr "اختر الطبيب..."
 
 #: templates/callcenter/complaint_form.html:159
+#: templates/complaints/complaint_detail.html:236
 #: templates/complaints/complaint_form.html:66
 #: templates/dashboard/command_center.html:240
 #: templates/feedback/feedback_form.html:276
@@ -1802,6 +1832,7 @@ msgstr "معرّف الزيارة (اختياري)"
 #: templates/callcenter/complaint_form.html:169
 #: templates/callcenter/complaint_success.html:64
 #: templates/complaints/complaint_detail.html:210
+#: templates/complaints/complaint_form.html:111
 msgid "Complaint Details"
 msgstr "تفاصيل الشكوى"
 
@@ -1811,6 +1842,7 @@ msgid "Brief summary of the complaint"
 msgstr "ملخص موجز للشكوى"
 
 #: templates/callcenter/complaint_form.html:179
+#: templates/complaints/complaint_detail.html:262
 #: templates/complaints/complaint_form.html:121
 #: templates/observations/category_form.html:47
 #: templates/observations/convert_to_action.html:46
@@ -1834,30 +1866,42 @@ msgid "Select category..."
 msgstr "اختر الفئة..."
 
 #: templates/callcenter/complaint_form.html:189
+#: templates/complaints/complaint_form.html:131
+#: templates/complaints/complaint_list.html:228
 msgid "Clinical Care"
 msgstr "الرعاية السريرية"
 
 #: templates/callcenter/complaint_form.html:190
+#: templates/complaints/complaint_form.html:132
+#: templates/complaints/complaint_list.html:229
 msgid "Staff Behavior"
 msgstr "سلوك الموظفين"
 
 #: templates/callcenter/complaint_form.html:191
+#: templates/complaints/complaint_form.html:133
+#: templates/complaints/complaint_list.html:230
 msgid "Facility & Environment"
 msgstr "المرافق والبيئة"
 
 #: templates/callcenter/complaint_form.html:192
+#: templates/complaints/complaint_form.html:134
+#: templates/complaints/complaint_list.html:231
 msgid "Wait Time"
 msgstr "مدة الانتظار"
 
 #: templates/callcenter/complaint_form.html:193
 #: templates/callcenter/inquiry_form.html:166
 #: templates/callcenter/inquiry_list.html:115
+#: templates/complaints/complaint_form.html:135
+#: templates/complaints/complaint_list.html:232
 #: templates/complaints/inquiry_form.html:90
 #: templates/complaints/inquiry_list.html:83
 msgid "Billing"
 msgstr "الفوترة"
 
 #: templates/callcenter/complaint_form.html:194
+#: templates/complaints/complaint_form.html:136
+#: templates/complaints/complaint_list.html:233
 msgid "Communication"
 msgstr "التواصل"
 
@@ -1873,6 +1917,7 @@ msgid "Optional subcategory"
 msgstr "فئة فرعية اختيارية"
 
 #: templates/callcenter/complaint_form.html:213
+#: templates/complaints/complaint_form.html:155
 msgid "Classification"
 msgstr "التصنيف"
 
@@ -1883,6 +1928,11 @@ msgstr "اختر درجة الخطورة..."
 #: templates/callcenter/complaint_form.html:220
 #: templates/callcenter/complaint_form.html:234
 #: templates/callcenter/complaint_list.html:121
+#: templates/complaints/complaint_form.html:162
+#: templates/complaints/complaint_form.html:176
+#: templates/complaints/complaint_form.html:212
+#: templates/complaints/complaint_list.html:204
+#: templates/complaints/complaint_list.html:216
 #: templates/observations/observation_list.html:210
 #: templates/observations/public_new.html:250
 msgid "Low"
@@ -1891,6 +1941,11 @@ msgstr "منخفض"
 #: templates/callcenter/complaint_form.html:221
 #: templates/callcenter/complaint_form.html:235
 #: templates/callcenter/complaint_list.html:120
+#: templates/complaints/complaint_form.html:163
+#: templates/complaints/complaint_form.html:177
+#: templates/complaints/complaint_form.html:211
+#: templates/complaints/complaint_list.html:205
+#: templates/complaints/complaint_list.html:217
 #: templates/observations/observation_list.html:211
 #: templates/observations/public_new.html:256
 msgid "Medium"
@@ -1899,6 +1954,11 @@ msgstr "متوسط"
 #: templates/callcenter/complaint_form.html:222
 #: templates/callcenter/complaint_form.html:236
 #: templates/callcenter/complaint_list.html:119
+#: templates/complaints/complaint_form.html:164
+#: templates/complaints/complaint_form.html:178
+#: templates/complaints/complaint_form.html:210
+#: templates/complaints/complaint_list.html:206
+#: templates/complaints/complaint_list.html:218
 #: templates/observations/observation_list.html:212
 #: templates/observations/public_new.html:262
 msgid "High"
@@ -1906,12 +1966,16 @@ msgstr "مرتفع"
 
 #: templates/callcenter/complaint_form.html:223
 #: templates/callcenter/complaint_list.html:118
+#: templates/complaints/complaint_form.html:165
+#: templates/complaints/complaint_form.html:209
+#: templates/complaints/complaint_list.html:207
 #: templates/observations/observation_list.html:213
 #: templates/observations/public_new.html:268
 msgid "Critical"
 msgstr "حرج"
 
 #: templates/callcenter/complaint_form.html:226
+#: templates/complaints/complaint_form.html:168
 msgid "Determines SLA deadline"
 msgstr "يحدد الموعد النهائي لاتفاقية مستوى الخدمة (SLA)"
 
@@ -1920,6 +1984,8 @@ msgid "Select priority..."
 msgstr "اختر الأولوية..."
 
 #: templates/callcenter/complaint_form.html:237
+#: templates/complaints/complaint_form.html:179
+#: templates/complaints/complaint_list.html:219
 msgid "Urgent"
 msgstr "عاجل"
 
@@ -2033,6 +2099,7 @@ msgstr "بحث..."
 #: templates/callcenter/inquiry_list.html:102
 #: templates/callcenter/inquiry_list.html:113
 #: templates/callcenter/inquiry_list.html:125
+#: templates/complaints/complaint_list.html:281
 #: templates/complaints/inquiry_list.html:71
 #: templates/complaints/inquiry_list.html:81
 #: templates/complaints/inquiry_list.html:92
@@ -2059,10 +2126,12 @@ msgstr "تصفية"
 
 #: templates/callcenter/complaint_list.html:178
 #: templates/callcenter/complaint_success.html:83
+#: templates/complaints/complaint_detail.html:241
 msgid "N/A"
 msgstr "غير متاح"
 
 #: templates/callcenter/complaint_list.html:211
+#: templates/complaints/complaint_list.html:415
 msgid "No complaints found"
 msgstr "لم يتم العثور على شكاوى"
 
@@ -2503,44 +2572,244 @@ msgstr "قيد الانتظار"
 msgid "Avg Resolution Time"
 msgstr "متوسط وقت الحل"
 
-#: templates/complaints/complaint_detail.html:304
-msgid "Activity Timeline"
-msgstr "الجدول الزمني للنشاط"
+#: templates/complaints/complaint_detail.html:119
+#: templates/complaints/complaint_form.html:36
+msgid "Back to Complaints"
+msgstr "الرجوع إلى الشكاوى"
 
+msgid "MRN"
+msgstr "الرقم الطبي (MRN)"
+
+msgid "SLA Deadline"
+msgstr "الموعد النهائي لاتفاقية مستوى الخدمة (SLA)"
+
+msgid "OVERDUE"
+msgstr "متأخرة"
+
+msgid "remaining"
+msgstr "متبقية"
+
+#: templates/complaints/complaint_detail.html:187
+#: templates/observations/observation_detail.html:311
+msgid "Timeline"
+msgstr "الجدول الزمني"
+
+#: templates/complaints/complaint_detail.html:193
 #: templates/complaints/complaint_detail.html:356
 #: templates/observations/observation_detail.html:289
 #: templates/observations/public_new.html:326
 msgid "Attachments"
 msgstr "المرفقات"
 
-#: templates/complaints/complaint_detail.html:399
-msgid "Related PX Actions"
-msgstr "إجراءات PX ذات الصلة"
+#: templates/complaints/complaint_detail.html:199
+#: templates/layouts/partials/sidebar.html:132
+msgid "PX Actions"
+msgstr "إجراءات تجربة المريض"
+
+msgid "Resolution"
+msgstr "الحل"
+
+msgid "Resolved by"
+msgstr "تم الحل بواسطة"
+
+#: templates/complaints/complaint_detail.html:277
+#: templates/complaints/inquiry_detail.html:71
+msgid "on"
+msgstr "في"
+
+#: templates/complaints/complaint_detail.html:292
+#: templates/observations/observation_detail.html:223
+#: templates/observations/public_track.html:287
+msgid "Last Updated"
+msgstr "آخر تحديث"
+
+#: templates/complaints/complaint_detail.html:304
+msgid "Activity Timeline"
+msgstr "الجدول الزمني للنشاط"
+
+#: templates/complaints/complaint_detail.html:345
+#: templates/observations/observation_detail.html:348
+msgid "No timeline entries yet"
+msgstr "لا توجد إدخالات في الجدول الزمني بعد"
+
+#: templates/complaints/complaint_detail.html:388
+msgid "No attachments"
+msgstr "لا توجد مرفقات"
+
+msgid "Related PX Actions"
+msgstr "إجراءات PX المرتبطة"
+
+msgid "No PX actions created yet"
+msgstr "لم يتم إنشاء أي إجراء PX بعد"
+
+msgid "Select user..."
+msgstr "اختر المستخدم..."
+
+msgid "Update Status"
+msgstr "تحديث الحالة"
+
+msgid "Escalate"
+msgstr "تصعيد"
+
+msgid "Unassigned"
+msgstr "غير معين"
+
+msgid "Resolved By"
+msgstr "تم الحل بواسطة"
+
+msgid "Closed By"
+msgstr "تم الإغلاق بواسطة"
 
-#: templates/complaints/complaint_detail.html:560
 msgid "Resolution Survey"
 msgstr "استبيان الحل"
 
-#: templates/complaints/complaint_detail.html:592
+msgid "View Survey"
+msgstr "عرض الاستبيان"
+
 msgid "Escalate Complaint"
 msgstr "تصعيد الشكوى"
 
+msgid "This will escalate the complaint to higher management"
+msgstr "سيؤدي ذلك إلى تصعيد الشكوى إلى الإدارة العليا"
+
 #: templates/complaints/complaint_detail.html:603
 msgid "Explain why this complaint needs escalation..."
 msgstr "اشرح سبب حاجة هذه الشكوى إلى التصعيد..."
 
-#: templates/complaints/complaint_form.html:123
+#: templates/complaints/complaint_form.html:5
+#: templates/complaints/complaint_list.html:94
+msgid "New Complaint"
+msgstr "شكوى جديدة"
+
+msgid "Create New Complaint"
+msgstr "إنشاء شكوى جديدة"
+
+msgid "File a new patient complaint with SLA tracking"
+msgstr "تقديم شكوى مريض جديدة مع تتبع اتفاقية مستوى الخدمة (SLA)"
+
+msgid "Patient Information"
+msgstr "معلومات المريض"
+
+msgid "Search and select patient"
+msgstr "ابحث واختر المريض"
+
+msgid "Search by MRN or name"
+msgstr "ابحث برقم الملف الطبي أو الاسم"
+
+msgid "Select hospital"
+msgstr "اختر المستشفى"
+
+msgid "Select department"
+msgstr "اختر القسم"
+
+msgid "Select physician"
+msgstr "اختر الطبيب"
+
 msgid "Detailed description of the complaint..."
 msgstr "وصف مفصل للشكوى..."
 
+msgid "Select category"
+msgstr "اختر الفئة"
+
+msgid "Select severity"
+msgstr "اختر شدة الشكوى"
+
+msgid "Select priority"
+msgstr "اختر الأولوية"
+
+msgid "Select source"
+msgstr "اختر المصدر"
+
+msgid "Staff"
+msgstr "الموظف"
+
+msgid "Survey"
+msgstr "الاستبيان"
+
+#: templates/complaints/complaint_form.html:191
+#: templates/layouts/partials/sidebar.html:233
+msgid "Social Media"
+msgstr "وسائل التواصل الاجتماعي"
+
+#: templates/complaints/complaint_form.html:193
+msgid "Ministry of Health"
+msgstr "وزارة الصحة"
+
+msgid "Council of Health Insurance"
+msgstr "مجلس الضمان الصحي"
+
+msgid "SLA deadline will be automatically calculated based on severity"
+msgstr "سيتم حساب الموعد النهائي لاتفاقية مستوى الخدمة تلقائيًا بناءً على شدة الشكوى"
+
+msgid "4 hours"
+msgstr "٤ ساعات"
+
+msgid "24 hours"
+msgstr "٢٤ ساعة"
+
+msgid "72 hours"
+msgstr "٧٢ ساعة"
+
+msgid "168 hours (7 days)"
+msgstr "١٦٨ ساعة (٧ أيام)"
+
+msgid "Complaints Console"
+msgstr "لوحة شكاوى المرضى"
+
+msgid "Manage and track patient complaints with SLA monitoring"
+msgstr "إدارة وتتبع شكاوى المرضى مع مراقبة اتفاقية مستوى الخدمة (SLA)"
+
 #: templates/complaints/complaint_list.html:182
 msgid "Title, MRN, Patient name..."
 msgstr "العنوان، رقم الملف الطبي، اسم المريض..."
 
+#: templates/complaints/complaint_list.html:190
+#: templates/observations/observation_list.html:196
+msgid "All Statuses"
+msgstr "جميع الحالات"
+
+#: templates/complaints/complaint_list.html:203
+#: templates/observations/observation_list.html:209
+msgid "All Severities"
+msgstr "جميع درجات الخطورة"
+
+#: templates/complaints/complaint_list.html:215
+msgid "All Priorities"
+msgstr "جميع الأولويات"
+
+#: templates/complaints/complaint_list.html:242
+#: templates/physicians/department_overview.html:56
+#: templates/physicians/leaderboard.html:83
+#: templates/physicians/physician_list.html:65
+#: templates/physicians/ratings_list.html:60
+#: templates/physicians/specialization_overview.html:56
+msgid "All Hospitals"
+msgstr "جميع المستشفيات"
+
+#: templates/complaints/complaint_list.html:255
+#: templates/observations/observation_list.html:234
+#: templates/physicians/leaderboard.html:94
+#: templates/physicians/physician_list.html:76
+#: templates/physicians/ratings_list.html:71
+msgid "All Departments"
+msgstr "جميع الأقسام"
+
+#: templates/complaints/complaint_list.html:268
+#: templates/observations/observation_list.html:247
+msgid "All Users"
+msgstr "جميع المستخدمين"
+
 #: templates/complaints/complaint_list.html:279
 msgid "SLA Status"
 msgstr "حالة اتفاقية مستوى الخدمة (SLA)"
 
+#: templates/complaints/complaint_list.html:318
+msgid "Export CSV"
+msgstr "تصدير CSV"
+
+msgid "Export Excel"
+msgstr "تصدير Excel"
+
 #: templates/complaints/inquiry_detail.html:4
 #: templates/complaints/inquiry_detail.html:11
 msgid "Inquiry Detail"
@@ -2560,10 +2829,6 @@ msgstr "الرد"
 msgid "Responded by"
 msgstr "تم الرد من قبل"
 
-#: templates/complaints/inquiry_detail.html:71
-msgid "on"
-msgstr "في"
-
 #: templates/complaints/inquiry_detail.html:82
 msgid "Respond to Inquiry"
 msgstr "الرد على الاستفسار"
@@ -2871,11 +3136,6 @@ msgstr "المريض / جهة الاتصال"
 msgid "Journey Information"
 msgstr "معلومات الرحلة"
 
-#: templates/journeys/instance_detail.html:323
-#: templates/surveys/instance_detail.html:102
-msgid "Patient Information"
-msgstr "معلومات المريض"
-
 #: templates/journeys/instance_list.html:70
 msgid "Total Journeys"
 msgstr "إجمالي الرحلات"
@@ -2936,10 +3196,6 @@ msgstr "التحليلات"
 msgid "Observations"
 msgstr "الملاحظات"
 
-#: templates/layouts/partials/sidebar.html:132
-msgid "PX Actions"
-msgstr "إجراءات تجربة المريض"
-
 #: templates/layouts/partials/sidebar.html:142
 msgid "Patient Journeys"
 msgstr "رحلات المرضى"
@@ -2967,10 +3223,6 @@ msgstr "المنظمات"
 msgid "Interactions"
 msgstr "التفاعلات"
 
-#: templates/layouts/partials/sidebar.html:233
-msgid "Social Media"
-msgstr "وسائل التواصل الاجتماعي"
-
 #: templates/layouts/partials/sidebar.html:253
 msgid "QI Projects"
 msgstr "مشاريع تحسين الجودة"
@@ -3005,105 +3257,138 @@ msgstr "تسجيل الخروج"
 msgid "Observation Categories"
 msgstr "فئات الملاحظات"
 
+#: templates/observations/category_form.html:59
 msgid "Bootstrap icon class, e.g., bi-exclamation-triangle"
 msgstr "فئة أيقونة Bootstrap، مثل: bi-exclamation-triangle"
 
+#: templates/observations/category_form.html:61
 msgid "Browse icons"
 msgstr "تصفح الأيقونات"
 
+#: templates/observations/category_form.html:68
 msgid "Sort Order"
 msgstr "ترتيب الفرز"
 
+#: templates/observations/category_form.html:70
 msgid "Lower numbers appear first"
 msgstr "الأرقام الأصغر تظهر أولاً"
 
+#: templates/observations/category_form.html:84
 msgid "Inactive categories won't appear in the public form"
 msgstr "لن تظهر الفئات غير النشطة في النموذج العام"
 
+#: templates/observations/category_form.html:94
 msgid "Save Category"
 msgstr "حفظ الفئة"
 
+#: templates/observations/category_list.html:16
 msgid "Manage categories for observation classification"
 msgstr "إدارة الفئات لتصنيف الملاحظات"
 
+#: templates/observations/category_list.html:20
 msgid "Back to Observations"
 msgstr "العودة إلى الملاحظات"
 
+#: templates/observations/category_list.html:35
 msgid "Order"
 msgstr "الترتيب"
 
+#: templates/observations/category_list.html:84
 msgid "Are you sure you want to delete this category?"
 msgstr "هل أنت متأكد من أنك تريد حذف هذه الفئة؟"
 
+#: templates/observations/category_list.html:100
 msgid "Add First Category"
 msgstr "إضافة أول فئة"
 
+#: templates/observations/convert_to_action.html:5
+#: templates/observations/convert_to_action.html:14
+#: templates/observations/observation_detail.html:174
 msgid "Convert to Action"
 msgstr "تحويل إلى إجراء"
 
+#: templates/observations/convert_to_action.html:24
 msgid "Convert Observation to PX Action"
 msgstr "تحويل الملاحظة إلى إجراء PX"
 
+#: templates/observations/convert_to_action.html:30
+#: templates/observations/public_success.html:213
 msgid "Observation Summary"
 msgstr "ملخص الملاحظة"
 
+#: templates/observations/convert_to_action.html:33
+#: templates/observations/observation_list.html:305
+#: templates/observations/public_track.html:258
 msgid "Tracking Code"
 msgstr "رمز التتبع"
 
+#: templates/observations/convert_to_action.html:55
 msgid "Action Title"
 msgstr "عنوان الإجراء"
 
+#: templates/observations/convert_to_action.html:57
 msgid "A clear, actionable title for the PX Action"
 msgstr "عنوان واضح وقابل للتنفيذ للإجراء PX"
 
+#: templates/observations/convert_to_action.html:78
 msgid "Assign to Department"
 msgstr "تعيين إلى القسم"
 
+#: templates/observations/convert_to_action.html:82
 msgid "Assign to User"
 msgstr "تعيين إلى المستخدم"
 
+#: templates/observations/convert_to_action.html:94
 msgid "Create PX Action"
 msgstr "إنشاء إجراء PX"
 
+#: templates/observations/observation_detail.html:5
 msgid "Observation Detail"
 msgstr "تفاصيل الملاحظة"
 
+#: templates/observations/observation_detail.html:209
+#: templates/observations/public_new.html:303
 msgid "Location"
 msgstr "الموقع"
 
+#: templates/observations/observation_detail.html:213
 msgid "Incident Date/Time"
 msgstr "تاريخ/وقت الحادثة"
 
+#: templates/observations/observation_detail.html:219
+#: templates/observations/public_success.html:236
+#: templates/observations/public_track.html:283
+#: templates/observations/public_track.html:296
 msgid "Submitted"
 msgstr "تم الإرسال"
 
-msgid "Last Updated"
-msgstr "آخر تحديث"
-
+#: templates/observations/observation_detail.html:228
+#: templates/observations/public_track.html:302
 msgid "Triaged"
 msgstr "تم الفرز"
 
+#: templates/observations/observation_detail.html:242
 msgid "Reporter Information"
 msgstr "معلومات المبلّغ"
 
+#: templates/observations/observation_detail.html:248
 msgid "This observation was submitted anonymously"
 msgstr "تم إرسال هذه الملاحظة بشكل مجهول"
 
+#: templates/observations/observation_detail.html:255
+#: templates/observations/public_new.html:352
 msgid "Staff ID"
 msgstr "معرّف الموظف"
 
-msgid "Timeline"
-msgstr "الجدول الزمني"
-
+#: templates/observations/observation_detail.html:321
 msgid "Status Changed"
 msgstr "تم تغيير الحالة"
 
+#: templates/observations/observation_detail.html:335
 msgid "Note Added"
 msgstr "تمت إضافة ملاحظة"
 
-msgid "No timeline entries yet"
-msgstr "لا توجد إدخالات في الجدول الزمني بعد"
-
+#: templates/observations/observation_detail.html:359
 msgid "Assignment"
 msgstr "التعيين"
 
@@ -3111,139 +3396,178 @@ msgstr "التعيين"
 msgid "Linked PX Action"
 msgstr "الإجراء المرتبط بـ PX"
 
+#: templates/observations/observation_detail.html:379
 msgid "View Action"
 msgstr "عرض الإجراء"
 
+#: templates/observations/observation_detail.html:388
 msgid "Triage"
 msgstr "فرز"
 
+#: templates/observations/observation_detail.html:406
 msgid "Note"
 msgstr "ملاحظة"
 
+#: templates/observations/observation_detail.html:430
 msgid "Internal note (not visible to public)"
 msgstr "ملاحظة داخلية (غير مرئية للعامة)"
 
+#: templates/observations/observation_detail.html:442
 msgid "Quick Status Change"
 msgstr "تغيير سريع للحالة"
 
+#: templates/observations/observation_list.html:5
+#: templates/observations/observation_list.html:92
 msgid "Observations Console"
 msgstr "لوحة تحكم الملاحظات"
 
+#: templates/observations/observation_list.html:94
 msgid "Manage and triage staff-reported observations"
 msgstr "إدارة وفرز الملاحظات المُبلّغ عنها من قِبل الموظفين"
 
+#: templates/observations/observation_list.html:101
 msgid "Public Form"
 msgstr "النموذج العام"
 
+#: templates/observations/observation_list.html:128
 msgid "New"
 msgstr "جديد"
 
+#: templates/observations/observation_list.html:188
 msgid "Tracking code, description..."
 msgstr "رمز التتبع، الوصف..."
 
-msgid "All Statuses"
-msgstr "جميع الحالات"
-
-msgid "All Severities"
-msgstr "جميع درجات الخطورة"
-
-msgid "All Users"
-msgstr "جميع المستخدمين"
-
+#: templates/observations/observation_list.html:258
 msgid "Reporter Type"
 msgstr "نوع المُبلّغ"
 
+#: templates/observations/observation_list.html:261
 msgid "Anonymous Only"
 msgstr "مجهول فقط"
 
+#: templates/observations/observation_list.html:262
 msgid "Identified Only"
 msgstr "معرّف فقط"
 
+#: templates/observations/observation_list.html:293
 msgid "Showing"
 msgstr "عرض"
 
+#: templates/observations/observation_list.html:293
 msgid "to"
 msgstr "إلى"
 
+#: templates/observations/observation_list.html:293
 msgid "observations"
 msgstr "ملاحظات"
 
+#: templates/observations/observation_list.html:311
 msgid "Reporter"
 msgstr "المُبلّغ"
 
-msgid "Unassigned"
-msgstr "غير معيّن"
-
+#: templates/observations/observation_list.html:386
 msgid "No observations found"
 msgstr "لم يتم العثور على ملاحظات"
 
+#: templates/observations/public_new.html:9
+#: templates/observations/public_new.html:199
 msgid "Report an Observation"
 msgstr "الإبلاغ عن ملاحظة"
 
+#: templates/observations/public_new.html:200
 msgid "Help us improve by reporting issues you notice"
 msgstr "ساعدنا في التحسين من خلال الإبلاغ عن المشكلات التي تلاحظها"
 
+#: templates/observations/public_new.html:206
 msgid "Anonymous Reporting"
 msgstr "إبلاغ مجهول"
 
+#: templates/observations/public_new.html:208
 msgid ""
 "You can submit this report anonymously. Providing your information is "
 "optional but may help us follow up if needed."
-msgstr "يمكنك إرسال هذا البلاغ بشكل مجهول. تقديم معلوماتك اختياري ولكنه قد يساعدنا في المتابعة إذا لزم الأمر."
+msgstr ""
+"يمكنك إرسال هذا البلاغ بشكل مجهول. تقديم معلوماتك اختياري ولكنه قد يساعدنا "
+"في المتابعة إذا لزم الأمر."
 
+#: templates/observations/public_new.html:233
+#: templates/observations/public_new.html:279
+#: templates/observations/public_new.html:304
+#: templates/observations/public_new.html:327
+#: templates/observations/public_new.html:344
 msgid "optional"
 msgstr "اختياري"
 
+#: templates/observations/public_new.html:297
 msgid "Please describe what you observed in detail."
 msgstr "يرجى وصف ما لاحظته بالتفصيل."
 
+#: templates/observations/public_new.html:315
 msgid "When did this occur?"
 msgstr "متى حدث ذلك؟"
 
+#: templates/observations/public_new.html:331
 msgid "Click to upload files"
 msgstr "انقر لتحميل الملفات"
 
+#: templates/observations/public_new.html:332
 msgid "Images, PDF, Word, Excel (max 10MB each)"
 msgstr "صور، PDF، Word، Excel (بحد أقصى 10MB لكل ملف)"
 
+#: templates/observations/public_new.html:343
 msgid "Your Information"
 msgstr "معلوماتك الشخصية"
 
+#: templates/observations/public_new.html:347
 msgid ""
 "Providing your information helps us follow up if needed. Leave blank to "
 "submit anonymously."
-msgstr "تقديم معلوماتك يساعدنا في المتابعة عند الحاجة. اتركها فارغة لتقديم البلاغ بشكل مجهول."
+msgstr ""
+"تقديم معلوماتك يساعدنا في المتابعة عند الحاجة. اتركها فارغة لتقديم البلاغ "
+"بشكل مجهول."
 
+#: templates/observations/public_new.html:373
 msgid "Submit Observation"
 msgstr "إرسال الملاحظة"
 
+#: templates/observations/public_new.html:380
 msgid "Track an existing observation"
 msgstr "تتبع ملاحظة موجودة"
 
+#: templates/observations/public_success.html:9
 msgid "Observation Submitted"
 msgstr "تم إرسال الملاحظة"
 
+#: templates/observations/public_success.html:183
 msgid "Thank You!"
 msgstr "شكرًا لك!"
 
+#: templates/observations/public_success.html:185
 msgid "Your observation has been submitted successfully."
 msgstr "تم إرسال ملاحظتك بنجاح."
 
+#: templates/observations/public_success.html:190
 msgid "Your Tracking Code"
 msgstr "رمز التتبع الخاص بك"
 
+#: templates/observations/public_success.html:194
+#: templates/observations/public_success.html:268
 msgid "Copy Code"
 msgstr "نسخ الرمز"
 
+#: templates/observations/public_success.html:202
 msgid "Important"
 msgstr "مهم"
 
+#: templates/observations/public_success.html:205
 msgid "Save this tracking code to check the status of your observation."
 msgstr "احفظ رمز التتبع هذا للتحقق من حالة ملاحظتك."
 
+#: templates/observations/public_success.html:206
 msgid "Our team will review your observation and take appropriate action."
 msgstr "سيقوم فريقنا بمراجعة ملاحظتك واتخاذ الإجراء المناسب."
 
+#: templates/observations/public_success.html:207
 msgid "You can track your observation status anytime using the tracking code."
 msgstr "يمكنك تتبع حالة ملاحظتك في أي وقت باستخدام رمز التتبع."
 
@@ -3251,56 +3575,75 @@ msgstr "يمكنك تتبع حالة ملاحظتك في أي وقت باستخ
 msgid "Track Status"
 msgstr "تتبع الحالة"
 
+#: templates/observations/public_success.html:249
 msgid "Submit Another"
 msgstr "إرسال ملاحظة أخرى"
 
+#: templates/observations/public_success.html:264
 msgid "Copied!"
 msgstr "تم النسخ!"
 
+#: templates/observations/public_track.html:9
 msgid "Track Observation"
 msgstr "تتبع الملاحظة"
 
+#: templates/observations/public_track.html:227
 msgid "Track Your Observation"
 msgstr "تتبع ملاحظتك"
 
+#: templates/observations/public_track.html:228
 msgid "Enter your tracking code to check the status"
 msgstr "أدخل رمز التتبع للتحقق من الحالة"
 
+#: templates/observations/public_track.html:244
 msgid "e.g., OBS-ABC123"
 msgstr "مثال: OBS-ABC123"
 
+#: templates/observations/public_track.html:248
 msgid "Track"
 msgstr "تتبع"
 
+#: templates/observations/public_track.html:293
 msgid "Status Progress"
 msgstr "تقدم الحالة"
 
+#: templates/observations/public_track.html:309
 msgid "Assigned"
 msgstr "تم التعيين"
 
+#: templates/observations/public_track.html:310
 msgid "Being reviewed by our team"
 msgstr "قيد المراجعة من قبل فريقنا"
 
+#: templates/observations/public_track.html:317
 msgid "Action is being taken"
 msgstr "يتم اتخاذ إجراء"
 
+#: templates/observations/public_track.html:337
 msgid "Rejected"
 msgstr "مرفوض"
 
+#: templates/observations/public_track.html:338
 msgid "This observation was not accepted"
 msgstr "لم يتم قبول هذه الملاحظة"
 
+#: templates/observations/public_track.html:344
 msgid "Duplicate"
 msgstr "مكررة"
 
+#: templates/observations/public_track.html:345
 msgid "This observation was marked as duplicate"
 msgstr "تم تحديد هذه الملاحظة كمكررة"
 
+#: templates/observations/public_track.html:353
 msgid ""
 "For privacy reasons, detailed notes and internal communications are not "
 "shown here."
-msgstr "لأسباب تتعلق بالخصوصية، لا يتم عرض الملاحظات التفصيلية والمراسلات الداخلية هنا."
+msgstr ""
+"لأسباب تتعلق بالخصوصية، لا يتم عرض الملاحظات التفصيلية والمراسلات الداخلية "
+"هنا."
 
+#: templates/observations/public_track.html:361
 msgid "Submit a new observation"
 msgstr "إرسال ملاحظة جديدة"
 
@@ -3325,11 +3668,6 @@ msgstr "المدينة"
 msgid "Patients"
 msgstr "المرضى"
 
-#: templates/organizations/patient_list.html:16
-#: templates/surveys/instance_detail.html:114
-msgid "MRN"
-msgstr "الرقم الطبي"
-
 #: templates/organizations/patient_list.html:19
 msgid "Primary Hospital"
 msgstr "المستشفى الرئيسي"
@@ -3360,14 +3698,6 @@ msgstr "عرض التخصص"
 msgid "Back to Physicians"
 msgstr "العودة إلى الأطباء"
 
-#: templates/physicians/department_overview.html:56
-#: templates/physicians/leaderboard.html:83
-#: templates/physicians/physician_list.html:65
-#: templates/physicians/ratings_list.html:60
-#: templates/physicians/specialization_overview.html:56
-msgid "All Hospitals"
-msgstr "جميع المستشفيات"
-
 #: templates/physicians/department_overview.html:122
 msgid "Dept Rank"
 msgstr "ترتيب القسم"
diff --git a/templates/complaints/complaint_detail.html b/templates/complaints/complaint_detail.html
index e4ddd59..dbbec63 100644
--- a/templates/complaints/complaint_detail.html
+++ b/templates/complaints/complaint_detail.html
@@ -116,7 +116,7 @@
     <!-- Back Button -->
     <div class="mb-3">
         <a href="{% url 'complaints:complaint_list' %}" class="btn btn-outline-secondary btn-sm">
-            <i class="bi bi-arrow-left me-1"></i> Back to Complaints
+            <i class="bi bi-arrow-left me-1"></i> {{ _("Back to Complaints")}}
         </a>
     </div>
 
@@ -135,18 +135,18 @@
                 </div>
                 <p class="mb-2">
                     <i class="bi bi-hash me-1"></i>
-                    <strong>ID:</strong> {{ complaint.id|slice:":8" }}
+                    <strong>{{ _("ID") }}:</strong> {{ complaint.id|slice:":8" }}
                     <span class="mx-2">|</span>
                     <i class="bi bi-person-fill me-1"></i>
-                    <strong>Patient:</strong> {{ complaint.patient.get_full_name }} (MRN: {{ complaint.patient.mrn }})
+                    <strong>{{ _("Patient") }}:</strong> {{ complaint.patient.get_full_name }} ({{ _("MRN") }}: {{ complaint.patient.mrn }})
                 </p>
                 <p class="mb-0">
                     <i class="bi bi-hospital me-1"></i>
-                    <strong>Hospital:</strong> {{ complaint.hospital.name_en }}
+                    <strong>{{ _("Hospital") }}:</strong> {{ complaint.hospital.name_en }}
                     {% if complaint.department %}
                     <span class="mx-2">|</span>
                     <i class="bi bi-building me-1"></i>
-                    <strong>Department:</strong> {{ complaint.department.name_en }}
+                    <strong>{{ _("Department") }}:</strong> {{ complaint.department.name_en }}
                     {% endif %}
                 </p>
             </div>
@@ -154,16 +154,16 @@
                 <div class="sla-countdown {% if complaint.is_overdue %}overdue{% endif %}">
                     <div class="mb-1">
                         <i class="bi bi-clock-history me-1"></i>
-                        <strong>SLA Deadline</strong>
+                        <strong>{{ _("SLA Deadline")}}</strong>
                     </div>
                     <h4 class="mb-0">{{ complaint.due_at|date:"M d, Y H:i" }}</h4>
                     {% if complaint.is_overdue %}
                     <div class="mt-2">
                         <i class="bi bi-exclamation-triangle-fill me-1"></i>
-                        <strong>OVERDUE</strong>
+                        <strong>{{ _("OVERDUE") }}</strong>
                     </div>
                     {% else %}
-                    <small>{{ complaint.due_at|timeuntil }} remaining</small>
+                    <small>{{ complaint.due_at|timeuntil }} {{ _("remaining") }}</small>
                     {% endif %}
                 </div>
             </div>
@@ -178,25 +178,25 @@
                 <li class="nav-item" role="presentation">
                     <button class="nav-link active" id="details-tab" data-bs-toggle="tab" 
                             data-bs-target="#details" type="button" role="tab">
-                        <i class="bi bi-info-circle me-1"></i> Details
+                        <i class="bi bi-info-circle me-1"></i> {{ _("Details") }}
                     </button>
                 </li>
                 <li class="nav-item" role="presentation">
                     <button class="nav-link" id="timeline-tab" data-bs-toggle="tab" 
                             data-bs-target="#timeline" type="button" role="tab">
-                        <i class="bi bi-clock-history me-1"></i> Timeline ({{ timeline.count }})
+                        <i class="bi bi-clock-history me-1"></i> {{ _("Timeline") }} ({{ timeline.count }})
                     </button>
                 </li>
                 <li class="nav-item" role="presentation">
                     <button class="nav-link" id="attachments-tab" data-bs-toggle="tab" 
                             data-bs-target="#attachments" type="button" role="tab">
-                        <i class="bi bi-paperclip me-1"></i> Attachments ({{ attachments.count }})
+                        <i class="bi bi-paperclip me-1"></i> {{ _("Attachments") }} ({{ attachments.count }})
                     </button>
                 </li>
                 <li class="nav-item" role="presentation">
                     <button class="nav-link" id="actions-tab" data-bs-toggle="tab" 
                             data-bs-target="#actions" type="button" role="tab">
-                        <i class="bi bi-lightning-fill me-1"></i> PX Actions ({{ px_actions.count }})
+                        <i class="bi bi-lightning-fill me-1"></i> {{ _("PX Actions")}} ({{ px_actions.count }})
                     </button>
                 </li>
             </ul>
@@ -211,7 +211,7 @@
                             
                             <div class="row mb-3">
                                 <div class="col-md-6">
-                                    <div class="info-label">Category</div>
+                                    <div class="info-label">{{ _("Category") }}</div>
                                     <div class="info-value">
                                         <span class="badge bg-secondary">{{ complaint.get_category_display }}</span>
                                         {% if complaint.subcategory %}
@@ -220,25 +220,25 @@
                                     </div>
                                 </div>
                                 <div class="col-md-6">
-                                    <div class="info-label">Source</div>
+                                    <div class="info-label">{{ _("Source") }}</div>
                                     <div class="info-value">{{ complaint.get_source_display }}</div>
                                 </div>
                             </div>
                             
                             <div class="row mb-3">
                                 <div class="col-md-6">
-                                    <div class="info-label">Priority</div>
+                                    <div class="info-label">{{ _("Priority") }}</div>
                                     <div class="info-value">
                                         <span class="badge bg-info">{{ complaint.get_priority_display }}</span>
                                     </div>
                                 </div>
                                 <div class="col-md-6">
-                                    <div class="info-label">Encounter ID</div>
+                                    <div class="info-label">{{ _("Encounter ID")}}</div>
                                     <div class="info-value">
                                         {% if complaint.encounter_id %}
                                         {{ complaint.encounter_id }}
                                         {% else %}
-                                        <span class="text-muted">N/A</span>
+                                        <span class="text-muted">{{ _("N/A")}}</span>
                                         {% endif %}
                                     </div>
                                 </div>
@@ -247,7 +247,7 @@
                             {% if complaint.physician %}
                             <div class="row mb-3">
                                 <div class="col-md-12">
-                                    <div class="info-label">Physician</div>
+                                    <div class="info-label">{{ _("Physician") }}</div>
                                     <div class="info-value">
                                         Dr. {{ complaint.physician.first_name }} {{ complaint.physician.last_name }}
                                         <span class="text-muted">({{ complaint.physician.specialty }})</span>
@@ -259,7 +259,7 @@
                             <hr>
                             
                             <div class="mb-3">
-                                <div class="info-label">Description</div>
+                                <div class="info-label">{{ _("Description") }}</div>
                                 <div class="info-value mt-2">
                                     <p class="mb-0">{{ complaint.description|linebreaks }}</p>
                                 </div>
@@ -268,13 +268,13 @@
                             {% if complaint.resolution %}
                             <hr>
                             <div class="mb-3">
-                                <div class="info-label">Resolution</div>
+                                <div class="info-label">{{ _("Resolution") }}</div>
                                 <div class="info-value mt-2">
                                     <div class="alert alert-success">
                                         <p class="mb-2">{{ complaint.resolution|linebreaks }}</p>
                                         <small class="text-muted">
-                                            Resolved by {{ complaint.resolved_by.get_full_name }} 
-                                            on {{ complaint.resolved_at|date:"M d, Y H:i" }}
+                                            {{ _("Resolved by")}} {{ complaint.resolved_by.get_full_name }}
+                                            {{ _("on") }} {{ complaint.resolved_at|date:"M d, Y H:i" }}
                                         </small>
                                     </div>
                                 </div>
@@ -285,11 +285,11 @@
                             
                             <div class="row">
                                 <div class="col-md-6">
-                                    <div class="info-label">Created</div>
+                                    <div class="info-label">{{ _("Created") }}</div>
                                     <div class="info-value">{{ complaint.created_at|date:"M d, Y H:i" }}</div>
                                 </div>
                                 <div class="col-md-6">
-                                    <div class="info-label">Last Updated</div>
+                                    <div class="info-label">{{ _("Last Updated")}}</div>
                                     <div class="info-value">{{ complaint.updated_at|date:"M d, Y H:i" }}</div>
                                 </div>
                             </div>
@@ -342,7 +342,7 @@
                             {% else %}
                             <div class="text-center py-5">
                                 <i class="bi bi-clock-history" style="font-size: 3rem; color: #ccc;"></i>
-                                <p class="text-muted mt-3">No timeline entries yet</p>
+                                <p class="text-muted mt-3">{{ _("No timeline entries yet")}}</p>
                             </div>
                             {% endif %}
                         </div>
@@ -385,7 +385,7 @@
                             {% else %}
                             <div class="text-center py-5">
                                 <i class="bi bi-paperclip" style="font-size: 3rem; color: #ccc;"></i>
-                                <p class="text-muted mt-3">No attachments</p>
+                                <p class="text-muted mt-3">{{ _("No attachments")}}</p>
                             </div>
                             {% endif %}
                         </div>
@@ -413,7 +413,7 @@
                                         </div>
                                         <a href="{% url 'actions:action_detail' action.id %}" 
                                            class="btn btn-sm btn-outline-primary">
-                                            View <i class="bi bi-arrow-right ms-1"></i>
+                                            {{ _("View") }} <i class="bi bi-arrow-right ms-1"></i>
                                         </a>
                                     </div>
                                 </div>
@@ -422,7 +422,7 @@
                             {% else %}
                             <div class="text-center py-5">
                                 <i class="bi bi-lightning" style="font-size: 3rem; color: #ccc;"></i>
-                                <p class="text-muted mt-3">No PX actions created yet</p>
+                                <p class="text-muted mt-3">{{ _("No PX actions created yet")}}</p>
                             </div>
                             {% endif %}
                         </div>
@@ -446,7 +446,7 @@
                         <label class="form-label">{% trans "Assign To" %}</label>
                         <div class="input-group">
                             <select name="user_id" class="form-select" required>
-                                <option value="">Select user...</option>
+                                <option value="">{{ _("Select user...")}}</option>
                                 {% for user_obj in assignable_users %}
                                 <option value="{{ user_obj.id }}" 
                                         {% if complaint.assigned_to and complaint.assigned_to.id == user_obj.id %}selected{% endif %}>
@@ -474,14 +474,14 @@
                         <textarea name="note" class="form-control mb-2" rows="2" 
                                   placeholder="{% trans 'Optional note...' %}"></textarea>
                         <button type="submit" class="btn btn-primary w-100">
-                            <i class="bi bi-arrow-repeat me-1"></i> Update Status
+                            <i class="bi bi-arrow-repeat me-1"></i> {{ _("Update Status")}}
                         </button>
                     </form>
                     
                     <!-- Escalate -->
                     <button type="button" class="btn btn-danger w-100" data-bs-toggle="modal" 
                             data-bs-target="#escalateModal">
-                        <i class="bi bi-exclamation-triangle me-1"></i> Escalate
+                        <i class="bi bi-exclamation-triangle me-1"></i> {{ _("Escalate") }}
                     </button>
                 </div>
             </div>
@@ -498,7 +498,7 @@
                         <textarea name="note" class="form-control mb-2" rows="3" 
                                   placeholder="{% trans 'Enter your note...' %}" required></textarea>
                         <button type="submit" class="btn btn-success w-100">
-                            <i class="bi bi-plus-circle me-1"></i> Add Note
+                            <i class="bi bi-plus-circle me-1"></i> {{ _("Add Note")}}
                         </button>
                     </form>
                 </div>
@@ -511,7 +511,7 @@
                 </div>
                 <div class="card-body">
                     <div class="mb-3">
-                        <div class="info-label">Assigned To</div>
+                        <div class="info-label">{{ _("Assigned To")}}</div>
                         <div class="info-value">
                             {% if complaint.assigned_to %}
                             {{ complaint.assigned_to.get_full_name }}
@@ -520,14 +520,14 @@
                                 Assigned {{ complaint.assigned_at|date:"M d, Y H:i" }}
                             </small>
                             {% else %}
-                            <span class="text-muted">Unassigned</span>
+                            <span class="text-muted">{{ _("Unassigned") }}</span>
                             {% endif %}
                         </div>
                     </div>
                     
                     {% if complaint.resolved_by %}
                     <div class="mb-3">
-                        <div class="info-label">Resolved By</div>
+                        <div class="info-label">{{ _("Resolved By")}}</div>
                         <div class="info-value">
                             {{ complaint.resolved_by.get_full_name }}
                             <br>
@@ -540,7 +540,7 @@
                     
                     {% if complaint.closed_by %}
                     <div class="mb-0">
-                        <div class="info-label">Closed By</div>
+                        <div class="info-label">{{ _("Closed By")}}</div>
                         <div class="info-value">
                             {{ complaint.closed_by.get_full_name }}
                             <br>
@@ -561,19 +561,19 @@
                 </div>
                 <div class="card-body">
                     <p class="mb-2">
-                        <strong>Status:</strong> 
+                        <strong>{{ _("Status") }}:</strong>
                         <span class="badge bg-{{ complaint.resolution_survey.status }}">
                             {{ complaint.resolution_survey.get_status_display }}
                         </span>
                     </p>
                     {% if complaint.resolution_survey.score %}
                     <p class="mb-2">
-                        <strong>Score:</strong> {{ complaint.resolution_survey.score }}/100
+                        <strong>{{ _("Score") }}:</strong> {{ complaint.resolution_survey.score }}/100
                     </p>
                     {% endif %}
                     <a href="{% url 'surveys:survey_instance_detail' complaint.resolution_survey.id %}" 
                        class="btn btn-sm btn-outline-info">
-                        View Survey <i class="bi bi-arrow-right ms-1"></i>
+                        {{ _("View Survey")}} <i class="bi bi-arrow-right ms-1"></i>
                     </a>
                 </div>
             </div>
@@ -595,7 +595,7 @@
                 <div class="modal-body">
                     <div class="alert alert-warning">
                         <i class="bi bi-exclamation-triangle me-2"></i>
-                        This will escalate the complaint to higher management.
+                        {{ _("This will escalate the complaint to higher management")}}.
                     </div>
                     <div class="mb-3">
                         <label class="form-label">{% trans "Reason for Escalation" %}</label>
@@ -606,7 +606,7 @@
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Cancel" %}</button>
                     <button type="submit" class="btn btn-danger">
-                        <i class="bi bi-exclamation-triangle me-1"></i> Escalate
+                        <i class="bi bi-exclamation-triangle me-1"></i> {{ _("Escalate") }}
                     </button>
                 </div>
             </form>
diff --git a/templates/complaints/complaint_form.html b/templates/complaints/complaint_form.html
index 259e0dd..3f4af63 100644
--- a/templates/complaints/complaint_form.html
+++ b/templates/complaints/complaint_form.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load static %}
 
-{% block title %}New Complaint - PX360{% endblock %}
+{% block title %}{{ _("New Complaint")}} - PX360{% endblock %}
 
 {% block extra_css %}
 <style>
@@ -33,13 +33,13 @@
     <!-- Page Header -->
     <div class="mb-4">
         <a href="{% url 'complaints:complaint_list' %}" class="btn btn-outline-secondary btn-sm mb-3">
-            <i class="bi bi-arrow-left me-1"></i> Back to Complaints
+            <i class="bi bi-arrow-left me-1"></i> {{ _("Back to Complaints")}}
         </a>
         <h2 class="mb-1">
             <i class="bi bi-plus-circle text-primary me-2"></i>
-            Create New Complaint
+            {{ _("Create New Complaint")}}
         </h2>
-        <p class="text-muted mb-0">File a new patient complaint with SLA tracking</p>
+        <p class="text-muted mb-0">{{ _("File a new patient complaint with SLA tracking")}}</p>
     </div>
 
     <form method="post" action="{% url 'complaints:complaint_create' %}" id="complaintForm">
@@ -50,16 +50,16 @@
                 <!-- Patient Information -->
                 <div class="form-section">
                     <h5 class="form-section-title">
-                        <i class="bi bi-person-fill me-2"></i>Patient Information
+                        <i class="bi bi-person-fill me-2"></i>{{ _("Patient Information")}}
                     </h5>
                     
                     <div class="row">
                         <div class="col-md-6 mb-3">
                             <label class="form-label required-field">{% trans "Patient" %}</label>
                             <select name="patient_id" class="form-select" id="patientSelect" required>
-                                <option value="">Search and select patient...</option>
+                                <option value="">{{ _("Search and select patient")}}</option>
                             </select>
-                            <small class="form-text text-muted">Search by MRN or name</small>
+                            <small class="form-text text-muted">{{ _("Search by MRN or name")}}</small>
                         </div>
                         
                         <div class="col-md-6 mb-3">
@@ -73,14 +73,14 @@
                 <!-- Organization Information -->
                 <div class="form-section">
                     <h5 class="form-section-title">
-                        <i class="bi bi-hospital me-2"></i>Organization
+                        <i class="bi bi-hospital me-2"></i>{{ _("Organization") }}
                     </h5>
                     
                     <div class="row">
                         <div class="col-md-6 mb-3">
                             <label class="form-label required-field">{% trans "Hospital" %}</label>
                             <select name="hospital_id" class="form-select" id="hospitalSelect" required>
-                                <option value="">Select hospital...</option>
+                                <option value="">{{ _("Select hospital")}}</option>
                                 {% for hospital in hospitals %}
                                 <option value="{{ hospital.id }}">{{ hospital.name_en }}</option>
                                 {% endfor %}
@@ -90,7 +90,7 @@
                         <div class="col-md-6 mb-3">
                             <label class="form-label">{% trans "Department" %}</label>
                             <select name="department_id" class="form-select" id="departmentSelect">
-                                <option value="">Select department...</option>
+                                <option value="">{{ _("Select department")}}</option>
                             </select>
                         </div>
                     </div>
@@ -99,7 +99,7 @@
                         <div class="col-md-6 mb-3">
                             <label class="form-label">{% trans "Physician" %}</label>
                             <select name="physician_id" class="form-select" id="physicianSelect">
-                                <option value="">Select physician...</option>
+                                <option value="">{{ _("Select physician")}}</option>
                             </select>
                         </div>
                     </div>
@@ -108,7 +108,7 @@
                 <!-- Complaint Details -->
                 <div class="form-section">
                     <h5 class="form-section-title">
-                        <i class="bi bi-file-text me-2"></i>Complaint Details
+                        <i class="bi bi-file-text me-2"></i>{{ _("Complaint Details")}}
                     </h5>
                     
                     <div class="mb-3">
@@ -127,14 +127,14 @@
                         <div class="col-md-6 mb-3">
                             <label class="form-label required-field">{% trans "Category" %}</label>
                             <select name="category" class="form-select" required>
-                                <option value="">Select category...</option>
-                                <option value="clinical_care">Clinical Care</option>
-                                <option value="staff_behavior">Staff Behavior</option>
-                                <option value="facility">Facility & Environment</option>
-                                <option value="wait_time">Wait Time</option>
-                                <option value="billing">Billing</option>
-                                <option value="communication">Communication</option>
-                                <option value="other">Other</option>
+                                <option value="">{{ _("Select category")}}</option>
+                                <option value="clinical_care">{{ _("Clinical Care")}}</option>
+                                <option value="staff_behavior">{{ _("Staff Behavior")}}</option>
+                                <option value="facility">{{ _("Facility & Environment")}}</option>
+                                <option value="wait_time">{{ _("Wait Time")}}</option>
+                                <option value="billing">{{ _("Billing") }}</option>
+                                <option value="communication">{{ _("Communication") }}</option>
+                                <option value="other">{{ _("Other") }}</option>
                             </select>
                         </div>
                         
@@ -152,47 +152,47 @@
                 <!-- Classification -->
                 <div class="form-section">
                     <h5 class="form-section-title">
-                        <i class="bi bi-tags me-2"></i>Classification
+                        <i class="bi bi-tags me-2"></i>{{ _("Classification") }}
                     </h5>
                     
                     <div class="mb-3">
                         <label class="form-label required-field">{% trans "Severity" %}</label>
                         <select name="severity" class="form-select" required>
-                            <option value="">Select severity...</option>
-                            <option value="low">Low</option>
-                            <option value="medium" selected>Medium</option>
-                            <option value="high">High</option>
-                            <option value="critical">Critical</option>
+                            <option value="">{{ _("Select severity")}}</option>
+                            <option value="low">{{ _("Low") }}</option>
+                            <option value="medium" selected>{{ _("Medium") }}</option>
+                            <option value="high">{{ _("High") }}</option>
+                            <option value="critical">{{ _("Critical") }}</option>
                         </select>
                         <small class="form-text text-muted">
-                            Determines SLA deadline
+                            {{ _("Determines SLA deadline")}}
                         </small>
                     </div>
                     
                     <div class="mb-3">
                         <label class="form-label required-field">{% trans "Priority" %}</label>
                         <select name="priority" class="form-select" required>
-                            <option value="">Select priority...</option>
-                            <option value="low">Low</option>
-                            <option value="medium" selected>Medium</option>
-                            <option value="high">High</option>
-                            <option value="urgent">Urgent</option>
+                            <option value="">{{ _("Select priority")}}</option>
+                            <option value="low">{{ _("Low") }}</option>
+                            <option value="medium" selected>{{ _("Medium") }}</option>
+                            <option value="high">{{ _("High") }}</option>
+                            <option value="urgent">{{ _("Urgent") }}</option>
                         </select>
                     </div>
                     
                     <div class="mb-3">
                         <label class="form-label required-field">{% trans "Source" %}</label>
                         <select name="source" class="form-select" required>
-                            <option value="">Select source...</option>
-                            <option value="patient">Patient</option>
-                            <option value="family">Family Member</option>
-                            <option value="staff">Staff</option>
-                            <option value="survey">Survey</option>
-                            <option value="social_media">Social Media</option>
-                            <option value="call_center">Call Center</option>
-                            <option value="moh">Ministry of Health</option>
-                            <option value="chi">Council of Health Insurance</option>
-                            <option value="other">Other</option>
+                            <option value="">{{ _("Select source")}}</option>
+                            <option value="patient">{{ _("Patient") }}</option>
+                            <option value="family">{{ _("Family Member")}}</option>
+                            <option value="staff">{{ _("Staff") }}</option>
+                            <option value="survey">{{ _("Survey") }}</option>
+                            <option value="social_media">{{ _("Social Media")}}</option>
+                            <option value="call_center">{{ _("Call Center")}}</option>
+                            <option value="moh">{{ _("Ministry of Health")}}</option>
+                            <option value="chi">{{ _("Council of Health Insurance")}}</option>
+                            <option value="other">{{ _("Other") }}</option>
                         </select>
                     </div>
                 </div>
@@ -200,26 +200,26 @@
                 <!-- SLA Information -->
                 <div class="alert alert-info">
                     <h6 class="alert-heading">
-                        <i class="bi bi-info-circle me-2"></i>SLA Information
+                        <i class="bi bi-info-circle me-2"></i>{{ _("SLA Information")}}
                     </h6>
                     <p class="mb-0 small">
-                        SLA deadline will be automatically calculated based on severity:
+                        {{ _("SLA deadline will be automatically calculated based on severity")}}:
                     </p>
                     <ul class="mb-0 mt-2 small">
-                        <li><strong>Critical:</strong> 4 hours</li>
-                        <li><strong>High:</strong> 24 hours</li>
-                        <li><strong>Medium:</strong> 72 hours</li>
-                        <li><strong>Low:</strong> 168 hours (7 days)</li>
+                        <li><strong>{{ _("Critical") }}:</strong> {{ _("4 hours")}}</li>
+                        <li><strong>{{ _("High") }}:</strong> {{ _("24 hours")}}</li>
+                        <li><strong>{{ _("Medium") }}:</strong> {{ _("72 hours")}}</li>
+                        <li><strong>{{ _("Low") }}:</strong> {{ _("168 hours (7 days)")}}</li>
                     </ul>
                 </div>
 
                 <!-- Action Buttons -->
                 <div class="d-grid gap-2">
                     <button type="submit" class="btn btn-primary btn-lg">
-                        <i class="bi bi-check-circle me-2"></i>Create Complaint
+                        <i class="bi bi-check-circle me-2"></i>{{ _("Create Complaint")}}
                     </button>
                     <a href="{% url 'complaints:complaint_list' %}" class="btn btn-outline-secondary">
-                        <i class="bi bi-x-circle me-2"></i>Cancel
+                        <i class="bi bi-x-circle me-2"></i>{{ _("Cancel") }}
                     </a>
                 </div>
             </div>
diff --git a/templates/complaints/complaint_list.html b/templates/complaints/complaint_list.html
index 4bdf034..413ff4a 100644
--- a/templates/complaints/complaint_list.html
+++ b/templates/complaints/complaint_list.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load static %}
 
-{% block title %}Complaints Console - PX360{% endblock %}
+{% block title %}{{ _("Complaints Console")}} - PX360{% endblock %}
 
 {% block extra_css %}
 <style>
@@ -84,14 +84,14 @@
         <div>
             <h2 class="mb-1">
                 <i class="bi bi-exclamation-triangle-fill text-warning me-2"></i>
-                Complaints Console
+                {{ _("Complaints Console")}}
             </h2>
-            <p class="text-muted mb-0">Manage and track patient complaints with SLA monitoring</p>
+            <p class="text-muted mb-0">{{ _("Manage and track patient complaints with SLA monitoring")}}</p>
         </div>
         <div>
             {% if user.is_px_admin or user.is_hospital_admin %}
             <a href="{% url 'complaints:complaint_create' %}" class="btn btn-primary">
-                <i class="bi bi-plus-circle me-1"></i> New Complaint
+                <i class="bi bi-plus-circle me-1"></i> {{ _("New Complaint")}}
             </a>
             {% endif %}
         </div>
@@ -165,7 +165,7 @@
     <div class="filter-panel" id="filterPanel">
         <div class="d-flex justify-content-between align-items-center mb-3">
             <h5 class="mb-0">
-                <i class="bi bi-funnel me-2"></i>Filters
+                <i class="bi bi-funnel me-2"></i>{{ _("Filters") }}
             </h5>
             <button class="btn btn-sm btn-outline-secondary" onclick="toggleFilters()">
                 <i class="bi bi-chevron-up" id="filterToggleIcon"></i>
@@ -187,7 +187,7 @@
                     <div class="col-md-4">
                         <label class="form-label">{% trans "Status" %}</label>
                         <select class="form-select" name="status">
-                            <option value="">All Statuses</option>
+                            <option value="">{{ _("All Statuses")}}</option>
                             {% for value, label in status_choices %}
                             <option value="{{ value }}" {% if filters.status == value %}selected{% endif %}>
                                 {{ label }}
@@ -200,11 +200,11 @@
                     <div class="col-md-4">
                         <label class="form-label">{% trans "Severity" %}</label>
                         <select class="form-select" name="severity">
-                            <option value="">All Severities</option>
-                            <option value="low" {% if filters.severity == 'low' %}selected{% endif %}>Low</option>
-                            <option value="medium" {% if filters.severity == 'medium' %}selected{% endif %}>Medium</option>
-                            <option value="high" {% if filters.severity == 'high' %}selected{% endif %}>High</option>
-                            <option value="critical" {% if filters.severity == 'critical' %}selected{% endif %}>Critical</option>
+                            <option value="">{{ _("All Severities")}}</option>
+                            <option value="low" {% if filters.severity == 'low' %}selected{% endif %}>{{ _("Low") }}</option>
+                            <option value="medium" {% if filters.severity == 'medium' %}selected{% endif %}>{{ _("Medium") }}</option>
+                            <option value="high" {% if filters.severity == 'high' %}selected{% endif %}>{{ _("High") }}</option>
+                            <option value="critical" {% if filters.severity == 'critical' %}selected{% endif %}>{{ _("Critical") }}</option>
                         </select>
                     </div>
                     
@@ -212,11 +212,11 @@
                     <div class="col-md-4">
                         <label class="form-label">{% trans "Priority" %}</label>
                         <select class="form-select" name="priority">
-                            <option value="">All Priorities</option>
-                            <option value="low" {% if filters.priority == 'low' %}selected{% endif %}>Low</option>
-                            <option value="medium" {% if filters.priority == 'medium' %}selected{% endif %}>Medium</option>
-                            <option value="high" {% if filters.priority == 'high' %}selected{% endif %}>High</option>
-                            <option value="urgent" {% if filters.priority == 'urgent' %}selected{% endif %}>Urgent</option>
+                            <option value="">{{ _("All Priorities")}}</option>
+                            <option value="low" {% if filters.priority == 'low' %}selected{% endif %}>{{ _("Low") }}</option>
+                            <option value="medium" {% if filters.priority == 'medium' %}selected{% endif %}>{{ _("Medium") }}</option>
+                            <option value="high" {% if filters.priority == 'high' %}selected{% endif %}>{{ _("High") }}</option>
+                            <option value="urgent" {% if filters.priority == 'urgent' %}selected{% endif %}>{{ _("Urgent") }}</option>
                         </select>
                     </div>
                     
@@ -224,14 +224,14 @@
                     <div class="col-md-4">
                         <label class="form-label">{% trans "Category" %}</label>
                         <select class="form-select" name="category">
-                            <option value="">All Categories</option>
-                            <option value="clinical_care" {% if filters.category == 'clinical_care' %}selected{% endif %}>Clinical Care</option>
-                            <option value="staff_behavior" {% if filters.category == 'staff_behavior' %}selected{% endif %}>Staff Behavior</option>
-                            <option value="facility" {% if filters.category == 'facility' %}selected{% endif %}>Facility & Environment</option>
-                            <option value="wait_time" {% if filters.category == 'wait_time' %}selected{% endif %}>Wait Time</option>
-                            <option value="billing" {% if filters.category == 'billing' %}selected{% endif %}>Billing</option>
-                            <option value="communication" {% if filters.category == 'communication' %}selected{% endif %}>Communication</option>
-                            <option value="other" {% if filters.category == 'other' %}selected{% endif %}>Other</option>
+                            <option value="">{{ _("All Categories")}}</option>
+                            <option value="clinical_care" {% if filters.category == 'clinical_care' %}selected{% endif %}>{{ _("Clinical Care")}}</option>
+                            <option value="staff_behavior" {% if filters.category == 'staff_behavior' %}selected{% endif %}>{{ _("Staff Behavior")}}</option>
+                            <option value="facility" {% if filters.category == 'facility' %}selected{% endif %}>{{ _("Facility & Environment")}}</option>
+                            <option value="wait_time" {% if filters.category == 'wait_time' %}selected{% endif %}>{{ _("Wait Time")}}</option>
+                            <option value="billing" {% if filters.category == 'billing' %}selected{% endif %}>{{ _("Billing") }}</option>
+                            <option value="communication" {% if filters.category == 'communication' %}selected{% endif %}>{{ _("Communication") }}</option>
+                            <option value="other" {% if filters.category == 'other' %}selected{% endif %}>{{ _("Other") }}</option>
                         </select>
                     </div>
                     
@@ -239,7 +239,7 @@
                     <div class="col-md-4">
                         <label class="form-label">{% trans "Hospital" %}</label>
                         <select class="form-select" name="hospital">
-                            <option value="">All Hospitals</option>
+                            <option value="">{{ _("All Hospitals")}}</option>
                             {% for hospital in hospitals %}
                             <option value="{{ hospital.id }}" {% if filters.hospital == hospital.id|stringformat:"s" %}selected{% endif %}>
                                 {{ hospital.name_en }}
@@ -252,7 +252,7 @@
                     <div class="col-md-4">
                         <label class="form-label">{% trans "Department" %}</label>
                         <select class="form-select" name="department">
-                            <option value="">All Departments</option>
+                            <option value="">{{ _("All Departments")}}</option>
                             {% for dept in departments %}
                             <option value="{{ dept.id }}" {% if filters.department == dept.id|stringformat:"s" %}selected{% endif %}>
                                 {{ dept.name_en }}
@@ -265,7 +265,7 @@
                     <div class="col-md-4">
                         <label class="form-label">{% trans "Assigned To" %}</label>
                         <select class="form-select" name="assigned_to">
-                            <option value="">All Users</option>
+                            <option value="">{{ _("All Users")}}</option>
                             {% for user_obj in assignable_users %}
                             <option value="{{ user_obj.id }}" {% if filters.assigned_to == user_obj.id|stringformat:"s" %}selected{% endif %}>
                                 {{ user_obj.get_full_name }}
@@ -278,7 +278,7 @@
                     <div class="col-md-4">
                         <label class="form-label">{% trans "SLA Status" %}</label>
                         <select class="form-select" name="is_overdue">
-                            <option value="">All</option>
+                            <option value="">{{ _("All") }}</option>
                             <option value="true" {% if filters.is_overdue == 'true' %}selected{% endif %}>Overdue Only</option>
                         </select>
                     </div>
@@ -296,10 +296,10 @@
                 
                 <div class="mt-3 d-flex gap-2">
                     <button type="submit" class="btn btn-primary">
-                        <i class="bi bi-search me-1"></i> Apply Filters
+                        <i class="bi bi-search me-1"></i> {{ _("Apply Filters")}}
                     </button>
                     <a href="{% url 'complaints:complaint_list' %}" class="btn btn-outline-secondary">
-                        <i class="bi bi-x-circle me-1"></i> Clear
+                        <i class="bi bi-x-circle me-1"></i> {{ _("Clear") }}
                     </a>
                 </div>
             </form>
@@ -315,10 +315,10 @@
         </div>
         <div class="d-flex gap-2">
             <button class="btn btn-sm btn-outline-primary" onclick="exportData('csv')">
-                <i class="bi bi-file-earmark-spreadsheet me-1"></i> Export CSV
+                <i class="bi bi-file-earmark-spreadsheet me-1"></i> {{ _("Export CSV")}}
             </button>
             <button class="btn btn-sm btn-outline-primary" onclick="exportData('excel')">
-                <i class="bi bi-file-earmark-excel me-1"></i> Export Excel
+                <i class="bi bi-file-earmark-excel me-1"></i> {{ _("Export Excel")}}
             </button>
         </div>
     </div>
@@ -358,13 +358,13 @@
                             </td>
                             <td>
                                 <strong>{{ complaint.patient.get_full_name }}</strong><br>
-                                <small class="text-muted">MRN: {{ complaint.patient.mrn }}</small>
+                                <small class="text-muted">{{ _("MRN") }}: {{ complaint.patient.mrn }}</small>
                             </td>
                             <td>
                                 <div class="d-flex align-items-center">
                                     {{ complaint.title|truncatewords:8 }}
                                     {% if complaint.is_overdue %}
-                                    <span class="overdue-badge">OVERDUE</span>
+                                    <span class="overdue-badge">{{ _("OVERDUE") }}</span>
                                     {% endif %}
                                 </div>
                             </td>
@@ -388,7 +388,7 @@
                                 {% if complaint.assigned_to %}
                                 <small>{{ complaint.assigned_to.get_full_name }}</small>
                                 {% else %}
-                                <span class="text-muted"><em>Unassigned</em></span>
+                                <span class="text-muted"><em>{{ _("Unassigned") }}</em></span>
                                 {% endif %}
                             </td>
                             <td>
@@ -412,7 +412,7 @@
                         <tr>
                             <td colspan="12" class="text-center py-5">
                                 <i class="bi bi-inbox" style="font-size: 3rem; color: #ccc;"></i>
-                                <p class="text-muted mt-3">No complaints found</p>
+                                <p class="text-muted mt-3">{{ _("No complaints found")}}</p>
                             </td>
                         </tr>
                         {% endfor %}
diff --git a/templates/observations/observation_detail.html b/templates/observations/observation_detail.html
index e3340fe..a23302a 100644
--- a/templates/observations/observation_detail.html
+++ b/templates/observations/observation_detail.html
@@ -375,7 +375,7 @@
             <div class="action-card mb-4">
                 <h6 class="mb-3"><i class="bi bi-link-45deg me-2"></i>{% trans "Linked PX Action" %}</h6>
                 <p class="small mb-2">{{ px_action.title|truncatewords:10 }}</p>
-                <a href="{% url 'px_action_center:action_detail' px_action.id %}" class="btn btn-sm">
+                <a href="{% url 'actions:action_detail' px_action.id %}" class="btn btn-sm">
                     <i class="bi bi-arrow-right me-1"></i>{% trans "View Action" %}
                 </a>
             </div>