Refactored the DHT-Trigger section in Performance_p.html page.

This is to be more easily understandable and to reflect more accurately the current memory strategies implementations that eventually set the "proper" state not only because DHT reception.
yacy · Feb 1, 2017 · f6ad927 · f6ad927
1 parent 85d8173
commit f6ad927
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 24 deletions.
diff --git a/htroot/Performance_p.html b/htroot/Performance_p.html
@@ -38,9 +38,6 @@ <h2>Performance Settings</h2>
     <form action="Performance_p.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
       <fieldset>
         <legend>Resource Observer</legend>
-        <div class="col-sm-12">
-        	<abbr title="Distributed Hash Table">DHT</abbr>-Trigger #(observerTrigger)#not triggered::<strong>triggered</strong>#(/observerTrigger)# <a href="?resetObserver=">[reset state]</a>
-        </div>
         <div class="col-sm-6">
         	<fieldset>
 	        	<legend>Free space disk</legend>
@@ -110,9 +107,22 @@ <h2>Performance Settings</h2>
         <div class="col-sm-12">
         	<fieldset>
         		<legend><abbr title="Random Access Memory">RAM</abbr></legend>
+        		<div class="form-group">
+        			Memory state : #(observerTrigger)#<span aria-describedby="properStateInfo">proper</span>
+        			<span class="info">
+        				<img src="env/grafics/i16.gif" width="16" height="16" alt="Proper state info"/>
+        				<span class="infobox" id="properStateInfo">Enough memory is available for proper operation.</span>
+        			</span>::
+        			<strong aria-describedby="exhaustedStateInfo">exhausted</strong>
+        			<span class="info">
+        				<img src="env/grafics/i16.gif" width="16" height="16" alt="Exhausted state info"/>
+        				<span class="infobox" id="exhaustedStateInfo">Within the last eleven minutes, at least four operations have tried to request memory that would have reduced free space within the minimum required.</span>
+        			</span>#(/observerTrigger)#
+        			<a href="?resetObserver=">[reset state]</a>
+        		</div>
           		<div class="form-group">
-          			<label for="memoryAcceptDHT">disable <abbr title="Distributed Hash Table">DHT</abbr>-in below</label>
+          			<label for="memoryAcceptDHT">Minimum required</label>
-          			<input name="memoryAcceptDHT" id="memoryAcceptDHT" type="text" size="4" value="#[memoryAcceptDHT]#" /> <abbr title="Mebibyte">MiB</abbr> free space
+          			<input name="memoryAcceptDHT" id="memoryAcceptDHT" type="text" size="4" value="#[memoryAcceptDHT]#" title="Amount of memory (in Mebibytes) that should at least be free for proper operation"/> <abbr title="Mebibyte">MiB</abbr> free space. Disable <abbr title="Distributed Hash Table">DHT</abbr>-in below.
           		</div>
         	</fieldset>
         </div>

diff --git a/locales/cn.lng b/locales/cn.lng
@@ -2002,9 +2002,6 @@ Memory Settings==内存设置
 Memory reserved for <abbr title="Java Virtual Machine">JVM</abbr>==<abbr title="Java Virtual Machine">JVM</abbr>内存设置
 "Set"=="设置"
 Resource Observer==资源查看
-<abbr title="Distributed Hash Table">DHT</abbr>-Trigger==<abbr title="Distributed Hash Table">DHT</abbr>-触发
-not triggered:==未触发:
->triggered==>已触发
 reset state==重置
 > free space==> 空闲空间
 disable <abbr title="Distributed Hash Table">DHT</abbr>-in below==停止接收<abbr title="Distributed Hash Table">DHT</abbr>当低于

diff --git a/locales/de.lng b/locales/de.lng
@@ -2433,9 +2433,6 @@ Memory Settings==Speicher Einstellungen
 Memory reserved for <abbr title="Java Virtual Machine">JVM</abbr>==Für <abbr title="Java Virtual Machine">JVM</abbr> reservierter Speicher
 "Set"=="Setzen"
 Resource Observer==Ressourcen Beobachter
-<abbr title="Distributed Hash Table">DHT</abbr>-Trigger==<abbr title="Distributed Hash Table">DHT</abbr>-Umschalter
-not triggered:==nicht ausgelöst:
->triggered==>ausgelöst
 reset state==Status zurücksetzen
 > free space==> freiem Speicher
 disable <abbr title="Distributed Hash Table">DHT</abbr>-in below==Deaktivere eingehende <abbr title="Distributed Hash Table">DHT</abbr> Transfers unter

diff --git a/locales/fr.lng b/locales/fr.lng
@@ -1420,10 +1420,15 @@ Memory reserved for <abbr title="Java Virtual Machine">JVM</abbr>==Mémoire allo
 MByte==Mégaoctets
 "Set"=="Appliquer"
 Resource Observer==Contrôle des ressources
