From 5a35aa4ace4b018d23dd9644df74651c8f03a75e Mon Sep 17 00:00:00 2001 From: Till Brehm <tbrehm@ispconfig.org> Date: Wed, 20 Nov 2013 13:08:07 -0500 Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5 --- interface/web/admin/lib/lang/en_users.lng | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/interface/web/admin/lib/lang/en_users.lng b/interface/web/admin/lib/lang/en_users.lng index c6a418e..9eec322 100644 --- a/interface/web/admin/lib/lang/en_users.lng +++ b/interface/web/admin/lib/lang/en_users.lng @@ -29,4 +29,5 @@ $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."'; ?> -- Gitblit v1.9.1