Merge branch 'master-beta' into master-AIO

client/src/translations/en_us/common.json

@@ -622,7 +622,7 @@
 				"dms": {
 					"cdk": {
 						"controllist": "Control Number List",
-						"payers": "CDK Payers"
+						"payers": "Payers"
 					},
 					"cdk_dealerid": "CDK Dealer ID",
 					"pbs_serialnumber": "PBS Serial Number",
@@ -858,13 +858,20 @@
 				"creating": "Error creating survey {{message}}",
 				"notconfigured": "You do not have any current CSI Question Sets configured.",
 				"notfoundsubtitle": "We were unable to find a survey using the link you provided. Please ensure the URL is correct or reach out to your shop for more help.",
-				"notfoundtitle": "No survey found."
+				"notfoundtitle": "No survey found.",
+				"surveycompletesubtitle": "",
+				"surveycompletetitle": ""
 			},
 			"fields": {
 				"completedon": "Completed On",
-				"created_at": "Created At"
+				"created_at": "Created At",
+				"surveyid": "",
+				"validuntil": ""
 			},
 			"labels": {
+				"copyright": "",
+				"greeting": "",
+				"intro": "",
 				"nologgedinuser": "Please log out of {{app}}",
 				"nologgedinuser_sub": "Users of {{app}} cannot complete CSI surveys while logged in. Please log out and try again.",
 				"noneselected": "No response selected.",
@@ -1277,14 +1284,20 @@
 			"columns": {
 				"duration": "Duration",
 				"end": "End",
+				"human_readable": "Human Readable",
+				"percentage": "Percentage",
 				"relative_end": "Relative End",
 				"relative_start": "Relative Start",
 				"start": "Start",
+				"status": "Status",
+				"status_count": "In Status",
 				"value": "Value"
 			},
 			"content": {
+				"calculated_based_on": "Calculated based on",
 				"current_status_accumulated_time": "Current Status Accumulated Time",
 				"data_unavailable": " There is currently no Lifecycle data for this Job.",
+				"jobs_in_since": "Jobs in since",
 				"legend_title": "Legend",
 				"loading": "Loading Job Timelines....",
 				"not_available": "N/A",
@@ -1296,6 +1309,10 @@
 			},
 			"errors": {
 				"fetch": "Error getting Job Lifecycle Data"
+			},
+			"titles": {
+				"dashboard": "Job Lifecycle",
+				"top_durations": "Top Durations"
 			}
 		},
 		"job_payments": {
@@ -1915,6 +1932,7 @@
 				"job": "Job Details",
 				"jobcosting": "Job Costing",
 				"jobtotals": "Job Totals",
+				"labor_hrs": "B/P/T Hrs",
 				"labor_rates_subtotal": "Labor Rates Subtotal",
 				"laborallocations": "Labor Allocations",
 				"labortotals": "Labor Totals",
@@ -2539,6 +2557,7 @@
 				"invoice_total_payable": "Invoice (Total Payable)",
 				"iou_form": "IOU Form",
 				"job_costing_ro": "Job Costing",
+				"job_lifecycle_ro": "",
 				"job_notes": "Job Notes",
 				"key_tag": "Key Tag",
 				"labels": {

client/src/translations/es/common.json

@@ -858,13 +858,20 @@
 				"creating": "",
 				"notconfigured": "",
 				"notfoundsubtitle": "",
-				"notfoundtitle": ""
+				"notfoundtitle": "",
+				"surveycompletesubtitle": "",
+				"surveycompletetitle": ""
 			},
 			"fields": {
 				"completedon": "",
-				"created_at": ""
+				"created_at": "",
+				"surveyid": "",
+				"validuntil": ""
 			},
 			"labels": {
+				"copyright": "",
+				"greeting": "",
+				"intro": "",
 				"nologgedinuser": "",
 				"nologgedinuser_sub": "",
 				"noneselected": "",
@@ -1277,14 +1284,20 @@
 			"columns": {
 				"duration": "",
 				"end": "",
+				"human_readable": "",
+				"percentage": "",
 				"relative_end": "",
 				"relative_start": "",
 				"start": "",
+				"status": "",
+				"status_count": "",
 				"value": ""
 			},
 			"content": {
+				"calculated_based_on": "",
 				"current_status_accumulated_time": "",
 				"data_unavailable": "",
+				"jobs_in_since": "",
 				"legend_title": "",
 				"loading": "",
 				"not_available": "",
@@ -1296,6 +1309,10 @@
 			},
 			"errors": {
 				"fetch": "Error al obtener los datos del ciclo de vida del trabajo"
+			},
+			"titles": {
+				"dashboard": "",
+				"top_durations": ""
 			}
 		},
 		"job_payments": {
@@ -1915,6 +1932,7 @@
 				"job": "",
 				"jobcosting": "",
 				"jobtotals": "",
+				"labor_hrs": "",
 				"labor_rates_subtotal": "",
 				"laborallocations": "",
 				"labortotals": "",
@@ -2539,6 +2557,7 @@
 				"invoice_total_payable": "",
 				"iou_form": "",
 				"job_costing_ro": "",
+				"job_lifecycle_ro": "",
 				"job_notes": "",
 				"key_tag": "",
 				"labels": {

client/src/translations/fr/common.json

@@ -858,13 +858,20 @@
 				"creating": "",
 				"notconfigured": "",
 				"notfoundsubtitle": "",
-				"notfoundtitle": ""
+				"notfoundtitle": "",
+				"surveycompletesubtitle": "",
+				"surveycompletetitle": ""
 			},
 			"fields": {
 				"completedon": "",
-				"created_at": ""
+				"created_at": "",
+				"surveyid": "",
+				"validuntil": ""
 			},
 			"labels": {
+				"copyright": "",
+				"greeting": "",
+				"intro": "",
 				"nologgedinuser": "",
 				"nologgedinuser_sub": "",
 				"noneselected": "",
@@ -1277,14 +1284,20 @@
 			"columns": {
 				"duration": "",
 				"end": "",
+				"human_readable": "",
+				"percentage": "",
 				"relative_end": "",
 				"relative_start": "",
 				"start": "",
+				"status": "",
+				"status_count": "",
 				"value": ""
 			},
 			"content": {
+				"calculated_based_on": "",
 				"current_status_accumulated_time": "",
 				"data_unavailable": "",
+				"jobs_in_since": "",
 				"legend_title": "",
 				"loading": "",
 				"not_available": "",
@@ -1296,6 +1309,10 @@
 			},
 			"errors": {
 				"fetch": "Erreur lors de l'obtention des données du cycle de vie des tâches"
+			},
+			"titles": {
+				"dashboard": "",
+				"top_durations": ""
 			}
 		},
 		"job_payments": {
@@ -1915,6 +1932,7 @@
 				"job": "",
 				"jobcosting": "",
 				"jobtotals": "",
+				"labor_hrs": "",
 				"labor_rates_subtotal": "",
 				"laborallocations": "",
 				"labortotals": "",
@@ -2539,6 +2557,7 @@
 				"invoice_total_payable": "",
 				"iou_form": "",
 				"job_costing_ro": "",
+				"job_lifecycle_ro": "",
 				"job_notes": "",
 				"key_tag": "",
 				"labels": {