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/id_mail_get.lng |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/interface/web/mail/lib/lang/id_mail_get.lng b/interface/web/mail/lib/lang/id_mail_get.lng
index 2808981..cec2466 100644
--- a/interface/web/mail/lib/lang/id_mail_get.lng
+++ b/interface/web/mail/lib/lang/id_mail_get.lng
@@ -13,4 +13,7 @@
 $wb['source_password_error_isempty'] = 'Kata Sandi kosong.';
 $wb['destination_error_isemail'] = 'Tidak ada tujuan yang dipilih.';
 $wb['source_server_error_regex'] = 'Server Pop3/Imap bukan merupakan nama domain yang valid.';
+$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