fixed conflict issues

myteam
umasoodch 6 years ago
commit 0e17984b20

@ -2190,24 +2190,24 @@
"ar":"Mark Attendance "
},
"check-in":{
"en": "CHECK IN",
"ar":"CHECK IN"
"en": "Check In",
"ar":"وقت الدخول"
},
"check-out":{
"en": "CHECK OUT",
"ar":"CHECK OUT"
"en": "Check Out",
"ar":"وقت الخروج"
},
"regular":{
"en": "REGULAR",
"ar":"REGULAR"
"en": "Regular",
"ar":"المنتظم"
},
"late-in":{
"en": "LATE IN",
"ar":"LATE IN"
"en": "Late In",
"ar":"القدوم المتأخر"
},
"shortage":{
"en": "Shortage",
"ar":"عجز"
"ar":"ساعات التقصير"
},
"excess":{
"en": "Excess",
@ -2215,7 +2215,7 @@
},
"early-out":{
"en": "Early Out",
"ar":""
"ar":"الخروج المبكر"
},
"today-time-left":{
"en": "TODAY'S TIME LEFT",
@ -2223,11 +2223,11 @@
},
"shortage-hours":{
"en": "SHORTAGE HOURS",
"ar":""
"ar":"ساعات التقصير"
},
"schedule":{
"en": "SCHEDULE",
"ar":""
"ar":"ايام العمل"
},
"off-days":{
"en": "OFF DAYS",
@ -2235,19 +2235,11 @@
},
"non-analyzed":{
"en": "NON ANALYZED",
"ar":""
"ar":"لايوجد تحليل"
},
"attendance-statistics":{
"en": "Attendance Statistics",
"ar":""
},
"more":{
"en": "MORE",
"ar":""
},
"less":{
"en": "LESS",
"ar":""
"ar":"احصائيات الحضور"
},
"confirm-alert1":{
"en": "Are you sure, you want to",
@ -2263,7 +2255,7 @@
},
"shift-time":{
"en":"Shift Time",
"ar":"SHIFT TIME"
"ar":"وقت التناوب"
}
},
"sms": {

Loading…
Cancel
Save