Merge branch 'master-AIO' into feature/IO-2458-RO-Closer

client/src/translations/en_us/common.json

@@ -749,7 +749,7 @@
 				"refuelcharge": "Refuel Charge (per liter/gallon)",
 				"scheduledreturn": "Scheduled Return",
 				"start": "Contract Start",
-				"statetax": "State Taxes",
+				"statetax": "Provincial/State Taxes",
 				"status": "Status"
 			},
 			"labels": {
@@ -899,6 +899,7 @@
 				"refhrs": "Refinish Hrs"
 			},
 			"titles": {
+				"joblifecycle": "Job Life Cycles",
 				"labhours": "Total Body Hours",
 				"larhours": "Total Refinish Hours",
 				"monthlyemployeeefficiency": "Monthly Employee Efficiency",
@@ -1164,6 +1165,7 @@
 				"loadingshop": "Loading shop data...",
 				"loggingin": "Authorizing...",
 				"markedexported": "Manually marked as exported.",
+				"media": "Media",
 				"message": "Message",
 				"monday": "Monday",
 				"na": "N/A",
@@ -2002,7 +2004,7 @@
 				"savebeforeconversion": "You have unsaved changes on the Job.  Please save them before converting it. ",
 				"scheduledinchange": "The scheduled in is based off the latest appointment. To change this date,  please schedule or reschedule the Job. ",
 				"specialcoveragepolicy": "Special Coverage Policy Applies",
-				"state_tax_amt": "State Taxes",
+				"state_tax_amt": "Provincial/State Taxes",
 				"subletstotal": "Sublets Total",
 				"subtotal": "Subtotal",
 				"supplementnote": "The Job had a supplement imported.",
@@ -2174,6 +2176,7 @@
 				"insurance": "Insurance Information",
 				"labor": "Labor",
 				"lifecycle": "Lifecycle",
+				"parts": "Parts",
 				"partssublet": "Parts & Bills",
 				"rates": "Rates",
 				"repairdata": "Repair Data",
@@ -2558,7 +2561,7 @@
 				"invoice_total_payable": "Invoice (Total Payable)",
 				"iou_form": "IOU Form",
 				"job_costing_ro": "Job Costing",
-				"job_lifecycle_ro": "",
+				"job_lifecycle_ro": "Job Lifecycle",
 				"job_notes": "Job Notes",
 				"key_tag": "Key Tag",
 				"labels": {