From c25ef307b78e48d01776195009a43205144911cc Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 22:57:09 +0300 Subject: [PATCH 1/8] Update plugins/box/users/languages/ru.lang.php --- plugins/box/users/languages/ru.lang.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/box/users/languages/ru.lang.php b/plugins/box/users/languages/ru.lang.php index 8be281d..53d6a53 100644 --- a/plugins/box/users/languages/ru.lang.php +++ b/plugins/box/users/languages/ru.lang.php @@ -18,8 +18,7 @@ 'Register new user' => 'Регистрация нового пользователя', 'Delete user: :user' => 'Удалить пользователя: :user', 'User :user have been deleted.' => 'Пользователь :user удален.', - 'This field should not be empty' => 'Это поле не должно быть пустым', - 'This user alredy exist' => 'Такой пользователь уже существует', + 'This user already exists' => 'Такой пользователь уже существует', 'Changes saved' => 'Изменения сохранены', 'Wrong old password' => 'Неправильный старый пароль', 'Admin' => 'Администратор', @@ -42,7 +41,6 @@ 'User email is invalid' => 'Эл. почта является недействительной', 'Reset Password' => 'Сбросить пароль', 'Send New Password' => 'Отправить пароль', - 'This user doesnt alredy exist' => 'Такого пользователя не существует', 'Users - Profile' => 'Пользователи - Профиль', 'Users - Edit Profile' => 'Пользователи - Редактирование профиля', 'Users - Login' => 'Пользователи - Вход', From 8a12299c16aacc1693d2966345ce3c2ee673afe0 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 22:59:44 +0300 Subject: [PATCH 2/8] Update plugins/box/users/users.admin.php --- plugins/box/users/users.admin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/box/users/users.admin.php b/plugins/box/users/users.admin.php index 88e33ba..0fbdc1c 100755 --- a/plugins/box/users/users.admin.php +++ b/plugins/box/users/users.admin.php @@ -90,8 +90,8 @@ if ($user_login == '') $errors['users_empty_login'] = __('Required field', 'users'); if ($user_password == '') $errors['users_empty_password'] = __('Required field', 'users'); if ($user_email == '') $errors['users_empty_email'] = __('Required field', 'users'); - if ($users->select("[login='".$user_login."']")) $errors['users_this_user_alredy_exists'] = __('This user alredy exist', 'users'); - if ($users->select("[email='".$user_email."']")) $errors['users_this_email_alredy_exists'] = __('This email alredy exist', 'users'); + if ($users->select("[login='".$user_login."']")) $errors['users_this_user_already_exists'] = __('This user already exists', 'users'); + if ($users->select("[email='".$user_email."']")) $errors['users_this_email_already_exists'] = __('This email already exists', 'users'); if (count($errors) == 0) { $users->insert(array('login' => Security::safeName($user_login), From 26dca8caa12cc858ab4bf587987b14a142ee2d13 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 23:09:42 +0300 Subject: [PATCH 3/8] Update plugins/box/users/languages/ru.lang.php --- plugins/box/users/languages/ru.lang.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/box/users/languages/ru.lang.php b/plugins/box/users/languages/ru.lang.php index 53d6a53..7573df6 100644 --- a/plugins/box/users/languages/ru.lang.php +++ b/plugins/box/users/languages/ru.lang.php @@ -19,6 +19,7 @@ 'Delete user: :user' => 'Удалить пользователя: :user', 'User :user have been deleted.' => 'Пользователь :user удален.', 'This user already exists' => 'Такой пользователь уже существует', + 'This email already exists' => 'Такая эл. почта уже существует', 'Changes saved' => 'Изменения сохранены', 'Wrong old password' => 'Неправильный старый пароль', 'Admin' => 'Администратор', From 4e76fe86f7168a95d9062bc738a5722383292cca Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 23:11:17 +0300 Subject: [PATCH 4/8] Update plugins/box/users/languages/en.lang.php --- plugins/box/users/languages/en.lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/box/users/languages/en.lang.php b/plugins/box/users/languages/en.lang.php index 4aa15af..f2d3419 100644 --- a/plugins/box/users/languages/en.lang.php +++ b/plugins/box/users/languages/en.lang.php @@ -19,8 +19,8 @@ 'New User Registration' => 'New User Registration', 'Delete user: :user' => 'Delete user: :user', 'User :user have been deleted.' => 'User :user have been deleted.', - 'This field should not be empty' => 'This field should not be empty', - 'This user alredy exist' => 'This user alredy exist', + 'This user already exists' => 'This user already exists', + 'This email already exits' => 'This email already exits', 'Changes saved' => 'Changes saved', 'Wrong old password' => 'Wrong old password', 'Admin' => 'Admin', From 10ec1ec4de56189334793ace117792a1bf634a55 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 23:12:45 +0300 Subject: [PATCH 5/8] Update plugins/box/users/languages/it.lang.php --- plugins/box/users/languages/it.lang.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/box/users/languages/it.lang.php b/plugins/box/users/languages/it.lang.php index 38a379e..025b61a 100644 --- a/plugins/box/users/languages/it.lang.php +++ b/plugins/box/users/languages/it.lang.php @@ -18,8 +18,8 @@ 'Register new user' => 'Crea un account', 'Delete user: :user' => 'Elimina utente: :user', 'User :user have been deleted.' => 'Utente :user è stato eliminato.', - 'This field should not be empty' => 'Questo campo non può essere vuoto', - 'This user alredy exist' => 'Questo utente è già esistente', + 'This user already exist' => 'Questo utente è già esistente', + 'This email already exits' => 'Questa email è già esistente', 'Changes saved' => 'Le modifiche sono state salvate', 'Wrong old password' => 'Vecchia password errata', 'Admin' => 'Amministratore', From 0d4b6b58341891b7b39a46bde353d03e0197ddb9 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 23:14:00 +0300 Subject: [PATCH 6/8] Update plugins/box/users/languages/it.lang.php --- plugins/box/users/languages/it.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/users/languages/it.lang.php b/plugins/box/users/languages/it.lang.php index 025b61a..8228a2f 100644 --- a/plugins/box/users/languages/it.lang.php +++ b/plugins/box/users/languages/it.lang.php @@ -19,7 +19,7 @@ 'Delete user: :user' => 'Elimina utente: :user', 'User :user have been deleted.' => 'Utente :user è stato eliminato.', 'This user already exist' => 'Questo utente è già esistente', - 'This email already exits' => 'Questa email è già esistente', + 'This email already exists' => 'Questa email è già esistente', 'Changes saved' => 'Le modifiche sono state salvate', 'Wrong old password' => 'Vecchia password errata', 'Admin' => 'Amministratore', From d193c3d7cfe6b2e51ff58df01bc38ef6b0de2195 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 23:14:24 +0300 Subject: [PATCH 7/8] Update plugins/box/users/languages/en.lang.php --- plugins/box/users/languages/en.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/users/languages/en.lang.php b/plugins/box/users/languages/en.lang.php index f2d3419..dc1fd28 100644 --- a/plugins/box/users/languages/en.lang.php +++ b/plugins/box/users/languages/en.lang.php @@ -20,7 +20,7 @@ 'Delete user: :user' => 'Delete user: :user', 'User :user have been deleted.' => 'User :user have been deleted.', 'This user already exists' => 'This user already exists', - 'This email already exits' => 'This email already exits', + 'This email already exists' => 'This email already exists', 'Changes saved' => 'Changes saved', 'Wrong old password' => 'Wrong old password', 'Admin' => 'Admin', From 687b97de0735edfb88809bcc23017996f5064664 Mon Sep 17 00:00:00 2001 From: Stanislav Ulver Date: Sun, 21 Oct 2012 23:16:45 +0300 Subject: [PATCH 8/8] Update plugins/box/users/languages/it.lang.php --- plugins/box/users/languages/it.lang.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/box/users/languages/it.lang.php b/plugins/box/users/languages/it.lang.php index 8228a2f..94ca207 100644 --- a/plugins/box/users/languages/it.lang.php +++ b/plugins/box/users/languages/it.lang.php @@ -18,7 +18,7 @@ 'Register new user' => 'Crea un account', 'Delete user: :user' => 'Elimina utente: :user', 'User :user have been deleted.' => 'Utente :user è stato eliminato.', - 'This user already exist' => 'Questo utente è già esistente', + 'This user already exists' => 'Questo utente è già esistente', 'This email already exists' => 'Questa email è già esistente', 'Changes saved' => 'Le modifiche sono state salvate', 'Wrong old password' => 'Vecchia password errata',