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, master has been updated via fa3844657695ee2891ef1b483981deb66124f149 (commit) via 083c56c7950c5f9ced484c7ef8d8372164a12981 (commit) from 96667929bf683af5d30426e397bbd5b136cce588 (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 fa3844657695ee2891ef1b483981deb66124f149 Merge: 083c56c7950c5f9ced484c7ef8d8372164a12981 96667929bf683af5d30426e397bbd5b136cce588 Author: Jan Paul Tuecking earl@ipfire.org Date: Wed Jun 23 17:47:55 2010 +0200

Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

commit 083c56c7950c5f9ced484c7ef8d8372164a12981 Author: Jan Paul Tuecking earl@ipfire.org Date: Wed Jun 23 17:47:02 2010 +0200

Fixed typo for outgoingfw p2p description

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

Summary of changes: langs/de/cgi-bin/de.pl | 4 ++-- 1 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 71873fb..6d15fb2 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1278,8 +1278,8 @@ 'outgoingfw mode1' => 'In diesem Modus werden nur Verbindungen nach den oben definierten Regeln zugelassen.', 'outgoingfw mode2' => 'In diesem Modus werden sämtliche Verbindungen erlaubt, bis auf die oben definierten Block-Regeln.', 'outgoingfw p2p description 1' => 'Das Symbol', -'outgoingfw p2p description 2' => 'bedeutet das, dass P2P-Protokoll erlaubt wird oder', -'outgoingfw p2p description 3' => 'das, dass P2P-Protokoll gesperrt wird.', +'outgoingfw p2p description 2' => 'bedeutet, dass das P2P-Protokoll erlaubt wird oder', +'outgoingfw p2p description 3' => 'das P2P-Protokoll gesperrt wird.', 'outgoingfw p2p deny' => 'P2P-Protokoll ist gesperrt!', 'outgoingfw p2p allow' => 'P2P-Protokoll ist erlaubt!', 'outgoingfw reset' => 'Alle Regeln löschen',

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