Merge branch 'master' into next

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index ca7a4ad4d918aa52f5f885edb91a5e85018b17e2..9cfe83eec64b666090b10f93df36c2a869b26e99 100644 (file)
--- 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 0394315e4a4d212f1ee3b1d5290aeff2e3c66eb4..7d558571d771cc049cc6d0b2f82d8fe6fb71fe8f 100644 (file)
--- 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 55d24c4884218e4fbcb2272a8c756a4ecb7e899c..a66ec677d840f54eb61df87ba3e237092fb96a92 100644 (file)
--- 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 5edbade56a7ec73587c8baf8b24a2d901c44033a..5a2fbe342bded1414c29300f2e26658054f6816f 100644 (file)
--- 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 bda9a4a00a95b28b9acb2010c7a3a0b15057937c..dbc11bf365cd0b8f55141016a93c2e775946de66 100644 (file)
--- 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 :',