From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 23 Mar 2024 18:12:26 +0000 (+0100)
Subject: web: Explain memory consumption
X-Git-Tag: v2.29-core197~25^2~138
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c85492195a84146a0c1908f709cf0b566b35a22;p=ipfire-2.x.git

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 48ca16996..9492b467d 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -985,6 +985,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 622c0b5a2..18f9bf721 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -796,6 +796,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
@@ -1037,6 +1038,8 @@ WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing = Routing
 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 861fdd352..e04ce08f5 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1623,6 +1623,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
@@ -1785,7 +1787,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 1a6c1c850..64c5513ec 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -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
@@ -1051,6 +1052,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: wio = unknown string
 WARNING: untranslated string: wio checked = unknown string
 WARNING: untranslated string: wio cron = unknown string
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 9bf8be186..e5ae50cde 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -832,6 +832,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
@@ -1062,6 +1063,8 @@ WARNING: untranslated string: remote subnets = Remote Subnets
 WARNING: untranslated string: routing = Routing
 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 edcfa2b17..ac74c27c9 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -781,6 +781,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
@@ -1328,6 +1329,8 @@ WARNING: untranslated string: routing = Routing
 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 0ee1e30d2..5f07cedb7 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -781,6 +781,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
@@ -1349,6 +1350,8 @@ WARNING: untranslated string: routing = Routing
 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 721f8e68a..3952103dc 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1525,6 +1525,8 @@ WARNING: untranslated string: routing = Routing
 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
@@ -1589,7 +1591,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 40d83cd0b..f9e522470 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1518,6 +1518,8 @@ WARNING: untranslated string: routing = Routing
 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
@@ -1582,7 +1584,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 afdf73608..0fa2f4ac2 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -810,6 +810,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
@@ -1236,6 +1237,8 @@ WARNING: untranslated string: routing = Routing
 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_issues.tw b/doc/language_issues.tw
index a4e5fcda0..c099ac0c2 100644
--- a/doc/language_issues.tw
+++ b/doc/language_issues.tw
@@ -178,7 +178,9 @@ WARNING: translation string unused: cannot enable both nat traversal and compres
 WARNING: translation string unused: cant enable xtaccess
 WARNING: translation string unused: capsinactive
 WARNING: translation string unused: ccd err iroute
+WARNING: translation string unused: ccd err name
 WARNING: translation string unused: ccd err netadr
+WARNING: translation string unused: ccd iroutehint
 WARNING: translation string unused: cfg restart
 WARNING: translation string unused: change share
 WARNING: translation string unused: check for net traffic update
@@ -241,6 +243,7 @@ WARNING: translation string unused: destination ip bad
 WARNING: translation string unused: destination ip or net
 WARNING: translation string unused: destination net
 WARNING: translation string unused: destination port overlaps
+WARNING: translation string unused: dh
 WARNING: translation string unused: dhcp base ip fixed lease
 WARNING: translation string unused: dhcp create fixed leases
 WARNING: translation string unused: dhcp fixed lease err1
@@ -481,6 +484,7 @@ WARNING: translation string unused: ipblocklist category invalid
 WARNING: translation string unused: ipblocklist category reputation
 WARNING: translation string unused: ipblocklist category scanner
 WARNING: translation string unused: ipfire side
+WARNING: translation string unused: ipfire side is invalid
 WARNING: translation string unused: ipsec no connections
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: javascript menu error1
@@ -644,6 +648,9 @@ WARNING: translation string unused: ovpn mtu-disc no
 WARNING: translation string unused: ovpn mtu-disc off
 WARNING: translation string unused: ovpn mtu-disc with mssfix or fragment
 WARNING: translation string unused: ovpn mtu-disc yes
+WARNING: translation string unused: ovpn on blue
+WARNING: translation string unused: ovpn on orange
+WARNING: translation string unused: ovpn on red
 WARNING: translation string unused: ovpn reneg sec
 WARNING: translation string unused: ovpn warning rfc3280
 WARNING: translation string unused: ovpn_fastio
@@ -761,6 +768,7 @@ WARNING: translation string unused: set
 WARNING: translation string unused: shaping add options
 WARNING: translation string unused: shaping list options
 WARNING: translation string unused: show areas
+WARNING: translation string unused: show dh
 WARNING: translation string unused: show last x lines
 WARNING: translation string unused: show lines
 WARNING: translation string unused: show share options
@@ -838,6 +846,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,7 +1051,8 @@ WARNING: untranslated string: online = Online
 WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
-WARNING: untranslated string: ovpn if ncp is disabled we must have cipher = If you want to disable cipher negotiation, you will have to select a fallback cipher.
+WARNING: untranslated string: ovpn no cipher selected = No cipher selected
+WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings
 WARNING: untranslated string: ovpn unsupported cipher selected = Unknown cipher selected
 WARNING: untranslated string: pakfire confirm upgrades = Do you want to install all upgrades?
 WARNING: untranslated string: pakfire deps = Package dependencies:
@@ -1060,6 +1070,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: wio = unknown string
 WARNING: untranslated string: wio checked = unknown string
 WARNING: untranslated string: wio cron = unknown string
diff --git a/doc/language_issues.zh b/doc/language_issues.zh
index a4e5fcda0..c099ac0c2 100644
--- a/doc/language_issues.zh
+++ b/doc/language_issues.zh
@@ -178,7 +178,9 @@ WARNING: translation string unused: cannot enable both nat traversal and compres
 WARNING: translation string unused: cant enable xtaccess
 WARNING: translation string unused: capsinactive
 WARNING: translation string unused: ccd err iroute
+WARNING: translation string unused: ccd err name
 WARNING: translation string unused: ccd err netadr
