diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 32bae811e4..85567d3648 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -42,26 +42,26 @@
 		Avatarnamen:
 	</text>
 	<radio_group name="Name_Tag_Preference">
-		<radio_item label="Aus" name="radio" width="87"/>
-		<radio_item label="An" name="radio2" width="87"/>
-		<radio_item label="Kurz anzeigen" name="radio3" width="87"/>
+		<radio_item label="Aus" name="radio"/>
+		<radio_item label="An" name="radio2"/>
+		<radio_item label="Kurz anzeigen" name="radio3"/>
 	</radio_group>
-	<text left_pad="0" name="RenderNameShowTime_LabelPrefix">
+	<text name="RenderNameShowTime_LabelPrefix">
 		(
 	</text>
 	<text name="RenderNameShowTime_LabelSuffix">
 		Sekunden)
 	</text>
 	<check_box label="Mein Name" name="show_my_name_checkbox1"/>
-	<check_box label="Benutzernamen" name="show_slids" tool_tip="Benutzernamen wie berndschmidt123 anzeigen" left_pad="75"/>
+	<check_box label="Benutzernamen" name="show_slids" tool_tip="Benutzernamen wie berndschmidt123 anzeigen" />
 	<check_box label="Gruppentitel" name="show_all_title_checkbox1" tool_tip="Gruppentitel wie „Vorstand“ oder „Mitglied“"/>
-	<check_box label="Eigenen Gruppentitel verstecken" name="RenderHideGroupTitle" tool_tip="Eigenen Gruppentitel für dich selbst und andere anzeigen bzw. verstecken." left_pad="75"/>
+	<check_box label="Eigenen Gruppentitel verstecken" name="RenderHideGroupTitle" tool_tip="Eigenen Gruppentitel für dich selbst und andere anzeigen bzw. verstecken."/>
 	<check_box label="Anzeigenamen anzeigen" name="display_names_check" tool_tip="Aktivieren Sie diese Option, um Anzeigenamen in Chat, IM, Avatarnamen usw. zu verwenden."/>
-	<check_box label="Viewer-Kennung anzeigen" name="show_viewerID" tool_tip="Zeigen den namen des erkannten Viewers neben dem Avatarnamen (verzögerter Effekt)" left_pad="75"/>
-	<check_box label="Altes Namensformat statt Benutzernamen" name="FSshow_legacyun" tool_tip="Zeigt den Avatarnamen im ursprünglichen Namensformat (Vorname Nachname) anstelle des Benutzernames (vorname.nachname)" left_pad="75" />
+	<check_box label="Viewer-Kennung anzeigen" name="show_viewerID" tool_tip="Zeigen den namen des erkannten Viewers neben dem Avatarnamen (verzögerter Effekt)"/>
+	<check_box label="Altes Namensformat statt Benutzernamen" name="FSshow_legacyun" tool_tip="Zeigt den Avatarnamen im ursprünglichen Namensformat (Vorname Nachname) anstelle des Benutzernames (vorname.nachname)" />
 	<check_box label="Freunde hervorheben" name="show_friends" tool_tip="Avatarnamen Ihrer Freunde hervorheben"/>
-	<check_box label="Im alten Namensformat „Resident“ nicht abschneiden" name="legacy_trim_check" tool_tip="Schneidet den Nachnamen „Resident“ im alten Namensformat nicht ab." left_pad="75"/>
-	<check_box label="Radar-Tags veröffentlichen und anzeigen (in Arbeit)" left_pad="75" name="FSPublishRadarTag" tool_tip="Zeigt die von anderen veröffentlichen Radar-Tags an und veröffentlicht gleichzeitig den eigenen 'Firestorm'-Tag. Diese Funktion benötigt die Firestorm-LSL-Brücke und ist momentan noch nicht vollständig implementiert."/>
+	<check_box label="Im alten Namensformat „Resident“ nicht abschneiden" name="legacy_trim_check" tool_tip="Schneidet den Nachnamen „Resident“ im alten Namensformat nicht ab." />
+	<check_box label="Radar-Tags veröffentlichen und anzeigen (in Arbeit)" name="FSPublishRadarTag" tool_tip="Zeigt die von anderen veröffentlichen Radar-Tags an und veröffentlicht gleichzeitig den eigenen 'Firestorm'-Tag. Diese Funktion benötigt die Firestorm-LSL-Brücke und ist momentan noch nicht vollständig implementiert."/>
 
 	<check_box label="Viewer-UI-Tipps aktivieren" name="viewer_hints_check"/>
 	<text name="inworld_typing_rg_label">
