From 8a77a74e1a7a31196541691fce711bdcebaa1d2e Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Sun, 23 Aug 2015 04:21:37 -0400 Subject: [PATCH] Merge branch 'master' into 'master' --- 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