Merge remote-tracking branch 'origin/master' into feature/payroll

client/src/translations/es/common.json

@@ -544,6 +544,7 @@
 				"target_touchtime": "",
 				"timezone": "",
 				"tt_allow_post_to_invoiced": "",
+				"tt_enforce_hours_for_tech_console": "",
 				"use_fippa": "",
 				"uselocalmediaserver": "",
 				"website": "",
@@ -1076,6 +1077,7 @@
 				"sunday": "",
 				"text": "",
 				"thursday": "",
+				"total": "",
 				"totals": "",
 				"tuesday": "",
 				"unknown": "Desconocido",
@@ -2675,7 +2677,8 @@
 			},
 			"validation": {
 				"clockoffmustbeafterclockon": "",
-				"clockoffwithoutclockon": ""
+				"clockoffwithoutclockon": "",
+				"hoursenteredmorethanavailable": ""
 			}
 		},
 		"titles": {