diff --git a/indra/llcharacter/llbvhconsts.h b/indra/llcharacter/llbvhconsts.h
index d5876aa07..b77732de1 100644
--- a/indra/llcharacter/llbvhconsts.h
+++ b/indra/llcharacter/llbvhconsts.h
@@ -33,7 +33,7 @@
 #ifndef LL_LLBVHCONSTS_H
 #define LL_LLBVHCONSTS_H
 
-const F32 MAX_ANIM_DURATION = 30.f;
+const F32 MAX_ANIM_DURATION = 60.f;
 
 typedef enum e_constraint_type
 	{
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index b1f702bcd..4e5bc6987 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -130,6 +130,10 @@ LLVector3 LLPanelObject::mClipboardPos;
 LLVector3 LLPanelObject::mClipboardSize;
 LLVector3 LLPanelObject::mClipboardRot;
 LLVolumeParams LLPanelObject::mClipboardVolumeParams;
+LLFlexibleObjectData* LLPanelObject::mClipboardFlexiParams = NULL;
+LLLightParams* LLPanelObject::mClipboardLightParams = NULL;
+LLSculptParams* LLPanelObject::mClipboardSculptParams = NULL;
+LLLightImageParams* LLPanelObject::mClipboardLightImageParams = NULL;
 BOOL LLPanelObject::hasParamClipboard = FALSE;
 
 BOOL	LLPanelObject::postBuild()
@@ -2493,15 +2497,65 @@ void LLPanelObject::onCopyRot(void* user_data)
 void LLPanelObject::onCopyParams(void* user_data)
 {
 	LLPanelObject* self = (LLPanelObject*) user_data;
+	if (!self) return;
+
 	self->getVolumeParams(mClipboardVolumeParams);
 	hasParamClipboard = TRUE;
+
+	LLViewerObject* objp = self->mObject;
+
+	mClipboardFlexiParams = (LLFlexibleObjectData*)objp->getParameterEntry(LLNetworkData::PARAMS_FLEXIBLE);
+	mClipboardLightParams = (LLLightParams*)objp->getParameterEntry(LLNetworkData::PARAMS_LIGHT);
+	mClipboardSculptParams = (LLSculptParams*)objp->getParameterEntry(LLNetworkData::PARAMS_SCULPT);
+	if (mClipboardSculptParams)
+	{
+		LLUUID id = mClipboardSculptParams->getSculptTexture();
+
+		// Texture perms check
+		if (!(id.isNull() || gInventory.isObjectDescendentOf(id, gInventory.getLibraryRootFolderID())
+			 || id == LLUUID(gSavedSettings.getString("UIImgWhiteUUID"))
+			 || id == LLUUID(gSavedSettings.getString("UIImgInvisibleUUID"))
+			 || id == LLUUID(std::string("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"))) // alpha
+			&& findItemID(id).isNull())
+		{
+			mClipboardSculptParams->setSculptTexture(LLUUID(SCULPT_DEFAULT_TEXTURE));
+		}
+	}
+	mClipboardLightImageParams = (LLLightImageParams*)objp->getParameterEntry(LLNetworkData::PARAMS_LIGHT_IMAGE);
+	if (mClipboardLightImageParams)
+	{
+		LLUUID id = mClipboardLightImageParams->getLightTexture();
+
+		// Texture perms check
+		if (!(id.isNull() || gInventory.isObjectDescendentOf(id, gInventory.getLibraryRootFolderID())
+			 || id == LLUUID(gSavedSettings.getString("UIImgWhiteUUID"))
+			 || id == LLUUID(gSavedSettings.getString("UIImgInvisibleUUID"))
+			 || id == LLUUID("8dcd4a48-2d37-4909-9f78-f7a9eb4ef903"))) // alpha
+		{
+			mClipboardLightImageParams->setLightTexture(findItemID(id));
+		}
+	}
 }
 
 void LLPanelObject::onPasteParams(void* user_data)
 {
+	if(!hasParamClipboard) return;
+
 	LLPanelObject* self = (LLPanelObject*) user_data;
-	if(hasParamClipboard)
-		self->mObject->updateVolume(mClipboardVolumeParams);
+	if(!self) return;
+
+	LLViewerObject* objp = self->mObject;
+
+	objp->updateVolume(mClipboardVolumeParams);
+
+	if (mClipboardFlexiParams)
+		objp->setParameterEntry(LLNetworkData::PARAMS_FLEXIBLE, *mClipboardFlexiParams, true);
+	if (mClipboardLightParams)
+		objp->setParameterEntry(LLNetworkData::PARAMS_LIGHT, *mClipboardLightParams, true);
+	if (mClipboardSculptParams)
+		objp->setParameterEntry(LLNetworkData::PARAMS_SCULPT, *mClipboardSculptParams, true);
+	if (mClipboardLightImageParams)
+		objp->setParameterEntry(LLNetworkData::PARAMS_LIGHT_IMAGE, *mClipboardLightImageParams, true);
 }
 
 void LLPanelObject::onLinkObj(void* user_data)
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
index ae2397294..e34d318c6 100644
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -50,6 +50,10 @@ class LLColorSwatchCtrl;
 class LLTextureCtrl;
 class LLInventoryItem;
 class LLUUID;
+class LLFlexibleObjectData;
+class LLLightParams;
+class LLLightImageParams;
+class LLSculptParams;
 
 class LLPanelObject : public LLPanel
 {
@@ -119,6 +123,10 @@ protected:
 	static LLVector3 mClipboardSize;
 	static LLVector3 mClipboardRot;
 	static LLVolumeParams mClipboardVolumeParams;
+	static LLFlexibleObjectData* mClipboardFlexiParams;
+	static LLLightParams* mClipboardLightParams;
+	static LLSculptParams* mClipboardSculptParams;
+	static LLLightImageParams* mClipboardLightImageParams;
 	static BOOL hasParamClipboard;
 
 	S32				mComboMaterialItemCount;
diff --git a/indra/newview/skins/default/xui/en-us/floater_tools.xml b/indra/newview/skins/default/xui/en-us/floater_tools.xml
index b981ef791..fe18acba2 100644
--- a/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -779,7 +779,7 @@
 			</text>
 			<button bottom="-24" follows="top|right" font="SansSerifSmall" halign="center"
 			    height="16" label="Copy" left="178" mouse_opaque="true" name="copyparams"  enabled="true"
-			    tool_tip="Copy Parameters from Clipboard"  width="42" />
+			    tool_tip="Copy Parameters to Clipboard"  width="42" />
 			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
 			     height="16" label="Paste" left_delta="42" mouse_opaque="true" name="pasteparams"  enabled="true"
      			 tool_tip="Paste Parameters from Clipboard"  width="42" />
diff --git a/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml b/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
index 94fb6b281..eac7c1929 100644
--- a/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
+++ b/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
@@ -33,9 +33,9 @@
 	<layout_stack name="panels">
 		<layout_panel name="im_contents_panel">
 			<button label="Infos sur le groupe" name="group_info_btn" width="130"/>
-			<button label="Participer à l'appel" left_delta="135" name="start_call_btn" width="145"/>
+			<button label="Participer à l'appel" left_delta="90" name="start_call_btn" width="145"/>
 			<button halign="center" label="Raccrocher" name="end_call_btn" width="145"/>
-			<button label="Historique" name="history_btn"/>
+			<button label="Historique" left_delta="135" name="history_btn"/>
 			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Affiche/Masque la liste des intervenants actifs dans cette session IM."/>
 			<button label="Envoyer" name="send_btn"/>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index ab33cf73e..93a131ffc 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -17,7 +17,7 @@
 	<check_box label="Sélectionner une face" name="radio select face"/>
 	<check_box label="Modifier les parties liées" name="checkbox edit linked parts"/>
 	<text name="text ruler mode">
-		Axe:
+		Axe :
 	</text>
 	<combo_box name="combobox grid mode">
 		<combo_item name="World">
@@ -65,7 +65,7 @@
 	<check_box label="Annuler modification" name="radio revert"/>
 	<button label="Appliquer" label_selected="Appliquer" name="button apply to selection" tool_tip="Modifier le terrain sélectionné" left="176"/>
 	<text name="Bulldozer:">
-		Bulldozer:
+		Bulldozer :
 	</text>
 	<text name="Dozer Size:">
 		Taille
@@ -74,28 +74,28 @@
 		Force
 	</text>
 	<text name="obj_count">
-		Objets sélectionnés: [COUNT]
+		Objets sélectionnés : [COUNT]
 	</text>
 	<text name="prim_count">
-		Prims: [COUNT]
+		Prims : [COUNT]
 	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="Général" name="General">
 			<text name="Name:">
-				Nom:
+				Nom :
 			</text>
 			<text name="Description:">
-				Description:
+				Description :
 			</text>
 			<text name="Creator:">
-				Créateur:
+				Créateur :
 			</text>
 			<text name="Creator Name">
 				Thrax Linden
 			</text>
 			<button label="Profil" label_selected="Profil" name="button creator profile"/>
 			<text name="Owner:">
-				Propriétaire:
+				Propriétaire :
 			</text>
 
 		    <button label="Profil" label_selected="Profil" name="button last owner profile"/>
@@ -111,15 +111,15 @@
 			</text>
 			<button label="Profil" label_selected="Profil" name="button owner profile"/>
 			<text name="Group:">
-				Groupe:
+				Groupe :
 			</text>
 			<text name="Group Name Proxy">
 				Les Lindens
 			</text>
 			<button label="Définir" label_selected="Définir" name="button set group"/>
 			<button label="Voir" name="button open group"/>
-			<text name="Permissions:">
-				Droits:
+			<text name="Permissions :">
+				Droits :
 			</text>
 			<text name="perm_modify">
 				Vous pouvez modifier cet objet.
@@ -151,7 +151,7 @@
 				</radio_item>
 			</radio_group>
 			<text name="Next owner can:">
-				Le prochain propriétaire pourra:
+				Le prochain propriétaire pourra :
 			</text>
 			<check_box label="Modifier" name="checkbox next owner can modify"/>
 			<check_box label="Copier" left_delta="66" name="checkbox next owner can copy"/>
@@ -184,22 +184,22 @@
 			</combo_box>
 			<button bottom="-338" label="Copier la Clef" tool_tip="Copie la clef dans le presse-papier." width="80"/>
 			<text name="B:">
-				B:
+				B :
 			</text>
 			<text name="O:">
-				O:
+				O :
 			</text>
 			<text name="G:">
-				G:
+				G :
 			</text>
 			<text name="E:">
-				E:
+				E :
 			</text>
 			<text name="N:">
-				N:
+				N :
 			</text>
 			<text name="F:">
-				F:
+				F :
 			</text>
 			<string name="text modify info 1">
 				Vous pouvez modifier cet objet.
@@ -217,13 +217,13 @@
 				Sélectionnez l'objet en entier.
 			</string>
 			<string name="Cost Default">
-				Prix:           [CURRENCY]
+				Prix :           [CURRENCY]
 			</string>
 			<string name="Cost Total">
-				Prix total:  [CURRENCY]
+				Prix total :  [CURRENCY]
 			</string>
 			<string name="Cost Per Unit">
-				Prix par:     [CURRENCY]
+				Prix par :     [CURRENCY]
 			</string>
 			<string name="Cost Mixed">
 				Prix mixte
@@ -419,7 +419,7 @@
 				Sélectionnez un prim pour modifier les attributs.
 			</text>
 			<text name="edit_object">
-				Modifiez les attributs de l'objet:
+				Modifiez les attributs de l'objet :
 			</text>
 			<check_box label="Flexibilité" name="Flexible1D Checkbox Ctrl" tool_tip="Donne à l'objet de la souplesse sur l'axe des Z (côté client uniquement)."/>
 			<spinner label="Souplesse" name="FlexNumSections"/>
@@ -567,7 +567,11 @@
 				Ajuster la texture du média
 (chargement préalable)
 			</text>
-			<button label="Ajuster" label_selected="Ajuster" left="150" name="button align"/>
+			<button label="Ajuster" label_selected="Ajuster" left="140" name="button align" width="45"/>
+
+			<text name="textbox params">Paramètres</text>
+			<button label="Copier" name="copytextures" tool_tip="Copie les paramètres de la texture dans le presse papier"  width="55"/>
+			<button label="Coller" name="pastetextures" tool_tip="Colle les paramètres de la texture du presse papier"  width="55"/>
 		</panel>
 		<panel label="Contenu" name="Contents">
 			<button label="Nouveau script" label_selected="Nouveau script" name="button new script"/>
@@ -579,7 +583,7 @@
 			Informations sur la parcelle
 		</text>
 		<text name="label_area_price">
-			Prix : [PRICE][CURRENCY] pour [AREA] m².
+			Prix : [PRICE] [CURRENCY] pour [AREA] m².
 		</text>
 		<text name="label_area">
 			Surface : [AREA] m²
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index fe680af24..9dcf5e26c 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -1,46 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <menu_bar name="Main Menu">
 	<menu label="Fichier" name="File">
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~"/>
-    <menu_item_call label="Import  d'image ([UPLOADFEE])" name="Upload Image">
-		<on_click function="File.UploadImage" userdata="" />
-		<on_enable function="File.EnableUpload" />
-    </menu_item_call>
-    <menu_item_call label="Import de son ([UPLOADFEE])" name="Upload Sound">
-        <on_click function="File.UploadSound" userdata="" />
-        <on_enable function="File.EnableUpload" />
-    </menu_item_call>
-    <menu_item_call label="Import d'animation ([UPLOADFEE])" name="Upload Animation">
-        <on_click function="File.UploadAnim" userdata="" />
-        <on_enable function="File.EnableUpload" />
-    </menu_item_call>
-    <menu_item_call label="Import  multiples ([UPLOADFEE] par fichier)" name="Bulk Upload">
-        <on_click function="File.UploadBulk" userdata="" />
-    </menu_item_call>
-	<menu_item_call label="Import XML" name="Import">
-		<on_click function="Object.Import" />
-		<on_enable function="Object.EnableImport" />
-	</menu_item_call>
-	<menu_item_call label="Import avec textures" name="Import2">
-		<on_click function="Object.ImportUpload" />
-		<on_enable function="Object.EnableImport" />
-	</menu_item_call>
-    <menu_item_separator label="-----------" name="separator" />
-    <menu_item_call label="Définir les droits par défaut " name="perm prefs" >
-        <on_click function="ShowFloater" userdata="perm prefs" />
-    </menu_item_call>
-		<menu_item_separator label="-----------" name="separator2"/>
-		<menu_item_call label="Enregistrer la texture sur le disque dur" name="Save Preview As...">
-			<on_click function="File.SavePreview" userdata="" />
-			<on_enable function="File.EnableSaveAs" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator"/>
+		<menu_item_call label="Import  d'image ([UPLOADFEE])" name="Upload Image"/>
+		<menu_item_call label="Import de son ([UPLOADFEE])" name="Upload Sound"/>
+		<menu_item_call label="Import d'animation ([UPLOADFEE])" name="Upload Animation"/>
+		<menu_item_call label="Import  multiples ([UPLOADFEE] par fichier)" name="Bulk Upload"/>
+		<menu_item_call label="Import XML" name="Import"/>
+		<menu_item_call label="Import avec textures" name="Import2"/>
+		<menu_item_call label="Définir les droits par défaut " name="perm prefs"/>
+		<menu_item_call label="Enregistrer la texture sur le disque dur en TGA" name="Save Preview As..."/>
+		<menu_item_call label="Enregistrer la texture sur le disque dur en PNG" name="Save Preview AsPNG..."/>
 		<menu_item_call label="Fermer la fenêtre" name="Close Window"/>
 		<menu_item_call label="Fermer toutes les fenêtres" name="Close All Windows"/>
 		<menu_item_separator label="-----------" name="separator3"/>
 		<menu_item_call label="Prendre une photo" name="Take Snapshot"/>
 		<menu_item_call label="Enregistrer la photo sur le disque dur" name="Snapshot to Disk" shortcut="control|shift|X"/>
-		<menu_item_separator label="-----------" name="separator4"/>
 		<menu_item_call label="Quitter" name="Quit"/>
 	</menu>
 	<menu label="Édition" name="Edit">
@@ -90,7 +64,7 @@
 		<menu_item_check label="Construire" name="Build"/>
 		<menu_item_check label="Vue au joystick" name="Joystick Flycam"/>
 		<menu_item_call label="Réinitialiser l'affichage" name="Reset View"/>
-		<menu_item_call label="Regarder le dernier intervenant" name="Look at Last Chatter" shortcut="alt|V"/>
+		<menu_item_call label="Regarder le dernier intervenant" name="Look at Last Chatter"/>
 		<menu_item_separator label="-----------" name="separator"/>
 		<menu_item_check label="Barre d'outils" name="Toolbar"/>
 		<menu_item_check label="Chat local" name="Chat History"/>
@@ -133,30 +107,17 @@
 	<menu label="Monde" name="World">
 		<menu_item_call label="Chat" name="Chat"/>
 		<menu_item_check label="Toujours courir" name="Always Run"/>
-		<menu_item_call label="S'asseoir au sol" name="Sit on Ground" shortcut="control|alt|S"/>
-		<menu_item_check label="Voler" name="Fly" shortcut="F"/>
+		<menu_item_call label="S'asseoir au sol" name="Sit on Ground"/>
+		<menu_item_check label="Voler" name="Fly"/>
 		<menu_item_separator label="-----------" name="separator"/>
 		<menu_item_call label="Créer un repère ici - Landmark" name="Create Landmark Here"/>
 		<menu_item_call label="Définir comme domicile" name="Set Home to Here"/>
 		<menu_item_separator label="-----------" name="separator2"/>
 		<menu_item_call label="Me téléporter chez moi" name="Teleport Home"/>
 		<menu_item_separator label="-----------" name="separator3"/>
-
-    	<menu_item_call bottom="-186" enabled="true" height="19" label="Faux Absent (on/off)" left="0"
-     		mouse_opaque="true" name="Fake Away Status" width="185">
-      		<on_click function="World.FakeAway" userdata=""/>
-    	</menu_item_call>
-
-
-		<menu_item_call bottom="-186" enabled="true" height="19" label="Absent(e)-Away" left="0"
-		     mouse_opaque="true" name="Set Away" width="185">
-			<on_click function="World.SetAway" userdata=""/>
-		</menu_item_call>
-		<menu_item_call bottom="-205" enabled="true" height="19" label="OQP-Busy" left="0"
-		     mouse_opaque="true" name="Set Busy" width="185">
-			<on_click function="World.SetBusy" userdata=""/>
-		</menu_item_call>
-
+		<menu_item_call label="Faux Absent (on/off)" name="Fake Away Status"/>
+		<menu_item_call label="Absent(e)-Away" name="Set Away"/>
+		<menu_item_call label="OQP-Busy" name="Set Busy"/>
 		<menu_item_call label="Arrêter d'animer mon avatar" name="Stop Animating My Avatar"/>
 		<menu_item_call label="Reprendre le contrôle" name="Release Keys"/>
 		<menu_item_separator label="-----------" name="separator4"/>
@@ -198,8 +159,6 @@
 		<menu_item_check label="Sélectionner les objets déplaçables uniquement" name="Select Only Movable Objects"/>
 		<menu_item_check label="Sélectionner en entourant" name="Select By Surrounding"/>
 		<menu_item_check label="Montrer les contours de la sélection" name="Show Selection Outlines" />
-			<on_click function="Tools.ShowSelectionHighlights" userdata="" />
-			<on_check control="RenderHighlightSelections" />
 		<menu_item_check label="Afficher les parties cachées de la sélection" name="Show Hidden Selection"/>
 		<menu_item_check label="Afficher la sphère de lumière de la sélection" name="Show Light Radius for Selection"/>
 		<menu_item_check label="Afficher le faisceau de sélection" name="Show Selection Beam"/>
@@ -211,11 +170,11 @@
 		<menu_item_separator label="-----------" name="separator3"/>
 		<menu_item_check label="Modifier les parties liées" name="Edit Linked Parts"/>
 		<menu label="Sélection parties liées" name="Select Linked Parts">
-		<menu_item_call label="Sélection Suivante" name="Select Next Part"/>		
-		<menu_item_call label="Sélection Precedente" name="Select Previous Part"/>
-		<menu_item_call label="Inclure Suivante" name="Include Next Part"/>
-		<menu_item_call label="Inclure Precedente" name="Include Previous Part"/>
-            </menu>
+			<menu_item_call label="Sélection Suivante" name="Select Next Part"/>
+			<menu_item_call label="Sélection Precedente" name="Select Previous Part"/>
+			<menu_item_call label="Inclure Suivante" name="Include Next Part"/>
+			<menu_item_call label="Inclure Precedente" name="Include Previous Part"/>
+		</menu>
 		<menu_item_call label="Lier" name="Link"/>
 		<menu_item_call label="Délier" name="Unlink"/>
 		<menu_item_separator label="-----------" name="separator4"/>
@@ -227,7 +186,7 @@
 		<menu_item_call label="Prendre une copie" name="Take Copy"/>
 		<menu_item_call label="Retourner l'objet" name="Return..."/>
 		<menu_item_call label="Remplacer l'objet dans le contenu de l'objet" name="Save Object Back to Object Contents"/>
-		<menu_item_call label="Admin Suppr.(fonction pour les open grids)" name="Admin Delete" shortcut="control|alt|shift|Del"/>		
+		<menu_item_call label="Admin Suppr.(fonction pour les open grids)" name="Admin Delete"/>
         <menu_item_separator label="-----------" name="separator6"/>
 		<menu_item_call label="Afficher la fenêtre d'alertes/erreurs de script" name="Show Script Warning/Error Window"/>
 		<menu label="Recompiler les scripts dans la sélection" name="Recompile Scripts in Selection">
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 69461e4aa..823d29b0d 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
@@ -1,111 +1,102 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel top="20" left="10" height="400" width="517" border="true" label="Chat Avanc&#xE9;" name="ascsys">
-  <tab_container label="Advanced Chat" bottom="0" height="440" width="497" left="0" name="Ascent Chat" tab_position="top">
-     <panel border="true" left="1" bottom="-408" height="408" width="500" label="Chat/IM" name="Chat/IM">
+<panel label="Chat Avanc&#xE9;" name="ascsys">
+  <tab_container label="Advanced Chat" name="Ascent Chat">
+     <panel label="Chat/IM" name="Chat/IM">
 
-      <check_box bottom_delta="-25" left="10" follows="top" initial_value="false" control_name="WoLfVerticalIMTabs" 
-        label="IMs verticaux (n&#xE9;cessite une d&#xE9;co/reco)" name="use_vertical_ims_check"/>
-      <check_box bottom_delta="-20" follows="left|top" initial_value="false" control_name="AscentInstantMessageAnnounceIncoming"
-        label="Annonce les IMs entrants" tool_tip="" name="quickstart_im_check"/>
-      <check_box bottom_delta="-20" follows="left|top" control_name="AscentHideTypingNotification" initial_value="false"
-        label="Ne pas envoyer &#x22;[Machin Truc] is typing...&#x22; dans les IMs" tool_tip="" name="hide_typing_check"/>
-      <check_box bottom_delta="-20" follows="left|top" control_name="OptionShowGroupNameInChatIM" initial_value="false"
-        label="Montrer le nom du groupe dans le chat" tool_tip="" name="append_group_name_check"/>
-      <check_box bottom_delta="-25" left_delta="-5" follows="left|top" control_name="PlayTypingSound" initial_value="true"
-        label="Jouer le son typique pour le chat local" tool_tip="" name="play_typing_sound_check"/>
-      <check_box bottom_delta="-20" follows="left|top" control_name="HideNotificationsInChat" initial_value="false"
-        label="Ne pas afficher les notifs. de log dans le chat" name="hide_notifications_in_chat_check"/>
-      <check_box bottom="-120" left="10" control_name="AscentAllowMUpose" initial_value="false"
-        label="Permet d'utiliser &#x22;/me&#x22; aussi bien que &#x22;:&#x22; pour les &#x22;emotes&#x22;" tool_tip="" name="allow_mu_pose_check"/>
-      <check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
-        label="Ajoute automatiquement les fins des commentaires OOC (RP mode)" tool_tip="Ajoute automatiquement &#x22;))&#x22; &#xE0; chaque message commen&#xE7;ant par &#x22;((&#x22;, et vice-versa." name="close_ooc_check"/>
-<text bottom_delta="-15" follows="left|top" name="objects_link_text_box3">Active un lien qui montre le nom du propri&#xE9;taire dans l'historique du chat pour :</text>
-       <radio_group bottom_delta="-26" control_name="LinksForChattingObjects" tool_tip="Enables a link to show you the owner of the speaking object."
-        follows="top" height="20" left="20" name="objects_link" width="350">
-        <radio_item bottom_delta="0" left_delta="5" name="no_object" width="48">Aucun objet</radio_item>
-        <radio_item bottom_delta="0" left_delta="45" name="others_objects" width="48">Les objets des autres</radio_item>
-        <radio_item bottom_delta="0" left_delta="65" name="anyones_objects" width="48">Tous les objets</radio_item>
+      <check_box label="Annonce les IMs entrants" name="quickstart_im_check"/>
+      <check_box label="Ne pas envoyer &#x22;[Machin Truc] is typing..." name="hide_typing_check"/>
+      <check_box label="Montrer le nom du groupe dans le chat" name="append_group_name_check"/>
+      <check_box label="Jouer le son typique pour le chat local" name="play_typing_sound_check"/>
+      <check_box label="Ne pas afficher les notifs. de log dans le chat" name="hide_notifications_in_chat_check"/>
+      <check_box label="Permet d'utiliser &#x22;/me&#x22; aussi bien que &#x22;:&#x22;" name="allow_mu_pose_check"/>
+      <check_box label="Ajoute automatiquement les fins des commentaires OOC (RP mode)" tool_tip="Ajoute automatiquement &#x22;))&#x22; &#xE0; chaque message commen&#xE7;ant par &#x22;((&#x22;, et vice-versa." name="close_ooc_check"/>
+      <text name="objects_link_text_box3">Active un lien qui montre le nom du propri&#xE9;taire dans l'historique du chat pour :</text>
+       <radio_group tool_tip="Enables a link to show you the owner of the speaking object." name="objects_link">
+        <radio_item name="no_object">Aucun objet</radio_item>
+        <radio_item name="others_objects">Les objets des autres</radio_item>
+        <radio_item left_delta="65" name="anyones_objects">Tous les objets</radio_item>
       </radio_group>
 
-      <text bottom_delta="-18" left="10" follows="top" name="time_format_text_box">Type d'heure :</text>
-      <combo_box bottom_delta="-5" left="90" follows="top" height="18" tool_tip="" name="time_format_combobox" width="130">
-        <combo_item name="24hours" value="default">Horloge 24/H</combo_item>
-        <combo_item name="12hours" value="default">Horloge 12/H</combo_item>
+      <text name="time_format_text_box">Type d'heure :</text>
+      <combo_box name="time_format_combobox">
+        <combo_item name="24hours">Horloge 24/H</combo_item>
+        <combo_item name="12hours">Horloge 12/H</combo_item>
       </combo_box>
-      <check_box bottom_delta="0" left="240" follows="top" control_name="SecondsInChatAndIMs" initial_value="false" label="Secondes dans les Chat/IMs" name="seconds_in_chat_and_ims_check"/>
-      <text bottom_delta="-18" left="10" follows="top" name="date_format_text_box">Type de date :</text>
-      <combo_box bottom_delta="-5" left="90" follows="top" height="18" name="date_format_combobox" width="130">
-        <combo_item name="year_first" value="default">AAAA-MM-JJ</combo_item>
-        <combo_item name="day_first" value="default">JJ/MM/AAAA</combo_item>
-        <combo_item name="month_first" value="default">MM/JJ/AAA</combo_item>
+      <check_box label="Secondes dans les Chat/IMs" name="seconds_in_chat_and_ims_check"/>
+      <text name="date_format_text_box">Type de date :</text>
+      <combo_box name="date_format_combobox">
+        <combo_item name="year_first">AAAA-MM-JJ</combo_item>
+        <combo_item name="day_first">JJ/MM/AAAA</combo_item>
+        <combo_item name="month_first">MM/JJ/AAA</combo_item>
       </combo_box>
       <!-- Auto-responder -->
-      <view_border bottom="-420" left="5" height="190" bevel_style="none" border_thickness="1" name="GraphicsBorder" width="485"/>
-      <check_box bottom_delta="168" left="10" follows="top" initial_value="false" label="Activer le R&#xE9;pondeur Automatique"
-        name="AscentInstantMessageResponseAnyone" tool_tip=""/>
-	  <check_box bottom_delta="-20" follows="left|top" initial_value="false"
-		label="Auto-r&#xE9;ponse aux 'non-friends'" name="AscentInstantMessageResponseFriends" tool_tip=""/>
-	  <check_box bottom_delta="-20" follows="left|top" initial_value="false" 
-		label="Auto-r&#xE9;ponse aux personnes 'muted'" name="AscentInstantMessageResponseMuted" tool_tip=""/>
-      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Envoyer d&#xE8;s que l'on commence &#xE0; vous &#xE9;crire" name="AscentInstantMessageShowOnTyping"/>
-      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Ne pas montrer les IMs auxquels vous avez r&#xE9;pondu" name="AscentInstantMessageShowResponded"/>
-      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Auto-r&#xE9;ponse &#xE0; chaque message" name="AscentInstantMessageResponseRepeat"/>
-      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Joindre un objet &#xE0; la r&#xE9;ponse" name="AscentInstantMessageResponseItem" tool_tip="Glissez l'objet dans la fen&#xEA;tre de r&#xE9;ponse."/>
+      <check_box label="Activer le R&#xE9;pondeur Automatique" name="AscentInstantMessageResponseAnyone"/>
+	  <check_box label="Auto-r&#xE9;ponse aux 'non-friends'" name="AscentInstantMessageResponseFriends"/>
+	  <check_box label="Auto-r&#xE9;ponse aux personnes 'muted'" name="AscentInstantMessageResponseMuted"/>
+      <check_box label="Envoyer d&#xE8;s que l'on commence &#xE0; vous &#xE9;crire" name="AscentInstantMessageShowOnTyping"/>
+      <check_box label="Ne pas montrer les IMs auxquels vous avez r&#xE9;pondu" name="AscentInstantMessageShowResponded"/>
+      <check_box label="Auto-r&#xE9;ponse &#xE0; chaque message" name="AscentInstantMessageResponseRepeat"/>
+      <check_box label="Joindre un objet &#xE0; la r&#xE9;ponse" name="AscentInstantMessageResponseItem" tool_tip="Glissez l'objet dans la fen&#xEA;tre de r&#xE9;ponse."/>
 	  <text bottom_delta="120" left_delta="280" follows="left|top" height="18" name="text_box1">Texte de la r&#xE9;ponse :</text>
-      <text_editor bottom_delta="-110" follows="left|top" height="110" max_length="1100" name="im_response" width="200" word_wrap="true" spell_check="true"/>
-      <text bottom_delta="-25" follows="left|top" height="18" name="text_box2">
-#f Pr&#xE9;nom, #l Nom, 
-#t Dur&#xE9;e, #r SLURL,
+      <text name="text_box2">
+#f Pr&#xE9;nom,#l Nom,#t Dur&#xE9;e,#r SLURL,
 #i Dur&#xE9;e de 'l'IDLE'. (ex. "5 mins")
       </text>
     </panel>
-
-    <panel border="true" left="1" bottom="-408" height="408" width="500" label="Spam" name="Spam">
-      <check_box left="10" bottom_delta="-25" follows="top" font="SansSerifSmall"
-        label="Activer le blocage de spam du chat" tool_tip="" name="AscChatSpamBlock" control_name="SGBlockChatSpam"/>
-      <spinner left_delta="20" height="18" width="120" follows="top" decimal_digits="0" increment="1" initial_val="10" min_val="2" max_val="100"
-        label="Nombre" label_width="70" tool_tip="(Default: 10)" name="AscChatSpamCount" control_name="SGChatSpamCount"/>
-      <spinner height="18" width="120" follows="left|top" decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
-        label="Dur&#xE9;e" label_width="70" name="AscChatSpamTime" control_name="SGChatSpamTime" tool_tip="(Default: 1.0)"/>
-      <text bottom_delta="0" left_delta="130" height="16" follows="top" name="" width="100">secondes</text>
-      <check_box left_delta="-150" height="16" follows="top" label="Activer le blocage du spam de dialogue" tool_tip="" name="AscDialogSpamBlock" control_name="SGBlockDialogSpam"/>
-      <check_box height="16" follows="left|top" label="Dur&#xE9;e" tool_tip="" name="AscCardSpamBlock" control_name="SGBlockCardSpam"/>
-      <spinner left_delta="20" height="18" width="120" follows="top" decimal_digits="0" increment="1" initial_val="4" min_val="2" max_val="100"
-        label="Nombre" label_width="70" name="AscSpamCount" control_name="SGSpamCount" tool_tip="(Default: 4)"/>
-      <spinner height="18" width="120" follows="left|top" decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
-        label="Dur&#xE9;e" label_width="70" name="AscSpamTime" control_name="SGSpamTime" tool_tip="(Default: 1.0)"/>
-      <text bottom_delta="0" left_delta="130" height="16" follows="top" name="">secondes</text>
+    <panel label="Chat UI" name="ChatUI">
+      <check_box label="IMs Verticaux (Déco Reco)" name="use_vertical_ims_check"/>
+      <check_box label="Ouvre les nouveaux IMs séparements" name="chats_torn_off"/>
+      <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"/>
+      <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"/>
+      <check_box label="Boutons sur la ligne de titre des conférences" name="conf_concise_butt"/>
+      <check_box label="Désactive le raccourci ouvrant détacher la liste d'amis" name="only_comm"/>
     </panel>
 
-    <panel border="true" bottom="-580" height="525" label="Options de Texte" left="1" name="TextOptions" width="418">
-      <check_box bottom="-25" left="12" height="16" label="Montre les 'fot de frap' ou suppos&#xE9;es telles en ROUGE" name="SpellDisplay" control_name="SpellDisplay"/>
-      <text bottom_delta="-24" follows="left|top" height="16" name="EmSpell_txt1">Langage courant (dictionnaire) :</text>
-      <combo_box bottom_delta="-20" follows="left|top" height="20" name="SpellBase" width="250" control_name="SpellBase"/>
-      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt3">T&#xE9;l&#xE9;charger les langues (dictionnaires) :</text>
-      <combo_box bottom_delta="-20" follows="left|top" height="20" name="EmSpell_Avail" width="250" control_name="EmSpell_Avail"/>
-      <button bottom_delta="0" left_delta="255" follows="left|top" height="20" label="Installer" name="EmSpell_Add" tool_tip="" width="80"/>
-      <button bottom_delta="-22" left="12" follows="top" height="20" label="T&#xE9;l&#xE9;charger +++" name="EmSpell_GetMore" tool_tip="Obtenez plus de dictionnaires en ligne" width="250"/>
-      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt2">Langues additionnelles (dictionnaires) :</text>
-      <combo_box bottom_delta="-20" follows="left|top" height="20" name="EmSpell_Installed" width="250" control_name="EmSpell_Installed" tool_tip=""/>
-      <button bottom_delta="0" left_delta="255" follows="left|top" height="20" label="Supprimer" name="EmSpell_Remove" tool_tip="" width="80"/>
-      <button bottom_delta="-20" left="12" follows="top" height="20" label="Editer un dictionnaire" name="EmSpell_EditCustom" width="250"/>
-      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt4">
+    <panel label="Spam" name="Spam">
+      <check_box label="Activer l'antispam" name="enable_as"/>
+      <check_box label="Aucun message spécifique dans la file d'attente de spam" name="spammsg_checkbox"/>
+      <button label="Réinitialiser la file d'attente" label_selected="d&#xE9;bloquer les sources de spam" name="reset_antispam"/>
+      <spinner label="Antispam (Dur&#xE9;e/secondes):" tool_tip="Le plus bas sera le moins sensible - O d&#xE9;sactive" name="antispamtime"/>
+      <spinner label="Nombre min. de messages par spam:" name="antispamamount"/>
+      <spinner label="Multiplicateur du nombre de messages pour les sons:" name="antispamsoundmulti"/>
+      <spinner label="Multiplicateur du nombre de sons &#xE0; pr&#xE9;charger par spam:" name="antispamsoundpreloadmulti"/>
+      <spinner label="Nombre de lignes max. d'un message:" name="antispamnewlines"/>
+      <check_box label="D&#xE9;sactive toutes les fen&#xEA;tres de dialogue (D&#xE9;co/Reco)" name="antispam_checkbox"/>
+
+	  <text name="Block All Dialogs From">Bloquer tous les dialogues provenants de :</text>
+      <check_box label="Alertes" name="Alerts"/>
+      <check_box label="Demande d'amitié" name="Friendship Offers" left_delta="80"/>
+      <check_box label="Invitations de groupes" name="Group Invites" left_delta="120"/>
+      <check_box label="Notices de groupes" name="Group Notices" left_delta="140"/>
+      <check_box label="Offre d'objets" name="Item Offers"/>
+      <check_box label="Scripts" name="Scripts"/>
+      <check_box label="Offres de TP" name="Teleport Offers"/>
+      <check_box label="Me notifier quand un spam est bloqu&#xE9;" name="Notify On Spam" tool_tip="When enabled, the bottom right corner may become a source of pseudo-spam whenever real spam is blocked."/>
+    </panel>
+
+    <panel label="Options de Texte" name="TextOptions">
+      <check_box label="Montre les 'fot de frap' ou suppos&#xE9;es telles en ROUGE" name="SpellDisplay"/>
+      <text name="EmSpell_txt1">Langage courant (dictionnaire) :</text>
+      <text name="EmSpell_txt3">T&#xE9;l&#xE9;charger les langues (dictionnaires) :</text>
+      <button label="Installer" name="EmSpell_Add"/>
+      <button label="T&#xE9;l&#xE9;charger +++" name="EmSpell_GetMore" tool_tip="Obtenez plus de dictionnaires en ligne"/>
+      <text name="EmSpell_txt2">Langues additionnelles (dictionnaires) :</text>
+      <button label="Supprimer" name="EmSpell_Remove"/>
+      <button label="Editer un dictionnaire" name="EmSpell_EditCustom"/>
+      <text name="EmSpell_txt4">
 Clic droit sur le mot mal &#xE9;crit et choisir son remplacement.
       </text>
 
-      <view_border bevel_style="none" border_thickness="1" bottom_delta="-16" follows="top" height="0" left="5" name="CmdDivisor" width="356"/>
-
-      <check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
-        label="Mettre en valeur les messages si l'un deux contient les termes suivants :" name="KeywordsOn" width="270"/>
-      <text bottom_delta="-20" follows="top" height="20" left="12" name="keyword_txt1">(s&#xE9;par&#xE9;s par des virgules)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" left_delta="5" max_length="500" name="KeywordsList" width="300"/>
-      <text bottom_delta="-24" follows="top" height="20" left_delta="15" name="EmKeyw">Est trouv&#xE9; dans :</text>
-      <check_box bottom_delta="3" follows="top" height="16" left_delta="100" label="Chat local" name="KeywordsInChat"/>
-      <check_box bottom_delta="-15" follows="left|top" height="16" label="IMs" name="KeywordsInIM"/>
-      <check_box bottom_delta="-24" follows="top" height="16" label="Mettre en valeur le message avec cette couleur :" left_delta="-110" name="KeywordsChangeColor"/>
-      <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-16" can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top" height="35" left_delta="270" name="KeywordsColor" tool_tip="Click to open Color Picker" width="50"/>
-      <check_box bottom_delta="-10" follows="top" height="16" left_delta="-210" label="Jouer cette alerte sonore : (UUID)" name="KeywordsPlaySound"/>
-      <line_editor bottom_delta="-20" follows="left|top" bevel_style="in" border_style="line" border_thickness="1" height="20" left_delta="-5" max_length="36" name="KeywordsSound" width="300"/>
+      <check_box label="Mettre en valeur les messages si l'un deux contient les termes suivants :" name="KeywordsOn"/>
+      <text name="keyword_txt1">(s&#xE9;par&#xE9;s par des virgules)</text>
+      <text name="EmKeyw">Est trouv&#xE9; dans :</text>
+      <check_box label="Chat local" name="KeywordsInChat"/>
+      <check_box label="IMs" name="KeywordsInIM"/>
+      <check_box label="Mettre en valeur le message avec cette couleur :" name="KeywordsChangeColor"/>
+      <color_swatch name="KeywordsColor" tool_tip="Click to open Color Picker"/>
+      <check_box label="Jouer cette alerte sonore : (UUID)" name="KeywordsPlaySound"/>
     </panel>
 
   </tab_container>
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 2c974d9ce..963644c50 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
@@ -1,346 +1,256 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
-  border="true" label="Syst&#xE8;me" name="ascsys" enabled="true" mouse_opaque="true">
-  <tab_container label="Singularity System" bottom="0" height="440" width="497" left="0"
-    name="Ascent System" tab_min_width="70" tab_position="top">
+  label="Syst&#xE8;me" name="ascsys">
+  <tab_container label="Singularity System" name="Ascent System">
 
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="G&#xE9;n&#xE9;ral" name="User Interface">
-      <check_box bottom_delta="-25" control_name="DoubleClickTeleport" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+    <panel label="G&#xE9;n&#xE9;ral" name="User Interface">
+      <check_box
         label="Activer le TP avec le double-clic" left="10"
         tool_tip="Activer le TP sur un objet/une personne avec le double-clic"
-        mouse_opaque="true" name="double_click_teleport_check" radio_style="false"
+        name="double_click_teleport_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="OptionRotateCamAfterLocalTP" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
         label="R&#xE9;initialiser la cam&#xE9;ra apr&#xE8;s le TP" left="20"
         tool_tip="Centre la cam&#xE9;ra derri&#xE8;re vous apr&#xE8;s un TP."
-        mouse_opaque="true" name="center_after_teleport_check" radio_style="false"
+        name="center_after_teleport_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="OptionOffsetTPByAgentHeight" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
         label="Compenser la cible du TP" left="20"
         tool_tip="Essaye de cibler le TP pour que vos pieds atterrissent au point vis&#xE9;"
-        mouse_opaque="true" name="offset_teleport_check" radio_style="false"
+        name="offset_teleport_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="PreviewAnimInWorld" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
         label="Preview animations on the avatar - Test temporaire d&#x27;une animation" left="10"
         tool_tip="L&#x27;animation est jou&#xE9;e avec votre avatar avant d&#x27;&#xEA;tre t&#xE9;l&#xE9;charg&#xE9;e."
-        mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
+        name="preview_anim_in_world_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="SaveInventoryScriptsAsMono" enabled="false"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
         label="Enregistrer les scripts syst&#xE9;matiquement en Mono" left="10"
         tool_tip="Compile les scripts en Mono quand cela est possible."
-        mouse_opaque="true" name="save_scripts_as_mono_check" radio_style="false"
+        name="save_scripts_as_mono_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="AscentAlwaysRezInGroup" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
         label="Rezzer les objets avec le groupe du terrain quand cela est possible" left="10"
         tool_tip="Rez les objets avec le m&#xEA;me groupe que le terrain, ind&#xE9;pendamment de votre tag actif."
         mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
         width="400" />
-      <check_box bottom_delta="-20" control_name="AscentBuildAlwaysEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
         label="Toujours montrer le bouton construire activ&#xE9;" left="10"
         tool_tip="Permet d&#x27;acc&#xE9;der &#xE0; au bouton construire en permanence, sans pour autant avoir le droit de construire."
-        mouse_opaque="true" name="always_build_check" radio_style="false"
+        name="always_build_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="AscentFlyAlwaysEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
         label="Toujours permettre le mode vol (Fly)" left="10"
         tool_tip="Permet de voler quelques soient les droits de la sim, &#xE0; vos risques et p&#xE9;rils."
-        mouse_opaque="true" name="always_fly_check" radio_style="false"
+        name="always_fly_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="AscentDisableMinZoomDist" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
         label="D&#xE9;sactiver la distance minimum de la cam&#xE9;ra" left="10"
         tool_tip="La cam&#xE9;ra zoome de tr&#xE9;s pr&#xE8;s."
-        mouse_opaque="true" name="disable_camera_zoom_check" radio_style="false"
+        name="disable_camera_zoom_check"
         width="400" />
-      <check_box bottom_delta="-20" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
         label="Activer les fonctions Power User - &#xE0; vos risques et p&#xE9;rils !" left="10"
         tool_tip="Ajoute des fonctions consid&#xE9;r&#xE9;es trop dangereuses pour une utilisation normale. Ces fonctions peuvent faire des ravages si employ&#xE9;es improprement."
-        mouse_opaque="true" name="power_user_check" radio_style="false"
+        name="power_user_check"
         width="400" />
-      <check_box bottom_delta="-20" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
         label="Confirmer les fonctions Power User" left="20"
         tool_tip="Confirme les fonctions Power User. A vos risques et p&#xE9;rils. Singularity n'est pas responsable de cette utilisation."
-        mouse_opaque="true" name="power_user_confirm_check" radio_style="false"
+        name="power_user_confirm_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="AscentUseSystemFolder" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
         label="Activer l&#x27;Ascent System Inventory (Red&#xE9;marrage n&#xE9;cessaire)" left="10"
         tool_tip="Cr&#xE9;e un nouveau dossier dans l&#x27;inventaire afin de stocker les fichiers de settings et les assets non permanents."
-        mouse_opaque="true" name="system_folder_check" radio_style="false"
+        name="system_folder_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="AscentSystemTemporary" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
         label="Les t&#xE9;l&#xE9;chargements temporaires vont dans le dossier : System Inventory &#x3E; Assets" left="20"
         tool_tip="Place les t&#xE9;l&#xE9;chargements temporaires dans le dossier : System Inventory &#x3E; Assets ce qui permet de les retrouver plus ais&#xE9;ment"
-        mouse_opaque="true" name="temp_in_system_check" radio_style="false"
+        name="temp_in_system_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="FetchInventoryOnLogin" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
         label="Pr&#xE9;charger l&#x27;inventaire &#xE0; la connection" left="10"
         tool_tip="R&#xE9;duit l&#x27;attente lors de votre recherche initiale dans l&#x27;inventaire"
-        mouse_opaque="true" name="fetch_inventory_on_login_check" radio_style="false"
+        name="fetch_inventory_on_login_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="WindEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
         label="Activer les effets de vent" left="10"
-        mouse_opaque="true" name="enable_wind" radio_style="false"
+        name="enable_wind"
         width="400" />
-      <check_box bottom_delta="-20" control_name="CloudsEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
         label="Activer les nuages" left="10"
-        mouse_opaque="true" name="enable_clouds" radio_style="false"
+        name="enable_clouds"
         width="400" />
-      <check_box bottom_delta="-20" left_delta="10"  control_name="SkyUseClassicClouds" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
         label="Activer les nuages classiques" left="10"
-        mouse_opaque="true" name="enable_classic_clouds" radio_style="false"
+        mouse_opaque="true" name="enable_classic_clouds"
         width="400" />
-      <check_box bottom_delta="-20" left_delta="-10" control_name="SpeedRez" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box left_delta="-10"
         label="Activer le rezz rapide par rapport &#xE0; une distance progressive" left="10"
-        mouse_opaque="true" name="speed_rez_check" radio_style="false"
+        name="speed_rez_check"
         tool_tip="Active, cette fonction charge progressivement les textures du plus pr&#xE8;s au plus loin"
         width="400" />
-      <spinner bottom_delta="-20" control_name="SpeedRezInterval" enabled="true" decimal_digits="0"
-        follows="left|top" font="SansSerifSmall" height="16" left="30" width="230"
+      <spinner
+        width="230"
         label="Intervalle distance/affichage:" label_width="180"
-        max_val="60" min_val="5" initial_val="20" increment="5"
-        mouse_opaque="true" name="speed_rez_interval" />
-      <text type="string" length="1" bottom_delta="0" left_delta="235" bg_visible="false"
-        border_visible="false" border_drop_shadow_visible="false"
-        drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="16"
-        mouse_opaque="true" name="speed_rez_seconds" v_pad="0" width="100">
+        name="speed_rez_interval" />
+      <text name="speed_rez_seconds" width="100">
 secondes
       </text>
     </panel>
 
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Commandes Texte"
-      left="1" mouse_opaque="true" name="Command Line" width="418">
-      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Activer l'usage de la barre de chat comme ligne de commande" left="10"
-        mouse_opaque="true" name="chat_cmd_toggle" radio_style="false" width="270"
-        control_name="AscentCmdLine"/>
-      <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
-        name="cmd_line_text_2" width="512">
+    <panel label="Commandes Texte" name="Command Line">
+      <check_box label="Activer l'usage de la barre de chat comme ligne de commande" left="10"
+        name="chat_cmd_toggle" width="270"/>
+      <text name="cmd_line_text_2" width="512">
 Tp &#224; travers la sim (usage: cmd x y z)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLinePos" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_3" width="512">
+      <line_editor name="AscentCmdLinePos" width="200"/>
+      <text name="cmd_line_text_3" width="512">
 Tp au sol (usage: cmd)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineGround" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_4" width="512">
+      <line_editor name="AscentCmdLineGround" width="200"/>
+      <text name="cmd_line_text_4" width="512">
 Tp en altitude (usage: cmd z)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineHeight" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_5" width="512">
+      <line_editor name="AscentCmdLineHeight" width="200"/>
+      <text name="cmd_line_text_5" width="512">
 Tp &#x22;ET, rentrer maison !&#x22; (usage: cmd)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineTeleportHome" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_6" width="512">
+      <line_editor name="AscentCmdLineTeleportHome" width="200"/>
+      <text name="cmd_line_text_6" width="512">
 Rezzer une plateforme (usage: cmd 0 - 30)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineRezPlatform" width="200"/>
-      <slider bottom_delta="-22" left_delta="0" name="AscentPlatformSize" control_name="AscentPlatformSize"
-        decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5"
-        initial_val="5" label="Dimensions:" label_width="75" max_val="30" min_val="5"
-        mouse_opaque="true" show_text="true" width="205" auto_resize="false" tool_tip="Quelle taille voulez-vous ?"/>
-      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_8" width="512">
+      <line_editor name="AscentCmdLineRezPlatform" width="200"/>
+      <slider name="AscentPlatformSize" label="Dimensions:" label_width="75"
+        tool_tip="Quelle taille voulez-vous ?"/>
+      <text name="cmd_line_text_8" width="512">
 Calculette (usage: cmd 2 + 2)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineCalc" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_15" width="512">
+      <line_editor name="AscentCmdLineCalc" width="200"/>
+      <text name="cmd_line_text_15" width="512">
 Vider l&apos;historique du chat (usage: cmd)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="Clears the Chat History to prevent lag effects from chat spammers."
-        name="AscentCmdLineClearChat" width="200"/>
+      <line_editor name="AscentCmdLineClearChat" width="200"/>
       <!-- Column Split -->
-      <view_border bevel_style="none" border_thickness="1" bottom_delta="-5" follows="top|left" height="295"
-        left="230" name="CmdDivisor" width="0"/>
-      <text bottom_delta="277" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
-        name="cmd_line_text_9" width="512">
+      <text name="cmd_line_text_9" width="512">
 Changer le "Draw Distance" (usage: cmd metres)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineDrawDistance" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_10" width="512">
+      <line_editor name="AscentCmdLineDrawDistance" width="200"/>
+      <text bname="cmd_line_text_10" width="512">
 Tp &#224; la position de la cam (usage: cmd)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdTeleportToCam" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_11" width="512">
+      <line_editor name="AscentCmdTeleportToCam" width="200"/>
+      <text name="cmd_line_text_11" width="512">
 Avoir un nom avec la clef (usage: cmd clef)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineKeyToName" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_12" width="512">
+      <line_editor name="AscentCmdLineKeyToName" width="200"/>
+      <text name="cmd_line_text_12" width="512">
 Tp un avatar avec la clef (usage: cmd clef)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineOfferTp" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_7" width="512">
+      <line_editor name="AscentCmdLineOfferTp" width="200"/>
+      <text name="cmd_line_text_7" width="512">
 Tp sur une sim x (usage: cmd nomdelasim)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineMapTo" width="200"/>
-      <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Utiliser la meme position entre les sims" left_delta="0" mouse_opaque="true"
-        name="map_to_keep_pos" radio_style="false" width="270"
-        control_name="AscentMapToKeepPos"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_13" width="512">
+      <line_editor name="AscentCmdLineMapTo" width="200"/>
+      <check_box
+        label="Utiliser la meme position entre les sims" left_delta="0"
+        name="map_to_keep_pos" width="270"/>
+      <text name="cmd_line_text_13" width="512">
 Se tp vers un avatar (usage: cmd nom)
       </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+      <line_editor
         tool_tip="Cette syntaxe permet les noms partiels."
         name="AscentCmdLineTP2" width="200"/>
-      <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_14">Active/d&#xE9;sactive le faux absent (usage: cmd)</text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="SinguCmdLineAway" width="200"/>
-
+      <text name="cmd_line_text_14">Active/d&#xE9;sactive le faux absent (usage: cmd)</text>
+      <line_editor name="SinguCmdLineAway" width="200"/>
     </panel>
 
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="S&#xE9;curit&#xE9;" name="Security">
-      <check_box bottom_delta="-25" control_name="BroadcastViewerEffects" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+    <panel label="S&#xE9;curit&#xE9;" name="Security">
+      <check_box
         label="Emettre les effets du viewer (Excluant les rayons)" left="10"
-        mouse_opaque="true" name="broadcast_viewer_effects" radio_style="false"
+        name="broadcast_viewer_effects"
         width="400" />
-      <check_box bottom_delta="-20" control_name="DisablePointAtAndBeam" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+      <check_box
         label="D&#xE9;sactiver le &#x22;Pointer vers&#x22; &#xE0; l&#x22;&#xE9;dition d&#x27;un objet" left="10"
         tool_tip="Masque le pointeur sur l&#x27;objet  &#xE9;dit&#xE9;"
-        mouse_opaque="true" name="disable_point_at_and_beams_check" radio_style="false"
+        name="disable_point_at_and_beams_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="PrivateLookAt" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
         label="Ne pas &#x22;Regarder vers&#x22;" left="10"
         tool_tip="Supprime les mouvements de t&#xEA;te, et le &#x22;Regarder vers&#x22; pour soi-m&#xEA;me"
-        mouse_opaque="true" name="private_look_at_check" radio_style="false"
+        name="private_look_at_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="AscentShowLookAt" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
         label="Voir quand les autres &#x22;Regardent vers&#x22;" left="10"
         tool_tip="Montre o&#xF9; les autres regardent."
-        mouse_opaque="true" name="show_look_at_check" radio_style="false"
+        name="show_look_at_check"
         width="400" />
-       <check_box bottom_delta="-20" control_name="QuietSnapshotsToDisk" 
-       follows="top" initial_value="false" 
+       <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&#x27;appareil, ni mouvement de cam&#xE9;ra, ni gesture. (Uniquement vers le disque dur)." 
        name="quiet_snapshots_check"/>
-       <check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+       <check_box
         label="En vous levant, annule les permissions que l&#x27;objet a sur votre avatar" left="10"
         tool_tip="Evite que l&#x27;objet garde le contr&#xF4;le de votre avatar, comme par exemple les animations."
-        mouse_opaque="true" name="revoke_perms_on_stand_up_check" radio_style="false"
+        name="revoke_perms_on_stand_up_check"
         width="400" />
-      <check_box bottom_delta="-20" control_name="DisableClickSit" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+      <check_box
         label="D&#xE9;sactive le &#x22;Click to sit&#x22; automatique" left="10"
         tool_tip="D&#xE9;sactive llSitTarget. Vous devrez s&#xE9;lectionner vous m&#xEA;me la fonction &#x22;sit&#x22; sur l&#x27;objet."
-        mouse_opaque="true" name="disable_click_sit_check" radio_style="false"
+        name="disable_click_sit_check"
         width="400" />
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Affiche les changements de d&#xE9;comptes de scripts de la r&#xE9;gion." left_delta="0"
-        mouse_opaque="true" name="totalscriptjumps" radio_style="false" width="270"
-        control_name="AscentDisplayTotalScriptJumps"
+      <check_box
+        label="Affiche les changements de d&#xE9;comptes de scripts de la r&#xE9;gion." left_delta="0"
+        name="totalscriptjumps" width="270"
         tool_tip="D&#xE9;pendant du seuil que vous choisissez dans la fen&#xEA;tre &#xE0; droite."/>
-      <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16" increment="1"
-        label="" label_width="0" digits="4" left_delta="325" max_val="9999"
-        min_val="1" mouse_opaque="true" name="ScriptJumpCount" width="50" control_name="Ascentnumscriptdiff"
-        tool_tip="Threshold for the script jump message [Default: 100]"/>
+      <spinner name="ScriptJumpCount" tool_tip="Threshold for the script jump message [Default: 100]"/>
     </panel>
 
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true" follows="left|top|right|bottom" label="Build/Cr&#xE9;ation" name="Building">
-
-
-      <text bottom_delta="-19" follows="top" height="10" left_delta="30" name="text_box6">Point de Pivot</text>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="X pos" label_width="40" left="10" max_val="256" min_val="-256" name="X pos" width="120" control_name="AscentBuildPrefs_PivotX"/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Y pos" label_width="40" max_val="256" min_val="-256" name="Y pos" width="120" control_name="AscentBuildPrefs_PivotY"/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Z pos" label_width="40" max_val="256" min_val="-256" name="Z pos" width="120" control_name="AscentBuildPrefs_PivotZ"/>
-      <check_box bottom_delta="-20" follows="top" label="Valeurs en pour&#xE7;entages" left_delta="-5" tool_tip="Default settings are Percentages and every axis set at 50" name="EmPivotPercToggle" control_name="AscentBuildPrefs_PivotIsPercent"/>
-      <check_box bottom_delta="60" follows="top" label="Active les &#x22;Highlights&#x22; sur les prims s&#xE9;lectionn&#xE9;s" left_delta="140" name="EmBuildPrefsRenderHighlight_toggle" control_name="RenderHighlightSelections"/>
-	  <check_box bottom_delta="-20" follows="top" initial_value="false" label="Axe sur le Root Prim" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead." name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"/>
-      <view_border bevel_style="none" border_thickness="1" bottom="-180" follows="top" height="70" left="5" name="NextOwnerBorder" width="130"/>
+    <panel label="Build/Cr&#xE9;ation" name="Building">
+      <text left_delta="30" name="text_box6">Point de Pivot</text>
+      <spinner label="X pos" label_width="40" left="10" name="X pos" width="120"/>
+      <spinner label="Y pos" label_width="40" name="Y pos" width="120"/>
+      <spinner label="Z pos" label_width="40" name="Z pos" width="120"/>
+      <check_box bottom_delta="-20" label="Valeurs en pour&#xE7;entages" left_delta="-5" tool_tip="Default settings are Percentages and every axis set at 50" name="EmPivotPercToggle"/>
+      <check_box bottom_delta="60" label="Active les &#x22;Highlights&#x22; sur les prims s&#xE9;lectionn&#xE9;s" left_delta="140" name="EmBuildPrefsRenderHighlight_toggle"/>
+	  <check_box bottom_delta="-20" label="Axe sur le Root Prim" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead." name="EmBuildPrefsActualRoot_toggle"/>
       <text bottom_delta="60" follows="top" height="10" left_delta="10" name="text_box7">Permissions:</text>
-        <check_box follows="top" height="16" initial_value="false" label="Copy " tool_tip="Next owner can make copies of creations" name="next_owner_copy" control_name="NextOwnerCopy"/>
-        <check_box follows="top" height="16" initial_value="false" label="Modify " tool_tip="Next owner can edit creations" name="next_owner_modify" control_name="NextOwnerModify"/>
-        <check_box follows="top" height="16" initial_value="true" label="Transfer " tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
-      <texture_picker allow_no_texture="false" bottom="-190" can_apply_immediately="true" default_image_name="Default" follows="top" height="80" label="     Texture" left="155" name="texture control" control_name="EmeraldBuildPrefs_Texture" tool_tip="Click to choose a texture" width="64"/>
-      <check_box bottom="-131" left_delta="75" follows="top" height="16" label="Phantom" name="EmPhantomToggle" control_name="EmeraldBuildPrefs_Phantom"/>
-      <check_box follows="top" height="16" label="Physical" name="EmPhysicalToggle" control_name="EmeraldBuildPrefs_Physical"/>
-      <check_box follows="top" height="16" label="Temporaire" name="EmTemporaryToggle" control_name="EmeraldBuildPrefs_Temporary"/>
-      <combo_box bottom="-190" left_delta="6" follows="top" height="18" name="material" width="64" control_name="BuildPrefs_Material">
-        <combo_item name="Stone" value="Stone">Stone</combo_item>
-        <combo_item name="Metal" value="Metal">Metal</combo_item>
-        <combo_item name="Glass" value="Glass">Glass</combo_item>
-        <combo_item name="Wood" value="Wood">Wood</combo_item>
-        <combo_item name="Flesh" value="Flesh">Flesh</combo_item>
-        <combo_item name="Plastic" value="Plastic">Plastic</combo_item>
-        <combo_item name="Rubber" value="Rubber">Rubber</combo_item>
+        <check_box label="Copy " tool_tip="Next owner can make copies of creations" name="next_owner_copy"/>
+        <check_box label="Modify " tool_tip="Next owner can edit creations" name="next_owner_modify"/>
+        <check_box label="Transfer " tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer"/>
+      <texture_picker bottom="-190" label="     Texture" left="155" name="texture control" tool_tip="Click to choose a texture" width="64"/>
+      <check_box bottom="-131" left_delta="75" label="Phantom" name="EmPhantomToggle"/>
+      <check_box label="Physical" name="EmPhysicalToggle"/>
+      <check_box label="Temporaire" name="EmTemporaryToggle"/>
+      <combo_box bottom="-190" left_delta="6" name="material" width="64">
+        <combo_item name="Stone">Stone</combo_item>
+        <combo_item name="Metal">Metal</combo_item>
+        <combo_item name="Glass">Glass</combo_item>
+        <combo_item name="Wood">Wood</combo_item>
+        <combo_item name="Flesh">Flesh</combo_item>
+        <combo_item name="Plastic">Plastic</combo_item>
+        <combo_item name="Rubber">Rubber</combo_item>
       </combo_box>
-      <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-190" can_apply_immediately="true" color="1, 1, 1, 1" follows="top" height="80" label="    Couleur" left_delta="76" name="colorswatch" tool_tip="Click to open Color Picker" width="64" control_name="EmeraldBuildPrefs_Color"/>
-      <spinner bottom_delta="60" decimal_digits="0" follows="top" height="16" increment="1" label="Alpha" label_width="45" left_delta="70" max_val="100" min_val="0" name="alpha" width="97" control_name="EmeraldBuildPrefs_Alpha"/>
-      <spinner bottom_delta="-20" decimal_digits="2" follows="top" height="16" increment="0.05" label="Glow" label_width="45" max_val="1" min_val="0" name="glow" width="97" control_name="EmeraldBuildPrefs_Glow"/>
-      <check_box follows="top" height="16" label="Lumineux" name="EmFBToggle" control_name="EmeraldBuildPrefs_FullBright"/>
-      <text follows="top">Brillance</text>
-      <combo_box bottom_delta="-5" follows="top" left_delta="42" height="18" name="combobox shininess" tool_tip="Set the amount of shine for the object" width="62" control_name="EmeraldBuildPrefs_Shiny">
+      <color_swatch label="    Couleur" left_delta="76" name="colorswatch" tool_tip="Click to open Color Picker" width="64"/>
+      <spinner bottom_delta="60" label="Alpha" label_width="45" left_delta="70" width="97"/>
+      <spinner bottom_delta="-20" label="Glow" label_width="45" name="glow" width="97"/>
+      <check_box label="Lumineux" name="EmFBToggle"/>
+      <combo_box bottom_delta="-5" left_delta="42" name="combobox shininess" tool_tip="Set the amount of shine for the object" width="62">
         <combo_item name="None" value="None">None</combo_item>
         <combo_item name="Low" value="Low">Low</combo_item>
         <combo_item name="Medium" value="Medium">Medium</combo_item>
         <combo_item name="High" value="High">High</combo_item>
       </combo_box>
-      <check_box name="EmeraldBuildPrefsEmbedItem" left="5" bottom_delta="-15" follows="top" initial_value="false" label="Mettre un &#xE9;l&#xE9;ment dans l'object" control_name="EmeraldBuildPrefs_EmbedItem"/>
-       <view_border blevel_style="in" bottom_delta="-20" left="25" follows="top" height="16" name="build_item_drop_target_rect" width="140"/>
-        <text bottom_delta="0" left_delta="8" follows="top" height="16" name="Give inventory">Glissez l'&#xE9;l&#xE9;ment ICI</text>
-       <view_border blevel_style="in" bottom_delta="-35" left_delta="-8" follows="top" height="35" name="build_item_add_disp_rect" width="140"/>
-         <text bottom_delta="15" left_delta="0" follows="top" height="16" name="build_item_add_disp_rect_txt" halign="center" width="138">Currently set to:
+      <check_box name="EmeraldBuildPrefsEmbedItem" left="5" bottom_delta="-15" label="Mettre un &#xE9;l&#xE9;ment dans l'object"/>
+        <text bottom_delta="0" left_delta="8" name="Give inventory">Glissez l'&#xE9;l&#xE9;ment ICI</text>
+         <text bottom_delta="15" left_delta="0" name="build_item_add_disp_rect_txt" halign="center" width="138">Currently set to:
 	       ITEM</text>
-       <spinner bottom="369" left="380" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="          X" label_width="40" max_val="10" min_val="0.0001" name="X size" width="110" control_name="BuildPrefs_Xsize"/>
-       <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="          Y" label_width="40" max_val="10" min_val="0.0001" name="Y size" width="110" control_name="BuildPrefs_Ysize"/>
-       <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="          Z" label_width="40" max_val="10" min_val="0.0001" name="Z size" width="110" control_name="BuildPrefs_Zsize"/>
+       <spinner bottom="369" left="380" label="          X" label_width="40" name="X size" width="110"/>
+       <spinner bottom_delta="-20" label="          Y" label_width="40" name="Y size" width="110"/>
+       <spinner bottom_delta="-20" label="          Z" label_width="40" name="Z size" width="110"/>
     </panel>
 
   </tab_container>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml
index d477c454d..9c918c3c3 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml
@@ -1,55 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel top="20" left="10" height="400" width="512" border="true" label="Vanity" name="ascvan">
-  <tab_container label="Singularity Vanity" bottom="0" height="440" width="497" name="Ascent Vanity" tab_min_width="90">
-    <panel border="true" left="1" bottom="-190" height="180" width="500" label="Principal" name="General">
-      <check_box bottom_delta="-25" control_name="AscentStoreSettingsPerAccount" follows="top" height="16" initial_value="true" label="Lorsque c'est possible, sauver le setting personnalisé par compte." left="10" tool_tip="Sauve le settings customis&#xE9; pour chaque alt." name="use_account_settings_check"/>
-      <check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" follows="top" height="16" initial_value="true" label="Masquer la barre de 'TP in progress'" tool_tip="Ceci permet de continuer des lire vos IMs durant le TP." name="disable_tp_screen_check"/>
-      <check_box bottom_delta="-20" control_name="OptionPlayTpSound" follows="top" height="16" initial_value="true" label="Jouer le son du TP pendant la transition inter sims" tool_tip="jouer le 'wooooooosssssssssh'." name="tp_sound_check"/>
-      <check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" follows="top" height="16" initial_value="true" label="Masquer l'&#xE9;cran du Login/Logout" tool_tip="" name="disable_logout_screen_check"/>
-      <check_box bottom_delta="-20" control_name="SGDisableChatAnimation" follows="top" height="16" initial_value="false" label="D&#xE9;sactiver les animations pour le chat local: dire, chuchoter, crier" tool_tip="" name="disable_chat_animation"/>
+<panel label="Vanity" name="ascvan">
+  <tab_container label="Singularity Vanity" name="Ascent Vanity">
+    <panel label="Principal" name="General">
+      <check_box bottom_delta="-25" follows="top" height="16" label="Lorsque c'est possible, sauver le setting personnalisé par compte." left="10" tool_tip="Sauve le settings customis&#xE9; pour chaque alt." name="use_account_settings_check"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Masquer la barre de 'TP in progress'" tool_tip="Ceci permet de continuer des lire vos IMs durant le TP." name="disable_tp_screen_check"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Jouer le son du TP pendant la transition inter sims" tool_tip="jouer le 'wooooooosssssssssh'." name="tp_sound_check"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Masquer l'&#xE9;cran du Login/Logout" tool_tip="" name="disable_logout_screen_check"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="D&#xE9;sactiver les animations pour le chat local: dire, chuchoter, crier" tool_tip="" name="disable_chat_animation"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Rajouter les attachements et habits au lieu de les remplacer" tool_tip="" name="add_not_replace"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Pivote l'avatar quand on marche en arriere" tool_tip="Certains AO peuvent empecher la fontion." name="turn_around"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Préviens quand quelqu'un prend une photo" tool_tip="Sauf si la personne a elle même choisi le mode silencieux." name="announce_snapshots"/>
+      <check_box bottom_delta="-20" follows="top" height="16" label="Annonce les titres des chansons dans le chat local" tool_tip="" name="announce_stream_metadata"/>
     </panel>
-    <panel border="true" left="1" bottom="-190" height="180" width="500" label="Tags/Couleurs" name="TagsColors">
+    <panel label="Tags/Couleurs" name="TagsColors">
       <!-- Client tag options -->
-      <check_box bottom_delta="-25" control_name="AscentUseTag" follows="top" height="16" initial_value="true" label="Activer les Fonctions des TAGs." left="10" tool_tip="CERTAINES FONCTIONS NE SONT PLUS ACTIVABLES SUITE AUX NOUVELLES MESURES DU LINDEN LAB." name="show_my_tag_check"/>
+      <check_box bottom_delta="-25" follows="top" label="Activer les Fonctions des TAGs." left="10" tool_tip="CERTAINES FONCTIONS NE SONT PLUS ACTIVABLES SUITE AUX NOUVELLES MESURES DU LINDEN LAB." name="show_my_tag_check"/>
       <combo_box follows="top" bottom_delta="-24" height="18" left_delta="24" max_chars="32" tool_tip="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" name="tag_spoofing_combobox" width="130">
         <combo_item name="Singularity" value="f25263b7-6167-4f34-a4ef-af65213b2e39">Singularity</combo_item>
       </combo_box>
-      <check_box bottom_delta="-23" control_name="AscentShowSelfTag" follows="top" height="16" initial_value="true" label="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" left_delta="-24" tool_tip="Le viewer utilis&#xE9; par les avatars ne peut plus &#xEA;tre visible depuis que Linden lab l&#x27;a d&#xE9;sactiv&#xE9;" name="show_self_tag_check"/>
-      <check_box bottom_delta="-20" control_name="AscentShowSelfTagColor" follows="top" height="16" initial_value="true" label="Afficher sa propre couleur custom " tool_tip="Vous seul la voyez." name="show_self_tag_color_check"/>
-      <check_box bottom_delta="-20" control_name="AscentShowFriendsTag" follows="top" height="16" initial_value="true" label="Afficher le tag (Friend)" tool_tip="Rajoute (friends) dans le tag quand vous voyez un(e) ami(e)." name="show_friend_tag_check"/>
+      <check_box bottom_delta="-23" follows="top" label="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" left_delta="-24" tool_tip="Le viewer utilis&#xE9; par les avatars ne peut plus &#xEA;tre visible depuis que Linden lab l&#x27;a d&#xE9;sactiv&#xE9;" name="show_self_tag_check"/>
+      <check_box bottom_delta="-20" follows="top" label="Afficher sa propre couleur custom " tool_tip="Vous seul la voyez." name="show_self_tag_color_check"/>
+      <check_box bottom_delta="-20" follows="top" label="Afficher le tag (Friend)" tool_tip="Rajoute (friends) dans le tag quand vous voyez un(e) ami(e)." name="show_friend_tag_check"/>
       <!-- End of Left Side -->
-      <check_box bottom_delta="87" control_name="AscentUseCustomTag" follows="top" height="16" initial_value="true" label="Choisir une couleur custom (Mode Local uniquement)" left_delta="205" tool_tip="Vous seul(e) la voyez." name="customize_own_tag_check"/>
-      <text bottom_delta="-17" left_delta="25" follows="top" height="10" name="custom_tag_label_text">Label :</text>
-      <line_editor bottom_delta="-6" follows="top" font="SansSerif" height="18" left_delta="35" name="custom_tag_label_box" tool_tip="" width="100"/>
-      <text bottom_delta="6" left_delta="110" follows="top" height="10" name="custom_tag_color_text">Couleur :</text>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-22"        can_apply_immediately="false" color="1 1 1 1" follows="top" height="34" left_delta="35" name="custom_tag_color_swatch" control_name="AscentCustomTagColor" tool_tip="" width="30" />
-      <check_box bottom_delta="-8" control_name="AscentShowOthersTag" follows="top" height="16" initial_value="true" label="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" left_delta="-205" tool_tip="Le viewer utilis&#xE9; par les avatars ne peut plus &#xEA;tre visible depuis que Linden lab l&#x27;a d&#xE9;sactiv&#xE9;" name="show_other_tag_check"/>
-      <check_box bottom_delta="-20" control_name="AscentShowOthersTagColor" follows="top" height="16" initial_value="true" label="Afficher la couleur pour les autres avatars" left_delta="0" tool_tip="" name="show_client_tag_color_check"/>
-      <check_box bottom_delta="-20" control_name="AscentShowIdleTime" follows="top" height="16" initial_value="true" label="Afficher la dur&#xE9;e du 'IDLE'" tool_tip="Affiche le temps pendant lequel l'avatar est immobile." name="show_idle_time_check"/>
-      <check_box bottom_delta="-20" control_name="AscentUpdateTagsOnLoad" follows="top" height="16" initial_value="true" label="Chercher automatiquement les Mises &#xE0; Jour des Tags" left_delta="-205" tool_tip="" name="update_tags_check"/>
-      <button bottom_delta="0" control_name="ManualUpdate" name="update_clientdefs" follows="top" label="MAJ Manuelle" height="18" left_delta="340" width="110"/>
+      <check_box bottom_delta="87" follows="top" label="Choisir une couleur custom (Mode Local uniquement)" left_delta="205" tool_tip="Vous seul(e) la voyez." name="customize_own_tag_check"/>
+      <text bottom_delta="-17" left_delta="25" follows="top" name="custom_tag_label_text">Label :</text>
+      <line_editor bottom_delta="-6" left_delta="35" name="custom_tag_label_box" width="100"/>
+      <text bottom_delta="6" left_delta="110" follows="top" name="custom_tag_color_text">Couleur :</text>
+      <color_swatch bottom_delta="-22" follows="top" height="34" left_delta="35" name="custom_tag_color_swatch" width="30" />
+      <check_box bottom_delta="-8" follows="top" label="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" left_delta="-205" tool_tip="Le viewer utilis&#xE9; par les avatars ne peut plus &#xEA;tre visible depuis que Linden lab l&#x27;a d&#xE9;sactiv&#xE9;" name="show_other_tag_check"/>
+      <check_box bottom_delta="-20" follows="top" label="Afficher la couleur pour les autres avatars" left_delta="0" tool_tip="" name="show_client_tag_color_check"/>
+      <check_box bottom_delta="-20" follows="top" label="Afficher la dur&#xE9;e du 'IDLE'" tool_tip="Affiche le temps pendant lequel l'avatar est immobile." name="show_idle_time_check"/>
+      <check_box bottom_delta="-20" follows="top" label="Chercher automatiquement les Mises &#xE0; Jour des Tags" left_delta="-205" name="update_tags_check"/>
+      <button bottom_delta="0" name="update_clientdefs" follows="top" label="MAJ Manuelle" left_delta="340" width="110"/>
       <!-- End of Client Tag settings -->
-      <text bottom_delta="-25" follows="top" height="10" left="20" name="effects_color_textbox">Couleurs de mes effets :</text>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34" can_apply_immediately="true" color="1 1 1 1" control_name="EffectColor" follows="top" height="47" label="Effets" left_delta="138" name="effect_color_swatch" width="44"/>
-      <check_box bottom_delta="-20" control_name="AscentUseStatusColors" follows="top" height="16" initial_value="true" label="Activer les couleurs pour: Amis, Linden, etc..." left="10" tool_tip="" name="use_status_check"/>
-      <text bottom_delta="-20" follows="top" height="10" left_delta="10" name="friends_color_textbox">Choix des couleurs :
+      <text bottom_delta="-25" follows="top" left="20" name="effects_color_textbox">Couleurs de mes effets :</text>
+      <color_swatch bottom_delta="-34" follows="top" height="47" label="Effets" left_delta="138" name="effect_color_swatch" width="44"/>
+      <check_box bottom_delta="-20" follows="top" label="Activer les couleurs pour: Amis, Linden, etc..." left="10" name="use_status_check"/>
+      <text bottom_delta="-20" follows="top" left_delta="10" name="friends_color_textbox">Choix des couleurs :
 (Radar, Tag, Minimap)</text>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34" can_apply_immediately="true" color="1 1 1 1" control_name="AscentFriendColor" follows="top" height="47" label="Amis" left_delta="138" name="friend_color_swatch" width="44" tool_tip=""/>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="1 1 1 1" control_name="AscentEstateOwnerColor" follows="top" height="47" label="Estate" left_delta="54" name="estate_owner_color_swatch" width="44" tool_tip=""/>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.6 0.6 1 1" control_name="AscentLindenColor" follows="top" height="47" label="Lindens" left_delta="54" name="linden_color_swatch" width="44" tool_tip=""/>
-      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.8 1 1 1" control_name="AscentMutedColor" follows="top" height="47" label="Mut&#xE9;" left_delta="54" name="muted_color_swatch" width="44" tool_tip=""/>
+      <color_swatch bottom_delta="-34" follows="top" height="47" label="Amis" left_delta="138" name="friend_color_swatch" width="44"/>
+      <color_swatch bottom_delta="0" follows="top" height="47" label="Estate" left_delta="54" name="estate_owner_color_swatch" width="44"/>
+      <color_swatch bottom_delta="0" follows="top" height="47" label="Lindens" left_delta="54" name="linden_color_swatch" width="44"/>
+      <color_swatch bottom_delta="0" follows="top" height="47" label="Mut&#xE9;" left_delta="54" name="muted_color_swatch" width="44"/>
     </panel>
-    <panel border="true" left="1" bottom="-190" height="180" width="500" label="Body Dyn. (Bouger les n&#xE9;n&#xE9;s)" name="Body Dynamics">
-      <check_box bottom_delta="-25" follows="top" height="16" label="Activer les &#x22;physics&#x22; des n&#xE9;n&#xE9;s voire du popotin des avatars ^^" left="10" name="EmBreastsToggle" control_name="EmeraldBreastPhysicsToggle" tool_tip=""/>
-      <slider bottom_delta="-20" left="10" name="EmeraldBoobMass" control_name="EmeraldBoobMass" decimal_digits="0" follows="top" height="18" increment="1" label="Masse :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
-      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobHardness" control_name="EmeraldBoobHardness" decimal_digits="0" follows="top" height="18" increment="1" label="Rebond :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
-      <slider bottom_delta="-20" name="EmeraldBoobVelMax" control_name="EmeraldBoobVelMax" decimal_digits="0" follows="top" height="18" increment="1" label="V&#xE9;locit&#xE9; max :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
-      <slider bottom_delta="-20" name="EmeraldBoobFriction" control_name="EmeraldBoobFriction" decimal_digits="0" follows="top" height="18" increment="1" label="Friction :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
-      <slider bottom_delta="-20" name="EmeraldBoobVelMin" control_name="EmeraldBoobVelMin" decimal_digits="0" follows="top" height="18" increment="1" label="V&#xE9;locit&#xE9; min :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
+    <panel label="Body Dyn. (Bouger les n&#xE9;n&#xE9;s)" name="Body Dynamics">
+      <check_box bottom_delta="-25" follows="top" label="Activer les &#x22;physics&#x22; des n&#xE9;n&#xE9;s voire du popotin des avatars ^^" left="10" name="EmBreastsToggle"/>
+      <slider bottom_delta="-20" left="10" name="EmeraldBoobMass" follows="top" height="18" label="Masse :" label_width="100" width="250"/>
+      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobHardness" follows="top" height="18" label="Rebond :" label_width="100" width="250"/>
+      <slider bottom_delta="-20" name="EmeraldBoobVelMax"follows="top" label="V&#xE9;locit&#xE9; max :" label_width="100" width="250"/>
+      <slider bottom_delta="-20" name="EmeraldBoobFriction" follows="top" label="Friction :" label_width="100" width="250"/>
+      <slider bottom_delta="-20" name="EmeraldBoobVelMin" follows="top" label="V&#xE9;locit&#xE9; min :" label_width="100" width="250"/>
       <text bottom_delta="-20" height="15" left="10" name="av_mod_textbox" follows="top">Modifier l'offset de l'avatar</text>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="X Modif." label_width="65" left_delta="5" max_val="0.15" min_val="-0.15" name="X Modifier" width="128" control_name="AscentAvatarXModifier" tool_tip=""/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Y Modif." label_width="65" max_val="0.20" min_val="-0.20" name="Y Modifier" width="128" control_name="AscentAvatarYModifier" tool_tip=""/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.1" label="Z Modif." label_width="65" max_val="5.0" min_val="-5.0" name="Z Modifier" width="128" control_name="AscentAvatarZModifier" tool_tip=""/>
+      <spinner bottom_delta="-20" follows="top" label="X Modif." label_width="65" left_delta="5" name="X Modifier" width="128"/>
+      <spinner bottom_delta="-20" follows="top" label="Y Modif." label_width="65" name="Y Modifier" width="128"/>
+      <spinner bottom_delta="-20" follows="top" label="Z Modif." label_width="65" name="Z Modifier" width="128"/>
     </panel>
   </tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index 4b5084d9e..5eddc2f42 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -5,7 +5,7 @@
 		D&#xE9;cocher cette option pour passer en mode plein &#xE9;cran.
 	</text_editor>
 	<text name="WindowSizeLabel">
-		Taille de la fen&#xEA;tre:
+		Taille de la fen&#xEA;tre :
 	</text>
 	<combo_box name="windowsize combo">
 		<combo_item name="640x480">
@@ -25,10 +25,10 @@
 		</combo_item>
 	</combo_box>
 	<text name="DisplayResLabel" width="165">
-		R&#xE9;solution de l'affichage:
+		R&#xE9;solution de l'affichage :
 	</text>
 	<text name="AspectRatioLabel1" tool_tip="largeur/hauteur">
-		Rapport hauteur/largeur:
+		Rapport hauteur/largeur :
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
 		<combo_item name="4:3(StandardCRT)">
@@ -45,71 +45,61 @@
 		</combo_item>
 	</combo_box>
 	<text name="text">
-		R&#xE9;solution d'affichage:
+		R&#xE9;solution d'affichage :
 	</text>
 	<text name="Fullscreen Aspect Ratio:">
-		Format de plein &#xE9;cran:
+		Format de plein &#xE9;cran :
 	</text>
 	<text name="(width / height)">
 		(largeur / hauteur)
 	</text>
 	<text name="UI Size:">
-		Taille de l'IU:
+		Taille de l'IU :
 	</text>
 	<text name="(meters, lower is faster)">
 		(mètres, moins = plus rapide)
 	</text>
 	<text name="text2">
-		Options d'affichage:
+		Options d'affichage :
 	</text>
 	<check_box label="Lancer Singularity dans une fen&#xEA;tre (et non pas, PAR la fen&#xEA;tre)" name="windowed mode"/>
+	<button label="Param&#xE8;tres recommand&#xE9;s" tool_tip="Reset to recommended graphics settings" name="Defaults"/>
 	<check_box label="Auto-d&#xE9;tection du ratio" left="350" name="aspect_auto_detect"/>
 	<check_box label="Utiliser &#xE9;chelle de r&#xE9;solution ind&#xE9;pendante" name="ui_auto_scale"/>
 	<check_box label="Montrer l'avatar en vue subjective" name="avfp"/>
-	<spinner label="Distance d'affichage:" name="draw_distance"/>
-	<text name="HigherText">
-		Qualit&#xE9; et
-	</text>
-	<text name="QualityText">
-		Performance :
-	</text>
-	<text left="105" name="FasterText">
-		Plus rapide
-	</text>
-	<text name="ShadersPrefText">
-		Faible
-	</text>
-	<text name="ShadersPrefText2">
-		Moyen
-	</text>
-	<text name="ShadersPrefText3">
-		Elev&#xE9;
-	</text>
-	<text name="ShadersPrefText4">
-		Ultra
-	</text>
-	<text bottom="-86" left="325" name="HigherText2">
-		Plus &#xE9;lev&#xE9;e
-	</text>
+	<spinner label="Distance d'affichage :" name="draw_distance"/>
+	<check_box label="Auto-detect ratio" name="aspect_auto_detect"/>
+
+  <tab_container name="graphics_tab">
+	<panel label="Main" name="Main">
+	<text bottom="330"  height="12" left="10" name="QualityText">Qualité / Perfs:</text>
+	<text bottom_delta="0"  height="12" left="125" name="FasterText">Rapidité</text>
+	<text bottom_delta="-16" height="12" left_delta="45" name="ShadersPrefText">Bas</text>
+	<text bottom_delta="0" height="12" left_delta="30" name="ShadersPrefText2">Medium</text>
+	<text bottom_delta="0" height="12" left_delta="52" name="ShadersPrefText3">Haut</text>
+	<text bottom_delta="0" height="12" left_delta="35" name="ShadersPrefText4">Ultra</text>
+	<text bottom_delta="16"  height="12"	left_delta="23" name="QualityText2">Qualité</text>
 	<text name="QualityText2" visible="false"/>
 	<check_box label="Personnaliser" left="395" name="CustomSettings"/>
 	<text name="ShadersText">
-		Effets:
+		Effets :
 	</text>
-	<check_box label="Pla&#xE7;age de relief et brillance" name="BumpShiny"/>
+	<check_box label="Eau Transparente" name="TransparentWater"/>
+	<check_box label="Placage de relief et brillance" name="BumpShiny"/>
+	<check_box label="Lumi&#xE8;re locales" name="LightingDetailRadio"/>
 	<check_box label="Effets de base" name="BasicShaders" tool_tip="D&#xE9;sactiver cette option peut emp&#xEA;cher certains drivers de cartes graphiques de planter."/>
 	<check_box label="Effets atmosph&#xE9;riques" name="WindLightUseAtmosShaders"/>
 	<check_box label="D&#xE9;lissage" name="RenderDeferred" width="256" />
 	<check_box label="Occlusion ambiante" name="UseSSAO"/>
 	<check_box label="Profondeur de champ" name="RenderDepthOfField"/>
 	<check_box label="Illumination globale (Experimental)" name="RenderDeferredGI" width="256"/>
-	<text bottom_delta="-17" name="ReflectionDetailText" width="128">
-		Reflets:
+	<text  name="ReflectionDetailText" width="128">
+		Reflets :
 	</text>
 	<combo_box bottom_delta="-20" label="Reflection Detail" name="ReflectionDetailCombo">
 		<combo_item name="0">
            Aucun
-		</combo_item>
+           </combo_item>
 		<combo_item name="1">
 			Terrain et arbres
 		</combo_item>
@@ -123,22 +113,29 @@
 			Tout
 		</combo_item>
 	</combo_box>
-	<text bottom_delta="-17" name="ShadowDetailText" width="128">
-		Ombres att&#xE9;nu&#xE9;es:
-	</text>
-	<combo_box bottom_delta="-20" label="Shadow Detail" name="ShadowDetailCombo">
-	<combo_item name="0">
-		D&#xE9;sactiv&#xE9;
+  <text name="TerrainScaleText">Echelle du terrain:</text>
+  <combo_box label="Echelle du terrain" name="TerrainScaleCombo">
+    <combo_item name="Low">Faible</combo_item>
+    <combo_item name="Medium">Medium</combo_item>
+    <combo_item name="High">Haute</combo_item>
+    <combo_item name="Ultra">Ultra</combo_item>
+  </combo_box>
+  <text bottom_delta="-17" name="ShadowDetailText" width="128">
+    Ombres att&#xE9;nu&#xE9;es :
+  </text>
+  <combo_box bottom_delta="-20" label="Shadow Detail" name="ShadowDetailCombo">
+    <combo_item name="0">
+      D&#xE9;sactiv&#xE9;
     </combo_item>
     <combo_item name="1">
-        Ombres solaires
+      Ombres solaires
     </combo_item>
     <combo_item name="2">
-        Ombres des projecteurs
+      Ombres des projecteurs
     </combo_item>
   </combo_box>
 	<text name="AvatarRenderingText">
-		Rendu de l'avatar:
+		Rendu de l'avatar :
 	</text>
 	<check_box label="Avatars &#xE9;loign&#xE9;s en 2D" name="AvatarImpostors"/>
 	<check_box label="Acc&#xE9;l&#xE9;ration du rendu" name="AvatarVertexProgram"/>
@@ -149,18 +146,18 @@
 	<text name="DrawDistanceMeterText2">
 		m
 	</text>
-	<slider label="Limite d'affichage:" name="DrawDistance"/>
-	<slider label="Nombre de particules max.:" label_width="143" name="MaxParticleCount"/>
-	<slider label="Qualit&#xE9; post-traitement:" label_width="125" name="RenderPostProcess"/>
+	<slider label="Limite d'affichage :" name="DrawDistance"/>
+	<slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/>
+	<slider label="Qualit&#xE9; post-traitement :" label_width="125" name="RenderPostProcess"/>
 	<text name="MeshDetailText">
-		D&#xE9;tails des rendus:
+		D&#xE9;tails des rendus :
 	</text>
-	<slider label="  Objets:" name="ObjectMeshDetail"/>
-	<slider label="  Flexiprims:" name="FlexibleMeshDetail"/>
-	<slider label="  Arbres:" name="TreeMeshDetail"/>
-	<slider label="  Avatars:" name="AvatarMeshDetail"/>
-	<slider label="  Relief:" name="TerrainMeshDetail"/>
-	<slider label="  Ciel:" name="SkyMeshDetail"/>
+	<slider label="  Objets :" name="ObjectMeshDetail"/>
+	<slider label="  Flexiprims :" name="FlexibleMeshDetail"/>
+	<slider label="  Arbres :" name="TreeMeshDetail"/>
+	<slider label="  Avatars :" name="AvatarMeshDetail"/>
+	<slider label="  Relief :" name="TerrainMeshDetail"/>
+	<slider label="  Ciel :" name="SkyMeshDetail"/>
 	<text name="PostProcessText">
 		Faible
 	</text>
@@ -183,7 +180,7 @@
 		Faible
 	</text>
 	<text name="LightingDetailText">
-		Sources lumineuses:
+		Sources lumineuses :
 	</text>
 	<radio_group name="LightingDetailRadio">
 		<radio_item name="SunMoon">
@@ -194,7 +191,7 @@
 		</radio_item>
 	</radio_group>
 	<text left="380" name="TerrainDetailText">
-		Rendu du terrain:
+		Rendu du terrain :
 	</text>
 	<radio_group name="TerrainDetailRadio">
 		<radio_item name="0">
@@ -204,9 +201,35 @@
 			Elev&#xE9;
 		</radio_item>
 	</radio_group>
-	<button label="Param&#xE8;tres recommand&#xE9;s" left="20" name="Defaults" width="200"/>
-	<!--button label="Advanced" left="130" name="CustomSettingsButton"/-->
-	<button label="Configuration du mat&#xE9;riel" left="240" name="GraphicsHardwareButton" width="220"/>
+  </panel>
+
+  <panel name="Hardware" label="Configuration du mat&#xE9;riel">
+	<check_box bottom="-22" label="Filtre anisotrope (plus lent si activ&#xE9;)" left="5" name="ani"/>
+    <text bottom="-37" left="10" name="Antialiasing:">Antialiasing:</text>
+    <combo_box bottom="-41" label="Antialiasing" left="148" name="fsaa">
+      <combo_item name="FSAADisabled">Disabled</combo_item>
+      <combo_item name="2x">2x</combo_item>
+      <combo_item name="4x">4x</combo_item>
+      <combo_item name="8x">8x</combo_item>
+      <combo_item name="16x">16x</combo_item>
+    </combo_box>
+    <spinner bottom_delta="70" label="M&#xE9;moire graphique (MB):" label_width="138" left="10" name="GrapicsCardTextureMemory"
+     tool_tip="Taille de la m&#xE9;moire allou&#xE9;e aux textures. Par d&#xE9;faut, c&#x27;est celle de la carte graphique. La réduire peut am&#xE9;liorer les performances mais peut aussi rendre les textures floues." width="202"/>
+    <check_box bottom_delta="-25" label="Activer OpenGL Vertex Buffer Objects" left="5" name="vbo"
+     tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu'ils sont activés."/>
+    <check_box bottom_delta="-18" label="Activer Streamed VBOs" left="14" name="vbo_stream"
+     tool_tip="La performance peut être ameliorée si les VBO sont activés. Désactivé, on observe une meilleure performance pour certains processeurs AMD."/>
+    <check_box bottom_delta="-25" label="Activer la m&#xE9;moire tampon de la trame" left="5" name="fbo"
+     tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu'ils sont activés."/>
+    <spinner bottom="-42" label="Gamma:" label_width="138" left="250" name="gamma" width="202" tool_tip="(0 = défaut, valeur faible = plus lumineux)"/>
+    <spinner bottom_delta="70" label="Coefficient de Brouillard :" label_width="138" name="fog" width="202"/>
+    <text bottom_delta="-50" name="note">
+Note: Le Gamma et le brouillard, sont inactifs
+quand les effets atmosphériques
+le sont également.
+    </text>
+  </panel>
+ </tab_container>
 	<text name="resolution_format">
 		[RES_X] x [RES_Y]
 	</text>