fixed conflict issues

myteam
umasoodch 6 years ago
commit 0e17984b20

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

Loading…
Cancel
Save