@@ -71,10 +71,10 @@
 		<radio_item label="Startet lokalen Chat" name="radio_start_chat"/>
 		<radio_item label="Beeinflusst Bewegung (z. B. WASD)" name="radio_move"/>
 	</radio_group>
-	<text name="title_afk_text" width="180">
+	<text name="title_afk_text">
 		Zeit bis zur Abwesenheit:
 	</text>
-	<text name="title_afk_quit_text" width="210">
+	<text name="title_afk_quit_text" >
 		Ausloggen im Abwesend-Modus nach:
 	</text> 
 	<combo_box label="Timeout für Abwesenheit:" name="afk">
@@ -92,7 +92,7 @@
 		<combo_box.item label="30 Minuten" name="item3"/>
 		<combo_box.item label="nie" name="item4"/>
 	</combo_box>
-	<check_box name="AvatarSitOnAway" label="Sitzen wenn abwesend" left_pad="30"/>
+	<check_box name="AvatarSitOnAway" label="Sitzen wenn abwesend"/>
 	<text name="text_box3">
 		Beschäftigt- und Abwesenheitsnachrichten können unter
 Privatsphäre, Automatische Antwort konfiguriert werden.
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 698ca10ef6..afeb14857e 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -7,8 +7,9 @@
  left="1"
  top="1"
  width="540"
- label="General"
- name="general_panel">
+ name="general_panel"
+ label="General">
+ <!--language-->
     <text
      type="string"
      length="1"
@@ -26,7 +27,7 @@
      follows="left|top"
      height="23"
      layout="topleft"
-     left="35"
+     left="30"
      max_chars="135"
      name="language_combobox"
      width="150">
@@ -97,19 +98,20 @@
          value="zh" />
     </combo_box>
     <text
+	 top_delta="4"
      font="SansSerifSmall"
      type="string"
      text_color="White_50"
      length="1"
      follows="left|top"
-     height="18"
+     height="15"
      layout="topleft"
-     left_pad="10"
+     left_pad="5"
      name="language_textbox2"
      width="130">
         (Requires restart)
     </text>
-
+<!--maturity-->
      <text
      type="string"
      length="1"
@@ -117,7 +119,7 @@
      height="15"
      layout="topleft"
      left="30"
-     top_pad="8"
+     top_pad="10"
      name="maturity_desired_prompt"
      width="200">
         I want to access content rated:
@@ -127,7 +129,7 @@
      follows="left|top"
      height="23"
      layout="topleft"
-     left="50"
+     left="30"
      name="maturity_desired_combobox"
      width="200">
         <combo_box.item
@@ -163,14 +165,14 @@
      layout="topleft"
      left_pad="5"
      name="rating_icon_general"
-     top_delta="3"
+     top_delta="-1"
      width="18"/>
     <icon
      follows="left|top"
      height="16"
      image_name="Parcel_M_Dark"
      layout="topleft"
-     left_pad="2"
+     left_pad="5"
      name="rating_icon_moderate"
      width="18"/>
     <icon
@@ -178,9 +180,10 @@
      height="16"
      image_name="Parcel_R_Dark"
      layout="topleft"
-     left_pad="2"
+     left_pad="5"
      name="rating_icon_adult"
      width="18"/>
+<!--start location-->
     <text
      type="string"
      length="1"
@@ -199,7 +202,7 @@
      height="23"
      layout="topleft"
      name="start_location_combo"
-     left="35"
+     left="30"
      width="150">
         <combo_box.item
          label="My Last Location"
@@ -216,11 +219,12 @@
      initial_value="true"
      label="Show on login"
      layout="topleft"
-     left_pad="20"
+     left_pad="5"
      name="show_location_checkbox"
      top_delta="5"
-     width="256" />
-
+     width="256"
+	 tool_tip="" />
+<!--name tags-->
     <text
      type="string"
      length="1"
