diff --git a/admin/controleurs/admin_config6.php b/admin/controleurs/admin_config6.php
index c0876df60..6cd5871c8 100644
--- a/admin/controleurs/admin_config6.php
+++ b/admin/controleurs/admin_config6.php
@@ -16,13 +16,8 @@
  * (at your option) any later version.
  */
 
-get_vocab_admin("admin_config1");
-get_vocab_admin("admin_config2");
-get_vocab_admin("admin_config3");
-get_vocab_admin("admin_config4");
-get_vocab_admin("admin_config5");
-get_vocab_admin("admin_config6");
-get_vocab_admin("admin_config7");
+
+$trad = $vocab;
 
 $msg = '';
 
@@ -107,11 +102,11 @@
     }
 }
 // display_info_bulle
-if (isset($_POST['display_info_bulle'])) {
+/*if (isset($_POST['display_info_bulle'])) {
     if (!Settings::set('display_info_bulle', $_POST['display_info_bulle'])) {
         $msg .= "Erreur lors de l'enregistrement de display_info_bulle !<br />";
     }
-}
+}*/
 // menu_gauche
 if (isset($_POST['menu_gauche'])) {
     if (!Settings::set('menu_gauche', $_POST['menu_gauche'])) {
@@ -119,33 +114,133 @@
     }
 }
 // display_type
-if (isset($_POST['display_type'])) {
-    if (!Settings::set('display_type', $_POST['display_type'])) {
-        $msg .= "Erreur lors de l'enregistrement de display_type !<br />";
+if (isset($_POST['display_type_nc'])) {
+    if (!Settings::set('display_type_nc', $_POST['display_type_nc'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_type_nc !<br />";
+    }
+}
+if (isset($_POST['display_type_vi'])) {
+    if (!Settings::set('display_type_vi', $_POST['display_type_vi'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_type_vi !<br />";
+    }
+}
+if (isset($_POST['display_type_us'])) {
+    if (!Settings::set('display_type_us', $_POST['display_type_us'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_type_us !<br />";
+    }
+}
+if (isset($_POST['display_type_gr'])) {
+    if (!Settings::set('display_type_gr', $_POST['display_type_gr'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_type_gr !<br />";
+    }
+}
+if (isset($_POST['display_type_ad'])) {
+    if (!Settings::set('display_type_ad', $_POST['display_type_ad'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_type_ad !<br />";
     }
 }
 // display_beneficiaire
-if (isset($_POST['display_beneficiaire'])) {
-    if (!Settings::set('display_beneficiaire', $_POST['display_beneficiaire'])) {
-        $msg .= "Erreur lors de l'enregistrement de display_beneficiaire !<br />";
+if (isset($_POST['display_beneficiaire_nc'])) {
+    if (!Settings::set('display_beneficiaire_nc', $_POST['display_beneficiaire_nc'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_beneficiaire_nc !<br />";
+    }
+}
+if (isset($_POST['display_beneficiaire_vi'])) {
+    if (!Settings::set('display_beneficiaire_vi', $_POST['display_beneficiaire_vi'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_beneficiaire_vi !<br />";
+    }
+}
+if (isset($_POST['display_beneficiaire_us'])) {
+    if (!Settings::set('display_beneficiaire_us', $_POST['display_beneficiaire_us'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_beneficiaire_us !<br />";
+    }
+}
+if (isset($_POST['display_beneficiaire_gr'])) {
+    if (!Settings::set('display_beneficiaire_gr', $_POST['display_beneficiaire_gr'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_beneficiaire_gr !<br />";
+    }
+}
+if (isset($_POST['display_beneficiaire_ad'])) {
+    if (!Settings::set('display_beneficiaire_ad', $_POST['display_beneficiaire_ad'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_beneficiaire_ad !<br />";
     }
 }
 // display_horaires
-if (isset($_POST['display_horaires'])) {
-    if (!Settings::set('display_horaires', $_POST['display_horaires'])) {
-        $msg .= "Erreur lors de l'enregistrement de display_horaires !<br />";
+if (isset($_POST['display_horaires_nc'])) {
+    if (!Settings::set('display_horaires_nc', $_POST['display_horaires_nc'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_horaires_nc !<br />";
+    }
+}
+if (isset($_POST['display_horaires_vi'])) {
+    if (!Settings::set('display_horaires_vi', $_POST['display_horaires_vi'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_horaires_vi !<br />";
+    }
+}
+if (isset($_POST['display_horaires_us'])) {
+    if (!Settings::set('display_horaires_us', $_POST['display_horaires_us'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_horaires_us !<br />";
+    }
+}
+if (isset($_POST['display_horaires_gr'])) {
+    if (!Settings::set('display_horaires_gr', $_POST['display_horaires_gr'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_horaires_gr !<br />";
+    }
+}
+if (isset($_POST['display_horaires_ad'])) {
+    if (!Settings::set('display_horaires_ad', $_POST['display_horaires_ad'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_horaires_gr !<br />";
     }
 }
 // display_full_description
-if (isset($_POST['display_full_description'])) {
-    if (!Settings::set('display_full_description', $_POST['display_full_description'])) {
-        $msg .= "Erreur lors de l'enregistrement de display_full_description !<br />";
+if (isset($_POST['display_full_description_nc'])) {
+    if (!Settings::set('display_full_description_nc', $_POST['display_full_description_nc'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_full_description_nc !<br />";
+    }
+}
+if (isset($_POST['display_full_description_vi'])) {
+    if (!Settings::set('display_full_description_vi', $_POST['display_full_description_vi'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_full_description_vi !<br />";
+    }
+}
+if (isset($_POST['display_full_description_us'])) {
+    if (!Settings::set('display_full_description_us', $_POST['display_full_description_us'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_full_description_us !<br />";
+    }
+}
+if (isset($_POST['display_full_description_gr'])) {
+    if (!Settings::set('display_full_description_gr', $_POST['display_full_description_gr'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_full_description_gr !<br />";
+    }
+}
+if (isset($_POST['display_full_description_ad'])) {
+    if (!Settings::set('display_full_description_ad', $_POST['display_full_description_ad'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_full_description_ad !<br />";
     }
 }
 // display_short_description
-if (isset($_POST['display_short_description'])) {
-    if (!Settings::set('display_short_description', $_POST['display_short_description'])) {
-        $msg .= "Erreur lors de l'enregistrement de display_short_description !<br />";
+if (isset($_POST['display_short_description_nc'])) {
+    if (!Settings::set('display_short_description_nc', $_POST['display_short_description_nc'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_short_description_nc !<br />";
+    }
+}
+if (isset($_POST['display_short_description_vi'])) {
+    if (!Settings::set('display_short_description_vi', $_POST['display_short_description_vi'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_short_description_vi !<br />";
+    }
+}
+if (isset($_POST['display_short_description_us'])) {
+    if (!Settings::set('display_short_description_us', $_POST['display_short_description_us'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_short_description_us !<br />";
+    }
+}
+if (isset($_POST['display_short_description_gr'])) {
+    if (!Settings::set('display_short_description_gr', $_POST['display_short_description_gr'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_short_description_gr !<br />";
+    }
+}
+if (isset($_POST['display_short_description_ad'])) {
+    if (!Settings::set('display_short_description_ad', $_POST['display_short_description_ad'])) {
+        $msg .= "Erreur lors de l'enregistrement de display_short_description_ad !<br />";
     }
 }
 // remplissage de la description brève
@@ -254,12 +349,6 @@
     $msg = '';
 }
 
-get_vocab_admin('default_parameter_values_title');
-get_vocab_admin('explain_default_parameter');
-get_vocab_admin('explain_area_list_format');
-get_vocab_admin('liste_area_list_format');
-get_vocab_admin('select_area_list_format');
-get_vocab_admin('item_area_list_format');
 
 if (Settings::get('module_multisite') == 'Oui') {
 	$d['use_site'] = 'y';
@@ -269,95 +358,6 @@
 	get_vocab_admin('explain_default_area_and_room');
 }
 
-get_vocab_admin('explain_css');
-get_vocab_admin('choose_language');
-get_vocab_admin('default_site');
-get_vocab_admin('choose_a_site');
-
-get_vocab_admin('display_info_bulle_msg');
-get_vocab_admin('info_bulle0');
-get_vocab_admin('info_bulle1');
-get_vocab_admin('info_bulle2');
-
-get_vocab_admin('display_menu');
-get_vocab_admin('display_menu_1');
-get_vocab_admin('display_menu_2');
-get_vocab_admin('display_menu_3');
-get_vocab_admin('display_menu_4');
-
-get_vocab_admin('display_mail_etat_destinataire');
-get_vocab_admin('display_mail_etat_destinataire_1');
-get_vocab_admin('display_mail_etat_destinataire_2');
-get_vocab_admin('display_mail_etat_destinataire_3');
-get_vocab_admin('display_mail_etat_destinataire_4');
-get_vocab_admin('display_mail_destinataire');
-get_vocab_admin('mail_user_destinataire');
-
-// Affichage des réservations dans les vues journées, semaine et mois
-get_vocab_admin('display_planning_resa');
-get_vocab_admin('horaires');
-get_vocab_admin('sum_by_creator');
-get_vocab_admin('namebooker');
-get_vocab_admin('match_descr');
-get_vocab_admin('type');
-
-/*
-get_vocab_admin('display_short_description_msg');
-get_vocab_admin('display_short_description0');
-get_vocab_admin('display_short_description1');
-
-get_vocab_admin('display_full_description_msg');
-get_vocab_admin('display_full_description0');
-get_vocab_admin('display_full_description1');
-*/
-get_vocab_admin('display_level_email_msg1');
-get_vocab_admin('display_level_email_msg2');
-get_vocab_admin('visu_fiche_description0');
-get_vocab_admin('visu_fiche_description1');
-get_vocab_admin('visu_fiche_description2');
-get_vocab_admin('visu_fiche_description3');
-get_vocab_admin('visu_fiche_description4');
-get_vocab_admin('visu_fiche_description5');
-get_vocab_admin('visu_fiche_description6');
-
-get_vocab_admin('display_level_view_entry');
-get_vocab_admin('display_level_view_entry_0');
-get_vocab_admin('display_level_view_entry_1');
-
-get_vocab_admin('remplissage_description_breve_msg');
-get_vocab_admin('remplissage_description_breve0');
-get_vocab_admin('remplissage_description_breve1');
-get_vocab_admin('remplissage_description_breve2');
-
-get_vocab_admin('remplissage_description_complete_msg');
-get_vocab_admin('remplissage_description_complete0');
-get_vocab_admin('remplissage_description_complete1');
-get_vocab_admin('remplissage_description_complete2');
-
-get_vocab_admin('pview_new_windows_msg');
-get_vocab_admin('pview_new_windows0');
-get_vocab_admin('pview_new_windows1');
-
-get_vocab_admin('legend_msg');
-get_vocab_admin('imprimante_msg');
-get_vocab_admin('affichage_pdf');
-get_vocab_admin('holidays_msg');
-
-get_vocab_admin('holidays_zone_msg');
-get_vocab_admin('holidays_zone_msg');
-get_vocab_admin('holidays_zone_msg');
-
-get_vocab_admin('default_report_days_msg');
-get_vocab_admin('default_report_days_explain');
-
-get_vocab_admin('formulaire_reservation');
-get_vocab_admin('longueur_liste_ressources');
-
-get_vocab_admin('YES');
-get_vocab_admin('NO');
-get_vocab_admin('save');
-get_vocab_admin('message_records');
-
 
 // Liste des sites
 if (Settings::get('module_multisite') == 'Oui') {
diff --git a/admin/templates/admin_config6.twig b/admin/templates/admin_config6.twig
index a1b2b0c21..29e3fb2d1 100644
--- a/admin/templates/admin_config6.twig
+++ b/admin/templates/admin_config6.twig
@@ -100,7 +100,7 @@
 						</section>
 
 						<hr>
-
+<!--
 						<section id="infobulle">
 							<h4 class="page-header">{{ trad.display_info_bulle_msg }}</h4>
 							<input type="radio" name="display_info_bulle" value="0" id="label_2a" {% if settings.display_info_bulle == '0' %} checked {% endif %} /> <label for="label_2a">{{ trad.info_bulle0 }}</label><br>
@@ -109,7 +109,7 @@
 						</section>
 
 						<hr>
-
+-->
 						<section id="menugauche">
 							<h4 class="page-header">{{ trad.display_menu }}</h4>
 							<p>{{ trad.display_menu_1 }}</p>
@@ -139,34 +139,202 @@
 							<table class="table table-condensed">
 								<tbody>
 									<tr>
-										<th style="width: 200px"></th>
-										<th style="width: 150px">Ne pas afficher</th>
-										<th>Afficher</th>
+										<th style="width: 150px"></th>
+										<th style="width: 100px">Non connecté</th>
+										<th style="width: 100px">Visiteur</th>
+										<th style="width: 100px">Usager</th>
+										<th style="width: 100px">Gestionnaire de ressource</th>
+										<th style="width: 100px">Administrateur</th>
 									</tr>
 									<tr>
-										<td>{{ trad.sum_by_creator }}</td>
-										<td><input type="radio" name="display_beneficiaire" value="0" id="label_4a" {% if settings.display_beneficiaire == '0' %} checked {% endif %} /></td>
-										<td><input type="radio" name="display_beneficiaire" value="1" id="label_4b" {% if settings.display_beneficiaire == '1' %} checked {% endif %} /></td>
+										<th>{{ trad.sum_by_creator }}</th>
+										<td>
+											<select class="form-control" name="display_beneficiaire_nc">
+												<option value="0" {% if settings.display_beneficiaire_nc == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_beneficiaire_nc == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_beneficiaire_nc == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_beneficiaire_vi">
+												<option value="0" {% if settings.display_beneficiaire_vi == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_beneficiaire_vi == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_beneficiaire_vi == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_beneficiaire_us">
+												<option value="0" {% if settings.display_beneficiaire_us == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_beneficiaire_us == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_beneficiaire_us == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_beneficiaire_gr">
+												<option value="0" {% if settings.display_beneficiaire_gr == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_beneficiaire_gr == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_beneficiaire_gr == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_beneficiaire_ad">
+												<option value="0" {% if settings.display_beneficiaire_ad == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_beneficiaire_ad == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_beneficiaire_ad == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
 									</tr>
 									<tr>
-										<td>{{ trad.horaires }}</td>
-										<td><input type="radio" name="display_horaires" value="0" id="label_4a" {% if settings.display_horaires == '0' %} checked {% endif %} /></td>
-										<td><input type="radio" name="display_horaires" value="1" id="label_4b" {% if settings.display_horaires == '1' %} checked {% endif %} /></td>
+										<th>{{ trad.horaires }}</th>
+										<td>
+											<select class="form-control" name="display_horaires_nc">
+												<option value="0" {% if settings.display_horaires_nc == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_horaires_nc == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_horaires_nc == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_horaires_vi">
+												<option value="0" {% if settings.display_horaires_vi == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_horaires_vi == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_horaires_vi == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_horaires_us">
+												<!--<option value="0" {% if settings.display_horaires_us == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>-->
+												<option value="1" {% if settings.display_horaires_us == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_horaires_us == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_horaires_gr">
+												<!--<option value="0" {% if settings.display_horaires_gr == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>-->
+												<option value="1" {% if settings.display_horaires_gr == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_horaires_gr == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_horaires_ad">
+												<!--<option value="0" {% if settings.display_horaires_ad == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>-->
+												<option value="1" {% if settings.display_horaires_ad == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_horaires_ad == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
 									</tr>
 									<tr>
-										<td>{{ trad.namebooker }}</td>
-										<td><input type="radio" name="display_short_description" value="0" id="label_4a" {% if settings.display_short_description == '0' %} checked {% endif %} /></td>
-										<td><input type="radio" name="display_short_description" value="1" id="label_4b" {% if settings.display_short_description == '1' %} checked {% endif %} /></td>
+										<th>{{ trad.namebooker }}</th>
+										<td>
+											<select class="form-control" name="display_short_description_nc">
+												<option value="0" {% if settings.display_short_description_nc == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_short_description_nc == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_short_description_nc == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_short_description_vi">
+												<option value="0" {% if settings.display_short_description_vi == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_short_description_vi == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_short_description_vi == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_short_description_us">
+												<option value="0" {% if settings.display_short_description_us == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_short_description_us == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_short_description_us == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_short_description_gr">
+												<option value="0" {% if settings.display_short_description_gr == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_short_description_gr == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_short_description_gr == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_short_description_ad">
+												<option value="0" {% if settings.display_short_description_ad == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_short_description_ad == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_short_description_ad == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
 									</tr>
 									<tr>
-										<td>{{ trad.match_descr }}</td>
-										<td><input type="radio" name="display_full_description" value="0" id="label_5a" {% if settings.display_full_description == '0' %} checked {% endif %} /></td>
-										<td><input type="radio" name="display_full_description" value="1" id="label_5b" {% if settings.display_full_description == '1' %} checked {% endif %} /></td>
+										<th>{{ trad.match_descr }}</th>
+										<td>
+											<select class="form-control" name="display_full_description_nc">
+												<option value="0" {% if settings.display_full_description_nc == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_full_description_nc == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_full_description_nc == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_full_description_vi">
+												<option value="0" {% if settings.display_full_description_vi == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_full_description_vi == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_full_description_vi == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_full_description_us">
+												<option value="0" {% if settings.display_full_description_us == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_full_description_us == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_full_description_us == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_full_description_gr">
+												<option value="0" {% if settings.display_full_description_gr == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_full_description_gr == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_full_description_gr == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_full_description_ad">
+												<option value="0" {% if settings.display_full_description_ad == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_full_description_ad == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_full_description_ad == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
 									</tr>
 									<tr>
-										<td>{{ trad.type }}</td>
-										<td><input type="radio" name="display_type" value="0" id="label_4a" {% if settings.display_type == '0' %} checked {% endif %} /></td>
-										<td><input type="radio" name="display_type" value="1" id="label_4b" {% if settings.display_type == '1' %} checked {% endif %} /></td>
+										<th>{{ trad.type }}</th>
+										<td>
+											<select class="form-control" name="display_type_nc">
+												<option value="0" {% if settings.display_type_nc == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_type_nc == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_type_nc == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_type_vi">
+												<option value="0" {% if settings.display_type_vi == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_type_vi == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_type_vi == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_type_us">
+												<option value="0" {% if settings.display_type_us == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_type_us == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_type_us == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_type_gr">
+												<option value="0" {% if settings.display_type_gr == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_type_gr == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_type_gr == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
+										<td>
+											<select class="form-control" name="display_type_ad">
+												<option value="0" {% if settings.display_type_ad == '0' %} selected {% endif %}>{{ trad.afficher_non }}</option>
+												<option value="1" {% if settings.display_type_ad == '1' %} selected {% endif %}>{{ trad.afficher_oui }}</option>
+												<option value="2" {% if settings.display_type_ad == '2' %} selected {% endif %}>{{ trad.afficher_popup }}</option>
+											</select>
+										</td>
 									</tr>
 								</tbody>
 							</table>
diff --git a/day.php b/day.php
index 062c0f18a..4d5b8f3ee 100644
--- a/day.php
+++ b/day.php
@@ -176,22 +176,13 @@
 		if ($row["start_time"] < $am7)
 		{
             $today[$row["room_id"]][$am7]["data"] = affichage_resa_planning_complet($overloadFieldList, 1, $row, $horaires);
-			if ($settings->get("display_info_bulle") == 1)
-				$today[$row["room_id"]][$am7]["who"] = get_vocab("reservation_au_nom_de").affiche_nom_prenom_email($row["beneficiaire"], $row["beneficiaire_ext"], "nomail");
-			else if (($settings->get("display_info_bulle") == 2)&&($row['description'] != ""))
-				$today[$row["room_id"]][$am7]["who"] = $row["description"];
-			else
-				$today[$row["room_id"]][$am7]["who"] = get_vocab('voir_details');
+			$today[$row["room_id"]][$am7]["who"] = affichage_resa_info_bulle($overloadFieldList, 1, $row, $horaires);
 		}
 		else
 		{
             $today[$row["room_id"]][$start_t]["data"] = affichage_resa_planning_complet($overloadFieldList, 1, $row, $horaires);
-			if ($settings->get("display_info_bulle") == 1)
-				$today[$row["room_id"]][$start_t]["who"] = get_vocab("reservation_au_nom_de").affiche_nom_prenom_email($row["beneficiaire"], $row["beneficiaire_ext"]);
-			else if (($settings->get("display_info_bulle") == 2)&&($row['description'] != ""))
-				$today[$row["room_id"]][$start_t]["who"] = $row["description"];
-			else
-				$today[$row["room_id"]][$start_t]["who"] = get_vocab('voir_details');
+			$today[$row["room_id"]][$start_t]["who"] = affichage_resa_info_bulle($overloadFieldList, 1, $row, $horaires);
+
 		}
 	}
 }
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 0f0b1e948..fcdec2f1e 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -4899,9 +4899,16 @@ function affichage_resa_planning_complet($ofl, $vue, $resa, $heures)
 	global $dformat;
 
 	$affichage = "";
+	$room = $resa[5];
 
 	// Heures ou créneaux + symboles <== ==>
-	if ($heures != "")
+	if( (authGetUserLevel(getUserName(), $room) == 0 && Settings::get("display_horaires_nc") == 1) || 
+		(authGetUserLevel(getUserName(), $room) == 1 && Settings::get("display_horaires_vi") == 1) ||
+		(authGetUserLevel(getUserName(), $room) == 2 && Settings::get("display_horaires_us") == 1) || 
+		(authGetUserLevel(getUserName(), $room) == 3 && Settings::get("display_horaires_gr") == 1) || 
+		(authGetUserLevel(getUserName(), $room) >= 4 && Settings::get("display_horaires_ad") == 1) &&
+		$heures != ""
+ 	)
         $affichage .= $heures."<br>";
 
 	// Ressource seulement dans les vues globales
@@ -4909,11 +4916,23 @@ function affichage_resa_planning_complet($ofl, $vue, $resa, $heures)
 		$affichage .= $resa[5]."<br>";
 
 	// Bénéficiaire
-	if (Settings::get("display_beneficiaire") == 1)
+	if( (authGetUserLevel(getUserName(), $room) == 0 && Settings::get("display_beneficiaire_nc") == 1) || 
+		(authGetUserLevel(getUserName(), $room) == 1 && Settings::get("display_beneficiaire_vi") == 1) ||
+		(authGetUserLevel(getUserName(), $room) == 2 && Settings::get("display_beneficiaire_us") == 1) || 
+		(authGetUserLevel(getUserName(), $room) == 3 && Settings::get("display_beneficiaire_gr") == 1) || 
+		(authGetUserLevel(getUserName(), $room) >= 4 && Settings::get("display_beneficiaire_ad") == 1)  
+	  )
+	{
 		$affichage .= affiche_nom_prenom_email($resa[4], $resa[12], "nomail")."<br>";
+	}
 
 	// Type
-	if (Settings::get("display_type") == 1)
+	if( (authGetUserLevel(getUserName(), $room) == 0 && Settings::get("display_type_nc") == 1) || 
+		(authGetUserLevel(getUserName(), $room) == 1 && Settings::get("display_type_vi") == 1) ||
+		(authGetUserLevel(getUserName(), $room) == 2 && Settings::get("display_type_us") == 1) || 
+		(authGetUserLevel(getUserName(), $room) == 3 && Settings::get("display_type_gr") == 1) || 
+		(authGetUserLevel(getUserName(), $room) >= 4 && Settings::get("display_type_ad") == 1)  
+	  )
 	{
         $typeResa = grr_sql_query1("SELECT ".TABLE_PREFIX."_type_area.type_name FROM ".TABLE_PREFIX."_type_area JOIN ".TABLE_PREFIX."_entry ON ".TABLE_PREFIX."_entry.type=".TABLE_PREFIX."_type_area.type_letter WHERE ".TABLE_PREFIX."_entry.id = '".$resa[2]."';");
 		if ($typeResa != -1)
@@ -4921,20 +4940,32 @@ function affichage_resa_planning_complet($ofl, $vue, $resa, $heures)
 	}
 
 	// Brève description ou le numéro de la réservation
-	if ((Settings::get("display_short_description") == 1) && ($resa[3] != ""))
+	if( (authGetUserLevel(getUserName(), $room) == 0 && Settings::get("display_short_description_nc") == 1) || 
+		(authGetUserLevel(getUserName(), $room) == 1 && Settings::get("display_short_description_vi") == 1) ||
+		(authGetUserLevel(getUserName(), $room) == 2 && Settings::get("display_short_description_us") == 1) || 
+		(authGetUserLevel(getUserName(), $room) == 3 && Settings::get("display_short_description_gr") == 1) || 
+		(authGetUserLevel(getUserName(), $room) >= 4 && Settings::get("display_short_description_ad") == 1) &&
+		$resa[3] != ""
+	  )
 		$affichage .= htmlspecialchars($resa[3],ENT_NOQUOTES)."<br>";
 	else
 		$affichage .= get_vocab("entryid").$resa[2]."<br>";
 
 	// Description Complète
-	if ((Settings::get("display_full_description") == 1) && ($resa[8] != ""))
+	if( (authGetUserLevel(getUserName(), $room) == 0 && Settings::get("display_full_description_nc") == 1) || 
+		(authGetUserLevel(getUserName(), $room) == 1 && Settings::get("display_full_description_vi") == 1) ||
+		(authGetUserLevel(getUserName(), $room) == 2 && Settings::get("display_full_description_us") == 1) || 
+		(authGetUserLevel(getUserName(), $room) == 3 && Settings::get("display_full_description_gr") == 1) || 
+		(authGetUserLevel(getUserName(), $room) >= 4 && Settings::get("display_full_description_ad") == 1) &&
+		$resa[8] != ""
+	  )
 		$affichage .= htmlspecialchars($resa[8],ENT_NOQUOTES)."<br>";
 
 	// Champs Additionnels
     // la ressource associée à la réservation :
 	//$res = mrbsGetEntryInfo($resa[2]);
 	//$room = (!$res) ? -1 : $res["room_id"]; 
-    $room = $resa[5];
+   
 	// Les champs add :
 	$overload_data = grrGetOverloadDescArray($ofl, $resa[16]);//mrbsEntryGetOverloadDesc($resa[2]);
 	foreach ($overload_data as $fieldname=>$field)
@@ -4974,6 +5005,98 @@ function affichage_resa_planning_complet($ofl, $vue, $resa, $heures)
 	return $affichage;
 }
 /*
+Construit les informations à afficher sur les plannings week_all, month ou month_all
+$vue = 1 pour une ressource / 2 vue multiple ressource
+$ofl = overload fields list, ne dépend que du domaine, donc est constant dans la boucle d'affichage
+*/
+function affichage_resa_info_bulle($ofl, $vue, $resa, $heures)
+{
+
+	$affichage = "";
+	$room = $resa[5];
+
+	// Heures ou créneaux + symboles <== ==>
+	if( (authGetUserLevel(getUserName(), $room) == 0 && Settings::get("display_horaires_nc") == 2) || 
+		(authGetUserLevel(getUserName(), $room) == 1 && Settings::get("display_horaires_vi") == 2) ||
+		(authGetUserLevel(getUserName(), $room) == 2 && Settings::get("display_horaires_us") == 2) || 
+		(authGetUserLevel(getUserName(), $room) == 3 && Settings::get("display_horaires_gr") == 2) || 
+		(authGetUserLevel(getUserName(), $room) >= 4 && Settings::get("display_horaires_ad") == 2) &&
+		$heures != ""
+ 	)
+        $affichage .= $heures."\n";
+
+	// Ressource seulement dans les vues globales
+	if($vue == 2)
+		$affichage .= $resa[5]."\n";
+
+	// Bénéficiaire
+	if( (authGetUserLevel(getUserName(), $room) == 0 && Settings::get("display_beneficiaire_nc") == 2) || 
+		(authGetUserLevel(getUserName(), $room) == 1 && Settings::get("display_beneficiaire_vi") == 2) ||
+		(authGetUserLevel(getUserName(), $room) == 2 && Settings::get("display_beneficiaire_us") == 2) || 
+		(authGetUserLevel(getUserName(), $room) == 3 && Settings::get("display_beneficiaire_gr") == 2) || 
+		(authGetUserLevel(getUserName(), $room) >= 4 && Settings::get("display_beneficiaire_ad") == 2)  
+	  )
+	{
+		$affichage .= affiche_nom_prenom_email($resa[4], $resa[12], "nomail")."\n";
+	}
+
+	// Type
+	if( (authGetUserLevel(getUserName(), $room) == 0 && Settings::get("display_type_nc") == 2) || 
+		(authGetUserLevel(getUserName(), $room) == 1 && Settings::get("display_type_vi") == 2) ||
+		(authGetUserLevel(getUserName(), $room) == 2 && Settings::get("display_type_us") == 2) || 
+		(authGetUserLevel(getUserName(), $room) == 3 && Settings::get("display_type_gr") == 2) || 
+		(authGetUserLevel(getUserName(), $room) >= 4 && Settings::get("display_type_ad") == 2)  
+	  )
+	{
+        $typeResa = grr_sql_query1("SELECT ".TABLE_PREFIX."_type_area.type_name FROM ".TABLE_PREFIX."_type_area JOIN ".TABLE_PREFIX."_entry ON ".TABLE_PREFIX."_entry.type=".TABLE_PREFIX."_type_area.type_letter WHERE ".TABLE_PREFIX."_entry.id = '".$resa[2]."';");
+		if ($typeResa != -1)
+			$affichage .= $typeResa."\n";
+	}
+
+	// Brève description ou le numéro de la réservation
+	if( (authGetUserLevel(getUserName(), $room) == 0 && Settings::get("display_short_description_nc") == 2) || 
+		(authGetUserLevel(getUserName(), $room) == 1 && Settings::get("display_short_description_vi") == 2) ||
+		(authGetUserLevel(getUserName(), $room) == 2 && Settings::get("display_short_description_us") == 2) || 
+		(authGetUserLevel(getUserName(), $room) == 3 && Settings::get("display_short_description_gr") == 2) || 
+		(authGetUserLevel(getUserName(), $room) >= 4 && Settings::get("display_short_description_ad") == 2) &&
+		$resa[3] != ""
+	  )
+		$affichage .= htmlspecialchars($resa[3],ENT_NOQUOTES)."\n";
+	else
+		$affichage .= get_vocab("entryid").$resa[2]."\n";
+
+	// Description Complète
+	if( (authGetUserLevel(getUserName(), $room) == 0 && Settings::get("display_full_description_nc") == 2) || 
+		(authGetUserLevel(getUserName(), $room) == 1 && Settings::get("display_full_description_vi") == 2) ||
+		(authGetUserLevel(getUserName(), $room) == 2 && Settings::get("display_full_description_us") == 2) || 
+		(authGetUserLevel(getUserName(), $room) == 3 && Settings::get("display_full_description_gr") == 2) || 
+		(authGetUserLevel(getUserName(), $room) >= 4 && Settings::get("display_full_description_ad") == 2) &&
+		$resa[8] != ""
+	  )
+		$affichage .= htmlspecialchars($resa[8],ENT_NOQUOTES)."\n";
+
+	// Champs Additionnels
+    // la ressource associée à la réservation :
+	//$res = mrbsGetEntryInfo($resa[2]);
+	//$room = (!$res) ? -1 : $res["room_id"]; 
+   
+	// Les champs add :
+	$overload_data = grrGetOverloadDescArray($ofl, $resa[16]);//mrbsEntryGetOverloadDesc($resa[2]);
+	foreach ($overload_data as $fieldname=>$field)
+	{
+		if (( (authGetUserLevel(getUserName(), $room) >= 4 && $field["confidentiel"] == 'n') || $field["affichage"] == 'y') && $field["valeur"] != "") {
+			// ELM - Gestion des champs aditionnels multivalués (lignes 384 - 392)
+			$valeur = str_replace("|", ",", $field["valeur"]);
+			$affichage .= "<i>".htmlspecialchars($fieldname,ENT_NOQUOTES).get_vocab("deux_points").htmlspecialchars($valeur,ENT_NOQUOTES|ENT_SUBSTITUTE)."</i>\n";
+		}
+	}
+
+	if($affichage == "")
+		$affichage = get_vocab('voir_details');
+
+	return $affichage;
+}
+/*
 Construit les informations à afficher en pop-up sur les plannings month_all2, year ou year_all
 $ofl = overload fields list, ne dépend que du domaine, donc est constant dans la boucle d'affichage
 */
diff --git a/installation/fonctions/maj.php b/installation/fonctions/maj.php
index 4bf53cdec..03f6cfa96 100644
--- a/installation/fonctions/maj.php
+++ b/installation/fonctions/maj.php
@@ -1074,6 +1074,63 @@ function execute_maj4($version_old_bdd, $version_grr_bdd)
 		$result_inter .= traiteRequete("ALTER TABLE ".TABLE_PREFIX."_room ADD `who_can_book` TINYINT(1) NOT NULL DEFAULT '1' AFTER `booking_range`;");
 		$result_inter .= traiteRequete("CREATE TABLE IF NOT EXISTS ".TABLE_PREFIX."_j_userbook_room (login varchar(190) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL default '', id_room int(11) NOT NULL default '0', PRIMARY KEY  (login,id_room) )");
 
+		$req = grr_sql_query1("SELECT VALUE FROM ".TABLE_PREFIX."_setting WHERE NAME='display_beneficiaire'");
+		if (($req != -1) && (($req != "")))
+		{
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_beneficiaire_nc', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_beneficiaire_vi', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_beneficiaire_us', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_beneficiaire_gr', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_beneficiaire_ad', '".$req."');");
+			$del = traiteRequete("DELETE FROM ".TABLE_PREFIX."_setting where NAME='display_beneficiaire'");
+		}
+
+		$req = grr_sql_query1("SELECT VALUE FROM ".TABLE_PREFIX."_setting WHERE NAME='display_horaires'");
+		if (($req != -1) && (($req != "")))
+		{
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_horaires_nc', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_horaires_vi', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_horaires_us', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_horaires_gr', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_horaires_ad', '".$req."');");
+			$del = traiteRequete("DELETE FROM ".TABLE_PREFIX."_setting where NAME='display_horaires'");
+		}
+
+		$req = grr_sql_query1("SELECT VALUE FROM ".TABLE_PREFIX."_setting WHERE NAME='display_short_description'");
+		if (($req != -1) && (($req != "")))
+		{
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_short_description_nc', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_short_description_vi', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_short_description_us', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_short_description_gr', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_short_description_ad', '".$req."');");
+			$del = traiteRequete("DELETE FROM ".TABLE_PREFIX."_setting where NAME='display_short_description'");
+		}
+
+		$req = grr_sql_query1("SELECT VALUE FROM ".TABLE_PREFIX."_setting WHERE NAME='display_full_description'");
+		if (($req != -1) && (($req != "")))
+		{
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_full_description_nc', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_full_description_vi', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_full_description_us', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_full_description_gr', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_full_description_ad', '".$req."');");
+			$del = traiteRequete("DELETE FROM ".TABLE_PREFIX."_setting where NAME='display_full_description'");
+		}
+
+		$req = grr_sql_query1("SELECT VALUE FROM ".TABLE_PREFIX."_setting WHERE NAME='display_type'");
+		if (($req != -1) && (($req != "")))
+		{
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_type_nc', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_type_vi', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_type_us', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_type_gr', '".$req."');");
+			$result_inter .= traiteRequete("INSERT INTO ".TABLE_PREFIX."_setting VALUES ('display_type_ad', '".$req."');");
+			$del = traiteRequete("DELETE FROM ".TABLE_PREFIX."_setting where NAME='display_type'");
+		}
+
+
+
 		if ($result_inter == '')
 			$result .= formatresult("Ok !","<span style='color:green;'>","</span>");
 		else
diff --git a/installation/tables.my.sql b/installation/tables.my.sql
index 1990ce3f1..15c977b72 100644
--- a/installation/tables.my.sql
+++ b/installation/tables.my.sql
@@ -94,14 +94,33 @@ INSERT INTO grr_setting VALUES ('default_report_days', '30');
 INSERT INTO grr_setting VALUES ('default_room', '-1');
 INSERT INTO grr_setting VALUES ('default_site', '-1');
 INSERT INTO grr_setting VALUES ('disable_login', 'no');
-INSERT INTO grr_setting VALUES ('display_beneficiaire', '1');
-INSERT INTO grr_setting VALUES ('display_full_description', '1');
-INSERT INTO grr_setting VALUES ('display_horaires', '1');
-INSERT INTO grr_setting VALUES ('display_info_bulle', '1');
+INSERT INTO grr_setting VALUES ('display_beneficiaire_nc', '1');
+INSERT INTO grr_setting VALUES ('display_beneficiaire_vi', '1');
+INSERT INTO grr_setting VALUES ('display_beneficiaire_us', '1');
+INSERT INTO grr_setting VALUES ('display_beneficiaire_gr', '1');
+INSERT INTO grr_setting VALUES ('display_beneficiaire_ad', '1');
+INSERT INTO grr_setting VALUES ('display_full_description_nc', '1');
+INSERT INTO grr_setting VALUES ('display_full_description_vi', '1');
+INSERT INTO grr_setting VALUES ('display_full_description_us', '1');
+INSERT INTO grr_setting VALUES ('display_full_description_gr', '1');
+INSERT INTO grr_setting VALUES ('display_full_description_ad', '1');
+INSERT INTO grr_setting VALUES ('display_horaires_nc', '1');
+INSERT INTO grr_setting VALUES ('display_horaires_vi', '1');
+INSERT INTO grr_setting VALUES ('display_horaires_us', '1');
+INSERT INTO grr_setting VALUES ('display_horaires_gr', '1');
+INSERT INTO grr_setting VALUES ('display_horaires_ad', '1');
 INSERT INTO grr_setting VALUES ('display_level_email', '0');
 INSERT INTO grr_setting VALUES ('display_level_view_entry', '0');
-INSERT INTO grr_setting VALUES ('display_short_description', '1');
-INSERT INTO grr_setting VALUES ('display_type', '1');
+INSERT INTO grr_setting VALUES ('display_short_description_nc', '1');
+INSERT INTO grr_setting VALUES ('display_short_description_vi', '1');
+INSERT INTO grr_setting VALUES ('display_short_description_us', '1');
+INSERT INTO grr_setting VALUES ('display_short_description_gr', '1');
+INSERT INTO grr_setting VALUES ('display_short_description_ad', '1');
+INSERT INTO grr_setting VALUES ('display_type_nc', '1');
+INSERT INTO grr_setting VALUES ('display_type_vi', '1');
+INSERT INTO grr_setting VALUES ('display_type_us', '1');
+INSERT INTO grr_setting VALUES ('display_type_gr', '1');
+INSERT INTO grr_setting VALUES ('display_type_ad', '1');
 INSERT INTO grr_setting VALUES ('end_bookings', '1735685999');
 INSERT INTO grr_setting VALUES ('envoyer_email_avec_formulaire', 'no');
 INSERT INTO grr_setting VALUES ('file', '1');
diff --git a/langue/de-de.php b/langue/de-de.php
index ca2de18f4..6a21cd21d 100644
--- a/langue/de-de.php
+++ b/langue/de-de.php
@@ -132,6 +132,9 @@
 $vocab['affichage_reservation_date_heure'] = " Datum/Uhrzeit der Reservierung, und <b>ihre Enddatum/Enduhrzeit</b>";
 $vocab['affichage_reservation_duree'] = " Datum/Uhrzeit der Reservierung, und <b>ihre Dauer</b>";
 $vocab['Afficher_description_complete_dans_titre_plannings'] = "Afficher la description complète dans le titre des plannings."; // A traduire
+$vocab['afficher_non'] = "Werden nicht angezeigt";
+$vocab['afficher_oui'] = "Anzeige";
+$vocab['afficher_popup'] = "Tooltip";
 $vocab['affiche_dans_les_mails'] = "Afficher le contenu dans les mails automatiques"; // A traduire
 $vocab['affiche_dans_les_vues'] = "Afficher le contenu dans les vues journées, semaine et mois"; // A traduire
 $vocab['ajout_correspondance_profil_statut'] = "Ajouter une correspondance Profil / Statut"; // A traduire
@@ -337,7 +340,7 @@
 $vocab['display_full_description0'] = "die komplette Beschreibung wird nicht angezeigt";
 $vocab['display_full_description1'] = "die komplette Beschreibung wird angezeigt";
 $vocab['display_full_description_msg'] = "Anzeige der kompletten Beschreibung der Reservierungen in wöchentlichen und monatlichen Überblicken.";
-$vocab['display_info_bulle_msg'] = "Anzeige der \"Sprechblasen\" für Reservierungen, in täglichen, wöchentlichen und monatlichen Überblicken";
+//$vocab['display_info_bulle_msg'] = "Anzeige der \"Sprechblasen\" für Reservierungen, in täglichen, wöchentlichen und monatlichen Überblicken";
 $vocab['display_level_email_msg1'] = "Affichage des liens email dans les fiches détaillées de réservation"; // A traduire
 $vocab['display_level_email_msg2'] = "Dans les fiches détaillées de réservation, des \"liens email\" permettent de contacter par email les auteurs de la réservation.<br />Indiquez ci-dessous qui bénéficie de cette fonctionnalité."; // A traduire
 $vocab['display_level_view_entry']= "Anzeige der Buchungen in Popup-Form" ;
diff --git a/langue/en-gb.php b/langue/en-gb.php
index 9abddf596..ff12a141e 100644
--- a/langue/en-gb.php
+++ b/langue/en-gb.php
@@ -131,6 +131,9 @@
 $vocab['affichage_reservation_date_heure'] = "the end date/hour of reservation ";
 $vocab['affichage_reservation_duree'] = "the reservation duration";
 $vocab['Afficher_description_complete_dans_titre_plannings'] = "Show the full description in the title of the schedules.";
+$vocab['afficher_non'] = "Do not display";
+$vocab['afficher_oui'] = "Display";
+$vocab['afficher_popup'] = "Tooltip";
 $vocab['affiche_dans_les_mails'] = "Display the content in the automatic e-mails";
 $vocab['affiche_dans_les_vues'] = "Display the content in the day, week, month views.";
 $vocab['ajout_correspondance_profil_statut'] = "Add correspondence profile / status";
@@ -336,7 +339,7 @@
 $vocab['display_full_description0'] = "the full description doesn't display";
 $vocab['display_full_description1'] = "the full description displays";
 $vocab['display_full_description_msg'] = "Display of the full description of the reservation in the views days, week, and month.";
-$vocab['display_info_bulle_msg'] = "Display of the tooltips of the reservations in the views days, week, and month.";
+//$vocab['display_info_bulle_msg'] = "Display of the tooltips of the reservations in the views days, week, and month.";
 $vocab['display_level_email_msg1'] = "Display of e-mail adresses in the detailed reservation forms";
 $vocab['display_level_email_msg2'] = "Depending on cases (below), user's e-mail adresses appear as links \"mailto\" on users names and firstnames.<br />Indicate below who has access to this information.";
 $vocab['display_level_view_entry']= "Display of reservations in popup form" ;
diff --git a/langue/es-es.php b/langue/es-es.php
index 2cf67712c..593bab4e7 100644
--- a/langue/es-es.php
+++ b/langue/es-es.php
@@ -132,6 +132,9 @@
 $vocab['affichage_reservation_date_heure'] = "la fecha/hora de fín de reserva ";
 $vocab['affichage_reservation_duree'] = "la duración de la reserva ";
 $vocab['Afficher_description_complete_dans_titre_plannings'] = "Muestre la descripción completa en el título de los planificacións.";
+$vocab['afficher_non'] = "No se muestran";
+$vocab['afficher_oui'] = "Mostrar";
+$vocab['afficher_popup'] = "Información sobre herramientas";
 $vocab['affiche_dans_les_mails'] = "Presentar el contenido en los mails automáticos";
 $vocab['affiche_dans_les_vues'] = "Presentar el contenido en jornadas, semana y mes";
 $vocab['ajout_correspondance_profil_statut'] = "Ajouter une correspondance Profil / Statut"; // A traduire
@@ -337,7 +340,7 @@
 $vocab['display_full_description0'] = "la descripción completa no se muestra";
 $vocab['display_full_description1'] = "la descripción completa se muestra";
 $vocab['display_full_description_msg'] = "Visualisación de la descripción completa de la reserva en las vistas jornadas, semana y mes.";
-$vocab['display_info_bulle_msg'] = "Visualisación de las \"info-BURBUJAS\" de las reservas en las vistas jornadas, semana y mes. ";
+//$vocab['display_info_bulle_msg'] = "Visualisación de las \"info-BURBUJAS\" de las reservas en las vistas jornadas, semana y mes. ";
 $vocab['display_level_email_msg1'] = "Visualisación de las direcciones mail en las fichas detalladas de reserva"; // A traduire
 $vocab['display_level_email_msg2'] = "Según los casos (más abajo), las direcciones mail de usuarios aparecen bajo la forma de enlaces \"mailto\" sobre los apellidos y nombres de los usuarios. Indique más abajo quién tiene acceso a esta información."; // A traduire
 $vocab['display_level_view_entry']= "Visualización de reservas en forma de popup" ;
diff --git a/langue/fr-fr.php b/langue/fr-fr.php
index 1e746fd97..ad1547104 100644
--- a/langue/fr-fr.php
+++ b/langue/fr-fr.php
@@ -131,6 +131,9 @@
 $vocab['affichage_reservation_date_heure'] = "la date/heure de fin de réservation";
 $vocab['affichage_reservation_duree'] = " la durée de la réservation";
 $vocab['Afficher_description_complete_dans_titre_plannings'] = "Afficher la description complète dans le titre des plannings.";
+$vocab['afficher_non'] = "Ne pas afficher";
+$vocab['afficher_oui'] = "Afficher";
+$vocab['afficher_popup'] = "Info-Bulle";
 $vocab['affiche_dans_les_mails'] = "Afficher le contenu dans les mails automatiques";
 $vocab['affiche_dans_les_vues'] = "Afficher le contenu dans les vues journées, semaine et mois";
 $vocab['ajout_correspondance_profil_statut'] = "Ajouter une correspondance Profil / Statut";
@@ -336,7 +339,7 @@
 $vocab['display_full_description0'] = "la description complète ne s'affiche pas";
 $vocab['display_full_description1'] = "la description complète s'affiche";
 $vocab['display_full_description_msg'] = "Affichage de la description complète de la réservation dans les vues journées, semaine et mois.";
-$vocab['display_info_bulle_msg'] = "Affichage des \"info-bulles\" des réservations, dans les vues journées, semaine et mois";
+//$vocab['display_info_bulle_msg'] = "Affichage des \"info-bulles\" des réservations, dans les vues journées, semaine et mois";
 $vocab['display_level_email_msg1'] = "Affichage des liens email dans les fiches détaillées de réservation";
 $vocab['display_level_email_msg2'] = "Dans les fiches détaillées de réservation, des \"liens email\" permettent de contacter par email les auteurs de la réservation.<br />Indiquez ci-dessous qui bénéficie de cette fonctionnalité.";
 $vocab['display_level_view_entry']= "Affichage des informations des réservations sous forme de page ou de popup";
diff --git a/langue/it-it.php b/langue/it-it.php
index 74322ab5b..56311eea2 100644
--- a/langue/it-it.php
+++ b/langue/it-it.php
@@ -132,6 +132,9 @@
 $vocab['affichage_reservation_date_heure'] = " data/horra di inizio di prenotazione e <b>data/horra di fine di prenotazione </b>";
 $vocab['affichage_reservation_duree'] = " data/horra di inizio di prenotazione e <b>tempo della prenotazione </b>";
 $vocab['Afficher_description_complete_dans_titre_plannings'] = "Afficher la description complète dans le titre des plannings."; // A traduire
+$vocab['afficher_non'] = "Non visualizzare";
+$vocab['afficher_oui'] = "Affiggere";
+$vocab['afficher_popup'] = "Descrizione comando";
 $vocab['affiche_dans_les_mails'] = "Afficher le contenu dans les mails automatiques"; // A traduire
 $vocab['affiche_dans_les_vues'] = "Afficher le contenu dans les vues journées, semaine et mois"; // A traduire
 $vocab['ajout_correspondance_profil_statut'] = "Ajouter une correspondance Profil / Statut"; // A traduire
@@ -337,7 +340,7 @@
 $vocab['display_full_description0'] = "la description complète ne s'affiche pas"; // A traduire
 $vocab['display_full_description1'] = "la description complète s'affiche"; // A traduire
 $vocab['display_full_description_msg'] = "Affichage de la description complète de la réservation dans les vues journées, semaine et mois."; // A traduire
-$vocab['display_info_bulle_msg'] = "Affichage des \"info-bulles\" des réservations, dans les vues journées, semaine et mois"; // A traduire
+//$vocab['display_info_bulle_msg'] = "Affichage des \"info-bulles\" des réservations, dans les vues journées, semaine et mois"; // A traduire
 $vocab['display_level_email_msg1'] = "Affichage des liens email dans les fiches détaillées de réservation"; // A traduire
 $vocab['display_level_email_msg2'] = "Dans les fiches détaillées de réservation, des \"liens email\" permettent de contacter par email les auteurs de la réservation.<br />Indiquez ci-dessous qui bénéficie de cette fonctionnalité."; // A traduire
 $vocab['display_level_view_entry']= "Visualizzazione delle riserve in forma popup" ;
diff --git a/month.php b/month.php
index 2f3cfba37..409b07846 100644
--- a/month.php
+++ b/month.php
@@ -259,6 +259,7 @@
 				}
 			}
             $d[$day_num]["resa"][] = affichage_resa_planning_complet($overloadFieldList, 1, $row, $horaires);
+            $d[$day_num]["infobulle"][] = affichage_resa_info_bulle($overloadFieldList, 1, $row, $horaires);
 
 			//Seulement si l'heure de fin est après minuit, on continue le jour prochain.
 			if ($row[1] <= $midnight_tonight)
@@ -439,11 +440,11 @@
                         {
                             $currentPage = 'month';
                             $id = $d[$cday]["id"][$i];
-                            echo '<a title="'.get_vocab('voir_details').'" data-width="675" onclick="request(',$id,',',$cday,',',$month,',',$year.','.$room.',\''.$currentPage,'\',readData);" data-rel="popup_name" class="poplight lienCellule">';
+                            echo '<a title="'.$d[$cday]["infobulle"][$i].'" data-width="675" onclick="request(',$id,',',$cday,',',$month,',',$year.','.$room.',\''.$currentPage,'\',readData);" data-rel="popup_name" class="poplight lienCellule">';
                         }
                         else
                         {
-                            echo '<a class="lienCellule" title="'.get_vocab('voir_details').'" href="view_entry.php?id=',$d[$cday]["id"][$i],'&amp;day=',$cday,'&amp;month=',$month,'&amp;year=',$year,'&amp;page=month">';
+                            echo '<a class="lienCellule" title="'.$d[$cday]["infobulle"][$i].'" href="view_entry.php?id=',$d[$cday]["id"][$i],'&amp;day=',$cday,'&amp;month=',$month,'&amp;year=',$year,'&amp;page=month">';
                         }
                     }
                     echo $d[$cday]["resa"][$i];
diff --git a/month_all.php b/month_all.php
index 07566c527..cafa89361 100644
--- a/month_all.php
+++ b/month_all.php
@@ -279,6 +279,7 @@
                     }
                 }
                 $d[$day_num]["resa"][] = affichage_resa_planning_complet($overloadFieldList, 2, $row, $horaires);
+				$d[$day_num]["infobulle"][] = affichage_resa_info_bulle($overloadFieldList, 1, $row, $horaires);
                 //Only if end time > midnight does the loop continue for the next day.
                 if ($row[1] <= $midnight_tonight)
                     break;
@@ -454,11 +455,11 @@
 								{
 									$currentPage = 'month_all';
 									$id =   $d[$cday]["id"][$i];
-									echo '<a title="',get_vocab('voir_details'),'" data-width="675" onclick="request(',$id,',',$cday,',',$month,',',$year.',\'all\',\''.$currentPage,'\',readData);" data-rel="popup_name" class="poplight lienCellule">',PHP_EOL;
+									echo '<a title="',$d[$cday]["infobulle"][$i],'" data-width="675" onclick="request(',$id,',',$cday,',',$month,',',$year.',\'all\',\''.$currentPage,'\',readData);" data-rel="popup_name" class="poplight lienCellule">',PHP_EOL;
 								}
 								else
 								{
-									echo '<a class="lienCellule" title="',get_vocab('voir_details'),'" href="view_entry.php?id=',$d[$cday]["id"][$i],'&amp;day=',$cday,'&amp;month=',$month,'&amp;year=',$year,'&amp;page=month_all">',PHP_EOL;
+									echo '<a class="lienCellule" title="',$d[$cday]["infobulle"][$i],'" href="view_entry.php?id=',$d[$cday]["id"][$i],'&amp;day=',$cday,'&amp;month=',$month,'&amp;year=',$year,'&amp;page=month_all">',PHP_EOL;
 								}
 							}
                             echo $d[$cday]["resa"][$i];
diff --git a/week.php b/week.php
index 69119c141..5d0cdeff8 100644
--- a/week.php
+++ b/week.php
@@ -307,12 +307,7 @@
                         $horaires = date('H:i',$d[$weekday][$slot]["horaireDebut"]).get_vocab("to"). $heure_fin."";
                         $d[$weekday][$slot]["data"] = affichage_resa_planning_complet($overloadFieldList, 1, $row, $horaires);
                         $d[$weekday][$slot]["id"] = $row["id"];
-                        if (Settings::get("display_info_bulle") == 1)
-                            $d[$weekday][$slot]["who"] = get_vocab("reservee au nom de").affiche_nom_prenom_email($row["beneficiaire"],$row["beneficiaire_ext"],"nomail");
-                        else if (Settings::get("display_info_bulle") == 2)
-                            $d[$weekday][$slot]["who"] = $row["description"];
-                        else
-                            $d[$weekday][$slot]["who"] = "";
+						$d[$weekday][$slot]["who"] = affichage_resa_info_bulle($overloadFieldList, 1, $row, $horaires);
                     }
                 }
                 $t += $this_area_resolution;
@@ -379,12 +374,7 @@
                         $horaires = "";
                         $d[$weekday][$slot]["data"] = affichage_resa_planning_complet($overloadFieldList, 1, $row, $horaires);
                         $d[$weekday][$slot]["id"] = $row["id"];
-                        if (Settings::get("display_info_bulle") == 1)
-                            $d[$weekday][$slot]["who"] = get_vocab("reservee au nom de").affiche_nom_prenom_email($row["beneficiaire"],$row["beneficiaire_ext"],"nomail");
-                        else if (Settings::get("display_info_bulle") == 2)
-                            $d[$weekday][$slot]["who"] = $row["description"];
-                        else
-                            $d[$weekday][$slot]["who"] = "";
+						$d[$weekday][$slot]["who"] = affichage_resa_info_bulle($overloadFieldList, 1, $row, $horaires);
                     }
                 }
                 $t += 60; 
diff --git a/week_all.php b/week_all.php
index 559486467..5a7f4274c 100644
--- a/week_all.php
+++ b/week_all.php
@@ -228,13 +228,6 @@
 			while ($t <= $end_t)
 			{
 				$d[$day_num]["id"][] = $row['2'];
-				/*if (Settings::get("display_info_bulle") == 1)
-					$d[$day_num]["who"][] = get_vocab("reservee au nom de").affiche_nom_prenom_email($row['4'], $row['12'], "nomail");
-				else if (Settings::get("display_info_bulle") == 2)
-					$d[$day_num]["who"][] = $row['8'];
-				else
-					$d[$day_num]["who"][] = "";*/
-				//$d[$day_num]["who1"][] = affichage_lien_resa_planning($row['3'], $row['2']);
 				$d[$day_num]["id_room"][]=$row['17'] ;
 				$d[$day_num]["color"][]=$row['6'];
 				//$d[$day_num]["res"][] = $row['7'];
@@ -334,6 +327,7 @@
 					}
 				}
 				$d[$day_num]["resa"][] = affichage_resa_planning_complet($overloadFieldList, 1, $row, $horaires);
+				$d[$day_num]["infobulle"][] = affichage_resa_info_bulle($overloadFieldList, 1, $row, $horaires);
 				if ($row[1] <= $midnight_tonight)
 					break;
 				$t = $midnight = $midnight_tonight;
@@ -546,9 +540,9 @@
 							if ($acces_fiche_reservation)
 							{
 								if (Settings::get("display_level_view_entry") == 0)
-									echo '<a title="'.get_vocab('voir_details').'" data-width="675" onclick="request('.$d[$cday]["id"][$i].','.$cday.','.$cmonth.','.$cyear.',\'all\',\'week_all\',readData);" data-rel="popup_name" class="poplight" style = "border-bottom:1px solid #FFF">'.PHP_EOL;
+									echo '<a title="'.$d[$cday]["infobulle"][$i].'" data-width="675" onclick="request('.$d[$cday]["id"][$i].','.$cday.','.$cmonth.','.$cyear.',\'all\',\'week_all\',readData);" data-rel="popup_name" class="poplight" style = "border-bottom:1px solid #FFF">'.PHP_EOL;
 								else
-									echo '<a class="lienCellule" style = "border-bottom:1px solid #FFF" title="'.get_vocab('voir_details').'" href="view_entry.php?id='.$d[$cday]["id"][$i].'&amp;page=week_all&amp;day='.$cday.'&amp;month='.$cmonth.'&amp;year='.$cyear.'&amp;" >'.PHP_EOL;
+									echo '<a class="lienCellule" style = "border-bottom:1px solid #FFF" title="'.$d[$cday]["infobulle"][$i].'" href="view_entry.php?id='.$d[$cday]["id"][$i].'&amp;page=week_all&amp;day='.$cday.'&amp;month='.$cmonth.'&amp;year='.$cyear.'&amp;" >'.PHP_EOL;
 							}
 
 								echo '<table class="pleine center">'.PHP_EOL;