+WARNING: translation string unused: ccd iroutehint
 WARNING: translation string unused: cfg restart
 WARNING: translation string unused: change share
 WARNING: translation string unused: check for net traffic update
@@ -241,6 +243,7 @@ WARNING: translation string unused: destination ip bad
 WARNING: translation string unused: destination ip or net
 WARNING: translation string unused: destination net
 WARNING: translation string unused: destination port overlaps
+WARNING: translation string unused: dh
 WARNING: translation string unused: dhcp base ip fixed lease
 WARNING: translation string unused: dhcp create fixed leases
 WARNING: translation string unused: dhcp fixed lease err1
@@ -481,6 +484,7 @@ WARNING: translation string unused: ipblocklist category invalid
 WARNING: translation string unused: ipblocklist category reputation
 WARNING: translation string unused: ipblocklist category scanner
 WARNING: translation string unused: ipfire side
+WARNING: translation string unused: ipfire side is invalid
 WARNING: translation string unused: ipsec no connections
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: javascript menu error1
@@ -644,6 +648,9 @@ WARNING: translation string unused: ovpn mtu-disc no
 WARNING: translation string unused: ovpn mtu-disc off
 WARNING: translation string unused: ovpn mtu-disc with mssfix or fragment
 WARNING: translation string unused: ovpn mtu-disc yes
+WARNING: translation string unused: ovpn on blue
+WARNING: translation string unused: ovpn on orange
+WARNING: translation string unused: ovpn on red
 WARNING: translation string unused: ovpn reneg sec
 WARNING: translation string unused: ovpn warning rfc3280
 WARNING: translation string unused: ovpn_fastio
@@ -761,6 +768,7 @@ WARNING: translation string unused: set
 WARNING: translation string unused: shaping add options
 WARNING: translation string unused: shaping list options
 WARNING: translation string unused: show areas
+WARNING: translation string unused: show dh
 WARNING: translation string unused: show last x lines
 WARNING: translation string unused: show lines
 WARNING: translation string unused: show share options
@@ -838,6 +846,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,7 +1051,8 @@ WARNING: untranslated string: online = Online
 WARNING: untranslated string: ovpn ciphers = Ciphers
 WARNING: untranslated string: ovpn fallback cipher = Fallback Cipher
 WARNING: untranslated string: ovpn fallback cipher help = This cipher is being used by clients that do not support cipher negotiation.
-WARNING: untranslated string: ovpn if ncp is disabled we must have cipher = If you want to disable cipher negotiation, you will have to select a fallback cipher.
+WARNING: untranslated string: ovpn no cipher selected = No cipher selected
+WARNING: untranslated string: ovpn roadwarrior settings = Roadwarrior Settings
 WARNING: untranslated string: ovpn unsupported cipher selected = Unknown cipher selected
 WARNING: untranslated string: pakfire confirm upgrades = Do you want to install all upgrades?
 WARNING: untranslated string: pakfire deps = Package dependencies:
@@ -1060,6 +1070,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: wio = unknown string
 WARNING: untranslated string: wio checked = unknown string
 WARNING: untranslated string: wio cron = unknown string
diff --git a/doc/language_missings b/doc/language_missings
index 25329c4c0..830bdbe26 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -105,6 +105,8 @@
 < remarks
 < required
 < routing
+< rss
+< rss long
 < samba server role member
 < samba server role standalone
 < shaping add options
@@ -155,6 +157,8 @@
 < ovpn roadwarrior settings
 < ovpn unsupported cipher selected
 < quality of service
+< rss
+< rss long
 ############################################################################
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
@@ -218,6 +222,8 @@
 < remarks
 < remote subnets
 < routing
+< rss
+< rss long
 < scanned
 < system time
 < timeformat
@@ -718,6 +724,8 @@
 < required field
 < retbleed
 < routing
+< rss
+< rss long
 < runmode
 < samba join a domain
 < samba join domain
@@ -1367,6 +1375,8 @@
 < required field
 < retbleed
 < routing
+< rss
+< rss long
 < runmode
 < samba join a domain
 < samba join domain
@@ -2359,6 +2369,8 @@
 < required field
 < retbleed
 < routing
+< rss
+< rss long
 < runmode
 < samba join a domain
 < samba join domain
@@ -3461,6 +3473,8 @@
 < required field
 < retbleed
 < routing
+< rss
+< rss long
 < runmode
 < samba join a domain
 < samba join domain
@@ -4042,6 +4056,8 @@
 < required
 < retbleed
 < routing
+< rss
+< rss long
 < runmode
 < samba server role member
 < samba server role standalone
@@ -4198,7 +4214,8 @@
 < ovpn ciphers
 < ovpn fallback cipher
 < ovpn fallback cipher help
-< ovpn if ncp is disabled we must have cipher
+< ovpn no cipher selected
+< ovpn roadwarrior settings
 < ovpn unsupported cipher selected
 < pakfire confirm upgrades
 < pakfire deps
@@ -4212,6 +4229,8 @@
 < pakfire remove package
 < pakfire updating
 < password has quotation mark
+< rss
+< rss long
 ############################################################################
 # Checking cgi-bin translations for language: zh                           #
 ############################################################################
@@ -4231,7 +4250,8 @@
 < ovpn ciphers
 < ovpn fallback cipher
 < ovpn fallback cipher help
-< ovpn if ncp is disabled we must have cipher
+< ovpn no cipher selected
+< ovpn roadwarrior settings
 < ovpn unsupported cipher selected
 < pakfire confirm upgrades
 < pakfire deps
@@ -4245,3 +4265,5 @@
 < pakfire remove package
 < pakfire updating
 < password has quotation mark
+< rss
+< rss long
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 2ed3e8a9a..ee0888f4c 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2311,6 +2311,8 @@
 'router ip' => 'Router IP address:',
 'routing' => 'Routing',
 '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',