Merge master into feature/local-images

client/src/translations/en_us/common.json

@@ -544,6 +544,8 @@
 				"jobstatuses": "Job Statuses",
 				"laborrates": "Labor Rates",
 				"licensing": "Licensing",
+				"md_to_emails": "Preset To Emails",
+				"md_to_emails_emails": "Emails",
 				"messagingpresets": "Messaging Presets",
 				"notemplatesavailable": "No templates available to add.",
 				"notespresets": "Notes Presets",
@@ -878,6 +880,7 @@
 				"base_rate": "Base Rate",
 				"cost_center": "Cost Center",
 				"employee_number": "Employee Number",
+				"external_id": "External Employee ID",
 				"first_name": "First Name",
 				"flat_rate": "Flat Rate (Disabled is Straight Time)",
 				"hire_date": "Hire Date",
@@ -2172,6 +2175,9 @@
 				"ca_bc_etf_table": "ICBC ETF Table",
 				"exported_payroll": "Payroll Table"
 			},
+			"special": {
+				"attendance_detail_csv": "Attendance Table"
+			},
 			"subjects": {
 				"jobs": {
 					"parts_order": "Parts Order PO: {{ro_number}} - {{name}}"