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/mail/lib/lang/ru_mail_get.lng |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/interface/web/mail/lib/lang/ru_mail_get.lng b/interface/web/mail/lib/lang/ru_mail_get.lng
index 8e99816..dfc846b 100644
--- a/interface/web/mail/lib/lang/ru_mail_get.lng
+++ b/interface/web/mail/lib/lang/ru_mail_get.lng
@@ -4,12 +4,16 @@
 $wb['source_server_txt'] = 'Pop3/Imap Сервер';
 $wb['source_username_txt'] = 'Пользовательname';
 $wb['source_password_txt'] = 'Пароль';
-$wb['source_delete_txt'] = 'Удалить emails after retrieval';
+$wb['source_delete_txt'] = 'Удалить emails после поиска';
 $wb['destination_txt'] = 'Получатель';
-$wb['active_txt'] = 'Активный';
+$wb['active_txt'] = 'Активен?';
 $wb['limit_fetchmail_txt'] = 'Максимальное число Fetchmail записей, достигнуто.';
-$wb['source_server_error_isempty'] = 'Server is empty.';
-$wb['source_username_error_isempty'] = 'Username is empty.';
-$wb['source_password_error_isempty'] = 'Password is empty.';
-$wb['destination_error_isemail'] = 'No destination selected.';
+$wb['source_server_error_isempty'] = 'Пустой сервер.';
+$wb['source_username_error_isempty'] = 'Пустой логин.';
+$wb['source_password_error_isempty'] = 'Пустой пароль.';
+$wb['destination_error_isemail'] = 'Не выбран получатель.';
+$wb['source_server_error_regex'] = 'Неверное доменное имя для сервера Pop3/Imap.';
+$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
+$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>

--
Gitblit v1.9.1