@@ -238,7 +242,7 @@
      height="20"
      width="280"
      layout="topleft"
-     left="35"
+     left="30"
      top_pad="0"
      name="Name_Tag_Preference">
         <radio_item
@@ -249,7 +253,7 @@
          height="16"
          left="0"
          value="0"
-         width="75" />
+         width="95" />
         <radio_item
          label="On"
          left_pad="0"
@@ -258,7 +262,7 @@
          height="16"
          name="radio2"
          value="1"
-         width="75" />
+         width="95" />
         <radio_item
          label="Show briefly"
          left_pad="0"
@@ -267,7 +271,7 @@
          layout="topleft"
          top_delta="0"
          value="2"
-         width="160" />
+         width="120" />
     </radio_group>
     <text
      type="string"
@@ -275,7 +279,7 @@
      follows="left|top"
      height="15"
      layout="topleft"
-     left_pad="-25"
+     left_pad="100"
      name="RenderNameShowTime_LabelPrefix"
      top_delta="0"
      width="5">
@@ -313,10 +317,11 @@
      height="16"
      label="My name"
      layout="topleft"
-     left="35"
+     left="30"
      name="show_my_name_checkbox1"
-     top_pad="2"
-     width="100" />
+     top_pad="8"
+     width="140"
+	 tool_tip="" />
     <check_box
      control_name="NameTagShowUsernames"
      enabled_control="AvatarNameTagMode"
@@ -335,8 +340,8 @@
      height="16"
      label="Group titles"
      layout="topleft"
-     left="35"
-     width="100"
+     left="30"
+     width="140"
      name="show_all_title_checkbox1"
      tool_tip="Show group titles, like Officer or Member"
      top_pad="3" />
@@ -356,9 +361,9 @@
      height="16"
      label="View Display Names"
      layout="topleft"
-     left="35"
+     left="30"
      name="display_names_check"
-     width="100"
+     width="140"
      tool_tip="Check to use display names in chat, IM, name tags, etc."
      top_pad="3">
         <check_box.commit_callback
@@ -381,8 +386,8 @@
      height="16"
      label="Highlight friends"
      layout="topleft"
-     left="35"
-     width="100"
+     left="30"
+     width="140"
      top_pad="3"
      name="show_friends"
      tool_tip="Highlight the name tags of your friends."
@@ -414,7 +419,7 @@
      tool_tip="Enabling this will allow scripted HUDs to receive a tag named 'Firestorm' when displaying information about your avatar. This functionality enhances the functionality of some scripted radar HUDs, and uses the Firestorm LSL bridge."
      top_delta="0" />
      -->
-	 
+<!--away/logout-->
 	 <text
      type="string"
      length="1"
@@ -424,7 +429,7 @@
      left="30"
      top_pad="20"
      name="title_afk_text"
-     width="150">
+     width="260">
         Away timeout:
     </text>
 
@@ -434,10 +439,10 @@
      follows="left|top"
      height="13"
      layout="topleft"
-     left_pad="5"
+     left_pad="0"
      top_delta="0"
      name="title_afk_quit_text"
-     width="190">
+     width="200">
         Log out after being marked away:
     </text>
 
@@ -445,12 +450,13 @@
      height="23"
      layout="topleft"
      control_name="AFKTimeout"
-     left="25"
+     left="30"
      top_pad="5"
-     label="Away timeout:"
+	 label="Away timeout:"
      top_delta="0"
      name="afk"
-     width="120">
+     width="100"
+	 tool_tip="">
         <combo_box.item
          label="2 minutes"
          name="item0"
@@ -477,14 +483,27 @@
          value="0" />
     </combo_box>
 
+    <check_box
+     control_name="AvatarSitOnAway"
+     name="AvatarSitOnAway"
+     follows="top|left"
+     height="16"
+     label="Sit when away"
+     layout="topleft"
+     left_pad="5"
+     top_delta="4"
+     width="150"
+	 tool_tip=""/>
+
     <combo_box
      height="23"
      layout="topleft"
      control_name="QuitAfterSecondsOfAFK"
-     left_pad="40"
-     top_delta="0"
+     left_pad="5"
+     top_delta="-4"
      name="quitafk"
