From f00699e8bb9f820f1be200a40d987b749cd278dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alf=20H=C3=B8gemark?= Date: Thu, 14 Jul 2016 13:14:55 +0200 Subject: [PATCH] Change case of the unit "bit" from "Bit" to "bit" in web UI MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The correct case for "kilobit" is "kilobit", not "kiloBit". And the same applies for Mbit, Gbit etc. Reference is https://en.wikipedia.org/wiki/Kilobit This commit changes the texts used in the web UI, so that it correctly displays as "bit", "kbit", "Mbit" etc. This fixes bugzilla item 10918. Signed-off-by: Alf Høgemark Signed-off-by: Michael Tremer --- config/updxlrator/download | 2 +- html/cgi-bin/proxy.cgi | 8 ++++---- html/cgi-bin/tor.cgi | 10 +++++----- html/html/themes/ipfire/include/functions.pl | 4 ++-- html/html/themes/ipfire/include/js/refreshInetInfo.js | 2 +- langs/de/cgi-bin/de.pl | 6 +++--- langs/en/cgi-bin/en.pl | 2 +- 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 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/config/updxlrator/download b/config/updxlrator/download index 1624609f4e..dbc722c232 100644 --- a/config/updxlrator/download +++ b/config/updxlrator/download @@ -108,7 +108,7 @@ if ($xlratorsettings{'MAX_DOWNLOAD_RATE'} eq '') { &writelog("Retrieving file for local cache: $updatefile"); } else { - &writelog("Retrieving file for local cache at max. " . $xlratorsettings{'MAX_DOWNLOAD_RATE'} . " kBit/s: $updatefile"); + &writelog("Retrieving file for local cache at max. " . $xlratorsettings{'MAX_DOWNLOAD_RATE'} . " kbit/s: $updatefile"); } $ENV{'http_proxy'} = $proxysettings{'UPSTREAM_PROXY'}; diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 1c9bb8724a..0b7d36c3ca 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -1532,7 +1532,7 @@ END ; foreach (@throttle_limits) { - print "\t\n"; + print "\t\n"; } print <$_ kBit/s\n"; + print "\t\n"; } print <$_ kBit/s\n"; + print "\t\n"; } print <$_ kBit/s\n"; + print "\t\n"; } print <= 1024) { - print "\n"; + print "\n"; } else { - print "\n"; + print "\n"; } } @@ -455,9 +455,9 @@ END foreach (@bandwidth_limits) { if ($_ >= 1024) { - print "\n"; + print "\n"; } else { - print "\n"; + print "\n"; } } print <= 1024)) { diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index eedf069dda..7f6000a46d 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -70,8 +70,8 @@ sub showmenu() { print < Traffic: - In --.-- Bit/s   - Out --.-- Bit/s + In --.-- bit/s   + Out --.-- bit/s EOF } diff --git a/html/html/themes/ipfire/include/js/refreshInetInfo.js b/html/html/themes/ipfire/include/js/refreshInetInfo.js index 259f86e070..7d9cf8fc35 100644 --- a/html/html/themes/ipfire/include/js/refreshInetInfo.js +++ b/html/html/themes/ipfire/include/js/refreshInetInfo.js @@ -51,7 +51,7 @@ function refreshInetInfo() { } function format_bytes(bytes) { - var units = ["Bit/s", "kBit/s", "MBit/s", "GBit/s", "TBit/s"]; + var units = ["bit/s", "kbit/s", "Mbit/s", "Gbit/s", "Tbit/s"]; var unit = units[0]; for (var i = 1; i < units.length; i++) { diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 7c330bb0fe..58c0e7ab13 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -786,7 +786,7 @@ 'dos charset' => 'DOS Charset', 'down and up speed' => 'Geben Sie bitte hier ihre Download- bzw. Upload-Geschwindigkeit ein
und klicken Sie danach auf Speichern.', 'downlink' => 'Downlink', -'downlink speed' => 'Downlink-Geschwindigkeit (kBit/sek)', +'downlink speed' => 'Downlink-Geschwindigkeit (kbit/sek)', 'downlink std class' => 'Downloadstandardklasse', 'download' => 'herunterladen', 'download ca certificate' => 'CA-Zertifikat herunterladen', @@ -2323,7 +2323,7 @@ 'updxlrtr maintenance' => 'Wartung', 'updxlrtr marked as' => 'markiert als', 'updxlrtr max disk usage' => 'Max. Festplattennutzung', -'updxlrtr max download rate' => 'Max. externe Downloadrate (kBit/s)', +'updxlrtr max download rate' => 'Max. externe Downloadrate (kbit/s)', 'updxlrtr month' => 'einem Monat', 'updxlrtr monthly' => 'monatlich', 'updxlrtr not accessed' => 'nicht zugegriffen seit', @@ -2357,7 +2357,7 @@ 'updxlrtr year' => 'einem Jahr', 'upgrade' => 'upgrade', 'uplink' => 'Uplink', -'uplink speed' => 'Uplink-Geschwindigkeit (kBit/sek)', +'uplink speed' => 'Uplink-Geschwindigkeit (kbit/sek)', 'uplink std class' => 'Uploadstandardklasse', 'upload' => 'Hochladen', 'upload a certificate' => 'Ein Zertifikat hochladen:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 57f93eab31..747d12ec0e 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2363,7 +2363,7 @@ 'updxlrtr maintenance' => 'Maintenance', 'updxlrtr marked as' => 'marked as', 'updxlrtr max disk usage' => 'Max. disk usage', -'updxlrtr max download rate' => 'Max. external download rate (kBit/s)', +'updxlrtr max download rate' => 'Max. external download rate (kbit/s)', 'updxlrtr month' => 'one month', 'updxlrtr monthly' => 'monthly', 'updxlrtr not accessed' => 'not accessed since', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index e24e75e56b..7ac5d11e78 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1813,7 +1813,7 @@ 'updxlrtr maintenance' => 'Mantenimiento', 'updxlrtr marked as' => 'marcado como', 'updxlrtr max disk usage' => 'Máximo uso de disco', -'updxlrtr max download rate' => 'Tasa Máxima de descarga externa (kBit/s)', +'updxlrtr max download rate' => 'Tasa Máxima de descarga externa (kbit/s)', 'updxlrtr month' => 'un mes', 'updxlrtr monthly' => 'mensual', 'updxlrtr not accessed' => 'no se ha accesado desde', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 0d173aef34..61c514daf3 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1818,7 +1818,7 @@ 'updxlrtr maintenance' => 'Maintenance', 'updxlrtr marked as' => 'marqué comme', 'updxlrtr max disk usage' => 'Utilisation du disque Max.', -'updxlrtr max download rate' => 'Taux de téléchargement externe Max. (kBit/s)', +'updxlrtr max download rate' => 'Taux de téléchargement externe Max. (kbit/s)', 'updxlrtr month' => 'un mois', 'updxlrtr monthly' => 'mensuellement', 'updxlrtr not accessed' => 'la dernière utilisation date de', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 950f700267..2ed22f231c 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -2281,7 +2281,7 @@ 'updxlrtr maintenance' => 'Maintenance', 'updxlrtr marked as' => 'marked as', 'updxlrtr max disk usage' => 'Max. disk usage', -'updxlrtr max download rate' => 'Max. external download rate (kBit/s)', +'updxlrtr max download rate' => 'Max. external download rate (kbit/s)', 'updxlrtr month' => 'one month', 'updxlrtr monthly' => 'Mensile', 'updxlrtr not accessed' => 'not accessed since', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 9d90a0815c..2469ff248f 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -2226,7 +2226,7 @@ 'updxlrtr maintenance' => 'Onderhoud', 'updxlrtr marked as' => 'gemarkeerd als', 'updxlrtr max disk usage' => 'Max. schijfgebruik', -'updxlrtr max download rate' => 'Max. externe downloadsnelheid (kBit/s)', +'updxlrtr max download rate' => 'Max. externe downloadsnelheid (kbit/s)', 'updxlrtr month' => 'een maand', 'updxlrtr monthly' => 'maandelijks', 'updxlrtr not accessed' => 'niet benaderd sinds', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 47abf2c5f4..92142058d4 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -1826,7 +1826,7 @@ 'updxlrtr maintenance' => 'Konserwacja', 'updxlrtr marked as' => 'oznaczone jako', 'updxlrtr max disk usage' => 'Maks. wykorzystanie dysku', -'updxlrtr max download rate' => 'Maks. prędkość pobierania (kBit/s)', +'updxlrtr max download rate' => 'Maks. prędkość pobierania (kbit/s)', 'updxlrtr month' => 'miesiąca', 'updxlrtr monthly' => 'miesięcznie', 'updxlrtr not accessed' => 'bez żądania od', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 6840f81207..6a45f7f051 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -1821,7 +1821,7 @@ 'updxlrtr maintenance' => 'Управление', 'updxlrtr marked as' => 'отмечен как', 'updxlrtr max disk usage' => 'Максимальное использование диска', -'updxlrtr max download rate' => 'Максимальная скорость загрузки (kBit/s)', +'updxlrtr max download rate' => 'Максимальная скорость загрузки (kbit/s)', 'updxlrtr month' => 'один месяц', 'updxlrtr monthly' => 'Ежемесячно', 'updxlrtr not accessed' => 'Не обращались с', -- 2.39.2