feature/IO-3223-canny - Merge release / fix conflicts

client/src/translations/fr/common.json

@@ -601,7 +601,8 @@
           "templates": ""
         },
         "ss_configuration": {
-          "dailyhrslimit": ""
+          "dailyhrslimit": "",
+          "nobusinessdays": ""
         },
         "ssbuckets": {
           "color": "",
@@ -1637,6 +1638,7 @@
         "actual_completion": "Achèvement réel",
         "actual_delivery": "Livraison réelle",
         "actual_in": "En réel",
+        "acv_amount": "",
         "adjustment_bottom_line": "Ajustements",
         "adjustmenthours": "",
         "alt_transport": "",
@@ -1765,6 +1767,7 @@
         "federal_tax_payable": "Impôt fédéral à payer",
         "federal_tax_rate": "",
         "flat_rate_ats": "",
+        "hit_and_run": "",
         "ins_addr1": "Adresse Insurance Co.",
         "ins_city": "Insurance City",
         "ins_co_id": "ID de la compagnie d'assurance",