[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, next, updated. c32eea083ba011e46ab
From:       git () ipfire ! org (Arne Fitzenreiter)
Date:       2010-08-16 13:06:21
Message-ID: 20100816130621.71A4E166442D () 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, next has been updated
       via  c32eea083ba011e46abca44fa26cda8875769768 (commit)
       via  40228ef46f523a151affc034e0510aa9075e2f3f (commit)
      from  d4d0ea202e7a6ede668d2d9d2cb7905e5879e6a2 (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 c32eea083ba011e46abca44fa26cda8875769768
Merge: d4d0ea2 40228ef
Author: Arne Fitzenreiter <arne_f at ipfire.org>
Date:   Mon Aug 16 13:05:24 2010 +0200

    Merge branch 'master' into next

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

Summary of changes:
 html/cgi-bin/pakfire.cgi |    4 ++--
 langs/de/cgi-bin/de.pl   |    1 +
 langs/en/cgi-bin/en.pl   |    1 +
 langs/es/cgi-bin/es.pl   |    1 +
 langs/fr/cgi-bin/fr.pl   |    1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index ca7a4ad..9cfe83e 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -64,7 +64,7 @@ if ($pakfiresettings{'ACTION'} eq 'install'){
 		system("$command");
 		system("/bin/sleep 1");
 	} else {
-		&Header::openbox("100%", "center", "Abfrage");
+		&Header::openbox("100%", "center", $Lang::tr{'request'});
   	my @output = `/usr/local/bin/pakfire resolvedeps --no-colors \
$pakfiresettings{'INSPAKS'}`;  print <<END;
 		<table><tr><td colspan='2'>$Lang::tr{'pakfire install \
package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'} @@ \
-104,7 +104,7 @@ END  system("$command");
 		system("/bin/sleep 1");
 	} else {
-		&Header::openbox("100%", "center", "Abfrage");
+		&Header::openbox("100%", "center", $Lang::tr{'request'});
   	my @output = `/usr/local/bin/pakfire resolvedeps --no-colors \
$pakfiresettings{'DELPAKS'}`;  print <<END;
 		<table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall \
                package'}.$pakfiresettings{'DELPAKS'}.$Lang::tr{'pakfire possible \
                dependency'}
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 0394315..7d55857 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1445,6 +1445,7 @@
 'remove x509' => 'L??sche x509',
 'reportfile' => 'Reportfile',
 'reportlevel' => 'Report Level',
+'request' => 'Abfrage',
 'requested data' => '1. Verbindungs Einstellungen',
 'reserved dst port' => 'Dieser Zielport ist f??r die ausschlie??liche Benutzung \
durch IPFire reserviert:',  'reserved src port' => 'Dieser Quellport ist f??r die \
                ausschlie??liche Benutzung durch IPFire reserviert:',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 55d24c4..a66ec67 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1475,6 +1475,7 @@
 'remove x509' => 'Remove x509',
 'reportfile' => 'Reportfile',
 'reportlevel' => 'Reportlevel',
+'request' => 'Request',
 'requested data' => '1. Connection Settings:',
 'reserved dst port' => 'Destination port is reserved for IPFire use only:',
 'reserved src port' => 'Source port is reserved for IPFire use only:',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 5edbade..5a2fbe3 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1465,6 +1465,7 @@
 'remove x509' => 'Remover x509',
 'reportfile' => 'Archivo de reporte',
 'reportlevel' => 'Nivel reporte',
+'request' => 'Consulta',
 'requested data' => 'Configuraciones de conexi??n:',
 'reserved dst port' => 'Puerto de destino est?? reservado para uso exclusivo de \
IPFire',  'reserved src port' => 'Puerto de or??gen est?? reservado para uso \
                exclusivo de IPFire:',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index bda9a4a..dbc11bf 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1471,6 +1471,7 @@
 'remove x509' => 'enlever x509',
 'reportfile' => 'Fichier de rapport',
 'reportlevel' => 'Niveau de rapport',
+'request' => 'Interrogation',
 'requested data' => '1. Param??tres de connexion :',
 'reserved dst port' => 'Le port de destination est r??serv?? pour l\'usage d\'IPFire \
:',  'reserved src port' => 'Le port source est r??serv?? pour l\'usage d\'IPFire :',


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


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