-     width="120">
+     width="100"
+	 tool_tip="">
         <combo_box.item
          label="2 minutes"
          name="item0"
@@ -507,17 +526,6 @@
 		 value="0" />
     </combo_box>
 
-    <check_box
-     control_name="AvatarSitOnAway"
-     name="AvatarSitOnAway"
-     follows="top|left"
-     height="16"
-     label="Sit when away"
-     layout="topleft"
-     left_pad="50"
-     top_delta="5"
-     width="50"/>
-
     <text
      type="string"
      length="1"
@@ -531,7 +539,7 @@
      width="500">
        Busy and Autoresponse messages can be found under Privacy / Autoresponse
     </text>
-
+<!--extras-->
     <panel
      border="true"
      bevel_style="none"
@@ -558,7 +566,7 @@
         </text>
         <check_box
          top_pad="5"
-         left="5"
+         left="2"
          control_name="FSUseWebProfiles"
          follows="left|top"
          layout="topleft"
@@ -586,7 +594,7 @@
          height="34"
          width="200"
          layout="topleft"
-         left="10"
+         left="2"
          top_pad="0"
          name="inworld_typing_preference">
             <radio_item
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index e9bae85abd..d58fe2f005 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -41,11 +41,11 @@
 		Etiquetas de los nombres:
 	</text>
 	<radio_group name="Name_Tag_Preference">
-		<radio_item label="No mostrar" name="radio" width="100"/>
+		<radio_item label="No mostrar" name="radio"/>
 		<radio_item label="Mostrar" name="radio2"/>
 		<radio_item label="Mostrar brevemente" name="radio3"/>
 	</radio_group>
