Resolve language conflicts.

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": {