Development May 2020

development@lists.ipfire.org

16 participants
95 discussions

Re: [PATCH] clamav: Update to 0.102.3
by Michael Tremer 13 May '20

13 May '20

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org> > On 12 May 2020, at 20:29, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote: > > For details see: > https://blog.clamav.net/2020/05/clamav-01023-security-patch-released.html > > "ClamAV 0.102.3 is a bug patch release to address the following issues. > > - CVE-2020-3327: Fix a vulnerability in the ARJ archive parsing module > in ClamAV 0.102.2 that could cause a Denial-of-Service (DoS) condition. > Improper bounds checking of an unsigned variable results in an > out-of-bounds read which causes a crash. > > - CVE-2020-3341: Fix a vulnerability in the PDF parsing module in ClamAV > 0.101 - 0.102.2 that could cause a Denial-of-Service (DoS) condition. > Improper size checking of a buffer used to initialize AES decryption > routines results in an out-of-bounds read which may cause a crash. Bug > found by OSS-Fuzz. > > - Fix "Attempt to allocate 0 bytes" error when parsing some PDF > documents. > > - Fix a couple of minor memory leaks. > > - Updated libclamunrar to UnRAR 5.9.2." > > Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> > --- > lfs/clamav | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/lfs/clamav b/lfs/clamav > index 4688f0fb8..d1dce39ab 100644 > --- a/lfs/clamav > +++ b/lfs/clamav > @@ -24,7 +24,7 @@ > > include Config > > -VER = 0.102.2 > +VER = 0.102.3 > > THISAPP = clamav-$(VER) > DL_FILE = $(THISAPP).tar.gz > @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) > DIR_APP = $(DIR_SRC)/$(THISAPP) > TARGET = $(DIR_INFO)/$(THISAPP) > PROG = clamav > -PAK_VER = 50 > +PAK_VER = 51 > > DEPS = > > @@ -50,7 +50,7 @@ objects = $(DL_FILE) > > $(DL_FILE) = $(DL_FROM)/$(DL_FILE) > > -$(DL_FILE)_MD5 = ecf5dd2c5c43aeed1c4b458b2e689847 > +$(DL_FILE)_MD5 = 1577144c66f558fbd8ece3075ea2ac79 > > install : $(TARGET) > > -- > 2.17.1

1 0

[PATCH] media.cgi: Added missing translation
by Matthias Fischer 13 May '20

13 May '20

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/media.cgi | 2 +- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index a33d69313..7ef6905bd 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -147,7 +147,7 @@ END my @iostat1 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$1}'); my @iostat2 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$5}'); my @iostat3 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$6}'); - print "<tr><td colspan='3'> \n<tr><td colspan='3'><h3>Transfers</h3></td></tr>"; + print "<tr><td colspan='3'> \n<tr><td colspan='3'><h3>$Lang::tr{'transfers}</h3></td></tr>"; my $i=0; for(my $i = 1; $i <= $#iostat1; $i++){ diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 0efb512cb..caa3d711e 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2442,6 +2442,7 @@ 'trafficsum' => 'Total', 'trafficto' => 'Nach', 'transfer limits' => 'Transferbeschränkungen', +'transfers' => 'Datenübertragungen', 'transparent on' => 'Transparent auf', 'transport mode does not support vti' => 'VTI wird im Transport-Modus nicht unterstützt', 'tripwire' => 'Tripwire', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index c1b26b3ff..29c90de5d 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2475,6 +2475,7 @@ 'transfer limits' => 'Transfer limits', 'transparent on' => 'Transparent on', 'transport mode does not support vti' => 'VTI is not support in transport mode', +'transfers' => 'Data transfers', 'tripwire' => 'Tripwire', 'tripwire cronjob' => 'tripwire cronjob', 'tripwire functions' => 'tripwire functions', -- 2.17.1

2 3

[PATCH] media.cgi: Added translation for 'inodes'
by Matthias Fischer 13 May '20

13 May '20

For details see: https://en.wikipedia.org/wiki/Inode or http://www.linfo.org/inode.html ;-) Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/media.cgi | 2 +- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index 1747e538f..81f0a80d1 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -106,7 +106,7 @@ END } } close DF; - print "<tr><td colspan='7'> \n<tr><td colspan='7'><h2>Inodes</h2>\n"; + print "<tr><td colspan='7'> \n<tr><td colspan='7'><h2>$Lang::tr{'inodes'}</h2>\n"; open(DF,'/bin/df -P -i -x rootfs|'); while(<DF>){ diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index caa3d711e..b9b6ff4ec 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1416,6 +1416,7 @@ 'info' => 'Info', 'info messages' => 'Info', 'init string' => 'Initialisierung:', +'inodes' => 'Index-Nodes', 'insert floppy' => 'Legen Sie eine formatierte Diskette in das Floppy-Laufwerk in IPFire und klicken auf <i>Datensicherung auf Diskette</i>, um die Systemeinstellungen zu sichern. Überprüfen Sie das Ergebnis sorgfältig, um sicher zu sein, dass die Datensicherung vollständig und erfolgreich abgeschlossen wurde.', 'install' => 'Installieren', 'install new update' => 'Installiere neues Update:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 29c90de5d..dadbf6d7a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1439,6 +1439,7 @@ 'incorrect password' => 'Incorrect password', 'info' => 'Info', 'init string' => 'Init:', +'inodes' => 'Index Nodes', 'insert floppy' => 'To backup to floppy, insert a formatted floppy into the drive on IPFire and click <i>backup to floppy</i> to backup the system configuration. Please examine the results carefully to make sure the backup completed successfully. This can take a while to complete, so please be patient.<p>', 'insert removable device' => 'Insert a removable device', 'install' => 'Install', -- 2.17.1

1 0

[PATCH] media.cgi: Fix for missing '
by Matthias Fischer 13 May '20

13 May '20

