From fa3ccf0feac5062833c5c0de918786df772760b8 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 1 Jun 2021 12:06:48 -0700
Subject: [PATCH] Resolve language conflicts.
---
bodyshop_translations.babel | 573 +++++++++++++++++++++-
client/src/translations/en_us/common.json | 48 +-
client/src/translations/es/common.json | 46 +-
client/src/translations/fr/common.json | 46 +-
4 files changed, 685 insertions(+), 28 deletions(-)
diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 1e18e7b09..3a96a3ffd 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -11040,6 +11040,27 @@
+
+ uploading
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
usage
false
@@ -11087,6 +11108,27 @@
+
+ edituploaded
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
insert
false
@@ -11907,6 +11949,37 @@
+
+ exportlogs
+
+
+ fields
+
+
+ createdat
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+
+
+
general
@@ -12377,6 +12450,32 @@
+
+ errors
+
+
+ notfound
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+
itemtypes
@@ -29185,6 +29284,48 @@
+
+ purchases_by_ro_detail
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ purchases_by_ro_summary
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
qc_sheet
false
@@ -29206,6 +29347,27 @@
+
+ ro_totals
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
ro_with_description
false
@@ -30696,6 +30858,27 @@
+
+ exportlogs
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
jobs
false
@@ -30787,6 +30970,27 @@
templates
+
+ attendance
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
attendance_employee
false
@@ -30808,6 +31012,27 @@
+
+ attendance_summary
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
credits_not_received_date
false
@@ -30871,6 +31096,90 @@
+
+ export_payables
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ export_payments
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ export_receivables
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ gsr_by_delivery_date
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
gsr_by_estimator
false
@@ -30892,6 +31201,48 @@
+
+ gsr_by_exported_date
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ gsr_by_ins_co
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
gsr_by_make
false
@@ -30913,6 +31264,48 @@
+
+ gsr_by_referral
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ gsr_by_ro
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
gsr_labor_only
false
@@ -30956,7 +31349,7 @@
- hours_sold_detail_closed_source
+ hours_sold_detail_closed_ins_co
false
@@ -30998,7 +31391,7 @@
- hours_sold_detail_open_source
+ hours_sold_detail_open_ins_co
false
@@ -31040,7 +31433,7 @@
- hours_sold_summary_closed_source
+ hours_sold_summary_closed_ins_co
false
@@ -31082,7 +31475,7 @@
- hours_sold_summary_open_source
+ hours_sold_summary_open_ins_co
false
@@ -31166,7 +31559,7 @@
- job_costing_ro_source
+ job_costing_ro_ins_co
false
@@ -31207,6 +31600,90 @@
+
+ open_orders_estimator
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ open_orders_ins_co
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ parts_backorder
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ payments_by_date
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
payments_by_date_type
false
@@ -31418,7 +31895,28 @@
- supplement_ratio_source
+ supplement_ratio_ins_co
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ thank_you_date
false
@@ -31501,6 +31999,27 @@
+
+ unclaimed_hrs
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
void_ros
false
@@ -31522,6 +32041,48 @@
+
+ work_in_progress_labour
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
+
+ work_in_progress_payables
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 0b1238c9b..3945bb9d5 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -6,7 +6,7 @@
},
"errors": {
"deleting": "Error encountered while deleting allocation. {{message}}",
- "saving": "Error while allocating. {{message}}",
+ "saving": "Error while allocating. {{message}}",
"validation": "Please ensure all fields are entered correctly. "
},
"fields": {
@@ -701,10 +701,12 @@
"upload": "Upload",
"upload_limitexceeded": "Uploading all selected documents will exceed the job storage limit for your shop. ",
"upload_limitexceeded_title": "Unable to upload document(s)",
+ "uploading": "Uploading...",
"usage": "of job storage used. ({{used}} / {{total}})"
},
"successes": {
"delete": "Document(s) deleted successfully.",
+ "edituploaded": "Edited document uploaded successfully. Please close this window and refresh the documents list.",
"insert": "Uploaded document successfully. ",
"updated": "Document updated successfully. "
}
@@ -767,6 +769,11 @@
"unique_employee_number": "You must enter a unique employee number."
}
},
+ "exportlogs": {
+ "fields": {
+ "createdat": "Created At"
+ }
+ },
"general": {
"actions": {
"add": "Add",
@@ -792,6 +799,9 @@
"submitticket": "Submit a Support Ticket",
"view": "View"
},
+ "errors": {
+ "notfound": "No record was found."
+ },
"itemtypes": {
"contract": "CC Contract",
"courtesycar": "Courtesy Car",
@@ -1743,7 +1753,10 @@
"payment_receipt": "Payment Receipt",
"payment_request": "Payment Request",
"payments_by_job": "Job Payments",
+ "purchases_by_ro_detail": "Purchases - Detail",
+ "purchases_by_ro_summary": "Purchases - Summary",
"qc_sheet": "Quality Control Sheet",
+ "ro_totals": "RO Totals",
"ro_with_description": "RO Summary with Descriptions",
"supplement_request": "Supplement Request",
"thank_you_ro": "Thank You Letter",
@@ -1844,6 +1857,7 @@
"objects": {
"appointments": "Appointments",
"bills": "Bills",
+ "exportlogs": "Export Logs",
"jobs": "Jobs",
"payments": "Payments",
"timetickets": "Timetickets"
@@ -1851,26 +1865,40 @@
"vendor": "Vendor"
},
"templates": {
+ "attendance": "Attendance (All Employees)",
"attendance_employee": "Employee Attendance",
+ "attendance_summary": "Attendance Summary (All Employees)",
"credits_not_received_date": "Credits not Received by Date",
"estimator_detail": "Jobs by Estimator (Detail)",
"estimator_summary": "Jobs by Estimator (Summary)",
+ "export_payables": "Export Log - Payables",
+ "export_payments": "Export Log - Payments",
+ "export_receivables": "Export Log - Receivables",
+ "gsr_by_delivery_date": "Gross Sales by Delivery Date",
"gsr_by_estimator": "Gross Sales by Estimator",
+ "gsr_by_exported_date": "Gross Sales by Export Date",
+ "gsr_by_ins_co": "Gross Sales by Insurance Company'",
"gsr_by_make": "Gross Sales by Vehicle Make",
+ "gsr_by_referral": "Gross Sales by Referral Source",
+ "gsr_by_ro": "Gross Sales by RO",
"gsr_labor_only": "Gross Sales - Labor Only",
"hours_sold_detail_closed": "Hours Sold Detail - Closed",
- "hours_sold_detail_closed_source": "Hours Sold Detail - Closed by Source",
+ "hours_sold_detail_closed_ins_co": "Hours Sold Detail - Closed by Source",
"hours_sold_detail_open": "Hours Sold Detail - Open",
- "hours_sold_detail_open_source": "Hours Sold Detail - Open by Source",
+ "hours_sold_detail_open_ins_co": "Hours Sold Detail - Open by Source",
"hours_sold_summary_closed": "Hours Sold Summary - Closed",
- "hours_sold_summary_closed_source": "Hours Sold Summary - Closed by Source",
+ "hours_sold_summary_closed_ins_co": "Hours Sold Summary - Closed by Source",
"hours_sold_summary_open": "Hours Sold Summary - Open",
- "hours_sold_summary_open_source": "Hours Sold Summary - Open by Source",
+ "hours_sold_summary_open_ins_co": "Hours Sold Summary - Open by Source",
"job_costing_ro_date_detail": "Job Costing by RO - Detail",
"job_costing_ro_date_summary": "Job Costing by RO - Summary",
"job_costing_ro_estimator": "Job Costing by Estimator",
- "job_costing_ro_source": "Job Costing by RO Source",
+ "job_costing_ro_ins_co": "Job Costing by RO Source",
"open_orders": "Open Orders by Date",
+ "open_orders_estimator": "Open Orders by Estimator",
+ "open_orders_ins_co": "Open Orders by Insurance Company",
+ "parts_backorder": "Backordered Parts",
+ "payments_by_date": "Payments by Date",
"payments_by_date_type": "Payments by Date Range",
"purchases_by_cost_center_detail": "Purchases by Cost Center (Detail)",
"purchases_by_cost_center_summary": "Purchases by Cost Center (Summary)",
@@ -1881,11 +1909,15 @@
"purchases_grouped_by_vendor_detailed": "Purchases Grouped by Vendor - Detailed",
"purchases_grouped_by_vendor_summary": "Purchases Grouped by Vendor - Summary",
"schedule": "Appointment Schedule",
- "supplement_ratio_source": "Supplement Ratio by Source",
+ "supplement_ratio_ins_co": "Supplement Ratio by Source",
+ "thank_you_date": "Thank You Letters",
"timetickets": "Time Tickets",
"timetickets_employee": "Employee Time Tickets",
"timetickets_summary": "Time Tickets Summary",
- "void_ros": "Void ROs"
+ "unclaimed_hrs": "Unclaimed Hours",
+ "void_ros": "Void ROs",
+ "work_in_progress_labour": "Work in Progress - Labor",
+ "work_in_progress_payables": "Work in Progress - Payables"
}
},
"scoreboard": {
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index d19817847..29f0beaac 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -701,10 +701,12 @@
"upload": "Subir",
"upload_limitexceeded": "",
"upload_limitexceeded_title": "",
+ "uploading": "",
"usage": ""
},
"successes": {
"delete": "Documento eliminado con éxito.",
+ "edituploaded": "",
"insert": "Documento cargado con éxito.",
"updated": ""
}
@@ -767,6 +769,11 @@
"unique_employee_number": ""
}
},
+ "exportlogs": {
+ "fields": {
+ "createdat": ""
+ }
+ },
"general": {
"actions": {
"add": "",
@@ -792,6 +799,9 @@
"submitticket": "",
"view": ""
},
+ "errors": {
+ "notfound": ""
+ },
"itemtypes": {
"contract": "",
"courtesycar": "",
@@ -1743,7 +1753,10 @@
"payment_receipt": "",
"payment_request": "",
"payments_by_job": "",
+ "purchases_by_ro_detail": "",
+ "purchases_by_ro_summary": "",
"qc_sheet": "",
+ "ro_totals": "",
"ro_with_description": "",
"supplement_request": "",
"thank_you_ro": "",
@@ -1844,6 +1857,7 @@
"objects": {
"appointments": "",
"bills": "",
+ "exportlogs": "",
"jobs": "",
"payments": "",
"timetickets": ""
@@ -1851,26 +1865,40 @@
"vendor": ""
},
"templates": {
+ "attendance": "",
"attendance_employee": "",
+ "attendance_summary": "",
"credits_not_received_date": "",
"estimator_detail": "",
"estimator_summary": "",
+ "export_payables": "",
+ "export_payments": "",
+ "export_receivables": "",
+ "gsr_by_delivery_date": "",
"gsr_by_estimator": "",
+ "gsr_by_exported_date": "",
+ "gsr_by_ins_co": "",
"gsr_by_make": "",
+ "gsr_by_referral": "",
+ "gsr_by_ro": "",
"gsr_labor_only": "",
"hours_sold_detail_closed": "",
- "hours_sold_detail_closed_source": "",
+ "hours_sold_detail_closed_ins_co": "",
"hours_sold_detail_open": "",
- "hours_sold_detail_open_source": "",
+ "hours_sold_detail_open_ins_co": "",
"hours_sold_summary_closed": "",
- "hours_sold_summary_closed_source": "",
+ "hours_sold_summary_closed_ins_co": "",
"hours_sold_summary_open": "",
- "hours_sold_summary_open_source": "",
+ "hours_sold_summary_open_ins_co": "",
"job_costing_ro_date_detail": "",
"job_costing_ro_date_summary": "",
"job_costing_ro_estimator": "",
- "job_costing_ro_source": "",
+ "job_costing_ro_ins_co": "",
"open_orders": "",
+ "open_orders_estimator": "",
+ "open_orders_ins_co": "",
+ "parts_backorder": "",
+ "payments_by_date": "",
"payments_by_date_type": "",
"purchases_by_cost_center_detail": "",
"purchases_by_cost_center_summary": "",
@@ -1881,11 +1909,15 @@
"purchases_grouped_by_vendor_detailed": "",
"purchases_grouped_by_vendor_summary": "",
"schedule": "",
- "supplement_ratio_source": "",
+ "supplement_ratio_ins_co": "",
+ "thank_you_date": "",
"timetickets": "",
"timetickets_employee": "",
"timetickets_summary": "",
- "void_ros": ""
+ "unclaimed_hrs": "",
+ "void_ros": "",
+ "work_in_progress_labour": "",
+ "work_in_progress_payables": ""
}
},
"scoreboard": {
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 497e05f9a..145fb9990 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -701,10 +701,12 @@
"upload": "Télécharger",
"upload_limitexceeded": "",
"upload_limitexceeded_title": "",
+ "uploading": "",
"usage": ""
},
"successes": {
"delete": "Le document a bien été supprimé.",
+ "edituploaded": "",
"insert": "Document téléchargé avec succès.",
"updated": ""
}
@@ -767,6 +769,11 @@
"unique_employee_number": ""
}
},
+ "exportlogs": {
+ "fields": {
+ "createdat": ""
+ }
+ },
"general": {
"actions": {
"add": "",
@@ -792,6 +799,9 @@
"submitticket": "",
"view": ""
},
+ "errors": {
+ "notfound": ""
+ },
"itemtypes": {
"contract": "",
"courtesycar": "",
@@ -1743,7 +1753,10 @@
"payment_receipt": "",
"payment_request": "",
"payments_by_job": "",
+ "purchases_by_ro_detail": "",
+ "purchases_by_ro_summary": "",
"qc_sheet": "",
+ "ro_totals": "",
"ro_with_description": "",
"supplement_request": "",
"thank_you_ro": "",
@@ -1844,6 +1857,7 @@
"objects": {
"appointments": "",
"bills": "",
+ "exportlogs": "",
"jobs": "",
"payments": "",
"timetickets": ""
@@ -1851,26 +1865,40 @@
"vendor": ""
},
"templates": {
+ "attendance": "",
"attendance_employee": "",
+ "attendance_summary": "",
"credits_not_received_date": "",
"estimator_detail": "",
"estimator_summary": "",
+ "export_payables": "",
+ "export_payments": "",
+ "export_receivables": "",
+ "gsr_by_delivery_date": "",
"gsr_by_estimator": "",
+ "gsr_by_exported_date": "",
+ "gsr_by_ins_co": "",
"gsr_by_make": "",
+ "gsr_by_referral": "",
+ "gsr_by_ro": "",
"gsr_labor_only": "",
"hours_sold_detail_closed": "",
- "hours_sold_detail_closed_source": "",
+ "hours_sold_detail_closed_ins_co": "",
"hours_sold_detail_open": "",
- "hours_sold_detail_open_source": "",
+ "hours_sold_detail_open_ins_co": "",
"hours_sold_summary_closed": "",
- "hours_sold_summary_closed_source": "",
+ "hours_sold_summary_closed_ins_co": "",
"hours_sold_summary_open": "",
- "hours_sold_summary_open_source": "",
+ "hours_sold_summary_open_ins_co": "",
"job_costing_ro_date_detail": "",
"job_costing_ro_date_summary": "",
"job_costing_ro_estimator": "",
- "job_costing_ro_source": "",
+ "job_costing_ro_ins_co": "",
"open_orders": "",
+ "open_orders_estimator": "",
+ "open_orders_ins_co": "",
+ "parts_backorder": "",
+ "payments_by_date": "",
"payments_by_date_type": "",
"purchases_by_cost_center_detail": "",
"purchases_by_cost_center_summary": "",
@@ -1881,11 +1909,15 @@
"purchases_grouped_by_vendor_detailed": "",
"purchases_grouped_by_vendor_summary": "",
"schedule": "",
- "supplement_ratio_source": "",
+ "supplement_ratio_ins_co": "",
+ "thank_you_date": "",
"timetickets": "",
"timetickets_employee": "",
"timetickets_summary": "",
- "void_ros": ""
+ "unclaimed_hrs": "",
+ "void_ros": "",
+ "work_in_progress_labour": "",
+ "work_in_progress_payables": ""
}
},
"scoreboard": {