-	<text name="RenderNameShowTime_LabelPrefix" left_pad="35">
+	<text name="RenderNameShowTime_LabelPrefix">
 		(
 	</text>
 	<text name="RenderNameShowTime_LabelSuffix">
@@ -73,7 +73,7 @@
 	<text name="title_afk_text">
 		Ausente tras:
 	</text>
-	<text name="title_afk_quit_text" top_delta="-15" width="120" height="25">
+	<text name="title_afk_quit_text" top_delta="-15" width="120" height="25" left_pad="55">
 		Desconectar tras
 permanecer ausente:
 	</text>
@@ -85,14 +85,14 @@ permanecer ausente:
 		<combo_box.item label="60 minutos" name="item4"/>
 		<combo_box.item label="nunca" name="item5"/>
 	</combo_box>
-	<combo_box name="quitafk">
+	<combo_box name="quitafk" left_pad="60">
 		<combo_box.item label="2 minutos" name="item0"/>
 		<combo_box.item label="5 minutos" name="item1"/>
 		<combo_box.item label="10 minutos" name="item2"/>
 		<combo_box.item label="30 minutos" name="item3"/>
 		<combo_box.item label="nunca" name="item4"/>
 	</combo_box>
-	<check_box name="AvatarSitOnAway" label="Sentarme cuando estoy ausente" left_pad="15"/>
+	<check_box name="AvatarSitOnAway" label="Sentarme cuando estoy ausente" />
 	<text name="text_box3" height="25">
 		Los mensajes para los modos Ocupado y Autorrespuesta
 se encuentran en Privacidad / Autorrespuesta
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 440d1832c9..d26acbc7d9 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -1,83 +1,173 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Général" name="general_panel">
-	<text name="language_textbox">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--alba30130521-->
+<panel name="general_panel"
+	label="Général">
+<!--language-->
+    <text name="language_textbox">
 		Langue :
 	</text>
 	<combo_box name="language_combobox">
-		<combo_box.item label="Choix par défaut" name="System Default Language"/>
-		<combo_box.item label="English (Anglais)" name="English"/>
-		<combo_box.item label="Dansk (Danois) - Bêta" name="Danish"/>
-		<combo_box.item label="Deutsch (Allemand) - Bêta" name="Deutsch(German)"/>
-		<combo_box.item label="Español (Espagnol) - Bêta" name="Spanish"/>
-		<combo_box.item label="Français - Bêta" name="French"/>
-		<combo_box.item label="Italiano (Italien) - Bêta" name="Italian"/>
-		<combo_box.item label="Polski (Polonais) - Bêta" name="Polish"/>
-		<combo_box.item label="Português (Portugais) - Bêta" name="Portugese"/>
-		<combo_box.item label="Русский (Russe) - Bêta" name="Russian"/>
-		<combo_box.item label="Türkçe (Turc) - Bêta" name="Turkish"/>
-		<combo_box.item label="日本語 (Japonais) - Bêta" name="(Japanese)"/>
-		<combo_box.item label="正體中文 (Chinois traditionnel) - Bêta" name="Traditional Chinese"/>
+		<combo_box.item name="System Default Language"
+			label="Choix par défaut du système" />
+		<combo_box.item name="English"
+			label="English (Anglais)" />
+		<combo_box.item name="Danish"
+			label="Dansk (Danois) - Bêta" />
+		<combo_box.item name="Deutsch(German)"
+			label="Deutsch (Allemand) - Bêta" />
+		<combo_box.item name="Spanish"
+			label="Español (Espagnol) - Bêta" />
+		<combo_box.item name="French"
+			label="Français - Bêta" />
+		<combo_box.item name="Italian"
+			label="Italiano (Italien) - Bêta" />
+		<combo_box.item name="Polish"
+			label="Polski (Polonais) - Bêta" />
+		<combo_box.item name="Portugese"
+			label="Português (Portugais) - Bêta" />
+		<combo_box.item name="Russian"
+			label="Русский (Russe) - Bêta" />
+		<combo_box.item name="Turkish"
+			label="Türkçe (Turc) - Bêta" />
+		<combo_box.item name="(Japanese)"
+			label="日本語 (Japonais) - Bêta" />
+		<combo_box.item name="Traditional Chinese"
+			label="正體中文 (Chinois traditionnel) - Bêta" />
 	</combo_box>
 	<text name="language_textbox2">
-		(redémarrage requis)
+		(Redémarrage requis)
 	</text>
+<!--maturity-->
 	<text name="maturity_desired_prompt">
-		Je veux accéder au contenu classé :
+		Accéder au contenu classé :
 	</text>
-	<text name="maturity_desired_textbox"/>
 	<combo_box name="maturity_desired_combobox">
-		<combo_box.item label="Général, Modéré, Adulte" name="Desired_Adult"/>
-		<combo_box.item label="Général et Modéré" name="Desired_Mature"/>
-		<combo_box.item label="Général" name="Desired_PG"/>
+		<combo_box.item name="Desired_Adult"
+			label="Général, modéré et adulte" />
+		<combo_box.item name="Desired_Mature"
+			label="Général et modéré" />
+		<combo_box.item name="Desired_PG"
+			label="Général" />
 	</combo_box>
+<!--start location-->
 	<text name="start_location_textbox">
-		Lieu de départ :
+		Lieu d'arrivée :
 	</text>
 	<combo_box name="start_location_combo">
-		<combo_box.item label="Dernier emplacement" name="MyLastLocation" tool_tip="Par défaut, choisir mon dernier emplacement comme lieu de départ."/>
-		<combo_box.item label="Domicile" name="MyHome" tool_tip="Par défaut, choisir mon domicile comme lieu de départ."/>
+		<combo_box.item name="MyLastLocation"
+			label="Dernier emplacement"/>
+		<combo_box.item name="MyHome"
+			label="Domicile"/>
 	</combo_box>
-	<check_box initial_value="true" label="Afficher à la connexion" name="show_location_checkbox"/>
+	<check_box name="show_location_checkbox"
+		label="Afficher à la connexion"
+		tool_tip="Ajoute le sélecteur de destinations sur la fenêtre de connexion." />
+<!--name tag-->
 	<text name="name_tags_textbox">
-		Affichage des noms :
+		Label et contenu :
 	</text>
 	<radio_group name="Name_Tag_Preference">
-		<radio_item label="Désactivé" name="radio"/>
-		<radio_item label="Activé" name="radio2"/>
-		<radio_item label="Afficher brièvement" name="radio3"/>
+		<radio_item name="radio"
+			label="Désactiver" />
+		<radio_item name="radio2"
+			label="Activer" />
+		<radio_item name="radio3"
+			label="Afficher brièvement" />
 	</radio_group>
-	<text left_pad="5" name="RenderNameShowTime_LabelPrefix">
+	<text name="RenderNameShowTime_LabelPrefix">
 		(
 	</text>
 	<text name="RenderNameShowTime_LabelSuffix">
-		seconds)
+		secondes)
 	</text>
