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 843ca290e1be08ddf614cb087b7ddc24d1dada1c (commit) via 673351d8a2b3b2c2ac3cc1367fc623c83fef67bc (commit) from 6feea5f77819febc1b7f75420b00881655039dbe (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 843ca290e1be08ddf614cb087b7ddc24d1dada1c Merge: 673351d 6feea5f Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 31 21:44:51 2015 +0000

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit 673351d8a2b3b2c2ac3cc1367fc623c83fef67bc Author: Lars Schuhmacher larsen007@web.de Date: Fri Oct 30 23:59:08 2015 +0100

Fix unnecessary space character in "E-Mail Absender"

Fix unnecessary space character in "E-Mail Absender".

Replaces the space character with a dash as is correct and already used in the other words in that part.

Signed-off-by: Lars Schuhmacher larsen007@web.de Signed-off-by: Michael Tremer michael.tremer@ipfire.org

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

Summary of changes: langs/de/cgi-bin/de.pl | 2 +- src/squid-accounting/acct.de.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

Difference in files: diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index cf04d3d..da9b885 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -849,7 +849,7 @@ 'email mailpass' => 'Passwort', 'email mailport' => 'Mailserver-Port', 'email mailrcpt' => 'E-Mail-Empfänger', -'email mailsender' => 'E-Mail Absender', +'email mailsender' => 'E-Mail-Absender', 'email mailuser' => 'Benutzername', 'email server can not be empty' => 'Email-Server darf nicht leer sein', 'email settings' => 'Mailversand', diff --git a/src/squid-accounting/acct.de.pl b/src/squid-accounting/acct.de.pl index 0291a9d..c139d03 100644 --- a/src/squid-accounting/acct.de.pl +++ b/src/squid-accounting/acct.de.pl @@ -77,7 +77,7 @@ 'acct mailuser' => 'Benutzername', 'acct mailpass' => 'Passwort', 'acct mailrcpt' => 'E-Mail-Empfänger', -'acct mailsender' => 'E-Mail Absender', +'acct mailsender' => 'E-Mail-Absender', 'acct mailtxt' => 'Text der Rechnungsmails', 'acct mb' => 'MB', 'acct members' => 'Mitglieder',

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