D'oh! Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/media.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index 73b6f7da9..1747e538f 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -147,7 +147,7 @@ END my @iostat1 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$1}'); my @iostat2 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$5}'); my @iostat3 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$6}'); - print "<tr><td colspan='3'> \n<tr><td colspan='3'><h2>$Lang::tr{'transfers}</h2></td></tr>"; + print "<tr><td colspan='3'> \n<tr><td colspan='3'><h2>$Lang::tr{'transfers'}</h2></td></tr>"; my $i=0; for(my $i = 1; $i <= $#iostat1; $i++){ -- 2.17.1

1 0

[PATCH] media.cgi: Changed topic format for 'Inodes' and 'transfers'
by Matthias Fischer 13 May '20

13 May '20

Changed from <h3> to <h2>. Both entries are now underlined and fit better into the context - IMHO. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/media.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index 7ef6905bd..73b6f7da9 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -106,7 +106,7 @@ END } } close DF; - print "<tr><td colspan='7'> \n<tr><td colspan='7'><h3>Inodes</h3>\n"; + print "<tr><td colspan='7'> \n<tr><td colspan='7'><h2>Inodes</h2>\n"; open(DF,'/bin/df -P -i -x rootfs|'); while(<DF>){ @@ -147,7 +147,7 @@ END my @iostat1 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$1}'); my @iostat2 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$5}'); my @iostat3 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$6}'); - print "<tr><td colspan='3'> \n<tr><td colspan='3'><h3>$Lang::tr{'transfers}</h3></td></tr>"; + print "<tr><td colspan='3'> \n<tr><td colspan='3'><h2>$Lang::tr{'transfers}</h2></td></tr>"; my $i=0; for(my $i = 1; $i <= $#iostat1; $i++){ -- 2.17.1

2 1

[PATCH] Typo in 'media.cgi'
by Matthias Fischer 13 May '20

13 May '20

'transfers' = 'Transfers' Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/media.cgi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index 0bb6435ab..a33d69313 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -147,7 +147,7 @@ END my @iostat1 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$1}'); my @iostat2 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$5}'); my @iostat3 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$6}'); - print "<tr><td colspan='3'> \n<tr><td colspan='3'><h3>transfers</h3></td></tr>"; + print "<tr><td colspan='3'> \n<tr><td colspan='3'><h3>Transfers</h3></td></tr>"; my $i=0; for(my $i = 1; $i <= $#iostat1; $i++){ -- 2.17.1

2 2

[PATCH] Fixed 'bandwith' typos in translation strings
by Matthias Fischer 13 May '20

13 May '20

