From patchwork Sat Sep 5 15:41:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3429 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BkJg94jDQz3x3K for ; Sat, 5 Sep 2020 15:41:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BkJg730qYznX; Sat, 5 Sep 2020 15:41:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BkJg71gWcz30WS; Sat, 5 Sep 2020 15:41:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BkJg52hksz2xTN for ; Sat, 5 Sep 2020 15:41:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BkJg43j29znX for ; Sat, 5 Sep 2020 15:41:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1599320480; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=kS4yMKSIMpzzrjIGZw7XUwXrHSEWINivRi2MbgEmgu0=; b=pSBcy5Sxlj5qmOHB4aJH2aySpeJ3Eu8YMFJqxMRta49GsDcDVGiS6NOunRu4Q07tS0cBRS CH+qSYuNlw+mrFf8EMm5XEBy3N70oqKl0GuriY3XFmbKZLigazeVR6liNBfHhERAS4elz6 wNNF6VJJfrkwdK969kUj2Mv4FsWqvYKXhJcRLdpH/X2ym+MWovRwUmFqYj4rLwlvXmkPhg IMXc2ZzsfWrLZ2ucF1ZkBSAdECeyAyIdg/BzbSYPQvAnH2TYURTyagDwOCsf0BSwHJyS25 rDMgS2zxR6y+JTlE1Q1bJ3qjQQQ3xcYbKGXLrlyhMM/Hp94ubHdjXnhslmKA6w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1599320481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=kS4yMKSIMpzzrjIGZw7XUwXrHSEWINivRi2MbgEmgu0=; b=NEcSzLdb+bn2DL3oMY5M/NB920mMhi3t0x5dpti8xMXVCGgRUWTrR4pRQIzM4HlOfxW9Ac Iz8JXe5zaN8kQkCw== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 1/4] graphs.pl: Added translation for 'ACPI Thermal Zone' Date: Sat, 5 Sep 2020 17:41:10 +0200 Message-Id: <20200905154113.3555-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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', From patchwork Sat Sep 5 15:41:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3430 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BkJgB17QHz3x3T for ; Sat, 5 Sep 2020 15:41:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BkJg76ZD1zyr; Sat, 5 Sep 2020 15:41:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BkJg72Q3Xz2yWh; Sat, 5 Sep 2020 15:41:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BkJg539lkz2xq9 for ; Sat, 5 Sep 2020 15:41:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BkJg51n7Dzsr for ; Sat, 5 Sep 2020 15:41:21 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1599320481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GYuk8GY+3cnOchTCSja/ShgLWOoh65ZwJUvR/95nUS0=; b=6QANRCW268VFjG+azPNQIfQNfP/jU64jbf94r8lCzMV9vSJbD6nqt06vo1c9EkvsS0fwO/ RWLAxzQFkC/YnuBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1599320481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GYuk8GY+3cnOchTCSja/ShgLWOoh65ZwJUvR/95nUS0=; b=j9k3d18MDFHhxpYmrTgWNi8763vSDzz0GOzCNc2UJleZsJuaJTfF1nJT3aCtf7z/tcdvGk ue2dMObERQH48sc7fvsk7mJ05Qoxn9becGk9IcA9pHDaj6FhFC/rb42ofs2S+W7IZG1E2F J/mjxwQJlNlPh6dISoh5zKPGgq2ep2Yduez7WlnBMHA2grGqc2sJrgGGcTYlYCRtrVxT5r BN3BRRfgFVEoHuTw/gA6kDdnGgWvCS5eoErxVd5kYQZRWQzOL1CR642bNhccFMs784Hsca 20R6UAEGjKSxPpYchAXeaHjiwOVoaFIPVBk83b+h5cbI/EWa5Rc+EbKUEQdTHg== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 2/4] Changed/fixed translation 'Connection tracking' Date: Sat, 5 Sep 2020 17:41:11 +0200 Message-Id: <20200905154113.3555-2-matthias.fischer@ipfire.org> In-Reply-To: <20200905154113.3555-1-matthias.fischer@ipfire.org> References: <20200905154113.3555-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Matthias Fischer --- 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' => 'Notice: 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', From patchwork Sat Sep 5 15:41:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3431 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BkJgB370Bz3x3b for ; Sat, 5 Sep 2020 15:41:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BkJg81WQbz102; Sat, 5 Sep 2020 15:41:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BkJg73BVKz2ytS; Sat, 5 Sep 2020 15:41:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BkJg54DcYz2xTN for ; Sat, 5 Sep 2020 15:41:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BkJg52dlZznX for ; Sat, 5 Sep 2020 15:41:21 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1599320481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=Izu1s3thWRiiEalF53MscvPpjF1j5qKalmWiWk2CEUk=; b=ETOUvAE7w/Qon9swps/bbdAnwH2iqwd4cq9lbLzk3ykUs+e4qFhhDCiKC3IH/kKWLRPrlE apCtebphsYZmxLBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1599320481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=Izu1s3thWRiiEalF53MscvPpjF1j5qKalmWiWk2CEUk=; b=ARTOKlXfjQExpJGqTExL/FEyDUJli/wCykgnb4LyYDT+8uOYpp84PMLfc76v5ZTh+julgY DeqYQ6GOV3t7C9VLtgiwZmazIXlYLVGOkyfPHjw24vS0AejczcM5EuI58A4yV+XeYgj7/b d2EVl1dw1tsElASCEYxOHMq2aXtSnvuxaGbHa12W66I78xH/O/1iHcxBBIelD9kOg/pRLn Xx+cfe9O9VC+yAe3ZHnGrfrTM/cIoXR3cG+DcfnfoPJ6zq0NpXu5fYXdCkkg6tqhrwEIZO 7yOoO6UrWbn8iQOpM8lkOU9EwqfHhfPCy+xkOlvjsK68Oyvdq2yUKygs4dEurA== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 3/4] netother.cgi: Added missing double quotes Date: Sat, 5 Sep 2020 17:41:12 +0200 Message-Id: <20200905154113.3555-3-matthias.fischer@ipfire.org> In-Reply-To: <20200905154113.3555-1-matthias.fischer@ipfire.org> References: <20200905154113.3555-1-matthias.fischer@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Matthias Fischer --- 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(); From patchwork Sat Sep 5 15:41:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 3432 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4BkJgC3Zb2z3x3K for ; Sat, 5 Sep 2020 15:41:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4BkJg847DMz10B; Sat, 5 Sep 2020 15:41:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4BkJg73v3wz30Wr; Sat, 5 Sep 2020 15:41:23 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4BkJg553Jfz2xq9 for ; Sat, 5 Sep 2020 15:41:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4BkJg53hVKzsr for ; Sat, 5 Sep 2020 15:41:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1599320481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VsIAHcGeBgq3N5FKw3QOO0yLpeETRJ4A3wuURkIekfQ=; b=cUTh0uL9Jp4WwiwYnSQHzUlQckCVq/IX+Jej8op2eJqbtDvaJ7dCuWlR+lkYldMxSf+S88 pPDJ2k2ftPHXt2OxeRIxz+htvJWUoOFQikfSpEnVeJOu5KPEbEeVf/ITjK9+g8mOhfB0D9 jEKJtC6ZcC4mKRKl7hQkAcN2iuLndTbAjJ3WQhMcfgPwynA7xuYUENGo7UfsxyIQR0tCqN Q9LNHV64xsZvasxZMc2tUFCkzh5JizL1QStZTrYU3lQrVoBh5fLZGvf/64FjCmsUOMDnBr yzmNLoeLJAYgwtO5wnpmGlKn8p3AMSwtA//e2A9nNVijcPW2nVE9oBqFgKJMNA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1599320481; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VsIAHcGeBgq3N5FKw3QOO0yLpeETRJ4A3wuURkIekfQ=; b=qxap+87sihy1Y4NkkD0MqaQ3wEX9zrGbWE79010XNivcFvGzhiHqwQTDobL83pQfc1EGGV T4gP+aYxsGrxMVDQ== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH 4/4] graphs.pl: Standardize temperature displays Date: Sat, 5 Sep 2020 17:41:13 +0200 Message-Id: <20200905154113.3555-4-matthias.fischer@ipfire.org> In-Reply-To: <20200905154113.3555-1-matthias.fischer@ipfire.org> References: <20200905154113.3555-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.mailfrom=matthias.fischer@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Matthias Fischer --- 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);