[PATCH 1/4] graphs.pl: Added translation for 'ACPI Thermal Zone'

[PATCH 1/4] graphs.pl: Added translation for 'ACPI Thermal Zone'

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 1841 bytes --]

This patchset is based on https://git.ipfire.org/?p=people/ms/ipfire-2.x.git;a=commitdiff;h=4bf0d000ffe961cdc5d9dbd27b3a11f900b3daed

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 config/cfgroot/graphs.pl | 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/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 5f146d226..8473613a3 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -1088,7 +1088,7 @@ sub updatethermaltempgraph {
 		"--start",
 		"-1".$period,
 		"-r",
-		"-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"},
+		"-t ".$Lang::tr{'acpitemp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
 		"-v Grad Celsius",
 		"--color=SHADEA".$color{"color19"},
 		"--color=SHADEB".$color{"color19"},
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 0c4a3b5b9..119b29913 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -135,6 +135,7 @@
 'accounting' => 'Benutzerverwaltung',
 'accounting user nonpdc' => 'Benutzerverwaltung - kein PDC Modus',
 'accounting user pdc' => 'Benutzerverwaltung - PDC Modus',
+'acpitemp' => 'ACPI - Temperaturen',
 'action' => 'Aktion',
 'activate' => 'aktivieren',
 'activate user' => 'Benutzer aktivieren',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 42ee304f7..592ee7fb7 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -133,6 +133,7 @@
 'accounting' => 'Accounting',
 'accounting user nonpdc' => 'Accounting - none PDC Mode',
 'accounting user pdc' => 'Accounting - PDC Mode',
+'acpitemp' => 'ACPI - Temperatures',
 'action' => 'Action',
 'activate' => 'Activate',
 'activate user' => 'Activate user',
-- 
2.18.0

[PATCH 2/4] Changed/fixed translation 'Connection tracking'

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 6445 bytes --]

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 langs/de/cgi-bin/de.pl | 2 +-
 langs/en/cgi-bin/en.pl | 3 +--
 langs/es/cgi-bin/es.pl | 2 +-
 langs/fr/cgi-bin/fr.pl | 2 +-
 langs/it/cgi-bin/it.pl | 2 +-
 langs/nl/cgi-bin/nl.pl | 2 +-
 langs/pl/cgi-bin/pl.pl | 2 +-
 langs/ru/cgi-bin/ru.pl | 2 +-
 langs/tr/cgi-bin/tr.pl | 2 +-
 9 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 119b29913..233924da0 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -638,7 +638,7 @@
 'connection closed' => 'Nicht Verbunden...',
 'connection debugging' => 'Debugmeldungen dieser Verbindung protokollieren',
 'connection status and controlc' => 'Verbindungsstatus und -kontrolle',
-'connection tracking' => 'iptables-Verbindungsverfolgung',
+'connection tracking' => 'Verbindungsverfolgung',
 'connection type' => 'Verbindungstyp',
 'connection type is invalid' => 'Verbindungstyp ist ungültig',
 'connections' => 'Verbindungen',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 592ee7fb7..75cdb006d 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -653,12 +653,11 @@
 'connection closed' => 'Not connected...',
 'connection debugging' => 'Connection debugging',
 'connection status and controlc' => 'Connection Status and -Control',
-'connection tracking' => 'iptables Connection Tracking',
+'connection tracking' => 'Connection Tracking',
 'connection type' => 'Connection Type',
 'connection type is invalid' => 'Connection type is invalid.',
 'connections' => 'Connections',
 'connections are associated with this ca.  deleting the ca will delete these connections as well.' => 'connections are associated with this CA. Deleting the CA will delete these connections as well.',
-'connnection tracking' => 'Connection Tracking',
 'connscheduler' => 'Connection Scheduler',
 'core notice 1' => '<strong>Notice:</strong> There is an core-update from',
 'core notice 2' => 'to',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index a4870f5f1..933d3b812 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -511,7 +511,7 @@
 'connection closed' => 'No conectado…',
 'connection debugging' => 'Depurado de conexión',
 'connection status and controlc' => 'Control y Status de conexión:',
-'connection tracking' => 'Rastreo de conexión iptables',
+'connection tracking' => 'Seguimiento de conexión',
 'connection type' => 'Tipo de conexión',
 'connection type is invalid' => 'Tipo de conexión no es válido',
 'connections' => 'Conexiones',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 41eb631af..2cb93f25b 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -658,7 +658,7 @@
 'connection closed' => 'Non connecté...',
 'connection debugging' => 'Déboggage de la connexion ',
 'connection status and controlc' => 'Etat et contrôle de connexion :',
-'connection tracking' => 'Surveillance des connexions tables IP',
+'connection tracking' => 'Suivi de connexion',
 'connection type' => 'Type de connexion',
 'connection type is invalid' => 'Le type de connexion est non valide.',
 'connections' => 'Connexions',
diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index b7722a892..9d0f349a4 100644
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -574,7 +574,7 @@
 'connection closed' => 'Non connesso...',
 'connection debugging' => 'Connection debugging',
 'connection status and controlc' => 'Stato della connessione e controllo',
-'connection tracking' => 'Monitoraggio connessioni iptables',
+'connection tracking' => 'Monitoraggio della connessione',
 'connection type' => 'Connection Type',
 'connection type is invalid' => 'Connection type is invalid.',
 'connections' => 'Connessioni',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 2b8f6868e..f14306871 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -571,7 +571,7 @@
 'connection closed' => 'Niet verbonden...',
 'connection debugging' => 'Connectie debugging',
 'connection status and controlc' => 'Verbindingsstatus en controle:',
-'connection tracking' => 'iptables verbindingen volgen',
+'connection tracking' => 'Verbinding volgen',
 'connection type' => 'Verbindingstype',
 'connection type is invalid' => 'Verbindingstype is ongeldig.',
 'connections' => 'Verbindingen',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index 15ddc7e95..668045537 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -512,7 +512,7 @@
 'connection closed' => 'Brak połączenia...',
 'connection debugging' => 'Debugowanie połączenia',
 'connection status and controlc' => 'Stan i kontrola połączenia:',
-'connection tracking' => 'Śledzenie połączeń iptables',
+'connection tracking' => 'Śledzenie połączeń',
 'connection type' => 'Rodzaj połączenia',
 'connection type is invalid' => 'Nieprawidłowy rodzaj połączenia.',
 'connections' => 'Połączenia',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index dbe86ddea..2c91a3fee 100644
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -510,7 +510,7 @@
 'connection closed' => 'Не подключён...',
 'connection debugging' => 'Connection debugging',
 'connection status and controlc' => 'Статус и управление подключениями:',
-'connection tracking' => 'Просмотр соединений через iptables',
+'connection tracking' => 'Отслеживание подключений',
 'connection type' => 'Connection Type',
 'connection type is invalid' => 'Connection type is invalid.',
 'connections' => 'Соединения',
diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index b67311ece..de5837a3f 100644
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -640,7 +640,7 @@
 'connection closed' => 'Bağlı değil...',
 'connection debugging' => 'Hata ayıklama bağlantısı',
 'connection status and controlc' => 'Bağlantı durumu ve kontrol:',
-'connection tracking' => 'IPTablo bağlantı takibi',
+'connection tracking' => 'Bağlantı izleme',
 'connection type' => 'Bağlantı türü',
 'connection type is invalid' => 'Geçersiz bağlantı türü.',
 'connections' => 'Bağlantılar',
-- 
2.18.0

[PATCH 3/4] netother.cgi: Added missing double quotes

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 643 bytes --]

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 html/cgi-bin/netother.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi
index 3256a0d6b..459979684 100755
--- a/html/cgi-bin/netother.cgi
+++ b/html/cgi-bin/netother.cgi
@@ -71,7 +71,7 @@ if ( $querry[0] eq "conntrack") {
 		&Header::closebox();
 	}
 
-	&Header::openbox('100%', 'center', $Lang::tr{'connnection tracking'});
+	&Header::openbox('100%', 'center', "$Lang::tr{'connnection tracking'}");
 	&Graphs::makegraphbox("netother.cgi", "conntrack", "day");
 	&Header::closebox();
 
-- 
2.18.0

[PATCH 4/4] graphs.pl: Standardize temperature displays

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 3677 bytes --]

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 config/cfgroot/graphs.pl | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 8473613a3..417da5cd7 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -810,15 +810,15 @@ sub updatehddgraph {
 		"DEF:standby=".$mainsettings{'RRDLOG'}."/hddshutdown-$disk.rrd:standby:AVERAGE",
 		"CDEF:st=standby,INF,*",
 		"AREA:st".$color{"color20"}."A0:standby",
-		"LINE3:temperature".$color{"color11"}."A0:$Lang::tr{'hdd temperature in'} C\\j",
+		"LINE3:temperature".$color{"color11"}."A0:$Lang::tr{'hdd temperature in'} °C\\j",
 		"COMMENT:$Lang::tr{'maximal'}",
 		"COMMENT:$Lang::tr{'average'}",
 		"COMMENT:$Lang::tr{'minimal'}",
 		"COMMENT:$Lang::tr{'current'}\\j",
-		"GPRINT:temperature:MAX:%3.0lf Grad C",
-		"GPRINT:temperature:AVERAGE:%3.0lf Grad C",
-		"GPRINT:temperature:MIN:%3.0lf Grad C",
-		"GPRINT:temperature:LAST:%3.0lf Grad C\\j",
+		"GPRINT:temperature:MAX:%3.0lf °C",
+		"GPRINT:temperature:AVERAGE:%3.0lf °C",
+		"GPRINT:temperature:MIN:%3.0lf °C",
+		"GPRINT:temperature:LAST:%3.0lf °C\\j",
 		);
 		$ERROR = RRDs::error;
 		print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
