From d8faa4e7e3fb74e554f6c9339f6fe4e2883c3bf1 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 18 Sep 2015 13:43:03 -0400
Subject: [PATCH] Fix by dirkd: Since file() doesn't remove "\n" from the lines read the condition $lines[$l] == '' never evaluated to true. So $mailHeaders would always contain every line from the template while $mailBody contained none of them.

---
 interface/web/sites/lib/lang/ru_ftp_user.lng |   40 ++++++++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/interface/web/sites/lib/lang/ru_ftp_user.lng b/interface/web/sites/lib/lang/ru_ftp_user.lng
index 95c7d35..f9609ce 100644
--- a/interface/web/sites/lib/lang/ru_ftp_user.lng
+++ b/interface/web/sites/lib/lang/ru_ftp_user.lng
@@ -1,24 +1,36 @@
 <?php
 $wb['uid_txt'] = 'UID';
 $wb['gid_txt'] = 'GID';
-$wb['dir_txt'] = 'Directory';
-$wb['quota_files_txt'] = 'Filequota';
-$wb['ul_ratio_txt'] = 'Uploadratio';
-$wb['dl_ratio_txt'] = 'Downloadratio';
-$wb['ul_bandwidth_txt'] = 'Uploadbandwidth';
-$wb['dl_bandwidth_txt'] = 'Downloadbandwidth';
+$wb['dir_txt'] = 'Директория';
+$wb['quota_files_txt'] = 'Квота файлов';
+$wb['ul_ratio_txt'] = 'Квота на аплоад';
+$wb['dl_ratio_txt'] = 'Квота на скачивание';
+$wb['ul_bandwidth_txt'] = 'Скорость аплоада';
+$wb['dl_bandwidth_txt'] = 'Скорость скачивания';
 $wb['server_id_txt'] = 'Сервер';
-$wb['parent_domain_id_txt'] = 'Website';
+$wb['parent_domain_id_txt'] = 'Web-сайт';
 $wb['username_txt'] = 'Пользователь';
 $wb['password_txt'] = 'Пароль';
-$wb['quota_size_txt'] = 'Harddisk-Quota';
-$wb['active_txt'] = 'Активный';
+$wb['quota_size_txt'] = 'Квота HDD';
+$wb['active_txt'] = 'Активен?';
 $wb['limit_ftp_user_txt'] = 'Максимальное число FTP пользователей достигнуто.';
 $wb['username_error_empty'] = 'Имя пользователя пустое.';
 $wb['username_error_unique'] = 'Имя пользователя должно быть уникальным.';
-$wb['username_error_regex'] = 'The username contains charachters that are not allowed.';
-$wb['quota_size_error_empty'] = 'Quota пустая.';
-$wb['uid_error_empty'] = 'GID пустое.';
-$wb['directory_error_empty'] = 'Directory empty.';
-$wb['password_strength_txt'] = 'Password strength';
+$wb['username_error_regex'] = 'Имя пользователя содержит недопустимые символы.';
+$wb['quota_size_error_empty'] = 'Размер квоты пустой.';
+$wb['uid_error_empty'] = 'Значениче GID пустое.';
+$wb['directory_error_empty'] = 'Пустая папка';
+$wb['password_strength_txt'] = 'Стойкость паоля';
+$wb['quota_files_unity_txt'] = 'Файлы';
+$wb['directory_error_notinweb'] = 'Директория снаружи web-root папки.';
+$wb['parent_domain_id_error_empty'] = 'Web-сайт не выбран.';
+$wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
+$wb['dir_dot_error'] = 'No .. in path allowed.';
+$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
+$wb['generate_password_txt'] = 'Generate Password';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['directory_error_regex'] = 'Invalid directory';
 ?>

--
Gitblit v1.9.1