From f686264ad6d82cfaf4e401da2e259880f57bfade Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Sat, 30 Jan 2016 07:44:29 -0500 Subject: [PATCH] Merge branch 'master' into 'stable-3.1' --- interface/web/admin/lib/lang/it_users.lng | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/interface/web/admin/lib/lang/it_users.lng b/interface/web/admin/lib/lang/it_users.lng index 3e141ed..a321aa4 100644 --- a/interface/web/admin/lib/lang/it_users.lng +++ b/interface/web/admin/lib/lang/it_users.lng @@ -29,5 +29,6 @@ $wb['repeat_password_txt'] = 'Repeat Password'; $wb['password_mismatch_txt'] = 'The passwords do not match.'; $wb['password_match_txt'] = 'The passwords do match.'; -$wb['username_error_collision'] = 'The username may not be web or web plus a number.\"'; +$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"'; +$wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; ?> -- Gitblit v1.9.1