-	<check_box label="Mon nom" name="show_my_name_checkbox1"/>
-	<check_box label="Noms d&apos;utilisateur" name="show_slids" tool_tip="Afficher le nom d&apos;utilisateur, comme bobsmith123."/>
-	<check_box label="Titres de groupe" name="show_all_title_checkbox1" tool_tip="Afficher les titres de groupe, comme Officier ou Membre."/>
-	<check_box label="Mettre mes amis en surbrillance" name="show_friends" tool_tip="Mettre en surbrillance l&apos;affichage des noms de vos amis."/>
-	<check_box label="Voir les noms d&apos;affichage" name="display_names_check" tool_tip="Cocher pour utiliser les noms d&apos;affichage dans les chats, les IM, l&apos;affichage des noms, etc."/>
-	<text name="inworld_typing_rg_label">
-		Appuyer sur les touches lettre :
-	</text>
-	<radio_group name="inworld_typing_preference">
-		<radio_item label="Lance le chat local" name="radio_start_chat"/>
-		<radio_item label="Affecte le déplacement (ZQSD/WASD)" name="radio_move"/>
-	</radio_group>
+	<check_box name="show_my_name_checkbox1"
+		label="Mon nom"
+		tool_tip="Afficher votre nom." />
+	<check_box name="show_slids" 
+		label="Nom d&apos;utilisateur"
+		tool_tip="Afficher le nom d&apos;utilisateur, comme bobsmith123."/>
+	<check_box name="show_all_title_checkbox1"
+		label="Titre de groupe"
+		tool_tip="Afficher le titre de groupe, comme Officier ou Membre."/>
+	<check_box name="RenderHideGroupTitle"
+		label="Masquer mon titre de groupe"
+		tool_tip="Masquer / afficher votre titre de groupe à vous-même et à autrui."/>
+    <check_box name="display_names_check" 
+		label="Nom d&apos;affichage"
+		tool_tip="Voir le nom d&apos;affichage (display name) dans les chats, les IM, les labels, etc.">
+	</check_box>
+	<check_box name="FSshow_legacyun"
+		label="Nom hérité plutôt que nom d'utilisateur"
+		tool_tip="Afficher le nom hérité (Prénom Nom) plutôt que le nom d'utilisateur (prénom.nom)."/>
+	<check_box  name="show_friends"
+		label="Surbrillance"
+		tool_tip="Afficher en surbrillance les labels des personnes de votre liste de contacts. (N'est pas en relation avec l'onglet Firestorm → Label.)"/>
+	<check_box name="legacy_trim_check"
+		label="Afficher 'Resident'"
+		tool_tip="Ajouter 'Resident' au nom hérité.">
+	</check_box>
+	<!--FIRE-5505 (work in progress)-->
+	<check_box name="FSPublishRadarTag"
+		label="Publier le label du viewer"
+		tool_tip="Cette fonction permet aux HUDs de recevoir un label appelé 'Firestorm' lors de l'affichage d'informations sur votre avatar. Cette option améliore la fonctionnalité de certains HUDs radar, et utilise le pont (bridge) LSL Firestorm."/>
+<!--time/log out-->
 	<text name="title_afk_text">
-		Me montrer absent après :
+		Absent après :
 	</text>
-	<combo_box label="Me montrer absent après :" name="afk">
-		<combo_box.item label="2 minutes" name="item0"/>
-		<combo_box.item label="5 minutes" name="item1"/>
-		<combo_box.item label="10 minutes" name="item2"/>
-		<combo_box.item label="30 minutes" name="item3"/>
-		<combo_box.item label="Jamais" name="item4"/>
+	<text name="title_afk_quit_text">
+		Déconnecter après :
+    </text>
+    <combo_box name="afk"
+		tool_tip="Délai d'inactivité avant que le système ne montre votre avatar comme étant absent." >
+		<combo_box.item name="item0"
+			label="2 minutes" />
+		<combo_box.item name="item1"
+			label="5 minutes" />
+		<combo_box.item name="item2"
+			label="10 minutes" />
+		<combo_box.item name="item3"
+			label="30 minutes" />
+		<combo_box.item name="item4"
+			label="60 minutes" />
+		<combo_box.item name="item5"
+			label="Jamais"/>
 	</combo_box>
