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/en_mail_get.lng |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/interface/web/mail/lib/lang/en_mail_get.lng b/interface/web/mail/lib/lang/en_mail_get.lng
index f6d3731..60c88ae 100644
--- a/interface/web/mail/lib/lang/en_mail_get.lng
+++ b/interface/web/mail/lib/lang/en_mail_get.lng
@@ -1,12 +1,19 @@
-<?php
-$wb["server_id_txt"] = 'server_id';
-$wb["type_txt"] = 'type';
-$wb["source_server_txt"] = 'source_server';
-$wb["source_username_txt"] = 'source_username';
-$wb["source_password_txt"] = 'source_password';
-$wb["source_delete_txt"] = 'source_delete';
-$wb["destination_txt"] = 'destination';
-$wb["active_txt"] = 'active';
-$wb["btn_save_txt"] = 'Save';
-$wb["btn_cancel_txt"] = 'Cancel';
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["type_txt"] = 'Type';
+$wb["source_server_txt"] = 'Pop3/Imap Server';
+$wb["source_username_txt"] = 'Username';
+$wb["source_password_txt"] = 'Password';
+$wb["source_delete_txt"] = 'Delete emails after retrieval';
+$wb["source_delete_note_txt"] = 'Please check first if email retrieval works, before you activate this option.';
+$wb["source_read_all_txt"] = 'Retrieve all emails (incl. read mails)';
+$wb["destination_txt"] = 'Destination';
+$wb["active_txt"] = 'Active';
+$wb["limit_fetchmail_txt"] = 'The max. number of Fetchmail records for your account is reached.';
+$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_regex"] = 'Pop3/Imap Server is not a valid domain name.';
+$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';
 ?>
\ No newline at end of file

--
Gitblit v1.9.1