admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IO-3083 Merge Conflit Resolution

Browse Source 
Signed-off-by: Allan Carr <allan.carr@thinkimex.com>
This commit is contained in:
Allan Carr
2025-01-14 17:54:12 -08:00
parent ee5e091118
commit e1fcb0ecba
1 changed files with 3740 additions and 3739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/translations/en_us/common.json
View File

@@ -366,7 +366,7 @@
"md_ccc_rates": "Courtesy Car Contract Rate Presets", "md_ccc_rates": "Courtesy Car Contract Rate Presets",
"md_classes": "Classes", "md_classes": "Classes",
"md_ded_notes": "Deductible Notes", "md_ded_notes": "Deductible Notes",
"md_email_cc": "Auto Email CC: $t(printcenter.subjects.jobs.{{template}})", "md_email_cc": "Auto Email CC: $t(parts_orders.labels.{{template}})",
"md_from_emails": "Additional From Emails", "md_from_emails": "Additional From Emails",
"md_functionality_toggles": { "md_functionality_toggles": {
"parts_queue_toggle": "Auto Add Imported/Supplemented Jobs to Parts Queue" "parts_queue_toggle": "Auto Add Imported/Supplemented Jobs to Parts Queue"
@@ -2529,6 +2529,7 @@
"orderhistory": "Order History", "orderhistory": "Order History",
"parts_order": "Parts Order", "parts_order": "Parts Order",
"parts_orders": "Parts Orders", "parts_orders": "Parts Orders",
"parts_returns": "Parts Returns",
"print": "Show Printed Form", "print": "Show Printed Form",
"receive": "Receive Parts Order", "receive": "Receive Parts Order",
"removefrompartsqueue": "Unqueue from Parts Queue?", "removefrompartsqueue": "Unqueue from Parts Queue?",