From deb3716e433556f4d259a98ac3969169d11d779a Mon Sep 17 00:00:00 2001 From: Till Brehm <tbrehm@ispconfig.org> Date: Wed, 26 Mar 2014 05:45:41 -0400 Subject: [PATCH] Merge branch 'master_fixes' into 'master' --- interface/web/admin/lib/lang/id_users.lng | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/interface/web/admin/lib/lang/id_users.lng b/interface/web/admin/lib/lang/id_users.lng index 1703841..915cb7e 100644 --- a/interface/web/admin/lib/lang/id_users.lng +++ b/interface/web/admin/lib/lang/id_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