diff --git a/indra/newview/skins/default/xui/de/floater_directory2.xml b/indra/newview/skins/default/xui/de/floater_directory2.xml
index 2e4dfe5ee..a99292f04 100644
--- a/indra/newview/skins/default/xui/de/floater_directory2.xml
+++ b/indra/newview/skins/default/xui/de/floater_directory2.xml
@@ -237,7 +237,7 @@ Um direkt zu kaufen, klicken Sie auf dem betreffenden Land in der Titelleiste au
       
       
       
-      <button tooltip="Zurücksetzen" name="reset_btn"/>
+      <button tool_tip="Zurücksetzen" name="reset_btn"/>
       <web_browser name="market_browser" trusted_content="true"/>
       
       <string name="loading_text">Wird geladen...</string>
diff --git a/indra/newview/skins/default/xui/de/floater_directory3.xml b/indra/newview/skins/default/xui/de/floater_directory3.xml
index 2fc63e0f9..e510fca6f 100644
--- a/indra/newview/skins/default/xui/de/floater_directory3.xml
+++ b/indra/newview/skins/default/xui/de/floater_directory3.xml
@@ -280,7 +280,7 @@ Um direkt zu kaufen, klicken Sie auf dem betreffenden Land in der Titelleiste au
       
       
       
-      <button tooltip="Zurücksetzen" name="reset_btn"/>
+      <button tool_tip="Zurücksetzen" name="reset_btn"/>
       <web_browser name="market_browser" trusted_content="true"/>
       
       <string name="loading_text">Wird geladen...</string>
diff --git a/indra/newview/skins/default/xui/en-us/floater_directory2.xml b/indra/newview/skins/default/xui/en-us/floater_directory2.xml
index 002de7414..04062fe07 100644
--- a/indra/newview/skins/default/xui/en-us/floater_directory2.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory2.xml
@@ -626,7 +626,7 @@ To buy direct, visit the land and click on the place name in the title bar.
       <button bottom="-30" follows="top|left" height="25" label="" left="10" name="back_btn" width="25" image_overlay="go-previous.png"/>
       <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next.png" />
       <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="reload_btn" width="25" image_overlay="view-refresh-5.png"/>
-      <button bottom_delta="0" follows="top|left" height="25" label="" tooltip="reset" left_delta="27" name="reset_btn" width="25" image_overlay="go-reload.png"/>
+      <button bottom_delta="0" follows="top|left" height="25" label="" tool_tip="reset" left_delta="27" name="reset_btn" width="25" image_overlay="go-reload.png"/>
       <web_browser name="market_browser" trusted_content="true" bottom="25" follows="all" left="10" right="-10" top="-40"/>
       <text bottom="5" follows="bottom|left" left="10" height="16" name="status_text"/>
       <string name="loading_text">Loading...</string>
diff --git a/indra/newview/skins/default/xui/en-us/floater_directory3.xml b/indra/newview/skins/default/xui/en-us/floater_directory3.xml
index f178cc46f..952dabbdd 100644
--- a/indra/newview/skins/default/xui/en-us/floater_directory3.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_directory3.xml
@@ -749,7 +749,7 @@ To buy direct, visit the land and click on the place name in the title bar.
       <button bottom="-30" follows="top|left" height="25" label="" left="10" name="back_btn" width="25" image_overlay="go-previous.png"/>
       <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next.png" />
       <button bottom_delta="0" follows="top|left" height="25" label="" left_delta="27" name="reload_btn" width="25" image_overlay="go-reload.png"/>
-      <button bottom_delta="0" follows="top|left" height="25" label="" tooltip="reset" left_delta="27" name="reset_btn" width="25" image_overlay="go-home.png"/>
+      <button bottom_delta="0" follows="top|left" height="25" label="" tool_tip="reset" left_delta="27" name="reset_btn" width="25" image_overlay="go-home.png"/>
       <web_browser name="market_browser" trusted_content="true" bottom="25" follows="all" left="10" right="-10" top="-40"/>
       <text bottom="5" follows="bottom|left" left="10" height="16" name="status_text"/>
       <string name="loading_text">Loading...</string>
diff --git a/indra/newview/skins/default/xui/en-us/floater_image_preview.xml b/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
index a495a9353..77c812a52 100644
--- a/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
@@ -60,7 +60,7 @@ Try saving image as 24 bit Targa (.tga).
 	<check_box bottom="37" control_name="TemporaryUpload" enabled="true"
              follows="bottom|left" font="SansSerifSmall" height="16"
              initial_value="false" label="Temporary (Free)"
-             left_delta="155" name="temp_check" width="280" tooltip="Sets the asset to be temporary, meaning its free, but in return, only good for a short time before it ceases to exist." />
+             left_delta="155" name="temp_check" width="280" tool_tip="Sets the asset to be temporary, meaning its free, but in return, only good for a short time before it ceases to exist." />
 	<button bottom="10" follows="bottom|right" height="20" label="Cancel" left="165"
 	     name="cancel_btn" width="125" />
 	<button bottom="10" follows="bottom|left" height="20" label="Upload ([UPLOADFEE])"
diff --git a/indra/newview/skins/default/xui/es/floater_directory3.xml b/indra/newview/skins/default/xui/es/floater_directory3.xml
index 09c082f64..8af5e1a25 100644
--- a/indra/newview/skins/default/xui/es/floater_directory3.xml
+++ b/indra/newview/skins/default/xui/es/floater_directory3.xml
@@ -488,7 +488,7 @@ subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno
 			<button label="" name="back_btn"/>
 			<button label="" name="forward_btn"/>
 			<button label="" name="reload_btn"/>
-			<button label="" tooltip="restablecer" name="reset_btn"/>
+			<button label="" tool_tip="restablecer" name="reset_btn"/>
 			<web_browser name="market_browser"/>
 			<text name="status_text"/>
 			<string name="loading_text">Cargando...</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_image_preview.xml b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
index 93ed1ca36..99a3213a8 100644
--- a/indra/newview/skins/default/xui/fr/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
@@ -49,7 +49,7 @@
 Sauvegarder en Targa 24 bits (.tga).
 	</text>
 	<check_box label="Compression sans perte" name="lossless_check"/>
-	<check_box label="Temporaire (Gratuit)" name="temp_check" tooltip="chargement gratuit mais qui disparaitra &#xE0; votre de&#xE9;connection."/>
+	<check_box label="Temporaire (Gratuit)" name="temp_check" tool_tip="chargement gratuit mais qui disparaitra &#xE0; votre de&#xE9;connection."/>
 	<button label="Annuler" name="cancel_btn"/>
 	<button label="Charger ([UPLOADFEE])" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index 317a2935e..ab91ae6ef 100644
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -152,7 +152,7 @@
 		</flyout_button_item>
 	</flyout_button>
 	<button label="Annuler" name="discard_btn" left="133" width="72" />
-	<check_box label="Image Temporaire (Gratuit)" name="temp_check" tooltip="Comme toute image temporaire elle disparaitra à votre deconnection."/>
+	<check_box label="Image Temporaire (Gratuit)" name="temp_check" tool_tip="Comme toute image temporaire elle disparaitra à votre deconnection."/>
 	<string name="unknown">
 		inconnu
 	</string>