connections.cgi: Make it clearer which direction traffic is flowing

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index e2ca260def34709eae37a6e730291cd7b2176922..279545834562c8cf53b754be4fa7ae798d74955c 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -710,6 +710,8 @@ WARNING: translation string unused: smbstop
 WARNING: translation string unused: smtphost
 WARNING: translation string unused: smtpport
 WARNING: translation string unused: socket options
+WARNING: translation string unused: sort ascending
+WARNING: translation string unused: sort descending
 WARNING: translation string unused: source ip bad
 WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
@@ -904,6 +906,7 @@ WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40
 WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
 WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
 WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
+WARNING: untranslated string: data transfer = Data Transfer
 WARNING: untranslated string: desired = Desired
 WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 443c2a9512b39afa1fbb43992f00e143d6c5df85..eb16994b7c9cbd99de39bc589b03ec0acb3f5671 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -540,6 +540,7 @@ WARNING: untranslated string: current playlist = Current Playlist
 WARNING: untranslated string: current rules = Current rules:
 WARNING: untranslated string: daemon login script = Daemon login script
 WARNING: untranslated string: dangerous = Dangerous
+WARNING: untranslated string: data transfer = Data Transfer
 WARNING: untranslated string: date = Date
 WARNING: untranslated string: date not in logs = No (or only partial) logs exist for the day queried
 WARNING: untranslated string: day = Day
@@ -1667,8 +1668,6 @@ WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) i
 WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported
 WARNING: untranslated string: snat new source ip address = New source IP address
 WARNING: untranslated string: software version = Software Version
-WARNING: untranslated string: sort ascending = Sort ascending
-WARNING: untranslated string: sort descending = Sort descending
 WARNING: untranslated string: sound = Sound
 WARNING: untranslated string: source = Source
 WARNING: untranslated string: source ip = Source IP

diff --git a/doc/language_issues.es b/doc/language_issues.es
index f949d8a033a95456cabeb5bdeef51f6009d2f1cc..f8696f3fad64686ca24cee48853a527f345f9b81 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -774,6 +774,8 @@ WARNING: translation string unused: smtpport
 WARNING: translation string unused: snort hits
 WARNING: translation string unused: snort working
 WARNING: translation string unused: socket options
+WARNING: translation string unused: sort ascending
+WARNING: translation string unused: sort descending
 WARNING: translation string unused: source ip bad
 WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
@@ -965,6 +967,7 @@ WARNING: untranslated string: access point name is invalid = Access Point Name i
 WARNING: untranslated string: access point name is required = Access Point Name is required
 WARNING: untranslated string: bytes = unknown string
 WARNING: untranslated string: cpu frequency = CPU frequency
+WARNING: untranslated string: data transfer = Data Transfer
 WARNING: untranslated string: dhcp fixed ip address in dynamic range = Fixed IP Address in dynamic range
 WARNING: untranslated string: dns servers = DNS Servers
 WARNING: untranslated string: downfall gather data sampling = Downfall/Gather Data Sampling

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index ef480a19e531bf707676bdb74af5eb84f2d62c56..dedb3b6656c6e8bf8a23dd102ffc9049cd3d5e23 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -745,6 +745,8 @@ WARNING: translation string unused: smbstop
 WARNING: translation string unused: smtphost
 WARNING: translation string unused: smtpport
 WARNING: translation string unused: socket options
+WARNING: translation string unused: sort ascending
+WARNING: translation string unused: sort descending
 WARNING: translation string unused: source ip bad
 WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
@@ -926,6 +928,7 @@ WARNING: translation string unused: zoneconf val vlan tag assignment error
 WARNING: translation string unused: zoneconf val vlan tag range error
 WARNING: translation string unused: zoneconf val zoneslave amount error
 WARNING: untranslated string: core notice 3 = available.
