- Merge release

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/translations/en_us/common.json

@@ -257,6 +257,7 @@
         "saving": "Error encountered while saving. {{message}}"
       },
       "fields": {
+        "ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
         "address1": "Address 1",
         "address2": "Address 2",
         "appt_alt_transport": "Appointment Alternative Transportation Options",
@@ -475,7 +476,7 @@
             "editaccess": "Users -> Edit access"
           }
         },
-        "ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
+
         "responsibilitycenter": "Responsibility Center",
         "responsibilitycenter_accountdesc": "Account Description",
         "responsibilitycenter_accountitem": "Item",
@@ -606,7 +607,7 @@
         "dms": {
           "cdk": {
             "controllist": "Control Number List",
-            "payers": "CDK Payers"
+            "payers": " Payers"
           },
           "cdk_dealerid": "CDK Dealer ID",
           "pbs_serialnumber": "PBS Serial Number",
@@ -842,8 +843,8 @@
         "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.",
-        "surveycompletetitle": "Survey previously completed",
-        "surveycompletesubtitle": "This survey was already completed on {{date}}."
+        "surveycompletesubtitle": "This survey was already completed on {{date}}.",
+        "surveycompletetitle": "Survey previously completed"
       },
       "fields": {
         "completedon": "Completed On",
@@ -852,13 +853,13 @@
         "validuntil": "Valid Until"
       },
       "labels": {
+        "copyright": "Copyright © $t(titles.app). All Rights Reserved.",
+        "greeting": "Hi {{name}}!",
+        "intro": "At {{shopname}}, we value your feedback. We would love to hear what you have to say. Please fill out the form below.",
         "nologgedinuser": "Please log out of $t(titles.app)",
         "nologgedinuser_sub": "Users of $t(titles.app) cannot complete CSI surveys while logged in. Please log out and try again.",
         "noneselected": "No response selected.",
-        "title": "Customer Satisfaction Survey",
-        "greeting": "Hi {{name}}!",
-        "intro": "At {{shopname}}, we value your feedback. We would love to hear what you have to say. Please fill out the form below.",
-        "copyright": "Copyright © $t(titles.app). All Rights Reserved."
+        "title": "Customer Satisfaction Survey"
       },
       "successes": {
         "created": "CSI created successfully. ",
@@ -896,7 +897,8 @@
         "scheduledindate": "Sheduled In Today: {{date}}",
         "scheduledintoday": "Sheduled In Today",
         "scheduledoutdate": "Sheduled Out Today: {{date}}",
-        "scheduledouttoday": "Sheduled Out Today"
+        "scheduledouttoday": "Sheduled Out Today",
+        "joblifecycle": "Job Lifecycle"
       }
     },
     "dms": {
@@ -1269,7 +1271,15 @@
         "relative_end": "Relative End",
         "relative_start": "Relative Start",
         "start": "Start",
-        "value": "Value"
+        "value": "Value",
+        "status": "Status",
+        "percentage": "Percentage",
+        "human_readable": "Human Readable",
+        "status_count": "In Status"
+      },
+      "titles": {
+        "dashboard": "Job Lifecycle",
+        "top_durations": "Top Durations"
       },
       "content": {
         "current_status_accumulated_time": "Current Status Accumulated Time",
@@ -1281,7 +1291,9 @@
         "title": "Job Lifecycle Component",
         "title_durations": "Historical Status Durations",
         "title_loading": "Loading",
-        "title_transitions": "Transitions"
+        "title_transitions": "Transitions",
+        "calculated_based_on": "Calculated based on",
+        "jobs_in_since": "Jobs in since"
       },
       "errors": {
         "fetch": "Error getting Job Lifecycle Data"
@@ -1856,6 +1868,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",
@@ -2450,6 +2463,7 @@
         "invoice_total_payable": "Invoice (Total Payable)",
         "iou_form": "IOU Form",
         "job_costing_ro": "Job Costing",
+        "job_lifecycle_ro": "Job Lifecycle",
         "job_notes": "Job Notes",
         "key_tag": "Key Tag",
         "labels": {
@@ -2616,17 +2630,17 @@
       },
       "labels": {
         "advanced_filters": "Advanced Filters and Sorters",
-        "advanced_filters_show": "Show",
-        "advanced_filters_hide": "Hide",
-        "advanced_filters_filters": "Filters",
-        "advanced_filters_sorters": "Sorters",
-        "advanced_filters_filter_field": "Field",
-        "advanced_filters_sorter_field": "Field",
-        "advanced_filters_true": "True",
         "advanced_filters_false": "False",
-        "advanced_filters_sorter_direction": "Direction",
+        "advanced_filters_filter_field": "Field",
         "advanced_filters_filter_operator": "Operator",
         "advanced_filters_filter_value": "Value",
+        "advanced_filters_filters": "Filters",
+        "advanced_filters_hide": "Hide",
+        "advanced_filters_show": "Show",
+        "advanced_filters_sorter_direction": "Direction",
+        "advanced_filters_sorter_field": "Field",
+        "advanced_filters_sorters": "Sorters",
+        "advanced_filters_true": "True",
         "dates": "Dates",
         "employee": "Employee",
         "filterson": "Filters on {{object}}: {{field}}",
@@ -2708,6 +2722,8 @@
         "job_costing_ro_date_summary": "Job Costing by RO - Summary",
         "job_costing_ro_estimator": "Job Costing by Estimator",
         "job_costing_ro_ins_co": "Job Costing by RO Source",
+        "job_lifecycle_date_detail": "Job Lifecycle by Date - Detail",
+        "job_lifecycle_date_summary": "Job Lifecycle by Date - Summary",
         "jobs_completed_not_invoiced": "Jobs Completed not Invoiced",
         "jobs_invoiced_not_exported": "Jobs Invoiced not Exported",
         "jobs_reconcile": "Parts/Sublet/Labor Reconciliation",