@@ -836,6 +836,7 @@ sub updatehwtempgraph {
 		"-1".$period,
 		"-r",
 		"-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
+		"-v Celsius",
 		"--color=SHADEA".$color{"color19"},
 		"--color=SHADEB".$color{"color19"},
 		"--color=BACK".$color{"color21"},
@@ -862,7 +863,7 @@ sub updatehwtempgraph {
 				$_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
 				my $label = $2.$3;$label=~ s/-//g;
 				if ( $sensorsettings{'LINE-'.$label} eq "off" ){next;}
-				push(@command,"LINE3:".$sensorsettings{'LABEL-'.$label}.random_hex_color(6)."A0:".sprintf("%-25s",$sensorsettings{'LABEL-'.$label}),"GPRINT:".$sensorsettings{'LABEL-'.$label}.":MAX:%3.2lf C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":AVERAGE:%3.2lf C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":MIN:%3.2lf C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":LAST:%3.2lf C\\j",);
+				push(@command,"LINE3:".$sensorsettings{'LABEL-'.$label}.random_hex_color(6)."A0:".sprintf("%-25s",$sensorsettings{'LABEL-'.$label}),"GPRINT:".$sensorsettings{'LABEL-'.$label}.":MAX:%3.2lf °C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":AVERAGE:%3.2lf °C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":MIN:%3.2lf °C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":LAST:%3.2lf °C\\j",);
 			}
 		}
 
@@ -1089,7 +1090,7 @@ sub updatethermaltempgraph {
 		"-1".$period,
 		"-r",
 		"-t ".$Lang::tr{'acpitemp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
-		"-v Grad Celsius",
+		"-v Celsius",
 		"--color=SHADEA".$color{"color19"},
 		"--color=SHADEB".$color{"color19"},
 		"--color=BACK".$color{"color21"},
@@ -1105,10 +1106,10 @@ sub updatethermaltempgraph {
 		push(@command,"DEF:temp".$i."_=".$mainsettings{'RRDLOG'}."/collectd/localhost/thermal-thermal_zone".$i."/temperature-temperature.rrd:value:AVERAGE"
 				,"CDEF:temp".$i."=temp".$i."_,1,/"
 				,"LINE3:temp".$i.$color{"color1$j"}."A0:Temp ".$i." "
-				,"GPRINT:temp".$i.":MAX:%3.0lf Grad C"
-				,"GPRINT:temp".$i.":AVERAGE:%3.0lf Grad C"
-				,"GPRINT:temp".$i.":MIN:%3.0lf Grad C"
-				,"GPRINT:temp".$i.":LAST:%3.0lf Grad C\\j");
+				,"GPRINT:temp".$i.":MAX:%3.0lf °C"
+				,"GPRINT:temp".$i.":AVERAGE:%3.0lf °C"
+				,"GPRINT:temp".$i.":MIN:%3.0lf °C"
+				,"GPRINT:temp".$i.":LAST:%3.0lf °C\\j");
 	}
 
 	RRDs::graph (@command);
-- 
2.18.0

Re: [PATCH 3/4] netother.cgi: Added missing double quotes

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 854 bytes --]

Hi,

> On 5 Sep 2020, at 16:41, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
> 
> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
> ---
> html/cgi-bin/netother.cgi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi
> index 3256a0d6b..459979684 100755
> --- a/html/cgi-bin/netother.cgi
> +++ b/html/cgi-bin/netother.cgi
> @@ -71,7 +71,7 @@ if ( $querry[0] eq "conntrack") {
> 		&Header::closebox();
> 	}
> 
> -	&Header::openbox('100%', 'center', $Lang::tr{'connnection tracking'});
> +	&Header::openbox('100%', 'center', "$Lang::tr{'connnection tracking'}");
> 	&Graphs::makegraphbox("netother.cgi", "conntrack", "day");
> 	&Header::closebox();

There was a typo here. “connnection” had three n.

> 
> -- 
> 2.18.0
> 

Re: [PATCH 3/4] netother.cgi: Added missing double quotes

[Matthias Fischer]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

Hi,

On 05.10.2020 17:32, Michael Tremer wrote:
> There was a typo here. “connnection” had three n.

Yep. Saw it - but too late.

I'm in the deepest basement right now - being ashamed...

Thanks for fixing.

Best,
Matthias

Re: [PATCH 3/4] netother.cgi: Added missing double quotes

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 471 bytes --]

Hi,

> On 5 Oct 2020, at 17:10, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
> 
> Hi,
> 
> On 05.10.2020 17:32, Michael Tremer wrote:
>> There was a typo here. “connnection” had three n.
> 
> Yep. Saw it - but too late.
> 
> I'm in the deepest basement right now - being ashamed...

Don’t be. Nobody saw it.

I am just using this to illustrate why we review code here :)

-Michael

> 
> Thanks for fixing.
> 
> Best,
> Matthias