web: Explain memory consumption

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

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 2d4aa89f24623f52aae634b8fef707076fc88762..23ac799b976ea79bba6eb9bd5d96af0ab46a2094 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -972,6 +972,10 @@ EOF
 
                                        <td class="text-right">
                                                ${mem}
+
+                                               <span title="$Lang::tr{'rss long'}">
+                                                       $Lang::tr{'rss'}
+                                               </span>
                                        </td>
 EOF
 

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 3f48086e28a5ee2efce6b40790a0c8f3c1a1765b..268f6c6806f8b9bd19f8c8f6809abc5fca6ef727 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -804,6 +804,7 @@ WARNING: translation string unused: tor 0 = disabled
 WARNING: translation string unused: tor accounting period daily
 WARNING: translation string unused: tor accounting period monthly
 WARNING: translation string unused: tor accounting period weekly
+WARNING: translation string unused: tor daemon
 WARNING: translation string unused: tor exit country
 WARNING: translation string unused: tor guard country
 WARNING: translation string unused: traffic back
@@ -1035,6 +1036,8 @@ WARNING: untranslated string: required = Required
 WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
+WARNING: untranslated string: rss = RSS
+WARNING: untranslated string: rss long = Resident Set Size
 WARNING: untranslated string: samba server role member = Domain Member
 WARNING: untranslated string: samba server role standalone = Standalone
 WARNING: untranslated string: show tls-auth key = Show tls-auth key

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 9b9cc51514e6c3734962c86e2d5146cba4cf29bb..646652aac2ac6b4256c993d8efd2008a912b4e04 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1583,6 +1583,8 @@ WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
 WARNING: untranslated string: routing table entries = Routing Table Entries
+WARNING: untranslated string: rss = RSS
+WARNING: untranslated string: rss long = Resident Set Size
 WARNING: untranslated string: running = RUNNING
 WARNING: untranslated string: samba = Samba
 WARNING: untranslated string: samba join a domain = Join a domain
@@ -1745,7 +1747,6 @@ WARNING: untranslated string: tor common settings = Common Settings
 WARNING: untranslated string: tor configuration = Tor Configuration
 WARNING: untranslated string: tor connected relays = Connected relays
 WARNING: untranslated string: tor contact info = Contact Info
-WARNING: untranslated string: tor daemon = Daemon
 WARNING: untranslated string: tor directory port = Directory port
 WARNING: untranslated string: tor enabled = Enable Tor
 WARNING: untranslated string: tor errmsg invalid accounting limit = Invalid accounting limit

diff --git a/doc/language_issues.es b/doc/language_issues.es
index c9234d276908c77e37b1c1b3a2d8b27ee120c180..4b59a4f092d12d35bc319d9d97bdeca068b7106a 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -868,6 +868,7 @@ WARNING: translation string unused: tor accounting period daily
 WARNING: translation string unused: tor accounting period monthly
 WARNING: translation string unused: tor accounting period weekly
 WARNING: translation string unused: tor bridge enabled
+WARNING: translation string unused: tor daemon
 WARNING: translation string unused: tor errmsg invalid node id
 WARNING: translation string unused: tor exit country
 WARNING: translation string unused: tor guard country
@@ -1099,6 +1100,8 @@ WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
+WARNING: untranslated string: rss = RSS
+WARNING: untranslated string: rss long = Resident Set Size
 WARNING: untranslated string: scanned = Scanned
 WARNING: untranslated string: service boot setting unavailable = No valid runlevel symlink was found for the initscript of this service.
 WARNING: untranslated string: spec rstack overflow = Speculative Return Stack Overflow

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 72fca7d9ee276583cde62a63c87c7debea47dc9f..50176f39cd5f26097c4e3f72bc25559998a5cbde 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -841,6 +841,7 @@ WARNING: translation string unused: tor accounting period daily
 WARNING: translation string unused: tor accounting period monthly
 WARNING: translation string unused: tor accounting period weekly
 WARNING: translation string unused: tor bridge enabled
