fix conflict trnslate

mekawy-issues
ashwaq 6 years ago
parent 77cabbea57
commit 469cb951fa

@ -161,15 +161,9 @@
"en": "Verify its you", "en": "Verify its you",
"ar": "Verify its you" "ar": "Verify its you"
}, },
<<<<<<< HEAD
"check-user-text1": {
"en": "Please Enter your Employee ID, A ",
"ar": "يرجى ادخال رقم الموظف "
=======
"check-user-text1":{ "check-user-text1":{
"en":"Employee ID", "en":"Employee ID",
"ar":"رقم الموظف " "ar":"رقم الموظف "
>>>>>>> d6e378c69904c2fe55904db983560b1858c9e431
}, },
"check-user-text2": { "check-user-text2": {
"en": "login Code ", "en": "login Code ",
@ -227,10 +221,6 @@
"en": " The connection timeout expired due to an error in the network or servers may be busy!", "en": " The connection timeout expired due to an error in the network or servers may be busy!",
"ar": " انتهت مهلة الاتصال بسبب خطأ في الشبكة أو الخوادم قد تكون مشغولة!" "ar": " انتهت مهلة الاتصال بسبب خطأ في الشبكة أو الخوادم قد تكون مشغولة!"
}, },
"alert": {
"en": "Alert",
"ar": "تنبية"
},
"details": { "details": {
"en": "Details", "en": "Details",
"ar": "التفاصيل" "ar": "التفاصيل"
@ -371,10 +361,6 @@
"en": "Year", "en": "Year",
"ar": "سنة" "ar": "سنة"
}, },
"delete": {
"en": "Delete",
"ar": "إحذف"
},
"add": { "add": {
"en": "Add", "en": "Add",
"ar": "أضف" "ar": "أضف"
@ -391,10 +377,6 @@
"en": "Measure time", "en": "Measure time",
"ar": "وقت القياس" "ar": "وقت القياس"
}, },
"save": {
"en": "Save",
"ar": "إحفظ"
},
"success": { "success": {
"en": "Done successfully", "en": "Done successfully",
"ar": "تم بنجاح" "ar": "تم بنجاح"
@ -447,10 +429,7 @@
"en": "Optional", "en": "Optional",
"ar": "خياري" "ar": "خياري"
}, },
"search": {
"en": "Search",
"ar": "إبحث"
},
"advanced-search": { "advanced-search": {
"en": "Advanced Search", "en": "Advanced Search",
"ar": "بحث متقدم" "ar": "بحث متقدم"
@ -815,14 +794,6 @@
"en": "Delete", "en": "Delete",
"ar": "حذف" "ar": "حذف"
}, },
"cancel": {
"en": "Cancel",
"ar": "إلغاء"
},
"next": {
"en": "Next",
"ar": "التالي"
},
"save": { "save": {
"en": "Save", "en": "Save",
"ar": "حفظ" "ar": "حفظ"
@ -843,14 +814,6 @@
"en": "Search", "en": "Search",
"ar": "بحث" "ar": "بحث"
}, },
"submit": {
"en": "Submit",
"ar": "ارسال"
},
"success": {
"en": "Success",
"ar": "تم بنجاح"
},
"noResult": { "noResult": {
"en": "No results found", "en": "No results found",
"ar": "لاتوجد نتائج" "ar": "لاتوجد نتائج"
@ -867,10 +830,6 @@
"en": "Confirmation", "en": "Confirmation",
"ar": "تأكيد" "ar": "تأكيد"
}, },
"attemptDel": {
"en": "You are attempting to delete a row that has already been deleted.",
"ar": "أنت تحاول حذف صف تم حذفه بالفعل."
},
"required": { "required": {
"en": "Please fill the required fields", "en": "Please fill the required fields",
"ar": "الرجاء ملء جميع الحقول المطلوبة" "ar": "الرجاء ملء جميع الحقول المطلوبة"

Loading…
Cancel
Save