Merge branch 'feature/payroll' into feature/america

client/src/translations/en_us/common.json

@@ -343,10 +343,12 @@
 				"md_payment_types": "Payment Types",
 				"md_referral_sources": "Referral Sources",
 				"md_tasks_presets": {
+					"enable_tasks": "Enable Task Claiming",
 					"hourstype": "Hour Types",
 					"memo": "Time Ticket Memo",
 					"name": "Preset Name",
-					"percent": "Percent"
+					"percent": "Percent",
+					"use_approvals": "Use Time Ticket Approval Queue"
 				},
 				"messaginglabel": "Messaging Preset Label",
 				"messagingtext": "Messaging Preset Text",
@@ -2696,8 +2698,11 @@
 				"claimtasks": "Claim Tasks",
 				"clockin": "Clock In",
 				"clockout": "Clock Out",
+				"commit": "Commit Tickets ({{count}})",
+				"commitone": "Commit",
 				"enter": "Enter New Time Ticket",
-				"printemployee": "Print Time Tickets"
+				"printemployee": "Print Time Tickets",
+				"uncommit": "Uncommit"
 			},
 			"errors": {
 				"clockingin": "Error while clocking in. {{message}}",
@@ -2749,6 +2754,7 @@
 			"successes": {
 				"clockedin": "Clocked in successfully.",
 				"clockedout": "Clocked out successfully.",
+				"committed": "Time Tickets Committed Successfully",
 				"created": "Time ticket entered successfully.",
 				"deleted": "Time ticket deleted successfully."
 			},
@@ -2859,6 +2865,10 @@
 		"tt_approvals": {
 			"actions": {
 				"approveselected": "Approve Selected"
+			},
+			"labels": {
+				"approval_queue_in_use": "Time tickets will be added to the approval queue.",
+				"calculate": "Calculate"
 			}
 		},
 		"user": {