Merge OpenOLAT 8.4 to OpenOLAT default branch with 3e93308cce7f6c7528a82796ed7a81c880d086ef

src/main/java/org/olat/admin/cache/AllCachesController.java

@@ -90,7 +90,6 @@ public class AllCachesController extends BasicController {
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("cache.disk", 1, null, getLocale()));
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("cache.hitcnt", 2, null, getLocale()));
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("cache.mcexp", 3, null, getLocale()));
-		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("cache.mcnotfound", 4, null, getLocale()));
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("cache.quickcount", 5, null, getLocale()));
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("cache.tti", 6, null, getLocale()));
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("cache.ttl", 7, null, getLocale()));
@@ -205,7 +204,6 @@ public class AllCachesController extends BasicController {
 				case 1: return c.getCacheConfiguration().storeAsBinary().enabled() ? Boolean.TRUE:Boolean.FALSE;
 				case 2: return new Long(stats.getHits());
 				case 3: return new Long(stats.getMisses());
-				case 4: return "???";
 				case 5: return new Long(stats.getTotalNumberOfEntries());
 				case 6: return new Long(c.getCacheConfiguration().expiration().maxIdle());
 				case 7: return new Long(c.getCacheConfiguration().expiration().lifespan());

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_ar.properties

@@ -4,8 +4,7 @@ cache.disk=\u0641\u0649 \u0627\u0644\u0642\u0631\u0635
 cache.empty=\u0627\u0644\u0639\u0645\u0644\u064A\u0629 \u0627\u0644\u0641\u0648\u0631\u064A\u0629
 cache.hitcnt=\u062A\u0644\u0645\u064A\u062D\u0627\u062A
 cache.maxElements=Max el
-cache.mcexp=Miss (exp)
-cache.mcnotfound=Miss (notfnd)
+cache.mcexp=Misses
 cache.name=\u0627\u0644\u0627\u0633\u0645
 cache.quickcount=\u0627\u0644\u0639\u0646\u0627\u0635\u0631 ~
 cache.tti=\u0627\u0644\u0648\u0642\u062A \u0644\u0644\u062E\u0645\u0648\u0644 - \u062B\u0627\u0646\u064A\u0629

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_bg.properties

@@ -4,8 +4,7 @@ cache.disk=\u041D\u0430 \u0434\u0438\u0441\u043A
 cache.empty=\u041A\u0435\u0448 \u043F\u0430\u043C\u0435\u0442 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u044F
 cache.hitcnt=\u041F\u043E\u0441\u0435\u0449\u0435\u043D\u0438\u044F
 cache.maxElements=Max el
-cache.mcexp=Miss (exp)
-cache.mcnotfound=Miss (notfnd)
+cache.mcexp=Misses
 cache.name=\u0418\u043C\u0435
 cache.quickcount=~ \u0415\u043B\u0435\u043C\u0435\u043D\u0442\u0438
 cache.tti=\u0412\u0440\u0435\u043C\u0435 \u0434\u043E \u0445\u0438\u0431\u0435\u0440\u043D\u0430\u0446\u0438\u044F (\u0441\u0435\u043A\u0443\u043D\u0434\u0438)

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_cs.properties

@@ -5,10 +5,9 @@ cache.empty=Cache operace
 cache.hitcnt=Z\u00E1sahy
 cache.maxElements=Max el
 cache.mcexp=Zme\u0161k\u00E1n\u00ED (projeven\u00E1)
-cache.mcnotfound=Zme\u0161k\u00E1n\u00ED (nenalezen\u00E1)
 cache.name=Jm\u00E9no
 cache.quickcount=~ Elementy
-cache.tti=\u010Das idle (sec)
-cache.ttl=\u010Das live (sec)
+cache.tti=\u010Das idle (millisec)
+cache.ttl=\u010Das live (millisec)
 caches.title=P\u0159ehled EHCache (jednoduch\u00E1 uspan\u00E1 cache)
 confirm.emptycache=Chcete smazat v\u0161echny z\u00E1znamy v t\u00E9to cache?

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_da.properties

@@ -4,7 +4,6 @@ cache.disk=P\u00E5 harddisk
 cache.empty=Cache operation
 cache.hitcnt=Hits
 cache.mcexp=Miss (exp)
-cache.mcnotfound=Miss (ikke fundet)
 cache.name=Navn
 cache.quickcount=~ elementer
 caches.title=Oversigt over Cache

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_de.properties

 #Mon Mar 02 09:54:03 CET 2009
-action.choose=leeren
+action.choose=Leeren
 cache.disk=Auf HD
 cache.empty=Cache Operation
-cache.hitcnt=Hit
+cache.hitcnt=Hits
 cache.maxElements=Max el
-cache.mcexp=Miss (exp)
-cache.mcnotfound=Miss (notfnd)
+cache.mcexp=Misses
 cache.name=Name
 cache.quickcount=~ Elemente
-cache.tti=Time to idle (sec)
-cache.ttl=Time to live (sec)
+cache.tti=Max idle (millisec)
+cache.ttl=Lifespan (millisec)
 cache.clustered=Clustered
 caches.title=\u00DCbersicht der Caches
 confirm.emptycache=Wollen Sie alle Eintr\u00E4ge dieses Cache l\u00F6schen?

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_el.properties

@@ -5,7 +5,6 @@ cache.empty=\u039B\u03B5\u03B9\u03C4\u03BF\u03C5\u03C1\u03B3\u03AF\u03B1 Cache
 cache.hitcnt=Hits
 cache.maxElements=Max el
 cache.mcexp=Miss (exp)
-cache.mcnotfound=Miss (notfnd)
 cache.name=\u038C\u03BD\u03BF\u03BC\u03B1
 cache.quickcount=~ \u03A3\u03C4\u03BF\u03B9\u03C7\u03B5\u03AF\u03B1
 cache.tti=\u03A7\u03C1\u03CC\u03BD\u03BF\u03C2 \u0391\u03B4\u03C1\u03AC\u03BD\u03B5\u03B9\u03B1\u03C2 (\u03B4\u03B5\u03C5\u03C4.)

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_en.properties

@@ -4,11 +4,11 @@ cache.disk=On HD
 cache.empty=Cache operation
 cache.hitcnt=Hits
 cache.maxElements=Max el
-cache.mcexp=Miss (exp)
-cache.mcnotfound=Miss (notfnd)
+cache.mcexp=Misses
 cache.name=Name
 cache.quickcount=~ Elements
-cache.tti=Time to idle (sec)
-cache.ttl=Time to live (sec)
+cache.tti=Max idle (millisec)
+cache.ttl=Lifespan (millisec)
+cache.clustered=Clustered
 caches.title=Overview of caches
 confirm.emptycache=Do you really want to delete all entries in this cache?

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_es.properties

@@ -5,10 +5,9 @@ cache.empty=Operaci\u00F3n de cach\u00E9
 cache.hitcnt=Aciertos
 cache.maxElements=Max elementos
 cache.mcexp=Perdido (exp)
-cache.mcnotfound=Perdido (notfnd)
 cache.name=Nombre
 cache.quickcount=~ Elementos
-cache.tti=Tiempo hasta idle (sec)
-cache.ttl=Tiempo hasta live (sec)
+cache.tti=Tiempo hasta idle (millisec)
+cache.ttl=Tiempo hasta live (millisec)
 caches.title=Visi\u00F3n general de caches
 confirm.emptycache=\u00BFDesea eliminar todas las entradas de esta cach\u00E9?

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_fa.properties

@@ -4,7 +4,6 @@ cache.disk=On disk
 cache.empty=Cache operation
 cache.hitcnt=Hits
 cache.mcexp=Miss (exp)
-cache.mcnotfound=Miss (notfnd)
 cache.name=Name
 cache.quickcount=~ Elements
 caches.title=Overview of caches

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_fr.properties

 #Mon Mar 02 09:54:07 CET 2009
-action.choose=vider
+action.choose=Vider
 cache.disk=Sur HD
-cache.empty=Cache Operation
-cache.hitcnt=Hit
-cache.maxElements=Max el
-cache.mcexp=Miss (exp)
-cache.mcnotfound=Miss (notfnd)
+cache.empty=Cache op\u00E9ration
+cache.hitcnt=Hits
+cache.maxElements=Max. \u00E9l.
+cache.mcexp=Misses
 cache.name=Nom
 cache.quickcount=~ \u00E9l\u00E9ments
-cache.tti=Time to idle (sec)
-cache.ttl=Time to live (sec)
+cache.tti=Max idle (millisec)
+cache.ttl=Lifespan (millisec)
 caches.title=Aper\u00E7u des caches
 confirm.emptycache=Voulez-vous effacer tous le contenu de ce cache?

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_it.properties

@@ -5,10 +5,9 @@ cache.empty=Cache Operation
 cache.hitcnt=Hit
 cache.maxElements=Max el
 cache.mcexp=Miss (exp)
-cache.mcnotfound=Miss (notfnd)
 cache.name=Nome
 cache.quickcount=~ Elementi
-cache.tti=Time to idle (sec)
-cache.ttl=Time to live (sec)
+cache.tti=Time to idle (millisec)
+cache.ttl=Time to live (millisec)
 caches.title=Visone d'insieme delle caches
 confirm.emptycache=Vuole eliminare tutte le entrate di questa cache?

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_lt.properties

@@ -4,7 +4,6 @@ cache.disk=Diske
 cache.empty=Pagalbin\u0117s atminties operacija
 cache.hitcnt=Parodymai
 cache.mcexp=Nerasta (exp)
-cache.mcnotfound=Nerasta (notfnd)
 cache.name=Pavadinimas
 cache.quickcount=~ Elementai
 caches.title=EHCache (palengvinan\u010Dioji \u201Ehibernate\u201C funkcijos atminties) ap\u017Evalga

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_nl_NL.properties

@@ -5,10 +5,9 @@ cache.empty=Cache operatie
 cache.hitcnt=Hits
 cache.maxElements=Max el
 cache.mcexp=Miss (exp)
-cache.mcnotfound=Miss (notfnd)
 cache.name=Name
 cache.quickcount=~ Elements
-cache.tti=Time to idle (sec)
-cache.ttl=Time to live (sec)
+cache.tti=Max idle (millisec)
+cache.ttl=Lifespan (millisec)
 caches.title=Overzicht van caches
 confirm.emptycache=Weet u zeker dat u alle bijdragen uit deze cache wilt verwijderen?

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_pl.properties

@@ -4,11 +4,10 @@ cache.disk=Na dysku
 cache.empty=Operacje
 cache.hitcnt=U\u017Cycia
 cache.maxElements=Max el
-cache.mcexp=Chybiony (exp)
-cache.mcnotfound=Chybiony (notfnd)
+cache.mcexp=Chybiony
 cache.name=Nazwa
 cache.quickcount=~ Element\u00F3w
-cache.tti=Time to idle (sec)
-cache.ttl=Time to live (sec)
+cache.tti=Max idle (millisec)
+cache.ttl=Lifespan (millisec)
 caches.title=Og\u00F3lne informacje o EHCache
 confirm.emptycache=Chcesz wykasowa\u0107 wszystkie wpisy w tym schowku?

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_pt_BR.properties

@@ -4,11 +4,10 @@ cache.disk=No disco
 cache.empty=Opera\u00E7\u00E3o cache
 cache.hitcnt=Batidas
 cache.maxElements=Elementos maximos
-cache.mcexp=Falta (exp)
-cache.mcnotfound=Falta (notfnd)
+cache.mcexp=Falta
 cache.name=Nome
 cache.quickcount=~ Elementos
-cache.tti=Tempo para dormir (sec)
-cache.ttl=Tempo para ativar (sec)
+cache.tti=Tempo para dormir (millisec)
+cache.ttl=Tempo para ativar (millisec)
 caches.title=Vis\u00E3o geral de caches
 confirm.emptycache=Voc\u00EA quer apagar todos os itens neste cache? 

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_pt_PT.properties

@@ -3,8 +3,7 @@ action.choose=Vazio
 cache.disk=No disco
 cache.empty=Opera\u00E7\u00E3o cache
 cache.hitcnt=Batidas
-cache.mcexp=Falta (exp)
-cache.mcnotfound=Falta (notfnd)
+cache.mcexp=Falta
 cache.name=Nome
 cache.quickcount=~ Elementos
 caches.title=Vis\u00E3o geral de caches

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_ru.properties

@@ -5,7 +5,6 @@ cache.empty=\u041A\u044D\u0448 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u044F
 cache.hitcnt=hit
 cache.maxElements=\u041C\u0430\u043A\u0441 \u044D\u043B
 cache.mcexp=miss (exp)
-cache.mcnotfound=miss (notfnd)
 cache.name=\u0418\u043C\u044F
 cache.quickcount=~ \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u043E\u0432
 cache.tti=\u0412\u0440\u0435\u043C\u044F \u0434\u043E idle (\u0441\u0435\u043A)

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_sq.properties

@@ -5,10 +5,9 @@ cache.empty=Operacioni i Cashe
 cache.hitcnt=Goditje
 cache.maxElements=El maks
 cache.mcexp=Mungon (exp)
-cache.mcnotfound=Mungon (notfnd)
 cache.name=Emri
 cache.quickcount=~ Elemente
-cache.tti=Koha p\u00EBr amulluar (sek)
-cache.ttl=Koha p\u00EBr t\u00EB gjall\u00EBruar (sek)
+cache.tti=Koha p\u00EBr amulluar (millisek)
+cache.ttl=Koha p\u00EBr t\u00EB gjall\u00EBruar (millisek)
 caches.title=Mbishikimi i caches
 confirm.emptycache=A doni t'i fshini t\u00EB gjitha t\u00EB hyrat n\u00EB k\u00EBt\u00EB cache?

src/main/java/org/olat/admin/cache/_i18n/LocalStrings_zh_CN.properties

@@ -4,8 +4,7 @@ cache.disk=\u5728\u78C1\u76D8\u4E0A
 cache.empty=\u7F13\u5B58\u64CD\u4F5C
 cache.hitcnt=\u6572\u51FB
 cache.maxElements=\u6700\u5927\u9AD8\u5EA6
-cache.mcexp=\u4E22\u5931(\u5F02\u5E38)
-cache.mcnotfound=\u4E22\u5931(\u672A\u627E\u5230)
+cache.mcexp=\u4E22\u5931
 cache.name=\u540D\u79F0
 cache.quickcount=~\u5143\u7D20
 cache.tti=\u95F2\u7F6E\u65F6\u95F4(\u5206\u949F)