Good catch, thank you!
Reviewed-by: Peter Müller peter.mueller@ipfire.org
- The Expires time heading for the Connections WUI page has seconds listed. However the code is converting the seconds to hours:minutes:seconds.
- This patch is changing the heading to H:M:S in English and the equivalent in the other languages. I have basewd this on the initial letter for Hours, Minutes & Seconds in each of the languages.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
doc/language_issues.en | 4 ++-- doc/language_issues.es | 2 +- doc/language_issues.fr | 2 +- doc/language_issues.it | 2 +- doc/language_issues.nl | 2 +- doc/language_issues.pl | 2 +- doc/language_issues.ru | 2 +- doc/language_issues.tr | 2 +- doc/language_missings | 15 ++++++++------- html/cgi-bin/connections.cgi | 4 ++-- langs/de/cgi-bin/de.pl | 2 +- langs/en/cgi-bin/en.pl | 4 ++-- 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 +- 19 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/doc/language_issues.en b/doc/language_issues.en index c9d1117ef..b4327cb78 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -752,7 +752,7 @@ WARNING: untranslated string: exclude logfiles = Exclude logfiles WARNING: untranslated string: expires = Expires WARNING: untranslated string: export = Export WARNING: untranslated string: external aliases configuration = External aliases configuration -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd because there is already a device mounted = , because there is already a device mounted WARNING: untranslated string: extrahd cant umount = Can't umount WARNING: untranslated string: extrahd detected drives = detected drives @@ -1047,6 +1047,7 @@ WARNING: untranslated string: hosts config added = Hosts config added WARNING: untranslated string: hosts config changed = Hosts config changed WARNING: untranslated string: hour = Hour WARNING: untranslated string: hours = Hours +WARNING: untranslated string: hours:minutes:seconds = H:M:S WARNING: untranslated string: idle = Idle WARNING: untranslated string: idle timeout = Idle timeout (mins; 0 to disable): WARNING: untranslated string: idle timeout not set = Idle timeout not set. @@ -1624,7 +1625,6 @@ WARNING: untranslated string: search = Search WARNING: untranslated string: secondary dns = Secondary DNS: WARNING: untranslated string: secondary ntp server = Secondary NTP server WARNING: untranslated string: secondary wins server address = Secondary WINS server address -WARNING: untranslated string: seconds = Secs WARNING: untranslated string: secret = Secret WARNING: untranslated string: section = Section WARNING: untranslated string: secure shell server = Secure Shell Server diff --git a/doc/language_issues.es b/doc/language_issues.es index 8bb0b56fb..45ffdf5d7 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -952,7 +952,7 @@ WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Da WARNING: untranslated string: enable disable client = unknown string WARNING: untranslated string: enable disable dyndns = unknown string WARNING: untranslated string: error message = unknown string -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd mounted = Mounted WARNING: untranslated string: extrahd no mount point given = No mount point given WARNING: untranslated string: extrahd not configured = Not configured diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 6805c1eb9..cacfb1ec6 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -911,7 +911,7 @@ WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Da WARNING: untranslated string: enable disable client = unknown string WARNING: untranslated string: enable disable dyndns = unknown string WARNING: untranslated string: error message = unknown string -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd mounted = Mounted WARNING: untranslated string: extrahd no mount point given = No mount point given WARNING: untranslated string: extrahd not configured = Not configured diff --git a/doc/language_issues.it b/doc/language_issues.it index bb1d5db96..68ff12c86 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -1004,7 +1004,7 @@ WARNING: untranslated string: eol architecture warning = You are running an arch WARNING: untranslated string: error = Error WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd mounted = Mounted WARNING: untranslated string: extrahd no mount point given = No mount point given WARNING: untranslated string: extrahd not configured = Not configured diff --git a/doc/language_issues.nl b/doc/language_issues.nl index b85619977..d1a637215 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1009,7 +1009,7 @@ WARNING: untranslated string: eol architecture warning = You are running an arch WARNING: untranslated string: error = Error WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd mounted = Mounted WARNING: untranslated string: extrahd no mount point given = No mount point given WARNING: untranslated string: extrahd not configured = Not configured diff --git a/doc/language_issues.pl b/doc/language_issues.pl index d88e3fb8e..893f73211 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -997,7 +997,7 @@ WARNING: untranslated string: eol architecture warning = You are running an arch WARNING: untranslated string: error = Error WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd because there is already a device mounted = , because there is already a device mounted WARNING: untranslated string: extrahd cant umount = Can't umount WARNING: untranslated string: extrahd install or load driver = If your device isn't listed here, you need to install or load the driver.<br />If you can see your device but no partitions you have to create them first. diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 22e06460c..64c9b5095 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -994,7 +994,7 @@ WARNING: untranslated string: eol architecture warning = You are running an arch WARNING: untranslated string: error = Error WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd because there is already a device mounted = , because there is already a device mounted WARNING: untranslated string: extrahd cant umount = Can't umount WARNING: untranslated string: extrahd install or load driver = If your device isn't listed here, you need to install or load the driver.<br />If you can see your device but no partitions you have to create them first. diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 0d9514083..eadbd33c7 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -967,7 +967,7 @@ WARNING: untranslated string: eol architecture warning = You are running an arch WARNING: untranslated string: error = Error WARNING: untranslated string: error message = unknown string WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date! -WARNING: untranslated string: extrahd because it is outside the allowed mount path = , because it is outside the allowed mount path +WARNING: untranslated string: extrahd because it is outside the allowed mount path = unknown string WARNING: untranslated string: extrahd mounted = Mounted WARNING: untranslated string: extrahd no mount point given = No mount point given WARNING: untranslated string: extrahd not configured = Not configured diff --git a/doc/language_missings b/doc/language_missings index 4d8f4a2a9..28ae29c2b 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -55,6 +55,7 @@ < download apple profile < enable < error the to date has to be later than the from date +< extrahd because it it outside the allowed mount path < g.dtm < g.lite < ids automatic rules update @@ -107,7 +108,7 @@ < dhcp fixed ip address in dynamic range < dns servers < downfall gather data sampling -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd mounted < extrahd no mount point given < extrahd not configured @@ -130,7 +131,7 @@ < bewan adsl pci st < bewan adsl usb < downfall gather data sampling -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd mounted < extrahd no mount point given < extrahd not configured @@ -326,7 +327,7 @@ < eol architecture warning < error < error the to date has to be later than the from date -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd mounted < extrahd no mount point given < extrahd not configured @@ -845,7 +846,7 @@ < eol architecture warning < error < error the to date has to be later than the from date -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd mounted < extrahd no mount point given < extrahd not configured @@ -1472,7 +1473,7 @@ < eol architecture warning < error < error the to date has to be later than the from date -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -2462,7 +2463,7 @@ < eol architecture warning < error < error the to date has to be later than the from date -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -3267,7 +3268,7 @@ < eol architecture warning < error < error the to date has to be later than the from date -< extrahd because it is outside the allowed mount path +< extrahd because it it outside the allowed mount path < extrahd mounted < extrahd no mount point given < extrahd not configured diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index 771728d88..a4cf7a7cf 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -352,7 +352,7 @@ if ($SORT_FIELD and $SORT_ORDER) { $Lang::tr{'destination port'}, $Lang::tr{'protocol'}, $Lang::tr{'connection'}.' '.$Lang::tr{'status'},
$Lang::tr{'expires'}.' ('.$Lang::tr{'seconds'}.')',
$Lang::tr{'expires'}.' ('.$Lang::tr{'hours:minutes:seconds'}.')',@@ -435,7 +435,7 @@ print <<END; $Lang::tr{'connection'}<br>$Lang::tr{'status'} </th> <th style='text-align:center'>
$Lang::tr{'expires'}<br>($Lang::tr{'seconds'})
$Lang::tr{'expires'}<br>($Lang::tr{'hours:minutes:seconds'}) </th></tr>
END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 140806130..49018f6a5 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1372,6 +1372,7 @@ 'hour-graph' => 'Stunde', 'hours' => 'Stunden', 'hours2' => 'Stunden', +'hours:minutes:seconds' => 'S:M:S', 'icmp selected but no type' => 'ICMP wurde zwar als Protokoll gewählt, es wurde aber kein ICMP-Typ angegeben.', 'icmp type' => 'ICMP-Typ', 'id' => 'ID', @@ -2219,7 +2220,6 @@ 'secondary dns' => 'Sekundärer DNS-Server:', 'secondary ntp server' => 'Sekundärer NTP-Server', 'secondary wins server address' => 'Sekundärer WINS-Server', -'seconds' => 'Sek.', 'secret' => 'Geheimnis', 'section' => 'Abschnitt', 'secure shell server' => 'Secure Shell Server', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 02cf1bf4b..16a3061b4 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1073,7 +1073,7 @@ 'external access rule removed' => ' External access rule removed; restarting access controller', 'external aliases configuration' => 'External aliases configuration', 'extrahd' => 'ExtraHD', -'extrahd because it is outside the allowed mount path' => ', because it is outside the allowed mount path', +'extrahd because it it outside the allowed mount path' => ', because it is outside the allowed mount path', 'extrahd because there is already a device mounted' => ', because there is already a device mounted', 'extrahd cant umount' => 'Can't umount', 'extrahd detected drives' => 'detected drives', @@ -1420,6 +1420,7 @@ 'hour-graph' => 'Hour', 'hours' => 'Hours', 'hours2' => 'Hours', +'hours:minutes:seconds' => 'H:M:S', 'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.', 'icmp type' => 'ICMP Type', 'id' => 'ID', @@ -2279,7 +2280,6 @@ 'secondary dns' => 'Secondary DNS:', 'secondary ntp server' => 'Secondary NTP server', 'secondary wins server address' => 'Secondary WINS server address', -'seconds' => 'Secs', 'secret' => 'Secret', 'section' => 'Section', 'secure shell server' => 'Secure Shell Server', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 2e85a5b27..04549ba83 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1419,6 +1419,7 @@ 'hour-graph' => 'Hora', 'hours' => 'horas', 'hours2' => 'Horas', +'hours:minutes:seconds' => 'H:M:S', 'icmp selected but no type' => 'ICMP seleccionado como protocolo, pero no se ha seleccionado tipo de ICMP.', 'icmp type' => 'Tipo de ICMP', 'id' => 'ID', @@ -2291,7 +2292,6 @@ 'secondary dns' => 'DNS Secundario:', 'secondary ntp server' => 'Servidor NTP Secundario', 'secondary wins server address' => 'Dirección de servidor WINS Secundario', -'seconds' => 'Segs', 'secret' => 'Secreto', 'section' => 'Sección', 'secure shell server' => 'Servidor Secure Shell', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 0e746736e..87ec52e8b 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1417,6 +1417,7 @@ 'hour-graph' => 'Heure', 'hours' => 'heure(s)', 'hours2' => 'Heures', +'hours:minutes:seconds' => 'H:M:S', 'icmp selected but no type' => 'ICMP est le protocole sélectionné, mais il n'y a aucun type ICMP spécifié.', 'icmp type' => 'Type ICMP', 'id' => 'ID', @@ -2282,7 +2283,6 @@ 'secondary dns' => 'DNS secondaire :', 'secondary ntp server' => 'Serveur NTP secondaire ', 'secondary wins server address' => 'Serveur WINS secondaire ', -'seconds' => 'Secondes', 'secret' => 'Secret', 'section' => 'Section ', 'secure shell server' => 'Serveur Shell Sécurisé', diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl index 7526d67ad..6e3508803 100644 --- a/langs/it/cgi-bin/it.pl +++ b/langs/it/cgi-bin/it.pl @@ -1204,6 +1204,7 @@ 'hour-graph' => 'Ora', 'hours' => 'Ore', 'hours2' => 'Ore', +'hours:minutes:seconds' => 'O:M:S', 'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.', 'icmp type' => 'ICMP Type', 'id' => 'ID', @@ -1899,7 +1900,6 @@ 'secondary dns' => 'DNS Secondario:', 'secondary ntp server' => 'NTP server secondario', 'secondary wins server address' => 'WINS server secondario', -'seconds' => 'Secondi', 'section' => 'Sezione', 'secure shell server' => 'Secure Shell Server', 'security' => 'Sicurezza', diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl index 898d42d28..a397680ce 100644 --- a/langs/nl/cgi-bin/nl.pl +++ b/langs/nl/cgi-bin/nl.pl @@ -1201,6 +1201,7 @@ 'hour-graph' => 'Uur', 'hours' => 'uren', 'hours2' => 'Uren', +'hours:minutes:seconds' => 'U:M:S', 'icmp selected but no type' => 'ICMP als protocol geselecteerd, maar er is geen ICMP type gespecificeerd.', 'icmp type' => 'ICMP Type', 'id' => 'ID', @@ -1877,7 +1878,6 @@ 'secondary dns' => 'Secondaire DNS:', 'secondary ntp server' => 'Secondaire NTP server', 'secondary wins server address' => 'Secondaire WINS serveradres', -'seconds' => 'Sec.', 'section' => 'Sectie', 'secure shell server' => 'Secure Shell Server', 'security' => 'Beveiliging', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index 6ff2dab7b..86364a0a2 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -912,6 +912,7 @@ 'hour-graph' => 'Godzina', 'hours' => 'Godziny', 'hours2' => 'Godziny', +'hours:minutes:seconds' => 'G:M:S', 'icmp selected but no type' => 'Wybrano protokół ICMP, ale nie określono typu ICMP.', 'icmp type' => 'Typ ICMP', 'id' => 'ID', @@ -1533,7 +1534,6 @@ 'secondary dns' => 'Zapasowy DNS:', 'secondary ntp server' => 'Zapasowy serwer NTP', 'secondary wins server address' => 'Adres zapasowego serwera WINS', -'seconds' => 'Sek', 'section' => 'Sekcja', 'secure shell server' => 'Secure Shell Server', 'security' => 'Bezpieczeństwo', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index 78a43c7d6..32f0f2425 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -906,6 +906,7 @@ 'hour' => 'Час', 'hours' => 'Часы', 'hours2' => 'Часы', +'hours:minutes:seconds' => 'Ч:М:С', 'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.', 'icmp type' => 'ICMP Type', 'id' => 'ID', @@ -1528,7 +1529,6 @@ 'secondary dns' => 'Второй DNS:', 'secondary ntp server' => 'Второй NTP сервер', 'secondary wins server address' => 'Второй WINS сервер', -'seconds' => 'сек.', 'section' => 'Раздел', 'secure shell server' => 'Secure Shell Server', 'security' => 'Безопасность', diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 45fc16144..d279309af 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1317,6 +1317,7 @@ 'hour-graph' => 'saat', 'hours' => 'saat', 'hours2' => 'saat', +'hours:minutes:seconds' => 'S:D:S', 'icmp selected but no type' => 'ICMP kuralı için seçildi ancak ICMP türü belirtildi.', 'icmp type' => 'ICMP Türü', 'id' => 'Kimlik Numarası (ID)', @@ -2052,7 +2053,6 @@ 'secondary dns' => 'İkincil DNS:', 'secondary ntp server' => 'İkincil NTP sunucusu', 'secondary wins server address' => 'İkincil WINS sunucu adresi', -'seconds' => 'Saniye', 'section' => 'Bölüm', 'secure shell server' => 'Güvenli Kabuk Sunucusu (SSH)', 'security' => 'Güvenlik',