This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via 913a442a2aad8f359462d2dbaa8f29a69ed3ebd6 (commit) from 795147c7d97b5fc691c6528bb5754f2b917a49c7 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 913a442a2aad8f359462d2dbaa8f29a69ed3ebd6 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Jul 2 12:18:38 2016 +0200

Fix compound nouns for mail service feature

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: langs/en/cgi-bin/en.pl | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)

Difference in files: diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 23f6310..57f93ea 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -868,25 +868,25 @@ 'eg' => 'e.g.:', 'email config' => 'Configuration', 'email empty field' => 'Empty field', -'email error' => 'ERROR: Testmail could not be sent', +'email error' => 'ERROR: Test mail could not be sent', 'email invalid' => 'Invalid field', -'email invalid mailfqdn' => 'Invalid mailserver fqdn', -'email invalid mailip' => 'Invalid mailserver IP address', -'email invalid mailport' => 'Invalid mailserver port', -'email mailaddr' => 'Mailserver address', +'email invalid mailfqdn' => 'Invalid mail server fqdn', +'email invalid mailip' => 'Invalid mail server IP address', +'email invalid mailport' => 'Invalid mail server port', +'email mailaddr' => 'Mail Server Address', 'email mailpass' => 'Password', -'email mailport' => 'Mailserver port', -'email mailrcpt' => 'Mail recipient', -'email mailsender' => 'Mail sender', +'email mailport' => 'Mail Server Port', +'email mailrcpt' => 'Mail Recipient', +'email mailsender' => 'Mail Sender', 'email mailuser' => 'Username', 'email server can not be empty' => 'E-mail server can not be empty', -'email settings' => 'Mailservice', -'email subject' => 'IPFire Testmail', -'email success' => 'Testmail successfully sent', -'email testmail' => 'Send testmail', -'email text' => 'Testmail from IPFire Mailservice.', +'email settings' => 'Mail Service', +'email subject' => 'IPFire Test Mail', +'email success' => 'Test message successfully sent', +'email testmail' => 'Send test mail', +'email text' => 'Test mail from IPFire Mail Service', 'email tls' => 'Use TLS', -'email usemail' => 'Activate Mailservice', +'email usemail' => 'Activate Mail Service', 'emailreportlevel' => 'E-mailreportlevel', 'emerging rules' => 'Emergingthreats.net Community Rules', 'empty' => 'This field may be left blank',

hooks/post-receive -- IPFire 2.x development tree