One of my favourites. So old, so mean. "I'm sorry to see you go..." ;-) Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- langs/de/cgi-bin/de.pl | 12 ++++++------ langs/en/cgi-bin/en.pl | 12 ++++++------ langs/es/cgi-bin/es.pl | 12 ++++++------ langs/fr/cgi-bin/fr.pl | 12 ++++++------ langs/it/cgi-bin/it.pl | 10 +++++----- langs/nl/cgi-bin/nl.pl | 12 ++++++------ langs/pl/cgi-bin/pl.pl | 12 ++++++------ langs/ru/cgi-bin/ru.pl | 12 ++++++------ langs/tr/cgi-bin/tr.pl | 12 ++++++------ 9 files changed, 53 insertions(+), 53 deletions(-) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 74765c11d..0efb512cb 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -478,8 +478,8 @@ 'bad return code' => 'Das Hilfsprogramm hat einen Fehlercode gemeldet', 'bad source range' => 'Der erste Wert des Quellportbereich ist größer oder gleich dem zweiten Wert.', 'bandwidth usage' => 'Bandbreitenauslastung (extern)', -'bandwitherror' => 'Sie können die Bandbreiteneinstellungen nicht bearbeiten, wenn QoS eingeschaltet ist. Schalten Sie es erst aus.<p>', -'bandwithsettings' => 'Bandbreiteneinstellungen', +'bandwidtherror' => 'Sie können die Bandbreiteneinstellungen nicht bearbeiten, wenn QoS eingeschaltet ist. Schalten Sie es erst aus.<p>', +'bandwidthsettings' => 'Bandbreiteneinstellungen', 'basic options' => 'Basisoptionen', 'beep when ppp connects or disconnects' => 'Signalton ausgeben, wenn IPFire verbindet oder trennt', 'behind a proxy' => 'Hinter einem Proxy:', @@ -1028,8 +1028,8 @@ 'extrahd you cant mount' => 'Sie können', 'fallout zombieload ridl' => 'Fallout/ZombieLoad/RIDL', 'false classnumber' => 'Die Klassennummer passt nicht zum angegebenen Interface.', -'false max bandwith' => 'Maximalbandbreite ist ungültig.', -'false min bandwith' => 'Mindestbandbreite ist ungültig.', +'false max bandwidth' => 'Maximalbandbreite ist ungültig.', +'false min bandwidth' => 'Mindestbandbreite ist ungültig.', 'february' => 'Februar', 'fetch ip from' => 'Schätze die echte öffentliche IP-Adresse mit Hilfe eines externen Servers', 'fifteen minutes' => '15 Minuten', @@ -1331,7 +1331,7 @@ 'green' => 'GRÜN', 'green interface' => 'Grünes Interface', 'grouptype' => 'Gruppentyp:', -'guaranteed bandwith' => 'Garantierte Bandbreite', +'guaranteed bandwidth' => 'Garantierte Bandbreite', 'guardian' => 'Guardian', 'guest ok' => 'Gastzugang gewähren', 'gui settings' => 'Benutzeroberfläche', @@ -1643,7 +1643,7 @@ 'masquerading' => 'Masquerading/NAT', 'masquerading disabled' => 'NAT ausgeschaltet', 'masquerading enabled' => 'NAT eingeschaltet', -'max bandwith' => 'Maximale Bandbreite', +'max bandwidth' => 'Maximale Bandbreite', 'max incoming size' => 'Max. eingehende Größe (kB):', 'max lease time' => 'Maximale Haltezeit (in Minuten):', 'max outgoing size' => 'Max. abgehende Größe (kB):', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 514e4ff7a..c1b26b3ff 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -492,8 +492,8 @@ 'bad return code' => 'Helper program returned error code', 'bad source range' => 'The Source port range has a first value that is greater than or equal to the second value.', 'bandwidth usage' => 'bandwidth usage (external)', -'bandwitherror' => 'You cannot change the bandwithsettings, with Qos being enabled. First disable Qos.<p>', -'bandwithsettings' => 'Bandwithsettings', +'bandwidtherror' => 'You cannot change the bandwidthsettings, with Qos being enabled. First disable Qos.<p>', +'bandwidthsettings' => 'Bandwidthsettings', 'basic options' => 'Basic Options', 'beep when ppp connects or disconnects' => 'Beep when IPFire connects or disconnects', 'behind a proxy' => 'Behind a proxy:', @@ -1050,8 +1050,8 @@ 'extrahd you cant mount' => 'You can\'t mount', 'fallout zombieload ridl' => 'Fallout/ZombieLoad/RIDL', 'false classnumber' => 'The Class-Number does not match the interface.', -'false max bandwith' => 'Maximum bandwith is false.', -'false min bandwith' => 'Minimum bandwith is false.', +'false max bandwidth' => 'Maximum bandwidth is false.', +'false min bandwidth' => 'Minimum bandwidth is false.', 'february' => 'February', 'fetch ip from' => 'Guess the real public IP with help of an external server', 'fifteen minutes' => '15 Minutes', @@ -1355,7 +1355,7 @@ 'green' => 'GREEN', 'green interface' => 'Green Interface', 'grouptype' => 'Grouptype:', -'guaranteed bandwith' => 'Guaranteed bandwith', +'guaranteed bandwidth' => 'Guaranteed bandwidth', 'guardian' => 'Guardian', 'guest ok' => 'allow guests to access', 'gui settings' => 'GUI Settings', @@ -1667,7 +1667,7 @@ 'masquerading' => 'Masquerading', 'masquerading disabled' => 'Masquerading disabled', 'masquerading enabled' => 'Masquerading enabled', -'max bandwith' => 'Maximum bandwith', +'max bandwidth' => 'Maximum bandwidth', 'max incoming size' => 'Max incoming size (KB):', 'max lease time' => 'Max lease time (mins):', 'max outgoing size' => 'Max outgoing size (KB):', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index b496a45a6..33d7b0127 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -395,8 +395,8 @@ 'bad return code' => 'El programa de ayuda regresó el código de error', 'bad source range' => 'El rango de puerto orígen tiene como primer valor un número que es igual o mayor que el valor final.', 'bandwidth usage' => 'uso de ancho de banda (externo)', -'bandwitherror' => 'No se pueden cambiar las configuraciones de ancho de banda cuando el servicio QoS está activado. Por favor primero desactive QoS.<p>', -'bandwithsettings' => 'Configuraciones de ancho de banda', +'bandwidtherror' => 'No se pueden cambiar las configuraciones de ancho de banda cuando el servicio QoS está activado. Por favor primero desactive QoS.<p>', +'bandwidthsettings' => 'Configuraciones de ancho de banda', 'basic options' => 'Opciones Básicas', 'beep when ppp connects or disconnects' => 'Sonar cuando IPFire se conecte o desconecte', 'behind a proxy' => 'Detrás de un proxy:', @@ -809,8 +809,8 @@ 'extrahd unable to write' => 'Unable to write', 'extrahd you cant mount' => 'You can\'t mount', 'false classnumber' => 'El número de clase no coincide con la interfaz', -'false max bandwith' => 'El ancho de banda máximo es falso', -'false min bandwith' => 'El ancho de banda mínimo es falso', +'false max bandwidth' => 'El ancho de banda máximo es falso', +'false min bandwidth' => 'El ancho de banda mínimo es falso', 'february' => 'FEB', 'fetch ip from' => 'Encontrar la dirección IP pública real con la ayuda de un servidor externo', 'filename' => 'Nombre de archivo', @@ -884,7 +884,7 @@ 'graph per' => 'por', 'green' => 'Green', 'green interface' => 'Interfaz Green', -'guaranteed bandwith' => 'Ancho de banda garantizado', +'guaranteed bandwidth' => 'Ancho de banda garantizado', 'guest ok' => 'permitir acceso de invitado', 'gui settings' => 'Configuraciones de GUI', 'gz with key' => 'Esta máquina sólo se puede restaurar desde archivos encriptados', @@ -1138,7 +1138,7 @@ 'map to guest' => 'Map to Guest', 'march' => 'Marzo', 'marked' => 'Marcado', -'max bandwith' => 'Ancho de banda Máximo', +'max bandwidth' => 'Ancho de banda Máximo', 'max incoming size' => 'Tamaño máximo entrante (KB)', 'max lease time' => 'Tiempo máximo de concesión (mins)', 'max outgoing size' => 'Tamaño máximo saliente (KB)', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 631dda39b..9b348cda9 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -492,8 +492,8 @@ 'bad return code' => 'Le programme d\'aide retourne un code d\'erreur', 'bad source range' => 'La plage des ports source à une première valeur supérieure ou égale à la deuxième valeur.', 'bandwidth usage' => 'utilisation de la bande passante (externe)', -'bandwitherror' => 'Vous ne pouvez pas changer les réglages de la bande passante tant que la Qos est activée. Désactivez d\'abord la Qos.<p>', -'bandwithsettings' => 'Réglages de la bande passante', +'bandwidtherror' => 'Vous ne pouvez pas changer les réglages de la bande passante tant que la Qos est activée. Désactivez d\'abord la Qos.<p>', +'bandwidthsettings' => 'Réglages de la bande passante', 'basic options' => 'Options de base', 'beep when ppp connects or disconnects' => 'Emettre un son quand IPFire se connecte ou se déconnecte', 'behind a proxy' => 'Derrière un proxy :', @@ -1046,8 +1046,8 @@ 'extrahd you cant mount' => 'Vous ne pouvez pas monter', 'fallout zombieload ridl' => 'Fallout/ZombieLoad/RIDL', 'false classnumber' => 'Le numéro de classe ne correspond pas à l\'interface.', -'false max bandwith' => 'La bande passante maximum est fausse.', -'false min bandwith' => 'La bande passante minimum est fausse.', +'false max bandwidth' => 'La bande passante maximum est fausse.', +'false min bandwidth' => 'La bande passante minimum est fausse.', 'february' => 'Février', 'fetch ip from' => 'Deviner la véritable IP publique à l\'aide d\'un serveur externe', 'fifteen minutes' => '15 minutes', @@ -1351,7 +1351,7 @@ 'green' => 'VERT', 'green interface' => 'Interface VERTE', 'grouptype' => 'Type de groupe :', -'guaranteed bandwith' => 'Bande passante garantie', +'guaranteed bandwidth' => 'Bande passante garantie', 'guardian' => 'Gardien', 'guest ok' => 'autoriser l\'accès aux invités', 'gui settings' => 'Interface graphique', @@ -1663,7 +1663,7 @@ 'masquerading' => 'Masquage (une seule IP pour plusieurs machines en sortie du réseau interne)', 'masquerading disabled' => 'Masquage désactivé', 'masquerading enabled' => 'Masquage activé', -'max bandwith' => 'Bande passante maximum', +'max bandwidth' => 'Bande passante maximum', 'max incoming size' => 'Taille maximum des téléchargement (Ko) :', 'max lease time' => 'Durée maximum du bail (minutes) :', 'max outgoing size' => 'Taille maximum des envois (Ko) :', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 8c55a89b5..83a07d08a 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -417,8 +417,8 @@ 'bad return code' => 'Helper program returned error code', 'bad source range' => 'The Source port range has a first value that is greater than or equal to the second value.', 'bandwidth usage' => 'bandwidth usage (external)', -'bandwitherror' => 'Per modificare le impostazioni devi prima disattivare il Qos.<p>', -'bandwithsettings' => 'Bandwithsettings', +'bandwidtherror' => 'Per modificare le impostazioni devi prima disattivare il Qos.<p>', +'bandwidthsettings' => 'Bandwidthsettings', 'basic options' => 'Opzioni di base', 'beep when ppp connects or disconnects' => 'Segnale acustico quando IPFire si connette o disconnette', 'behind a proxy' => 'Behind a proxy:', @@ -913,8 +913,8 @@ 'extrahd unable to write' => 'Unable to write', 'extrahd you cant mount' => 'You can\'t mount', 'false classnumber' => 'The Class-Number does not match the interface.', -'false max bandwith' => 'Maximum bandwith is false.', -'false min bandwith' => 'Minimum bandwith is false.', +'false max bandwidth' => 'Maximum bandwidth is false.', +'false min bandwidth' => 'Minimum bandwidth is false.', 'february' => 'Febbraio', 'fetch ip from' => 'Ottieni l\'indirizzo IP pubblico con l\'aiuto di un server esterno', 'filename' => 'Filename', @@ -1453,7 +1453,7 @@ 'map to guest' => 'Map to Guest', 'march' => 'Marzo', 'marked' => 'Marked', -'max bandwith' => 'Maximum bandwith', +'max bandwidth' => 'Maximum bandwidth', 'max incoming size' => 'Max incoming size (KB):', 'max lease time' => 'Tempo massimo lease (min):', 'max outgoing size' => 'Max outgoing size (KB):', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 3035d7af2..276c3ecfe 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -415,8 +415,8 @@ 'bad return code' => 'Helper-programma gaf een foutcode terug', 'bad source range' => 'De bronpoort heeft een eerste waarde die groter dan of gelijk is aan de tweede waarde', 'bandwidth usage' => 'bandbreedtegebruik (extern)', -'bandwitherror' => 'U kunt de bandbreedte-instellingen niet wijzigen als QoS aanstaat. Zet QoS eerst uit.<p>', -'bandwithsettings' => 'Bandbreedte-instellingen', +'bandwidtherror' => 'U kunt de bandbreedte-instellingen niet wijzigen als QoS aanstaat. Zet QoS eerst uit.<p>', +'bandwidthsettings' => 'Bandbreedte-instellingen', 'basic options' => 'Basis opties', 'beep when ppp connects or disconnects' => 'Geef pieptoon als IPFire verbinding maakt of verbreekt.', 'behind a proxy' => 'Achter een proxy:', @@ -896,8 +896,8 @@ 'extrahd unable to write' => 'Kan niet schrijven', 'extrahd you cant mount' => 'U kan het niet aankoppelen', 'false classnumber' => 'Het klasse-nummer komt niet overeen met de interface.', -'false max bandwith' => 'Maximum bandbreedte is ongeldig.', -'false min bandwith' => 'Minimum bandbreedte is ongeldig.', +'false max bandwidth' => 'Maximum bandbreedte is ongeldig.', +'false min bandwidth' => 'Minimum bandbreedte is ongeldig.', 'february' => 'Februari', 'fetch ip from' => 'Bepaal het echte publieke IP-adres met behulp van een externe server', 'filename' => 'Bestandsnaam', @@ -1166,7 +1166,7 @@ 'green' => 'GROEN', 'green interface' => 'Groene Interface', 'grouptype' => 'Groeptype:', -'guaranteed bandwith' => 'Gegarandeerde bandbreedte', +'guaranteed bandwidth' => 'Gegarandeerde bandbreedte', 'guest ok' => 'verleen gasten toegang', 'gui settings' => 'Gebruikersinterface', 'gz with key' => 'Alleen gecodeerde archieven kunnen worden teruggezet op deze machine.', @@ -1432,7 +1432,7 @@ 'map to guest' => 'Toewijzen aan gast', 'march' => 'Maart', 'marked' => 'Gemarkeerd', -'max bandwith' => 'Maximum bandbreedte', +'max bandwidth' => 'Maximum bandbreedte', 'max incoming size' => 'Max. inkomende grootte (KB):', 'max lease time' => 'Max. leasetijd (min.):', 'max outgoing size' => 'Max. uitgaande grootte (KB):', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 8c789ffe5..714029f0e 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -397,8 +397,8 @@ 'bad return code' => 'Program pomocniczy zwrócił kod błędu', 'bad source range' => 'The Source port range has a first value that is greater than or equal to the second value.', 'bandwidth usage' => 'wykorzystanie pasma (wyjście)', -'bandwitherror' => 'Nie możesz zmienić ustawień przepustawości kiedy Qos jest włączony. Najpierw wyłącz Qos.<p>', -'bandwithsettings' => 'Ustawienia przepustowości', +'bandwidtherror' => 'Nie możesz zmienić ustawień przepustawości kiedy Qos jest włączony. Najpierw wyłącz Qos.<p>', +'bandwidthsettings' => 'Ustawienia przepustowości', 'basic options' => 'Podstawowe opcje', 'beep when ppp connects or disconnects' => 'Dźwięk przy połączeniu/rozłączeniu IPFire', 'behind a proxy' => 'Za proxy:', @@ -801,8 +801,8 @@ 'extrahd' => 'ExtraHD', 'extrahd detected drives' => 'wykryte napędy', 'false classnumber' => 'Numer klasy nie pasuje do interfejsu.', -'false max bandwith' => 'Nieprawidłowe maksymalne pasmo (false).', -'false min bandwith' => 'Nieprawidłowe minimalne pasmo (false).', +'false max bandwidth' => 'Nieprawidłowe maksymalne pasmo (false).', +'false min bandwidth' => 'Nieprawidłowe minimalne pasmo (false).', 'february' => 'Luty', 'fetch ip from' => 'Próbuj uzyskać publiczne IP za pomocą zewnętrznego serwera', 'filename' => 'Nazwa pliku', @@ -883,7 +883,7 @@ 'graph per' => 'na', 'green' => 'Green', 'green interface' => 'Interfejs Green', -'guaranteed bandwith' => 'Gwarantowane pasmo', +'guaranteed bandwidth' => 'Gwarantowane pasmo', 'guest ok' => 'zezwól na dostęp dla gości', 'gui settings' => 'Ustawienia GUI', 'gz with key' => 'Tylko zaszyfrowane archiwum może być odtworzone na tej maszynie.', @@ -1137,7 +1137,7 @@ 'map to guest' => 'Map to Guest', 'march' => 'Marzec', 'marked' => 'Zaznaczone', -'max bandwith' => 'Maksymalne pasmo', +'max bandwidth' => 'Maksymalne pasmo', 'max incoming size' => 'Maks rozmiar przychodzący (KB):', 'max lease time' => 'Maks czas dzierżawy (min):', 'max outgoing size' => 'Maks rozmiar wychodzący (KB):', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 80a584fdd..cad18ffd9 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -395,8 +395,8 @@ 'bad return code' => 'Программа помощи сообщает об ошибке', 'bad source range' => 'В диапазоне исходящих портов номер начального порт больше конечного.', 'bandwidth usage' => 'Внешний трафик', -'bandwitherror' => 'Вы не сможете поменять пропускную способность, пока работает Qos. Сперва остановите Qos.<p>', -'bandwithsettings' => 'Настройка пропускной способности', +'bandwidtherror' => 'Вы не сможете поменять пропускную способность, пока работает Qos. Сперва остановите Qos.<p>', +'bandwidthsettings' => 'Настройка пропускной способности', 'basic options' => 'Основные опции', 'beep when ppp connects or disconnects' => 'Пищать спикером, когда IPFire подключается и отключается', 'behind a proxy' => 'За proxy:', @@ -797,8 +797,8 @@ 'extrahd' => 'Дополнительные HD', 'extrahd detected drives' => 'Найдены устройства', 'false classnumber' => 'The Class-Number does not match the interface.', -'false max bandwith' => 'Maximum bandwith is false.', -'false min bandwith' => 'Minimum bandwith is false.', +'false max bandwidth' => 'Maximum bandwidth is false.', +'false min bandwidth' => 'Minimum bandwidth is false.', 'february' => 'Февраль', 'fetch ip from' => 'Узнать реальный внешний IP с помощью внешнего сервера', 'filename' => 'Имя файла', @@ -878,7 +878,7 @@ 'graph per' => 'per', 'green' => 'Green', 'green interface' => 'Green Интерфейс', -'guaranteed bandwith' => 'Гарантированная пропускная способность', +'guaranteed bandwidth' => 'Гарантированная пропускная способность', 'guest ok' => 'Разрешить гостевой доступ', 'gui settings' => 'Внешний вид', 'gz with key' => 'Только зашифрованный архив может быть восстановлен на этой машине.', @@ -1130,7 +1130,7 @@ 'map to guest' => 'Map to Guest', 'march' => 'Март', 'marked' => 'Отмечен', -'max bandwith' => 'Максимальная полоса пропускания', +'max bandwidth' => 'Максимальная полоса пропускания', 'max incoming size' => 'Максимальный входящий размер (KB):', 'max lease time' => 'Максимальное время аренды (мин.):', 'max outgoing size' => 'Максимальный исходящий размер (KB):', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index cde7862d3..b51623471 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -481,8 +481,8 @@ 'bad return code' => 'Yardımcı programı hata kodu döndürdü', 'bad source range' => 'Kaynak bağlantı noktası aralığı büyük veya ikinci değere eşit bir ilk değere sahip.', 'bandwidth usage' => 'bant genişliği kullanımı (harici)', -'bandwitherror' => 'QoS aktifken bant genişliği ayarları değiştiremezsiniz. İlk önce QoS devre dışı bırakın.<p>', -'bandwithsettings' => 'Bant genişliği ayarları', +'bandwidtherror' => 'QoS aktifken bant genişliği ayarları değiştiremezsiniz. İlk önce QoS devre dışı bırakın.<p>', +'bandwidthsettings' => 'Bant genişliği ayarları', 'basic options' => 'Temel seçenekler', 'beep when ppp connects or disconnects' => 'IPFire bağlanırken veya kapatılırken ses çıkar.', 'behind a proxy' => 'Bir vekil sunucu arkasında:', @@ -1007,8 +1007,8 @@ 'extrahd unable to write' => 'Yazmak için açılamıyor', 'extrahd you cant mount' => 'Bağlanamadı', 'false classnumber' => 'Sınıf-Numarası arayüzle eşleşmiyor.', -'false max bandwith' => 'Yanlış en fazla bant genişliği.', -'false min bandwith' => 'Yanlış en az bant genişliği.', +'false max bandwidth' => 'Yanlış en fazla bant genişliği.', +'false min bandwidth' => 'Yanlış en az bant genişliği.', 'february' => 'Şubat', 'fetch ip from' => 'Harici sunucunun yardımıyla tahmini gerçek genel IP', 'fifteen minutes' => '15 Dakika', @@ -1308,7 +1308,7 @@ 'green' => 'YEŞİL', 'green interface' => 'Yeşil Arabirim', 'grouptype' => 'Grup türü:', -'guaranteed bandwith' => 'Garantili bant genişliği', +'guaranteed bandwidth' => 'Garantili bant genişliği', 'guardian' => 'Guardian', 'guest ok' => 'istemcilere erişim izni', 'gui settings' => 'GUI Ayarları', @@ -1589,7 +1589,7 @@ 'masquerading' => 'Gizle', 'masquerading disabled' => 'Gizlemeyi kapat', 'masquerading enabled' => 'Gizlemeyi aç', -'max bandwith' => 'En fazla bant genişliği', +'max bandwidth' => 'En fazla bant genişliği', 'max incoming size' => 'En fazla gelen boyut (KB):', 'max lease time' => 'En fazla kira süresi (dakika):', 'max outgoing size' => 'En fazla giden boyutu (KB):', -- 2.17.1

