From 7a3fd811b791ab5cf7787541832462f4e4bc35f4 Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Thu, 11 Feb 2016 12:07:20 -0500 Subject: [PATCH] Merge branch 'stable-3.1' --- interface/web/admin/lib/lang/en_users.lng | 3 +++ 1 files changed, 3 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..9c57f1d 100644 --- a/interface/web/admin/lib/lang/en_users.lng +++ b/interface/web/admin/lib/lang/en_users.lng @@ -29,4 +29,7 @@ $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['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin'; +$wb['lost_password_function_txt'] = 'Forgot password function is available'; ?> -- Gitblit v1.9.1