[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfire-scm
Subject:    [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. f4371697328441a9a
From:       git () ipfire ! org (Jan Paul Tuecking)
Date:       2010-01-28 13:39:34
Message-ID: 20100128133935.4CDBBAEB2003 () mail01 ! tremer ! info
[Download RAW message or body]

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  f4371697328441a9acaa554e74034809278b3de5 (commit)
       via  25423823072bfdb18501160a3b7562297efe2b92 (commit)
       via  ab5cc762dcaf31814efcd232da28bd9386177f5b (commit)
      from  fe5e577b7b6c86eddabd45e3e4b51bae3c738e70 (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 f4371697328441a9acaa554e74034809278b3de5
Author: Jan Paul Tuecking <earl at ipfire.org>
Date:   Thu Jan 28 14:38:16 2010 +0100

    Fixed some typos (thx lavaguy)

commit 25423823072bfdb18501160a3b7562297efe2b92
Author: Jan Paul Tuecking <earl at ipfire.org>
Date:   Thu Jan 28 14:36:33 2010 +0100

    Insert total connection time tag displayed on index side.

commit ab5cc762dcaf31814efcd232da28bd9386177f5b
Author: Jan Paul Tuecking <earl at ipfire.org>
Date:   Thu Jan 28 14:35:49 2010 +0100

    Insert language tag for total connection time.

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

Summary of changes:
 langs/de/cgi-bin/de.pl  |    1 +
 langs/en/cgi-bin/en.pl  |    7 ++++---
 langs/fr/cgi-bin/fr.pl  |    7 ++++---
 src/scripts/dialctrl.pl |    2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index c0bf7ba..bc95648 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1640,6 +1640,7 @@
 'tone dial' => 'Tonwahl:',
 'too long 80 char max' => ' ist zu lang, es sind maximal 80 Zeichen erlaubt',
 'total hits for log section' => 'Gesamte Treffer f??r Log Sektion',
+'total connection time' => 'Verbindungszeit',
 'traffic back' => 'Zur??ck',
 'traffic calc time' => 'Berechnungszeitpunkt',
 'traffic calc time bad' => 'Berechnungsintervall ist nicht g??ltig',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 7522873..7e5ba5e 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1347,7 +1347,7 @@
 'pakfire uninstall package' => 'You want to uninstall the following packages: ',
 'pakfire update daily' => 'Search for updates daily:',
 'pakfire updates' => 'Available Update:',
-'pakfire working' => 'Pakfire ist working ... Please wait until everything is done \
successfull.', +'pakfire working' => 'Pakfire is working ... Please wait until all \
operations have completed successfully.',  'pap or chap' => 'PAP or CHAP',
 'parentclass' => 'Parentclass',
 'password' => 'Password:',
@@ -1596,8 +1596,8 @@
 'ssh no auth' => 'You have not allowed any authentication methods; this will stop \
you logging in',  'ssh passwords' => 'Allow password based authentication',
 'ssh portfw' => 'Allow TCP forwarding',
-'ssh tempstart15' => 'Stop SSH deamon in 15 minutes',
-'ssh tempstart30' => 'Stop SSH deamon in 30 minutes',
+'ssh tempstart15' => 'Stop SSH demon in 15 minutes',
+'ssh tempstart30' => 'Stop SSH demon in 30 minutes',
 'ssh1 disabled' => 'SSHv1 is disabled, a version 2 client will be required.',
 'ssh1 enabled' => 'SSHv1 is enabled, old clients will be supported.',
 'ssh1 support' => 'Support SSH protocol version 1 (required only for old clients)',
@@ -1671,6 +1671,7 @@
 'tone' => 'Tone',
 'tone dial' => 'Tone dial:',
 'too long 80 char max' => ' is too long, maximum allowed is 80 characters',
+'total connection time' => 'Total connection time',
 'total hits for log section' => 'Total hits for log section',
 'traffic back' => 'Back',
 'traffic calc time' => 'Time of calculation',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 7522873..7e5ba5e 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1347,7 +1347,7 @@
 'pakfire uninstall package' => 'You want to uninstall the following packages: ',
 'pakfire update daily' => 'Search for updates daily:',
 'pakfire updates' => 'Available Update:',
-'pakfire working' => 'Pakfire ist working ... Please wait until everything is done \
successfull.', +'pakfire working' => 'Pakfire is working ... Please wait until all \
operations have completed successfully.',  'pap or chap' => 'PAP or CHAP',
 'parentclass' => 'Parentclass',
 'password' => 'Password:',
@@ -1596,8 +1596,8 @@
 'ssh no auth' => 'You have not allowed any authentication methods; this will stop \
you logging in',  'ssh passwords' => 'Allow password based authentication',
 'ssh portfw' => 'Allow TCP forwarding',
-'ssh tempstart15' => 'Stop SSH deamon in 15 minutes',
-'ssh tempstart30' => 'Stop SSH deamon in 30 minutes',
+'ssh tempstart15' => 'Stop SSH demon in 15 minutes',
+'ssh tempstart30' => 'Stop SSH demon in 30 minutes',
 'ssh1 disabled' => 'SSHv1 is disabled, a version 2 client will be required.',
 'ssh1 enabled' => 'SSHv1 is enabled, old clients will be supported.',
 'ssh1 support' => 'Support SSH protocol version 1 (required only for old clients)',
@@ -1671,6 +1671,7 @@
 'tone' => 'Tone',
 'tone dial' => 'Tone dial:',
 'too long 80 char max' => ' is too long, maximum allowed is 80 characters',
+'total connection time' => 'Total connection time',
 'total hits for log section' => 'Total hits for log section',
 'traffic back' => 'Back',
 'traffic calc time' => 'Time of calculation',
diff --git a/src/scripts/dialctrl.pl b/src/scripts/dialctrl.pl
index 81ef3dd..88f5492 100644
--- a/src/scripts/dialctrl.pl
+++ b/src/scripts/dialctrl.pl
@@ -163,7 +163,7 @@ else {
 print <<END
 <br />$Lang::tr{'since'} $update
 <tr><td colspan='3' align='center'>$Lang::tr{'connections'}: $up | \
                $Lang::tr{'disconnects'}: $down | $Lang::tr{'attemps'}: $rec
-<tr><td><b>Verbindungszeit:</b><td align='right'>$current<td align='left'> ~ \
$ontime% +<tr><td><b>$Lang::tr{'total connection time'}:</b><td \
align='right'>$current<td align='left'> ~ $ontime%  END
 ;
 	}


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


[prev in list] [next in list] [prev in thread] [next in thread]