From f686264ad6d82cfaf4e401da2e259880f57bfade Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Sat, 30 Jan 2016 07:44:29 -0500 Subject: [PATCH] Merge branch 'master' into 'stable-3.1' --- interface/web/mail/lib/lang/br_mail_get.lng | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/interface/web/mail/lib/lang/br_mail_get.lng b/interface/web/mail/lib/lang/br_mail_get.lng index c47427b..801aebc 100644 --- a/interface/web/mail/lib/lang/br_mail_get.lng +++ b/interface/web/mail/lib/lang/br_mail_get.lng @@ -12,5 +12,8 @@ $wb['source_username_error_isempty'] = 'Usuário em branco.'; $wb['source_password_error_isempty'] = 'Senha em branco.'; $wb['destination_error_isemail'] = 'Destino não selecionado.'; +$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.'; +$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