Merge branch 'feature/payroll' into feature/america

client/src/translations/en_us/common.json

@@ -435,10 +435,15 @@
 					},
 					"timetickets": {
 						"edit": "Time Tickets -> Edit",
+						"editcommitted": "Time Tickets -> Edit Committed",
 						"enter": "Time Tickets -> Enter",
 						"list": "Time Tickets -> List",
 						"shiftedit": "Time Tickets -> Shift Edit"
 					},
+					"ttapprovals": {
+						"approve": "Time Ticket Approval -> Approve",
+						"view": "Time Ticket Approval -> View"
+					},
 					"users": {
 						"editaccess": "Users -> Edit access"
 					}
@@ -1907,6 +1912,7 @@
 				"shop_vendors": "Vendors",
 				"temporarydocs": "Temporary Documents",
 				"timetickets": "Time Tickets",
+				"ttapprovals": "Time Ticket Approvals",
 				"vehicles": "Vehicles"
 			},
 			"jobsactions": {
@@ -2649,10 +2655,12 @@
 				"clockhours": "Clock Hours",
 				"clockoff": "Clock Off",
 				"clockon": "Clocked In",
+				"committed": "Committed",
 				"cost_center": "Cost Center",
 				"date": "Ticket Date",
 				"efficiency": "Efficiency",
 				"employee": "Employee",
+				"employee_team": "Employee Team",
 				"flat_rate": "Flat Rate?",
 				"memo": "Memo",
 				"productivehrs": "Productive Hours",
@@ -2739,6 +2747,7 @@
 				"shop-vendors": "Vendors",
 				"temporarydocs": "Temporary Documents",
 				"timetickets": "Time Tickets",
+				"ttapprovals": "Time Ticket Approvals",
 				"vehicle-details": "Vehicle: {{vehicle}}",
 				"vehicles": "Vehicles"
 			},
@@ -2784,9 +2793,15 @@
 			"shop_vendors": "Vendors | $t(titles.app)",
 			"temporarydocs": "Temporary Documents | $t(titles.app)",
 			"timetickets": "Time Tickets | $t(titles.app)",
+			"ttapprovals": "Time Ticket Approvals | $t(titles.app)",
 			"vehicledetail": "Vehicle Details {{vehicle}} | $t(titles.app)",
 			"vehicles": "All Vehicles | $t(titles.app)"
 		},
+		"tt_approvals": {
+			"actions": {
+				"approveselected": "Approve Selected"
+			}
+		},
 		"user": {
 			"actions": {
 				"changepassword": "Change Password",