Resolve master merge conflicts.

client/src/translations/en_us/common.json

@@ -1142,6 +1142,7 @@
 			},
 			"fields": {
 				"act_price": "Retail Price",
+				"ah_detail_line": "Mark as Detail Labor Line (Autohouse Only)",
 				"db_price": "List Price",
 				"lbr_types": {
 					"LA1": "LA1",
@@ -1214,6 +1215,7 @@
 				"updated": "Job line updated successfully."
 			},
 			"validations": {
+				"ahdetailonlyonuserdefinedtypes": "Detail line indicator can only be set for LA1, LA2, LA3, LA4, and LAU labor types.",
 				"hrsrequirediflbrtyp": "Labor hours are required if a labor type is selected. Clear the labor type if there are no labor hours.",
 				"requiredifparttype": "Required if a part type has been specified.",
 				"zeropriceexistingpart": "This line cannot have any price since it uses an existing part."
@@ -2745,7 +2747,9 @@
 				"photourl": "Avatar URL"
 			},
 			"labels": {
-				"actions": "Actions"
+				"actions": "Actions",
+				"changepassword": "Change Password",
+				"profileinfo": "Profile Info"
 			},
 			"successess": {
 				"passwordchanged": "Password changed successfully. "