-	<text name="text_box3">
-		Réponse si occupé(e) :
-	</text>
-	<text_editor name="busy_response">
-		log_in_to_change
-	</text_editor>
-</panel>
+	<combo_box name="quitafk"
+		tool_tip="Délai d'attente, additionné au délai d'inactivité, avant que le système ne déconnecte votre avatar.">
+        <combo_box.item name="item0"
+			label="2 minutes"/>
+        <combo_box.item name="item1"
+			label="5 minutes"/>
+        <combo_box.item name="item2"
+			label="10 minutes"/>
+        <combo_box.item name="item3"
+			label="30 minutes"/>
+		<combo_box.item name="item4"
+			label="jamais"/>
+    </combo_box>
+    <check_box name="AvatarSitOnAway"
+		label="Asseoir si absent"
+		tool_tip="Asseoir automatiquement votre avatar en mode absent."/>
+    <text name="text_box3">
+		(Les réponses automatiques sont dans l'onglet Confidentialité → Auto-réponse)
+    </text>
+<!--extras-->
+	<panel name="general_extras" >
+        <text name="text_box3">
+			Options supplémentaires :
+        </text>
+        <check_box name="FSUseWebProfiles"
+			label="Utiliser le profil web par défaut"
+			tool_tip="Affiche les profils comme une page web plutôt que comme une fenêtre style v1"/>
+	<!-- This option is duplicated here for ease of locating and to replicate LLv3 -->
+		<text name="inworld_typing_rg_label">
+			Presser une touche du clavier :
+		</text>
+		<radio_group name="inworld_typing_preference">
+			<radio_item name="radio_start_chat"
+				label="Lance le chat local" />
+			<radio_item name="radio_move"
+				label="Affecte le déplacement (WASD)" />
+		</radio_group>
+	</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
index 732322ece1..6f2d693c43 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
@@ -46,7 +46,7 @@
 		<radio_item label="On" name="radio2"/>
 		<radio_item label="Mostra brevemente" name="radio3"/>
 	</radio_group>
-	<text left_pad="5" name="RenderNameShowTime_LabelPrefix">
+	<text name="RenderNameShowTime_LabelPrefix">
 		(
 	</text>
 	<text name="RenderNameShowTime_LabelSuffix">
@@ -75,7 +75,7 @@
 	<text name="title_afk_text">
 		Pausa assenza:
 	</text>
-	<text name="title_afk_quit_text">
+	<text name="title_afk_quit_text" left_pad="40">
 		Logout da away dopo:
 	</text>
 	<combo_box label="Pausa assenza:" name="afk">
@@ -86,7 +86,7 @@
 		<combo_box.item label="60 minuti" name="item4"/>
 		<combo_box.item label="Mai" name="item5"/>
 	</combo_box>
-	<combo_box label="Logout da away dopo:" name="quitafk">
+	<combo_box label="Logout da away dopo:" name="quitafk" left_pad="45">
 		<combo_box.item label="2 minuti" name="item0"/>
 		<combo_box.item label="5 minuti" name="item1"/>
 		<combo_box.item label="10 minuti" name="item2"/>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
index 46054db783..97782d44be 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_general.xml
@@ -45,7 +45,7 @@
 		<radio_item label="Włącz" name="radio2"/>
 		<radio_item label="Pokaż na chwilę" name="radio3"/>
 	</radio_group>
-	<text left_pad="-20" name="RenderNameShowTime_LabelPrefix">
+	<text name="RenderNameShowTime_LabelPrefix">
 		(
 	</text>
 	<text name="RenderNameShowTime_LabelSuffix">
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
index 9b098e56ea..1b55fb2090 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
@@ -44,7 +44,7 @@
 		<radio_item label="Вкл." name="radio2"/>
 		<radio_item label="Временный показ" name="radio3"/>
 	</radio_group>
-	<text left_pad="0" name="RenderNameShowTime_LabelPrefix">
+	<text name="RenderNameShowTime_LabelPrefix">
 		(
 	</text>
 	<text name="RenderNameShowTime_LabelSuffix">
@@ -55,10 +55,10 @@
 	<check_box label="Титулы групп" name="show_all_title_checkbox1" tool_tip="Показывать титулы групп, например, Officer или Member"/>
 	<check_box label="Подсветка друзей" name="show_friends" tool_tip="Подсвечивать теги имен ваших друзей"/>
 	<check_box label="Экранные имена" name="display_names_check" tool_tip="Показывать экранные имена в чате, IM, тегах имен и пр."/>
-	<check_box label="Показать титул группы" name="RenderHideGroupTitle" tool_tip="EПоказать титул своей активной группы" left_pad="75"/>
-	<check_box label="Показать Viewer" name="show_viewerID" tool_tip="Показывает рядом с именем пользователя используемый Viewer" left_pad="75"/>
-	<check_box label="Старый формат" name="FSshow_legacyun" tool_tip="Имя Фамилия в замен имя.фамилия" left_pad="75" />
-	<check_box label="Показать тэги радара (в работе)" left_pad="75" name="FSPublishRadarTag" tool_tip="показать вивер другим на радаре"/>
+	<check_box label="Показать титул группы" name="RenderHideGroupTitle" tool_tip="EПоказать титул своей активной группы" />
+	<check_box label="Показать Viewer" name="show_viewerID" tool_tip="Показывает рядом с именем пользователя используемый Viewer" />
+	<check_box label="Старый формат" name="FSshow_legacyun" tool_tip="Имя Фамилия в замен имя.фамилия" />
+	<check_box label="Показать тэги радара (в работе)" name="FSPublishRadarTag" tool_tip="показать вивер другим на радаре"/>
 
 	<text name="inworld_typing_rg_label">
 		Нажатие клавиш с буквами:
@@ -67,10 +67,10 @@
 		<radio_item label="Начинает локальный чат" name="radio_start_chat"/>
 		<radio_item label="Приводит к перемещению (т. е. WASD)" name="radio_move"/>
 	</radio_group>
-	<text name="title_afk_text" width="180">
+	<text name="title_afk_text" >
 		Статус "Отошел" через:
 	</text>
-	<text name="title_afk_quit_text" width="210">
+	<text name="title_afk_quit_text" left_pad="40">
 		Выйти из системы через:
 	</text> 
 	<combo_box label="Статус 'Отошел' через:" name="afk">
@@ -80,14 +80,14 @@
 		<combo_box.item label="30 минут" name="item3"/>
 		<combo_box.item label="никогда" name="item4"/>
 	</combo_box>
-	<combo_box  layout="topleft" left_pad="70" name="quitafk">
+	<combo_box  layout="topleft" left_pad="60" name="quitafk">
 		<combo_box.item label="2 минуты" name="item0"/>
 		<combo_box.item label="5 минут" name="item1"/>
 		<combo_box.item label="10 минут" name="item2"/>
 		<combo_box.item label="30 минут" name="item3"/>
 		<combo_box.item label="никогда" name="item4"/>
 	</combo_box>
-	<check_box name="AvatarSitOnAway" label="Сесть, если статус 'Отошел'" left_pad="20"/>
+	<check_box name="AvatarSitOnAway" label="Сесть, если статус 'Отошел'" />
 	<text name="text_box3">
 		Сообщение автоответчика (для "Занят" и для автоответчика):
 	</text>
@@ -110,4 +110,4 @@
             <radio_item label="Ходить (WASD)" name="radio_move"/>
         </radio_group>
 	</panel>
-</panel>
\ No newline at end of file
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index ca89e41962..5b0191e9a4 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -45,7 +45,7 @@
 		<radio_item label="啟動" name="radio2"/>
 		<radio_item label="簡短顯示" name="radio3"/>
 	</radio_group>
-	<text left_pad="-55" name="RenderNameShowTime_LabelPrefix">
+	<text name="RenderNameShowTime_LabelPrefix">
 		(
 	</text>
 	<text name="RenderNameShowTime_LabelSuffix">