+WARNING: translation string unused: tor daemon
 WARNING: translation string unused: tor errmsg invalid node id
 WARNING: translation string unused: tor exit country
 WARNING: translation string unused: tor guard country
@@ -1042,6 +1043,8 @@ WARNING: untranslated string: processors = Processors
 WARNING: untranslated string: reg_file_data_sampling = Register File Data Sampling (RFDS)
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
+WARNING: untranslated string: rss = RSS
+WARNING: untranslated string: rss long = Resident Set Size
 WARNING: untranslated string: scanned = Scanned
 WARNING: untranslated string: system time = System Time (as of last page load)
 WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 0c832833c6c3e30d82f55af0ca1aa31bc601b2ac..cc7902d65b63a69818823ea17bc35c4959e343fe 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -789,6 +789,7 @@ WARNING: translation string unused: tor accounting period daily
 WARNING: translation string unused: tor accounting period monthly
 WARNING: translation string unused: tor accounting period weekly
 WARNING: translation string unused: tor bridge enabled
+WARNING: translation string unused: tor daemon
 WARNING: translation string unused: tor errmsg invalid node id
 WARNING: translation string unused: tor exit country
 WARNING: translation string unused: traffic back
@@ -1307,6 +1308,8 @@ WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
+WARNING: untranslated string: rss = RSS
+WARNING: untranslated string: rss long = Resident Set Size
 WARNING: untranslated string: samba join a domain = Join a domain
 WARNING: untranslated string: samba join domain = Join domain
 WARNING: untranslated string: samba server role member = Domain Member

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index c3e8b3a40586ae6333b61676e4924c9df5348eb1..ee91418131b2dba23b832212837cf1828fb3e03b 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -790,6 +790,7 @@ WARNING: translation string unused: tor accounting period daily
 WARNING: translation string unused: tor accounting period monthly
 WARNING: translation string unused: tor accounting period weekly
 WARNING: translation string unused: tor bridge enabled
+WARNING: translation string unused: tor daemon
 WARNING: translation string unused: tor errmsg invalid node id
 WARNING: translation string unused: tor exit country
 WARNING: translation string unused: traffic back
@@ -1330,6 +1331,8 @@ WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
+WARNING: untranslated string: rss = RSS
+WARNING: untranslated string: rss long = Resident Set Size
 WARNING: untranslated string: samba join a domain = Join a domain
 WARNING: untranslated string: samba join domain = Join domain
 WARNING: untranslated string: samba server role member = Domain Member

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 15e33af4013da08c1d0ae71b9bb0d7fb4328139f..931f23de34714cf1c8d7549d77561baa80a3895e 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1505,6 +1505,8 @@ WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
+WARNING: untranslated string: rss = RSS
+WARNING: untranslated string: rss long = Resident Set Size
 WARNING: untranslated string: samba join a domain = Join a domain
 WARNING: untranslated string: samba join domain = Join domain
 WARNING: untranslated string: samba server role member = Domain Member
@@ -1569,7 +1571,6 @@ WARNING: untranslated string: tor common settings = Common Settings
 WARNING: untranslated string: tor configuration = Tor Configuration
 WARNING: untranslated string: tor connected relays = Connected relays
 WARNING: untranslated string: tor contact info = Contact Info
-WARNING: untranslated string: tor daemon = Daemon
 WARNING: untranslated string: tor directory port = Directory port
 WARNING: untranslated string: tor enabled = Enable Tor
 WARNING: untranslated string: tor errmsg invalid accounting limit = Invalid accounting limit

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index d1d1271ce772e18614810b576640a8098287a24f..dedc6011bead0b20e193b0e5175277471ad76fb4 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1498,6 +1498,8 @@ WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
+WARNING: untranslated string: rss = RSS
+WARNING: untranslated string: rss long = Resident Set Size
 WARNING: untranslated string: samba join a domain = Join a domain
 WARNING: untranslated string: samba join domain = Join domain
 WARNING: untranslated string: samba server role member = Domain Member