+WARNING: untranslated string: data transfer = Data Transfer
 WARNING: untranslated string: enable disable client = unknown string
 WARNING: untranslated string: enable disable dyndns = unknown string
 WARNING: untranslated string: error message = unknown string

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 44387439cee5054fdc7e534237f64a10f5df8c89..00ea8639138dc90b5aac3f35ce2700609feea412 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -702,6 +702,8 @@ WARNING: translation string unused: smtpport
 WARNING: translation string unused: snort hits
 WARNING: translation string unused: snort working
 WARNING: translation string unused: socket options
+WARNING: translation string unused: sort ascending
+WARNING: translation string unused: sort descending
 WARNING: translation string unused: source ip bad
 WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
@@ -955,6 +957,7 @@ WARNING: untranslated string: cpu frequency = CPU frequency
 WARNING: untranslated string: crypto error = Cryptographic error
 WARNING: untranslated string: crypto warning = Cryptographic warning
 WARNING: untranslated string: dangerous = Dangerous
+WARNING: untranslated string: data transfer = Data Transfer
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
 WARNING: untranslated string: dh = Diffie-Hellman-Parameter

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 57edc0f5b7f1f940263949cb969173e7d585fdff..89bef0d889fa38572be5446a89f6d835597a4f95 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -702,6 +702,8 @@ WARNING: translation string unused: smtpport
 WARNING: translation string unused: snort hits
 WARNING: translation string unused: snort working
 WARNING: translation string unused: socket options
+WARNING: translation string unused: sort ascending
+WARNING: translation string unused: sort descending
 WARNING: translation string unused: source ip bad
 WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
@@ -958,6 +960,7 @@ WARNING: untranslated string: crypto error = Cryptographic error
 WARNING: untranslated string: crypto warning = Cryptographic warning
 WARNING: untranslated string: daemon login script = Daemon login script
 WARNING: untranslated string: dangerous = Dangerous
+WARNING: untranslated string: data transfer = Data Transfer
 WARNING: untranslated string: default = Default
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 0b3ce39a5b44c2d533c07e3acd5c7f965605b670..c1952a26dd61c6e478fc3d989610175a020fbb26 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -628,6 +628,8 @@ WARNING: translation string unused: smtpport
 WARNING: translation string unused: snort hits
 WARNING: translation string unused: snort working
 WARNING: translation string unused: socket options
+WARNING: translation string unused: sort ascending
+WARNING: translation string unused: sort descending
 WARNING: translation string unused: source ip bad
 WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
@@ -925,6 +927,7 @@ WARNING: untranslated string: cpu frequency = CPU frequency
 WARNING: untranslated string: crypto error = Cryptographic error
 WARNING: untranslated string: crypto warning = Cryptographic warning
 WARNING: untranslated string: dangerous = Dangerous
+WARNING: untranslated string: data transfer = Data Transfer
 WARNING: untranslated string: dead peer detection = Dead Peer Detection
 WARNING: untranslated string: default = Default
 WARNING: untranslated string: default IP address = Default IP Address

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 73823a7a819840f0e1d5eb4c8f443e8c5b092a3a..deaaf076dbd1349924c5113b86e849ef74648eb0 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -623,6 +623,8 @@ WARNING: translation string unused: smtpport
 WARNING: translation string unused: snort hits
 WARNING: translation string unused: snort working
 WARNING: translation string unused: socket options
+WARNING: translation string unused: sort ascending
+WARNING: translation string unused: sort descending
 WARNING: translation string unused: source ip bad
 WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
@@ -920,6 +922,7 @@ WARNING: untranslated string: cpu frequency = CPU frequency
 WARNING: untranslated string: crypto error = Cryptographic error
 WARNING: untranslated string: crypto warning = Cryptographic warning
 WARNING: untranslated string: dangerous = Dangerous
+WARNING: untranslated string: data transfer = Data Transfer
 WARNING: untranslated string: dead peer detection = Dead Peer Detection
 WARNING: untranslated string: default = Default
 WARNING: untranslated string: default IP address = Default IP Address

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 9cc962515be90d99276d5aad3e3f1ff536f57c08..f638744944c5e919e2daaf401e35a310cabfe667 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -732,6 +732,8 @@ WARNING: translation string unused: smtpport
 WARNING: translation string unused: snort hits
 WARNING: translation string unused: snort working
 WARNING: translation string unused: socket options
