Merge branch 'feature/payroll' into feature/america

client/src/translations/en_us/common.json

@@ -374,6 +374,9 @@
 						"export": "CSI -> Export",
 						"page": "CSI -> Page"
 					},
+					"employee_teams": {
+						"page": "Employee Teams -> List"
+					},
 					"employees": {
 						"page": "Employees -> List"
 					},
@@ -541,6 +544,7 @@
 				"target_touchtime": "Target Touch Time",
 				"timezone": "Timezone",
 				"tt_allow_post_to_invoiced": "Allow Time Tickets to be posted to Invoiced & Exported Jobs",
+				"tt_enforce_hours_for_tech_console": "Restrict Claimable hours from Tech Console",
 				"use_fippa": "Use FIPPA for Names on Generated Documents?",
 				"uselocalmediaserver": "Use Local Media Server?",
 				"website": "Website",
@@ -572,6 +576,7 @@
 					"title": "DMS"
 				},
 				"emaillater": "Email Later",
+				"employee_teams": "Employee Teams",
 				"employees": "Employees",
 				"estimators": "Estimators",
 				"filehandlers": "File Handlers",
@@ -905,6 +910,15 @@
 				"sent": "Email sent successfully."
 			}
 		},
+		"employee_teams": {
+			"actions": {
+				"new": "New Team"
+			},
+			"fields": {
+				"active": "Active",
+				"name": "Team Name"
+			}
+		},
 		"employees": {
 			"actions": {
 				"addvacation": "Add Vacation",
@@ -1063,6 +1077,7 @@
 				"sunday": "Sunday",
 				"text": "Text",
 				"thursday": "Thursday",
+				"total": "Total",
 				"totals": "Totals",
 				"tuesday": "Tuesday",
 				"unknown": "Unknown",
@@ -2605,6 +2620,7 @@
 		},
 		"timetickets": {
 			"actions": {
+				"claimtasks": "Claim Tasks",
 				"clockin": "Clock In",
 				"clockout": "Clock Out",
 				"enter": "Enter New Time Ticket",
@@ -2663,7 +2679,8 @@
 			},
 			"validation": {
 				"clockoffmustbeafterclockon": "Clock off time must be the same or after clock in time.",
-				"clockoffwithoutclockon": "Clock off time cannot be set without a clock in time."
+				"clockoffwithoutclockon": "Clock off time cannot be set without a clock in time.",
+				"hoursenteredmorethanavailable": "The number of hours entered is more than what is available for this cost center."
 			}
 		},
 		"titles": {