-<abbr title="Distributed Hash Table">DHT</abbr>-Trigger==Déclenchement de <abbr title="Distributed Hash Table">DHT</abbr>
+Memory state==État de la mémoire
-not triggered:==non déclenché :
+>proper<==>sain<
->triggered==>déclenché
+>exhausted<==>espace libre insuffisant<
-reset state==réinitialiser
+reset state==réinitialiser l'état
+Enough memory is available for proper operation.==Il y a suffisamment de mémoire à disposition pour un fonctionnement correct.
+Within the last eleven minutes, at least four operations have tried to request memory that would have reduced free space within the minimum required.==Durant les onze dernières minutes, au moins quatre opérations ont tenté d'obtenir une quantité de mémoire qui aurait réduit l'espace libre en-deçà du minimum requis.
+Minimum required==Minimum requis
+Amount of memory (in Mebibytes) that should at least be free for proper operation==Quantité de mémoire minimale (en Mébioctets) qui devrait rester disponible pour un fonctionnement correct
+Disable <abbr title="Distributed Hash Table">DHT</abbr>-in below.==Désactive la réception de <abbr title="Distributed Hash Table">DHT</abbr> en-dessous.
 Free space disk==Espace disque disponible
 Steady-state minimum==Valeur nominale
 Amount of space (in Mebibytes) that should be kept free as steady state==Espace disque nominal (en Mébioctets) à laisser libre

diff --git a/locales/master.lng.xlf b/locales/master.lng.xlf
@@ -6508,17 +6508,32 @@
        <source>Resource Observer</source>
     </trans-unit>
     <trans-unit id="4e7c891b" xml:space="preserve" approved="no" translate="yes">
-       <source>&lt;abbr title="Distributed Hash Table"&gt;DHT&lt;/abbr&gt;-Trigger</source>
+       <source>Memory state</source>
     </trans-unit>
     <trans-unit id="e2777230" xml:space="preserve" approved="no" translate="yes">
-       <source>not triggered:</source>
+       <source>&gt;proper&lt;</source>
     </trans-unit>
     <trans-unit id="31e39d9" xml:space="preserve" approved="no" translate="yes">
-       <source>&gt;triggered</source>
+       <source>&gt;exhausted&lt;</source>
     </trans-unit>
     <trans-unit id="7ade7e80" xml:space="preserve" approved="no" translate="yes">
        <source>reset state</source>
     </trans-unit>
+    <trans-unit id="a5c476c2" xml:space="preserve" approved="no" translate="yes">
+       <source>Enough memory is available for proper operation.</source>
+    </trans-unit>
+    <trans-unit id="6a62f3de" xml:space="preserve" approved="no" translate="yes">
+       <source>Within the last eleven minutes, at least four operations have tried to request memory that would have reduced free space within the minimum required.</source>
+    </trans-unit>
+    <trans-unit id="5c75ef91" xml:space="preserve" approved="no" translate="yes">
+       <source>Minimum required</source>
+    </trans-unit>
+    <trans-unit id="be97a043" xml:space="preserve" approved="no" translate="yes">
+       <source>Amount of memory (in Mebibytes) that should at least be free for proper operation</source>
+    </trans-unit>
+    <trans-unit id="41c7401c" xml:space="preserve" approved="no" translate="yes">
+       <source>Disable &lt;abbr title="Distributed Hash Table"&gt;DHT&lt;/abbr&gt;-in below.</source>
+    </trans-unit>
     <trans-unit id="116c8" xml:space="preserve" approved="no" translate="yes">
        <source>Free space disk</source>
     </trans-unit>

diff --git a/locales/ru.lng b/locales/ru.lng
@@ -2541,9 +2541,6 @@ Memory Settings==Настройки оперативной памяти
 Memory reserved for <abbr title="Java Virtual Machine">JVM</abbr>==Резервирование динамической памяти для Java
 "Set"=="Сохранить"
 Resource Observer==Обзор ресурсов
-<abbr title="Distributed Hash Table">DHT</abbr>-Trigger==<abbr title="Distributed Hash Table">DHT</abbr>-триггер
-not triggered:==не срабатывает:
->triggered==>ausgelöst
 reset state==сбросить состояние
 > free space==> свободного места
 disable <abbr title="Distributed Hash Table">DHT</abbr>-in below==Остановить <abbr title="Distributed Hash Table">DHT</abbr>-приём при достижении

diff --git a/locales/uk.lng b/locales/uk.lng
@@ -2173,9 +2173,6 @@ Memory Settings==Налаштування пам’яті
 Memory reserved for <abbr title="Java Virtual Machine">JVM</abbr>==Пам’ять, утримувана для <abbr title="Java Virtual Machine">JVM</abbr>
 "Set"=="Виставити"
 Resource Observer==Спостерігач за ресурсами
-<abbr title="Distributed Hash Table">DHT</abbr>-Trigger==<abbr title="Distributed Hash Table">DHT</abbr>-перемикач
-not triggered:==не перемкнено:
->triggered==>перемкнено
 reset state==відновити стан
 > free space==> вільної пам’яті
 disable <abbr title="Distributed Hash Table">DHT</abbr>-in below==Вимкнути отримання <abbr title="Distributed Hash Table">DHT</abbr> при менше