1 0

[PATCH] Typo in 'qos.cgi'
by Matthias Fischer 13 May '20

13 May '20

'bandwith*' => 'bandwidth*' Plus: Image button for going back... Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/qos.cgi | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index e3b3eefb4..faf8a4745 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -777,10 +777,10 @@ END } sub changebandwidth { - &Header::openbox('100%', 'center', $Lang::tr{'bandwithsettings'}); + &Header::openbox('100%', 'center', $Lang::tr{'bandwidthsettings'}); if ($qossettings{'ENABLED'} eq 'on') { - print "$Lang::tr{'bandwitherror'}"; - print "<a href='/cgi-bin/qos.cgi'>$Lang::tr{'back'}</a>"; + print "$Lang::tr{'bandwidtherror'}"; + print "<table width='100%'><tr><td align='center'><a href='/cgi-bin/qos.cgi'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>"; } else { print <<END <form method='post' action='$ENV{'SCRIPT_NAME'}'> @@ -871,10 +871,10 @@ END print <<END </select> <td width='33%' align='center'>  - <tr><td width='33%' align='right'>$Lang::tr{'guaranteed bandwith'}: + <tr><td width='33%' align='right'>$Lang::tr{'guaranteed bandwidth'}: <td width='33%' align='left'><input type='text' size='20' name='MINBWDTH' maxlength='8' required='1' value="$qossettings{'MINBWDTH'}" /> <td width='33%' align='center'>  - <tr><td width='33%' align='right'>$Lang::tr{'max bandwith'} <img src='/blob.gif' alt='*' />: + <tr><td width='33%' align='right'>$Lang::tr{'max bandwidth'} <img src='/blob.gif' alt='*' />: <td width='33%' align='left'><input type='text' size='20' name='MAXBWDTH' maxlength='8' required='1' value="$qossettings{'MAXBWDTH'}" /> <td width='33%' align='center'>  <tr><td width='33%' align='right'>Burst: @@ -1036,8 +1036,8 @@ sub showclasses { <tr><td bgcolor='$color{'color20'}' width='10%' align='center'><b>$Lang::tr{'interface'}</b> <td bgcolor='$color{'color20'}' width='10%' align='center'><b>$Lang::tr{'Class'}</b> <td bgcolor='$color{'color20'}' width='10%' align='center'>$Lang::tr{'priority'} - <td bgcolor='$color{'color20'}' width='10%' align='center'>$Lang::tr{'guaranteed bandwith'} - <td bgcolor='$color{'color20'}' width='10%' align='center'>$Lang::tr{'max bandwith'} + <td bgcolor='$color{'color20'}' width='10%' align='center'>$Lang::tr{'guaranteed bandwidth'} + <td bgcolor='$color{'color20'}' width='10%' align='center'>$Lang::tr{'max bandwidth'} <td bgcolor='$color{'color20'}' width='10%' align='center'>Burst <td bgcolor='$color{'color20'}' width='10%' align='center'>Ceil Burst <td bgcolor='$color{'color20'}' width='10%' align='center'>TOS @@ -1248,7 +1248,7 @@ sub validminbwdth { } unless ( ( $qossettings{'MINBWDTH'} >= 1 ) && ( $qossettings{'MINBWDTH'} <= $qossettings{'SPD'} ) ) { $qossettings{'VALID'} = 'no'; - $message = "$Lang::tr{'false min bandwith'}"; + $message = "$Lang::tr{'false min bandwidth'}"; } $qossettings{'SPD'} = ''; } @@ -1263,7 +1263,7 @@ sub validmaxbwdth { } unless ( ( $qossettings{'MAXBDWTH'} >= 0 ) && ($qossettings{'MAXBDWTH'} >= $qossettings{'MINBDWTH'}) &&( $qossettings{'MAXBDWTH'} <= $qossettings{'SPD'} ) ) { $qossettings{'VALID'} = 'no'; - $message = "$Lang::tr{'false max bandwith'}"; + $message = "$Lang::tr{'false max bandwidth'}"; } $qossettings{'SPD'} = ''; } -- 2.17.1

1 0

[PATCH] Removed obsolete translation string from translation strings
by Matthias Fischer 13 May '20

13 May '20

'graph' => ... is no longer needed Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- 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 - langs/it/cgi-bin/it.pl | 1 - langs/nl/cgi-bin/nl.pl | 1 - langs/pl/cgi-bin/pl.pl | 1 - langs/ru/cgi-bin/ru.pl | 1 - langs/tr/cgi-bin/tr.pl | 1 - 9 files changed, 9 deletions(-) diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 05b0973a0..74765c11d 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1327,7 +1327,6 @@ 'gpl license agreement' => 'Lizenzvereinbarung', 'gpl please read carefully the general public license and accept it below' => 'Bitte die General Public License genau lesen und diese unten akzeptieren.', 'gpl unofficial translation of the general public license v3' => 'Inoffizielle Übersetzung der General Public License v3', -'graph' => 'Diagramm', 'graph per' => 'pro', 'green' => 'GRÜN', 'green interface' => 'Grünes Interface', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index cb3df3a7e..514e4ff7a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1351,7 +1351,6 @@ 'gpl license agreement' => 'License Agreement', 'gpl please read carefully the general public license and accept it below' => 'Please read carefully the General Public License and accept it below', 'gpl unofficial translation of the general public license v3' => 'Unofficial translation of the General Public License v3', -'graph' => 'Graph', 'graph per' => 'per', 'green' => 'GREEN', 'green interface' => 'Green Interface', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 23bc20727..b496a45a6 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -881,7 +881,6 @@ 'gpl license agreement' => 'License Agreement', 'gpl please read carefully the general public license and accept it below' => 'Please read carefully the General Public License and accept it below', 'gpl unofficial translation of the general public license v3' => 'Unofficial translation of the General Public License v3', -'graph' => 'Gráfico', 'graph per' => 'por', 'green' => 'Green', 'green interface' => 'Interfaz Green', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 509dc0053..631dda39b 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1347,7 +1347,6 @@ 'gpl license agreement' => 'Accord de licence', 'gpl please read carefully the general public license and accept it below' => 'Veuillez lire attentivement la Licence et l\'accepter', 'gpl unofficial translation of the general public license v3' => 'Traduction non officielle de la Licence v3', -'graph' => 'Graphique', 'graph per' => 'par', 'green' => 'VERT', 'green interface' => 'Interface VERTE', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 6c9137c28..8c55a89b5 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1182,7 +1182,6 @@ 'gpl license agreement' => 'License Agreement', 'gpl please read carefully the general public license and accept it below' => 'Please read carefully the General Public License and accept it below', 'gpl unofficial translation of the general public license v3' => 'Unofficial translation of the General Public License v3', -'graph' => 'Grafico', 'graph per' => 'per', 'green' => 'Verde', 'green interface' => 'Interfaccia Verde', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 5fa89b1ac..3035d7af2 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1162,7 +1162,6 @@ 'gpl license agreement' => 'Licentieovereenkomst', 'gpl please read carefully the general public license and accept it below' => 'Lees alstublieft de General Public License aandachtig door en accepteer het hieronder', 'gpl unofficial translation of the general public license v3' => 'Onofficiële vertaling van de General Public License v3', -'graph' => 'Grafiek', 'graph per' => 'per', 'green' => 'GROEN', 'green interface' => 'Groene Interface', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 521381af2..8c789ffe5 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -880,7 +880,6 @@ 'gpl license agreement' => 'Akceptacja licencji', 'gpl please read carefully the general public license and accept it below' => 'Proszę uważnie przeczytać licencję General Public License i zaakceptować jej warunki', 'gpl unofficial translation of the general public license v3' => 'Nieoficjalne tłumaczenie General Public License v3', -'graph' => 'Wykres', 'graph per' => 'na', 'green' => 'Green', 'green interface' => 'Interfejs Green', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 9ac46d459..80a584fdd 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -875,7 +875,6 @@ 'gpl license agreement' => 'License Agreement', 'gpl please read carefully the general public license and accept it below' => 'Please read carefully the General Public License and accept it below', 'gpl unofficial translation of the general public license v3' => 'Unofficial translation of the General Public License v3', -'graph' => 'Graph', 'graph per' => 'per', 'green' => 'Green', 'green interface' => 'Green Интерфейс', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 1917b8241..cde7862d3 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1304,7 +1304,6 @@ 'gpl license agreement' => 'Lisans Sözleşmesi', 'gpl please read carefully the general public license and accept it below' => 'Dikkatlice Genel Kamu Lisansını okuyup kabul edin', 'gpl unofficial translation of the general public license v3' => 'Resmi olmayan sürüm-3 Genel Kamu Lisansı çevirisi', -'graph' => 'grafiği', 'graph per' => '-', 'green' => 'YEŞİL', 'green interface' => 'Yeşil Arabirim', -- 2.17.1

1 0

[PATCH] Removed unnecessary translation string for 'graph' from several cgis
by Matthias Fischer 13 May '20

13 May '20

The translation string $Lang::tr{'graph'} is unnecessary, because everyone who opens the appropriate GUI should know that he will see: Graphs. So we don't need to translate this twenty-two times for each affected cgi. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/hardwaregraphs.cgi | 10 +++++----- html/cgi-bin/media.cgi | 2 +- html/cgi-bin/memory.cgi | 4 ++-- html/cgi-bin/netexternal.cgi | 2 +- html/cgi-bin/netinternal.cgi | 4 ++-- html/cgi-bin/netother.cgi | 4 ++-- html/cgi-bin/netovpnrw.cgi | 2 +- html/cgi-bin/netovpnsrv.cgi | 2 +- html/cgi-bin/qos.cgi | 4 ++-- html/cgi-bin/services.cgi | 4 ++-- html/cgi-bin/system.cgi | 6 +++--- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi index e582acfb9..6c167f8cc 100644 --- a/html/cgi-bin/hardwaregraphs.cgi +++ b/html/cgi-bin/hardwaregraphs.cgi @@ -104,31 +104,31 @@ if ( $querry[0] =~ "hwtemp"){ chomp $disk; my @array = split(/\//,$disk); - &Header::openbox('100%', 'center', "$array[$#array] $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$array[$#array]"); &Graphs::makegraphbox("hardwaregraphs.cgi",$array[$#array],"day"); &Header::closebox(); } if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone* 2>/dev/null` ) { - &Header::openbox('100%', 'center', "ACPI Thermal-Zone Temp $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "ACPI Thermal-Zone Temp"); &Graphs::makegraphbox("hardwaregraphs.cgi","thermaltemp","day"); &Header::closebox(); } if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/temperature-* 2>/dev/null` ) { - &Header::openbox('100%', 'center', "hwtemp $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "hwtemp"); &Graphs::makegraphbox("hardwaregraphs.cgi","hwtemp","day"); Header::closebox(); } if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/fanspeed-* 2>/dev/null` ) { - &Header::openbox('100%', 'center', "hwfan $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "hwfan"); &Graphs::makegraphbox("hardwaregraphs.cgi","hwfan","day"); &Header::closebox(); } if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/voltage-* 2>/dev/null` ) { - &Header::openbox('100%', 'center', "hwvolt $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "hwvolt"); &Graphs::makegraphbox("hardwaregraphs.cgi","hwvolt","day"); &Header::closebox(); } diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index 5753bc301..0bb6435ab 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -61,7 +61,7 @@ if ( $querry[0] =~ "sd?" || $querry[0] =~ "mmcblk?" || $querry[0] =~ "nvme?n?" | my $device = $_; chomp($device); my @array = split(/\//,$device); - &Header::openbox('100%', 'center', "$array[$#array] $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$array[$#array]"); diskbox($array[$#array]); &Graphs::makegraphbox("media.cgi",$array[$#array],"day"); &Header::closebox(); diff --git a/html/cgi-bin/memory.cgi b/html/cgi-bin/memory.cgi index 1708b0f32..a06e62512 100644 --- a/html/cgi-bin/memory.cgi +++ b/html/cgi-bin/memory.cgi @@ -52,12 +52,12 @@ if ( $querry[0] =~ "memory"){ &Header::openpage($Lang::tr{'memory information'}, 1, ''); &Header::openbigbox('100%', 'left'); - &Header::openbox('100%', 'center', "Memory $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$Lang::tr{'memory'}"); &Graphs::makegraphbox("memory.cgi","memory","day"); &Header::closebox(); if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/swap 2>/dev/null` ) { - &Header::openbox('100%', 'center', "Swap $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "Swap"); &Graphs::makegraphbox("memory.cgi","swap","day"); &Header::closebox(); } diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi index 98ac4fe12..ab94ca315 100644 --- a/html/cgi-bin/netexternal.cgi +++ b/html/cgi-bin/netexternal.cgi @@ -75,7 +75,7 @@ if ( $querry[0] ne~ ""){ } foreach (@graphs) { - &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$_"); &Graphs::makegraphbox("netexternal.cgi",$_,"day"); &Header::closebox(); } diff --git a/html/cgi-bin/netinternal.cgi b/html/cgi-bin/netinternal.cgi index 3f2fb56cc..b6926d0c9 100644 --- a/html/cgi-bin/netinternal.cgi +++ b/html/cgi-bin/netinternal.cgi @@ -71,13 +71,13 @@ if ( $querry[0] =~ /wireless/ ){ } foreach (@graphs) { - &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$_"); &Graphs::makegraphbox("netinternal.cgi",$_,"day"); &Header::closebox(); } foreach (@wireless) { - &Header::openbox('100%', 'center', "Wireless $_ $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "Wireless $_"); &Graphs::makegraphbox("netinternal.cgi","wireless".$_,"day"); &Header::closebox(); } diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi index 4f03c82e8..0b36a96d1 100755 --- a/html/cgi-bin/netother.cgi +++ b/html/cgi-bin/netother.cgi @@ -62,12 +62,12 @@ if ( $querry[0] =~ "fwhits"){ } foreach (@pings) { - &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$_"); &Graphs::makegraphbox("netother.cgi",$_,"day"); &Header::closebox(); } - &Header::openbox('100%', 'center', "$Lang::tr{'firewallhits'} $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$Lang::tr{'firewallhits'}"); &Graphs::makegraphbox("netother.cgi","fwhits","day"); &Header::closebox(); diff --git a/html/cgi-bin/netovpnrw.cgi b/html/cgi-bin/netovpnrw.cgi index cae7770bb..fc0307a33 100755 --- a/html/cgi-bin/netovpnrw.cgi +++ b/html/cgi-bin/netovpnrw.cgi @@ -58,7 +58,7 @@ if ( $querry[0] ne "" && $querry[0] ne "UNDEF"){ } if(@vpns){ foreach (@vpns) { - &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$_"); &Graphs::makegraphbox("netovpnrw.cgi",$_, "day"); &Header::closebox(); } diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi index 77c69cddb..c2a5531cd 100755 --- a/html/cgi-bin/netovpnsrv.cgi +++ b/html/cgi-bin/netovpnsrv.cgi @@ -80,7 +80,7 @@ if ( $querry[0] ne ""){ } foreach (@vpns) { - &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$_"); &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day"); &Header::closebox(); } diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 8211a3ca0..e3b3eefb4 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -708,10 +708,10 @@ if ( ($qossettings{'DEFCLASS_INC'} eq '') || ($qossettings{'DEFCLASS_OUT'} eq '' exit } - &Header::openbox('100%', 'center', "$qossettings{'RED_DEV'} $Lang::tr{'graph'}, $Lang::tr{'uplink'}"); + &Header::openbox('100%', 'center', "$qossettings{'RED_DEV'} $Lang::tr{'uplink'}"); &Graphs::makegraphbox("qos.cgi",$qossettings{'RED_DEV'},"hour"); &Header::closebox(); - &Header::openbox('100%', 'center', "$qossettings{'IMQ_DEV'} $Lang::tr{'graph'}, $Lang::tr{'downlink'}"); + &Header::openbox('100%', 'center', "$qossettings{'IMQ_DEV'} $Lang::tr{'downlink'}"); &Graphs::makegraphbox("qos.cgi",$qossettings{'IMQ_DEV'},"hour"); &Header::closebox(); diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index 26ab4f314..ca33c7285 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -204,11 +204,11 @@ END print "</table></div>\n"; &Header::closebox(); - &Header::openbox('100%', 'center', "$Lang::tr{'processes'} $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$Lang::tr{'processes'}"); &Graphs::makegraphbox("services.cgi","processescpu","day"); &Header::closebox(); - &Header::openbox('100%', 'center', "$Lang::tr{'processes'} $Lang::tr{'memory'} $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$Lang::tr{'processes'} $Lang::tr{'memory'}"); &Graphs::makegraphbox("services.cgi","processesmemory","day"); &Header::closebox(); diff --git a/html/cgi-bin/system.cgi b/html/cgi-bin/system.cgi index 0548dddda..3af4b8e01 100644 --- a/html/cgi-bin/system.cgi +++ b/html/cgi-bin/system.cgi @@ -56,17 +56,17 @@ if ( $querry[0] =~ "cpufreq"){ &Header::openpage($Lang::tr{'status information'}, 1, ''); &Header::openbigbox('100%', 'left'); - &Header::openbox('100%', 'center', "CPU $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "CPU"); &Graphs::makegraphbox("system.cgi","cpu","day"); &Header::closebox(); if ( -e "$mainsettings{'RRDLOG'}/collectd/localhost/cpufreq/cpufreq-0.rrd"){ - &Header::openbox('100%', 'center', "$Lang::tr{'cpu frequency'} $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$Lang::tr{'cpu frequency'}"); &Graphs::makegraphbox("system.cgi","cpufreq","day"); &Header::closebox(); } - &Header::openbox('100%', 'center', "$Lang::tr{'uptime load average'} $Lang::tr{'graph'}"); + &Header::openbox('100%', 'center', "$Lang::tr{'uptime load average'}"); &Graphs::makegraphbox("system.cgi","load","day"); &Header::closebox(); -- 2.17.1

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development May 2020