diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 41722370b..67b991607 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2948,12 +2948,7 @@ LLFolderType::EType LLFolderBridge::getPreferredType() const
 // Icons for folders are based on the preferred type
 LLUIImagePtr LLFolderBridge::getIcon() const
 {
-	LLFolderType::EType preferred_type = LLFolderType::FT_NONE;
-	LLViewerInventoryCategory* cat = getCategory();
-	if(cat)
-	{
-		preferred_type = cat->getPreferredType();
-	}
+	LLFolderType::EType preferred_type(getPreferredType()); // Singu Note: Duplicate code
 	return getIcon(preferred_type);
 }
 
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 259b08f87..6f2a9aafd 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -523,7 +523,6 @@ public:
 	// File I/O
 	//--------------------------------------------------------------------
 protected:
-	friend class LLLocalInventory;
 	static bool loadFromFile(const std::string& filename,
 							 cat_array_t& categories,
 							 item_array_t& items,
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
index 5a9d3f106..fae40c814 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
@@ -40,6 +40,36 @@
       <check_box label="Signale les nouveaux IM entrants" name="chat_steal_focus"/>
       <check_box label="Montre la barre du chat local séparée (Déco Reco)" tool_tip="" name="show_local_chat_floater_bar"/>
       <check_box label="boutons horizontaux pour les contacts (Déco Reco)" tool_tip="Activé, les boutons amis/groupes seront en bas et horizontaux et non plus verticaux et à droite." name="horiz_butt"/>
+      <combo_box name="friends_namesystem_combobox">
+        <combo_item name="Old Names">Anciens Names</combo_item>
+        <combo_item name="Display Names (with Username)">Display Names(w/Username)</combo_item>
+        <combo_item name="Display Names only">Display Names only</combo_item>
+        <combo_item name="Old Names (with Display Names)">Anciens Names (w/Display)</combo_item>
+      </combo_box>
+      <combo_box name="group_members_namesystem_combobox">
+        <combo_item name="Old Names">Anciens Names</combo_item>
+        <combo_item name="Display Names (with Username)">Display Names(w/Username)</combo_item>
+        <combo_item name="Display Names only">Display Names only</combo_item>
+        <combo_item name="Old Names (with Display Names)">Anciens Names (w/Display)</combo_item>
+      </combo_box>
+      <combo_box name="land_management_namesystem_combobox">
+        <combo_item name="Old Names">Anciens Names</combo_item>
+        <combo_item name="Display Names (with Username)">Display Names(w/Username)</combo_item>
+        <combo_item name="Display Names only">Display Names only</combo_item>
+        <combo_item name="Old Names (with Display Names)">Anciens Names (w/Display)</combo_item>
+      </combo_box>
+      <combo_box name="radar_namesystem_combobox">
+        <combo_item name="Old Names">Anciens Names</combo_item>
+        <combo_item name="Display Names (with Username)">Display Names(w/Username)</combo_item>
+        <combo_item name="Display Names only">Display Names only</combo_item>
+        <combo_item name="Old Names (with Display Names)">Anciens Names (w/Display)</combo_item>
+      </combo_box>
+      <combo_box name="speaker_namesystem_combobox">
+        <combo_item name="Old Names">Anciens Names</combo_item>
+        <combo_item name="Display Names (with Username)">Display Names(w/Username)</combo_item>
+        <combo_item name="Display Names only">Display Names only</combo_item>
+        <combo_item name="Old Names (with Display Names)">Anciens Names (w/Display)</combo_item>
+      </combo_box>
       <check_box label="Utilise les anciens noms pour la liste des voices actives" tool_tip="Aide à une meilleure modération en ne montrant que le nom àl'ancienne" name="legacy_speaker_names"/>
       <check_box label="Boutons sur la même ligne que les noms pour les IMs" name="im_concise_butt"/>
       <check_box label="Boutons sur la ligne des noms des chats de groupe" name="group_concise_butt"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
index 0e22f27d9..489d9d156 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
@@ -69,6 +69,13 @@
       <check_box label="D&#xE9;sactiver le &#x22;Pointer vers&#x22; &#xE0; l&#x22;&#xE9;dition d'un objet" tool_tip="Masque le pointeur sur l'objet  &#xE9;dit&#xE9;" name="disable_point_at_and_beams_check"/>
       <check_box label="Ne pas &#x22;Regarder vers&#x22;" tool_tip="Supprime les mouvements de t&#xEA;te, et le &#x22;Regarder vers&#x22; pour soi-m&#xEA;me" name="private_look_at_check"/>
       <check_box label="Voir quand les autres &#x22;Regardent vers&#x22;" tool_tip="Montre o&#xF9; les autres regardent." name="show_look_at_check"/>
+      <combo_box left_delta="260" name="lookat_namesystem_combobox" tool_tip="Style for displaying names on LookAt beacons">
+        <combo_item name="No Names">Aucun de Name</combo_item>
+        <combo_item name="Old Names">Anciens Names</combo_item>
+        <combo_item name="Display Names (with Username)">Display Names(w/Username)</combo_item>
+        <combo_item name="Display Names only">Display Names only</combo_item>
+        <combo_item name="Old Names (with Display Names)">Anciens Names (w/Display)</combo_item>
+      </combo_box>
       <check_box label="Détache automatiquement ce rodjudju de LSL Bridge" tool_tip="détache le LSL Bridge de Phoenix et/ou Firestorm viewer." name="detach_bridge"/>
       <check_box label="Prendre discr&#xE8;tement un photo, sur votre disque dur" tool_tip="Permet de prendre une photo en mode &#x22;espionnage&#x22;, sans bruit d'appareil, ni mouvement de cam&#xE9;ra, ni gesture. (Uniquement vers le disque dur)." name="quiet_snapshots_check"/>
       <check_box label="En vous levant, annule les permissions que l'objet a sur votre avatar" tool_tip="Evite que l'objet garde le contr&#xF4;le de votre avatar, comme par exemple les animations." name="revoke_perms_on_stand_up_check"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 412453c17..46c0aa89a 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -14,6 +14,7 @@
 		<combo_item name="Old Names">Anciens Names</combo_item>
 		<combo_item name="Display Names (with Username)">Display Names(w/Username)</combo_item>
 		<combo_item name="Display Names only">Display Names only</combo_item>
+		<combo_item name="Old Names (with Display Names)">Anciens Names (w/Display)</combo_item>
 	</combo_box>
 	<check_box label="Afficher Resident" name="show_resident_checkbox"/>
 	<check_box label="Nom des avatars en petit" name="small_avatar_names_checkbox"/>
@@ -38,7 +39,7 @@
 	<text name="seconds_textbox">secondes</text>
 	<text name="crash_report_textbox">Rapports de crash :</text>
 	<text name="language_textbox">Langue :</text>
-	<text left_delta="313" name="language_textbox2">(redémarrage requis)</text>
+	<text left_delta="268" bottom_delta="0" name="language_textbox2">(redémarrage requis)</text>
 	<combo_box name="language_combobox" width="166">
 		<combo_item name="System Default Language">Choix par défaut</combo_item>
 		<combo_item name="English">English (Anglais)</combo_item>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_im.xml b/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
index dee5e0044..d4923b855 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
@@ -16,7 +16,7 @@
 	<check_box label="Inclure les heures" name="log_chat_timestamp"/>
 	<check_box label="Inclure les IM reçus" name="log_chat_IM"/>
 	<check_box label="Inclure la date avec les heures" name="log_date_timestamp"/>
-	<check_box label="Joindre la date dans le nom du fichier de log" left="148" name="logfile_name_datestamp" width="237"/>
-	<button label="Changer d'emplacement" label_selected="Changer d'emplacement" name="log_path_button" width="180"/>
-	<line_editor left="308" name="log_path_string"/>
+	<check_box label="Joindre la date dans le nom du fichier de log" name="logfile_name_datestamp"/>
+	<button label="Changer d'emplacement" label_selected="Changer d'emplacement" name="log_path_button" left="30" width="180"/>
+	<line_editor left="196" name="log_path_string"/>
 </panel>