Merge branch 'master-AIO' into feature/IO-3356-pbs-ro-posting

client/src/translations/en_us/common.json

@@ -658,6 +658,8 @@
         "zip_post": "Zip/Postal Code"
       },
       "labels": {
+        "parts_shop_management": "Shop Management",
+        "parts_vendor_management": "Vendor Management",
         "2tiername": "Name => RO",
         "2tiersetup": "2 Tier Setup",
         "2tiersource": "Source => RO",
@@ -1248,7 +1250,8 @@
         "sizelimit": "The selected items exceed the size limit.",
         "sub_status": {
           "expired": "The subscription for this shop has expired. Please contact Sales to reactivate.",
-          "trial-expired": "The trial for this shop has expired. Please contact Sales to reactivate."
+          "trial-expired": "The trial for this shop has expired. Please contact Sales to reactivate.",
+          "undefined": "The subscription for this shop is removed. Please contact Sales to reactivate."
         },
         "submit-for-testing": "Error submitting Job for testing."
       },
@@ -1260,6 +1263,7 @@
         "vehicle": "Vehicle"
       },
       "labels": {
+        "settings": "Settings",
         "actions": "Actions",
         "areyousure": "Are you sure?",
         "barcode": "Barcode",
@@ -3521,12 +3525,17 @@
       }
     },
     "titles": {
+      "parts_settings": "Parts Management Settings | {{app}}",
+      "simplified-parts-jobs": "Parts Management | {{app}}",
       "accounting-payables": "Payables | {{app}}",
       "accounting-payments": "Payments | {{app}}",
       "accounting-receivables": "Receivables | {{app}}",
       "all_tasks": "All Tasks",
       "app": "",
       "bc": {
+        "simplified-parts-jobs": "Jobs",
+        "parts": "Parts",
+        "parts_settings": "Settings",
         "accounting-payables": "Payables",
         "accounting-payments": "Payments",
         "accounting-receivables": "Receivables",