+WARNING: translation string unused: sort ascending
+WARNING: translation string unused: sort descending
 WARNING: translation string unused: source ip bad
 WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
@@ -941,6 +943,7 @@ WARNING: untranslated string: cpu frequency = CPU frequency
 WARNING: untranslated string: crypto error = Cryptographic error
 WARNING: untranslated string: crypto warning = Cryptographic warning
 WARNING: untranslated string: dangerous = Dangerous
+WARNING: untranslated string: data transfer = Data Transfer
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
 WARNING: untranslated string: dh = Diffie-Hellman-Parameter

diff --git a/doc/language_missings b/doc/language_missings
index 05fff37d1006dd78ab45fa38dbf7e5723e4feb4b..7f71e2de4be666f4f1f5cc120e8b54a173312d21 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -46,6 +46,7 @@
 < choose media
 < could not connect to www ipfire org
 < cryptographic settings
+< data transfer
 < desired
 < dhcp server disabled on blue interface
 < dhcp server enabled on blue interface
@@ -115,6 +116,7 @@
 < access point name is required
 < addon
 < cpu frequency
+< data transfer
 < dhcp fixed ip address in dynamic range
 < dns servers
 < downfall gather data sampling
@@ -155,6 +157,7 @@
 < ansi t1.483
 < bewan adsl pci st
 < bewan adsl usb
+< data transfer
 < extrahd because it it outside the allowed mount path
 < fwdfw syn flood protection
 < g.dtm
@@ -283,6 +286,7 @@
 < crypto warning
 < Daily
 < dangerous
+< data transfer
 < default IP address
 < desired
 < dh
@@ -812,6 +816,7 @@
 < daemon login script
 < Daily
 < dangerous
+< data transfer
 < default
 < default IP address
 < desired
@@ -1428,6 +1433,7 @@
 < crypto warning
 < Daily
 < dangerous
+< data transfer
 < dead peer detection
 < default
 < default ip
@@ -2429,6 +2435,7 @@
 < crypto warning
 < Daily
 < dangerous
+< data transfer
 < day-graph
 < dead peer detection
 < default
@@ -3308,6 +3315,7 @@
 < crypto warning
 < Daily
 < dangerous
+< data transfer
 < default IP address
 < desired
 < dh

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index b8a27a28f155f67f79eef3cb7ac3dc9097188c7d..4bd4c6057c8e5d3d3ddbea0b1529f8199dd4b478 100644 (file)
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -345,9 +345,8 @@ print <<END;
                        <th>
                                $Lang::tr{'country'}
                        </th>
-                       <th>
-                               $Lang::tr{'download'} /
-                               <br>$Lang::tr{'upload'}
+                       <th colspan='2'>
+                               $Lang::tr{'data transfer'}
                        </th>
                        <th>
                                $Lang::tr{'connection'}<br>$Lang::tr{'status'}
@@ -562,8 +561,11 @@ foreach my $line (<CONNTRACK>) {
                <td style='text-align:center; background-color:$sip_colour;'>
                        <a href='country.cgi#$dstccode'><img src='$dst_flag_icon' border='0' align='absmiddle' alt='$dstccode' title='$dstccode' /></a>
                </td>
-               <td style='text-align:center'>
-                       $bytes_in / $bytes_out
+               <td class="text-right">
+                       &gt; $bytes_in
+               </td>
+               <td class="text-right">
+                       &lt; $bytes_out
                </td>
                <td style='text-align:center'>$state</td>
                <td style='text-align:center'>$ttl</td>

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 4b5d0779af379b4293130ebdd272397c5beef727..82612e08ba6e3bddf75449bea089af8178c6c09f 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -745,6 +745,7 @@
 'daily firewallhits' => 'daily firewallhits',
 'dangerous' => 'Dangerous',
 'dat without key' => 'An encrypted archive cannot be restored without the key.',
+'data transfer' => 'Data Transfer',
 'date' => 'Date',
 'date not in logs' => 'No (or only partial) logs exist for the day queried',
 'day' => 'Day',