public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9f42af2453086189322b2bb810f479a82cbae54b
@ 2023-11-24 13:23 Peter Müller
  0 siblings, 0 replies; only message in thread
From: Peter Müller @ 2023-11-24 13:23 UTC (permalink / raw)
  To: ipfire-scm

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  9f42af2453086189322b2bb810f479a82cbae54b (commit)
       via  74eb1c95394009ac4fbe30ce7ca15afc31a7aa25 (commit)
       via  ee556e820f02c77716e74be727da319bd429fba4 (commit)
       via  e7e1a3514e4084306f6a37c3584d7fd3af382354 (commit)
       via  05730a8b48d7b64c253ed65c09c66922e06be5c7 (commit)
       via  58543d54c6ba2e04581df5dc84b949cc309cb18c (commit)
      from  3b20134742a656fffc9d467a4f139e0010222c6b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9f42af2453086189322b2bb810f479a82cbae54b
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Fri Nov 24 13:23:09 2023 +0000

    Core Update 182: Ship dhcp.cgi
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 74eb1c95394009ac4fbe30ce7ca15afc31a7aa25
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Fri Nov 24 13:22:42 2023 +0000

    dhcp.cgi: Update file header
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit ee556e820f02c77716e74be727da319bd429fba4
Author: Sebastien GISLAIN <sebastien.gislain(a)free.fr>
Date:   Fri Nov 17 15:44:22 2023 +0100

    dhcp.cgi: Add column with resolved hostname by IP address
    
    In web interface, on page DHCP Server, in table Current fixed leases, add column with resolved hostname by IP address
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

commit e7e1a3514e4084306f6a37c3584d7fd3af382354
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Fri Nov 24 13:13:16 2023 +0000

    connections.cgi: Update file header
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 05730a8b48d7b64c253ed65c09c66922e06be5c7
Author: Peter Müller <peter.mueller(a)ipfire.org>
Date:   Fri Nov 24 13:12:48 2023 +0000

    Core Update 182: Ship connections.cgi
    
    Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>

commit 58543d54c6ba2e04581df5dc84b949cc309cb18c
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date:   Thu Nov 9 09:24:06 2023 +0100

    connections.cgi: Fix Expires time Heading in Connections cgi page
    
    - 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(a)ipfire.org>
    Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/182/filelists/files |  2 ++
 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              |  6 +++---
 html/cgi-bin/dhcp.cgi                     | 13 ++++++++++---
 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 +-
 21 files changed, 42 insertions(+), 32 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/182/filelists/files b/config/rootfiles/core/182/filelists/files
index 722b58f68..961e4b020 100644
--- a/config/rootfiles/core/182/filelists/files
+++ b/config/rootfiles/core/182/filelists/files
@@ -247,3 +247,5 @@ lib/firmware/qcom/vpu-1.0/venus.mbn
 lib/firmware/rtl_nic/rtl8156b-2.fw
 lib/firmware/rtw89/rtw8851b_fw.bin
 lib/firmware/rtw89/rtw8852b_fw-1.bin
+srv/web/ipfire/cgi-bin/connections.cgi
+srv/web/ipfire/cgi-bin/dhcp.cgi
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..24702980c 100644
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2023  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -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'}.')',
 		$Lang::tr{'download'},
 		$Lang::tr{'upload'}
 	);
@@ -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/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index f45703f0b..fdfc74eb4 100755
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2023  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -21,6 +21,7 @@
 
 use strict;
 use experimental 'smartmatch';
+use IO::Socket;
 
 # enable only the following on debugging purpose
 #use warnings;
@@ -1007,8 +1008,9 @@ END
 print <<END
 <table width='100%' class='tbl'>
 <tr>
-    <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac address'}</b></a></th>
-    <th width='20%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FIPADDR'><b>$Lang::tr{'ip address'}</b></a></th>
+    <th width='15%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FETHER'><b>$Lang::tr{'mac address'}</b></a></th>
+    <th width='10%' align='center'><a href='$ENV{'SCRIPT_NAME'}?FIPADDR'><b>$Lang::tr{'ip address'}</b></a></th>
+    <th width='15%' align='center'><b>$Lang::tr{'hostname'}</b></th>
     <th width='15%' align='center'><b>$Lang::tr{'remark'}</b></th>
     <th width='15%' class='boldbase' align='center'><b>next-server</b></th>
     <th width='15%' class='boldbase' align='center'><b>filename</b></th>
@@ -1106,9 +1108,14 @@ foreach my $line (@current2) {
 	$TAG4 = "class='red'" if ($dhcpsettings{'KEY2'} ne $key);
     }
 
+	# resolved name (if exists)
+	my $iaddr = inet_aton($temp[1]);
+	my $rname = gethostbyaddr($iaddr, AF_INET);
+	if (!$rname || $rname eq "") { $rname = $Lang::tr{'ptr lookup failed'}; }
     print <<END
 <td align='center' $col>$TAG2$temp[0]$TAG3</td>
 <td align='center' $TAG4 $col>$TAG0$temp[1]$TAG1</td>
+<td align='center' $col>$rname&nbsp;</td>
 <td align='center' $col>$temp[6]&nbsp;</td>
 <td align='center' $col>$temp[3]&nbsp;</td>
 <td align='center' $col>$temp[4]&nbsp;</td>
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',


hooks/post-receive
--
IPFire 2.x development tree

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-11-24 13:23 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-24 13:23 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9f42af2453086189322b2bb810f479a82cbae54b Peter Müller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox