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 df03cb462e22f8f0d4cf0860b69cf8845cfabda5..8a16e4a587d434b18ea229480e481fcd6d440c53 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -920,6 +920,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 a69b73d8b4805209efa3b031496beff1b766b4e9..6853b4f23b0277d5257ac7105a988dbd02b38876 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -111,6 +111,7 @@ WARNING: translation string unused: age ssecond
 WARNING: translation string unused: alcatelusb help
 WARNING: translation string unused: alcatelusb upload
 WARNING: translation string unused: all interfaces
+WARNING: translation string unused: all services
 WARNING: translation string unused: all updates installed
 WARNING: translation string unused: allmsg
 WARNING: translation string unused: alt information
@@ -407,7 +408,6 @@ WARNING: translation string unused: installed updates
 WARNING: translation string unused: interfaces
 WARNING: translation string unused: intrusion detection system log viewer
 WARNING: translation string unused: intrusion detection system2
-WARNING: translation string unused: intrusion prevention system
 WARNING: translation string unused: invalid cache size
 WARNING: translation string unused: invalid date entered
 WARNING: translation string unused: invalid downlink speed
@@ -761,6 +761,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
@@ -971,6 +972,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 8c086d041a181bfd25c8f75746f9193c435c23c4..3d848cddb673edf23ed85c726994b7fef49eb993 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -320,7 +320,6 @@ WARNING: untranslated string: aliases = Aliases
 WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: aliases not active = Aliases will not be active unless your RED interface is STATIC
 WARNING: untranslated string: all = All
-WARNING: untranslated string: all services = All Services
 WARNING: untranslated string: alt dialup = Dialup
 WARNING: untranslated string: alt home = Home
 WARNING: untranslated string: alt logs = Logs
@@ -1113,6 +1112,7 @@ WARNING: untranslated string: internet = INTERNET
 WARNING: untranslated string: intrusion detection = Intrusion Prevention
 WARNING: untranslated string: intrusion detection system = Intrusion Prevention System
 WARNING: untranslated string: intrusion detection system rules = Ruleset
+WARNING: untranslated string: intrusion prevention system = Intrusion Prevention System
 WARNING: untranslated string: invalid broadcast ip = Invalid broadcast IP
 WARNING: untranslated string: invalid characters found in pre-shared key = Invalid characters found in pre-shared key.
 WARNING: untranslated string: invalid default lease time = Invalid default lease time.
@@ -1616,6 +1616,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
@@ -1783,7 +1785,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 0fb54957b8bc5376975de36cc5fabe283a6d914c..045110b5fe8acd1e05f19143eea1ac2961b658f9 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -113,6 +113,7 @@ WARNING: translation string unused: age ssecond
 WARNING: translation string unused: alcatelusb help
 WARNING: translation string unused: alcatelusb upload
 WARNING: translation string unused: all interfaces
+WARNING: translation string unused: all services
 WARNING: translation string unused: all updates installed
 WARNING: translation string unused: allmsg
 WARNING: translation string unused: alt information
@@ -453,7 +454,6 @@ WARNING: translation string unused: installed updates
 WARNING: translation string unused: interfaces
 WARNING: translation string unused: intrusion detection system log viewer
 WARNING: translation string unused: intrusion detection system2
-WARNING: translation string unused: intrusion prevention system
 WARNING: translation string unused: invalid cache size
 WARNING: translation string unused: invalid date entered
 WARNING: translation string unused: invalid downlink speed
@@ -828,6 +828,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
@@ -1033,6 +1034,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: 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
 WARNING: untranslated string: system time = System Time (as of last page load)

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index eb29151ee6e3f7a57878a816f61e9a957c0ef022..33f1b0178fa86ec33571dedf9bfe4d56c8d8ba94 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -116,6 +116,7 @@ WARNING: translation string unused: age ssecond
 WARNING: translation string unused: alcatelusb help
 WARNING: translation string unused: alcatelusb upload
 WARNING: translation string unused: all interfaces
+WARNING: translation string unused: all services
 WARNING: translation string unused: all updates installed
 WARNING: translation string unused: allmsg
 WARNING: translation string unused: alt information
@@ -436,7 +437,6 @@ WARNING: translation string unused: installed updates
 WARNING: translation string unused: interfaces
 WARNING: translation string unused: intrusion detection system log viewer
 WARNING: translation string unused: intrusion detection system2
-WARNING: translation string unused: intrusion prevention system
 WARNING: translation string unused: invalid cache size
 WARNING: translation string unused: invalid date entered
 WARNING: translation string unused: invalid downlink speed
@@ -799,6 +799,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
@@ -972,6 +973,8 @@ WARNING: untranslated string: ovpn unsupported cipher selected = Unknown cipher
 WARNING: untranslated string: pakfire ago = ago.
 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: system time = System Time (as of last page load)
 WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z
 WARNING: untranslated string: wio = unknown string

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 969144ebdb8e2546d20decfab4c71e4a7e73a1d2..121d35d175c539fc81e37b2985e8681437249501 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -88,6 +88,7 @@ WARNING: translation string unused: age ssecond
 WARNING: translation string unused: alcatelusb help
 WARNING: translation string unused: alcatelusb upload
 WARNING: translation string unused: all interfaces
+WARNING: translation string unused: all services
 WARNING: translation string unused: all updates installed
 WARNING: translation string unused: allmsg
 WARNING: translation string unused: alt information
@@ -751,6 +752,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
@@ -1123,6 +1125,7 @@ WARNING: untranslated string: incoming overhead in bytes per second = Incoming O
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: inodes = Index-Nodes
 WARNING: untranslated string: interface mode = Interface
+WARNING: untranslated string: intrusion prevention system = Intrusion Prevention System
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout
 WARNING: untranslated string: invalid input for interface address = Invalid input for interface address
 WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode
@@ -1246,6 +1249,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 73e5b8ecbac4dd5fcfa43536ae16e59f0a90ac1e..85ef5cd3395d17d3a512aa451f431534826e3bd7 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -88,6 +88,7 @@ WARNING: translation string unused: age ssecond
 WARNING: translation string unused: alcatelusb help
 WARNING: translation string unused: alcatelusb upload
 WARNING: translation string unused: all interfaces
+WARNING: translation string unused: all services
 WARNING: translation string unused: all updates installed
 WARNING: translation string unused: allmsg
 WARNING: translation string unused: alt information
@@ -751,6 +752,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
@@ -1130,6 +1132,7 @@ WARNING: untranslated string: incoming overhead in bytes per second = Incoming O
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: inodes = Index-Nodes
 WARNING: untranslated string: interface mode = Interface
+WARNING: untranslated string: intrusion prevention system = Intrusion Prevention System
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout
 WARNING: untranslated string: invalid input for interface address = Invalid input for interface address
 WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode
@@ -1267,6 +1270,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 de67bac798af0b0c8327c99c97bb1b2806c6ab9a..f98d6d9f39d0c6b2cfc57229e81cb716137a74f5 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -83,6 +83,7 @@ WARNING: translation string unused: again
 WARNING: translation string unused: alcatelusb help
 WARNING: translation string unused: alcatelusb upload
 WARNING: translation string unused: all interfaces
+WARNING: translation string unused: all services
 WARNING: translation string unused: all updates installed
 WARNING: translation string unused: allmsg
 WARNING: translation string unused: alt information
@@ -1268,6 +1269,7 @@ WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: inodes = Index-Nodes
 WARNING: untranslated string: integrity = Integrity:
 WARNING: untranslated string: interface mode = Interface
+WARNING: untranslated string: intrusion prevention system = Intrusion Prevention System
 WARNING: untranslated string: invalid input for dpd delay = Invalid input for DPD delay
 WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout
@@ -1445,6 +1447,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
@@ -1508,7 +1512,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 e342fe4b472046dce8f80e6062c1c573ea7275b4..3cfce3f5e5ef087982c634cb9ed8c23ea44e2320 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -83,6 +83,7 @@ WARNING: translation string unused: again
 WARNING: translation string unused: alcatelusb help
 WARNING: translation string unused: alcatelusb upload
 WARNING: translation string unused: all interfaces
+WARNING: translation string unused: all services
 WARNING: translation string unused: all updates installed
 WARNING: translation string unused: allmsg
 WARNING: translation string unused: alt information
@@ -1266,6 +1267,7 @@ WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: inodes = Index-Nodes
 WARNING: untranslated string: integrity = Integrity:
 WARNING: untranslated string: interface mode = Interface
+WARNING: untranslated string: intrusion prevention system = Intrusion Prevention System
 WARNING: untranslated string: invalid input for dpd delay = Invalid input for DPD delay
 WARNING: untranslated string: invalid input for dpd timeout = Invalid input for DPD timeout
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout
@@ -1440,6 +1442,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
@@ -1503,7 +1507,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 dde29568ed82787e72d5d2767b420364a418a2e1..93570cdd7f57517c49d74f7627195d50b3df0fa1 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -110,6 +110,7 @@ WARNING: translation string unused: age ssecond
 WARNING: translation string unused: alcatelusb help
 WARNING: translation string unused: alcatelusb upload
 WARNING: translation string unused: all interfaces
+WARNING: translation string unused: all services
 WARNING: translation string unused: all updates installed
 WARNING: translation string unused: allmsg
 WARNING: translation string unused: alt information
@@ -781,6 +782,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
@@ -1063,6 +1065,7 @@ WARNING: untranslated string: ids working = Changes are being applied. Please wa
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: inodes = Index-Nodes
 WARNING: untranslated string: interface mode = Interface
+WARNING: untranslated string: intrusion prevention system = Intrusion Prevention System
 WARNING: untranslated string: invalid input for interface address = Invalid input for interface address
 WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode
 WARNING: untranslated string: invalid input for interface mtu = Invalid input to interface MTU
@@ -1155,6 +1158,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: secret = Secret

diff --git a/doc/language_missings b/doc/language_missings
index 795adc693782a0c1dfa5f8df1789fd84f96be436..9a3c48fca9f7b28b33962b5b0315f4b1490eb47a 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -94,6 +94,8 @@
 < reiserfs warning1
 < reiserfs warning2
 < required
+< rss
+< rss long
 < samba server role member
 < samba server role standalone
 < shaping add options
@@ -155,6 +157,8 @@
 < regenerate host certificate
 < reiserfs warning1
 < reiserfs warning2
+< rss
+< rss long
 < service boot setting unavailable
 < spec rstack overflow
 < system time
@@ -184,6 +188,8 @@
 < ovpn roadwarrior server
 < ovpn roadwarrior settings
 < ovpn unsupported cipher selected
+< rss
+< rss long
 < system time
 < timeformat
 < upload fcdsl.o
@@ -591,6 +597,8 @@
 < required
 < required field
 < retbleed
+< rss
+< rss long
 < runmode
 < samba join a domain
 < samba join domain
@@ -1149,6 +1157,8 @@
 < required
 < required field
 < retbleed
+< rss
+< rss long
 < runmode
 < samba join a domain
 < samba join domain
@@ -2049,6 +2059,8 @@
 < required
 < required field
 < retbleed
+< rss
+< rss long
 < runmode
 < samba join a domain
 < samba join domain
@@ -3059,6 +3071,8 @@
 < required
 < required field
 < retbleed
+< rss
+< rss long
 < runmode
 < samba join a domain
 < samba join domain
@@ -3548,6 +3562,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 70c56cdfb48fafab6e9a147f08310e15005f77ea..7f64a7a4ebf8d2203526d12be96184ee02fd1e66 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2274,6 +2274,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',