@@ -1562,7 +1564,6 @@ WARNING: untranslated string: tor common settings = Common Settings
 WARNING: untranslated string: tor configuration = Tor Configuration
 WARNING: untranslated string: tor connected relays = Connected relays
 WARNING: untranslated string: tor contact info = Contact Info
-WARNING: untranslated string: tor daemon = Daemon
 WARNING: untranslated string: tor directory port = Directory port
 WARNING: untranslated string: tor enabled = Enable Tor
 WARNING: untranslated string: tor errmsg invalid accounting limit = Invalid accounting limit

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 48018e38d425fe322ec7f6e755ca01fa2714ad29..4ae16b6b2ce435de6e89aecec450d409aaaec509 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -819,6 +819,7 @@ WARNING: translation string unused: tor accounting period daily
 WARNING: translation string unused: tor accounting period monthly
 WARNING: translation string unused: tor accounting period weekly
 WARNING: translation string unused: tor bridge enabled
+WARNING: translation string unused: tor daemon
 WARNING: translation string unused: tor errmsg invalid node id
 WARNING: translation string unused: tor exit country
 WARNING: translation string unused: traffic back
@@ -1216,6 +1217,8 @@ WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
+WARNING: untranslated string: rss = RSS
+WARNING: untranslated string: rss long = Resident Set Size
 WARNING: untranslated string: samba server role member = Domain Member
 WARNING: untranslated string: samba server role standalone = Standalone
 WARNING: untranslated string: scanned = Scanned

diff --git a/doc/language_missings b/doc/language_missings
index fdf0677efb7b8d6c384b6146efa9d3cdd4b3f911..86553c78458151c2de38a03168f7ff11f1d9ae5e 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -99,6 +99,8 @@
 < reiserfs warning1
 < reiserfs warning2
 < required
+< rss
+< rss long
 < samba server role member
 < samba server role standalone
 < shaping add options
@@ -177,6 +179,8 @@
 < reg_file_data_sampling
 < reiserfs warning1
 < reiserfs warning2
+< rss
+< rss long
 < scanned
 < service boot setting unavailable
 < spec rstack overflow
@@ -228,6 +232,8 @@
 < ovpn unsupported cipher selected
 < processors
 < reg_file_data_sampling
+< rss
+< rss long
 < scanned
 < system time
 < timeformat
@@ -657,6 +663,8 @@
 < required
 < required field
 < retbleed
+< rss
+< rss long
 < runmode
 < samba join a domain
 < samba join domain
@@ -1236,6 +1244,8 @@
 < required
 < required field
 < retbleed
+< rss
+< rss long
 < runmode
 < samba join a domain
 < samba join domain
@@ -2157,6 +2167,8 @@
 < required
 < required field
 < retbleed
+< rss
+< rss long
 < runmode
 < samba join a domain
 < samba join domain
@@ -3188,6 +3200,8 @@
 < required
 < required field
 < retbleed
+< rss
+< rss long
 < runmode
 < samba join a domain
 < samba join domain
@@ -3698,6 +3712,8 @@
 < release
 < required
 < retbleed
+< rss
+< rss long
 < runmode
 < samba server role member
 < samba server role standalone

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 83d63421dc17aa0cde58d39f58dfba5cd2b6d6a5..7b1a8e7d7efb6d337c90b37d23326e1cc73638ef 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2279,6 +2279,8 @@
 'route subnet is invalid' => 'Additional push route subnet is invalid',
 'router ip' => 'Router IP address:',
 'routing table entries' => 'Routing Table Entries',
+'rss' => 'RSS',
+'rss long' => 'Resident Set Size',
 'rsvd dst port overlap' => 'Destination Port Range overlaps a port reserved for IPFire:',
 'rsvd src port overlap' => 'Source Port Range overlaps a port reserved for IPFire:',
 'rules already up to date' => 'Rules already up to date',