diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
index 9958279ec..ae05c8bb2 100644
--- a/indra/newview/skins/default/xui/de/menu_login.xml
+++ b/indra/newview/skins/default/xui/de/menu_login.xml
@@ -8,6 +8,6 @@
 	</menu>
 	<menu label="Hilfe" name="Help">
 		<menu_item_call label="Hilfe zu Snowglobe/Second Life" name="Second Life Help"/>
-		<menu_item_call label="Über [APP_NAME]..." name="About Second Life..."/>
+		<menu_item_call label="Über [SHORT_APP_NAME]..." name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 71a41de40..7d9ff54d9 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -247,19 +247,19 @@
 		<menu label="Fehlermeldungen" name="Bug Reporting">
 			<menu_item_call label="Allgemeiner Probleme-Tracker..." name="Public Issue Tracker..."/>
 			<menu_item_call label="Hilfe zum Allgemeinen Probleme-Tracker..." name="Publc Issue Tracker Help..."/>
-			<menu_item_call label="Singularity Probleme-Tracker..." name="Singularity Issue Tracker..."/>
+			<menu_item_call label="[SHORT_APP_NAME] Probleme-Tracker..." name="Singularity Issue Tracker..."/>
 			<menu_item_separator label="-----------" name="separator7"/>
 			<menu_item_call label="Fehlermeldungs 101..." name="Bug Reporting 101..."/>
 			<menu_item_call label="Sicherheitsprobleme..." name="Security Issues..."/>
 			<menu_item_call label="QA-Wiki..." name="QA Wiki..."/>
 			<menu_item_separator label="-----------" name="separator9"/>
 			<menu_item_call label="Fehler melden..." name="Report Bug..."/>
-			<menu_item_call label="Singularity Problem berichten..." name="Report Singularity Bug..."/>
+			<menu_item_call label="[SHORT_APP_NAME] Problem berichten..." name="Report Singularity Bug..."/>
 			<menu_item_call label="Neue Funktionalität nachfragen..." name="Request New Feature..."/>
 		</menu>
 		<menu_item_call label="Über [APP_NAME]..." name="About Second Life..."/>
 	</menu>
-	<menu label="Singularity" name="Singularity">
+	<menu label="[SHORT_APP_NAME]" name="Singularity">
 		<menu_item_call label="Alle Dialoge schließen" name="Close All Dialogs"/>
 		
 		<menu_item_call label="Täusche Abwesend-Status vor" name="Fake Away Status"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index 37a86b525..6fb3958a4 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -1050,7 +1050,7 @@ In Ihren Anwendungsordner herunterladen?<usetemplate name="okcancelbuttons" yest
 
   <notification name="WebLaunchPublicIssue">Im [SECOND_LIFE] Allgemeine-Fragen-Tracker k&#xF6;nnen Sie Fehler und andere Probleme melden.<usetemplate name="okcancelignore" yestext="Gehe zu Seite"/></notification>
 
-  <notification name="WebLaunchSinguIssue">Besuche den Singularity Issue Tracker, um Fehler und Bugs mit dem Singularity Viewer zu berichten.
+  <notification name="WebLaunchSinguIssue">Besuche den [SHORT_APP_NAME] Issue Tracker, um Fehler und Bugs mit dem [SHORT_APP_NAME] Viewer zu berichten.
 Achte bitte da drauf das deine Meldung nicht schon existiert.<usetemplate name="okcancelignore" yestext="Gehe zu Seite"/></notification>
 
   <notification name="WebLaunchPublicIssueHelp">Informieren Sie sich im [SECOND_LIFE] Wiki &#xFC;ber den Allgemeine Fragen-Tracker.<usetemplate name="okcancelignore" yestext="Gehe zu Seite"/></notification>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/de/panel_preferences_ascent_system.xml
index ac0a2cd25..f46bd45af 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_ascent_system.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="System" name="ascsys">
-  <tab_container label="Singularity System" name="Ascent System">
+  <tab_container label="System" name="Ascent System">
 
     <panel label="Generell" name="User Interface">
       <check_box label="Teleport mit Doppelklick erlauben" tool_tip="Doppelklick auf eine Person oder Ort teleportiert dich dorthin" name="double_click_teleport_check"/>
@@ -16,7 +16,7 @@
       <check_box label="Fliegen immer erlauben" tool_tip="Erlaubt dir in Flugverbotszonen zu fliegen. Benutzung auf eigene Gefahr - Es zu können heisst nicht, daß man es auch sollte." name="always_fly_check"/>
       <check_box label="Deaktiviert die Minimal-Distanz der Kamera zum Objekt" tool_tip="Erlaubt mit der Kamera ganz ganz nah zu zoomen." name="disable_camera_zoom_check"/>
       <check_box label="Power User Funktionen einschalten" tool_tip="Fügt Optionen hinzu, die normalerweise als zu gefährlich erachtet werden. Diese Optionen können schwerste Fehler verursachen wenn sie falsch benutzt werden - entweder an dir oder deinem Inventar. Wenn du dir wirklich sicher bist, aktiviere die Checkbox unten ebenfalls." name="power_user_check"/>
-      <check_box label="Power User Funktionen bestätigen" tool_tip="Bestätigt Power User Funktionen. Aktiviere dies auf eingene Gefahr und benutze alle Features die aktiviert werden verantwortungsvoll. Die Singularity Entwicker ersetzen nichts was durch die Benutzung dieser Funktionen zerstört wird. Wir empfehlen immer Backups von allem zu erstellen, um nicht Opfer dieser Funktionen zu werden. Im Gegensatz zu anderen Checkboxen, musst du erst Anwenden oder OK klicken um es zu aktivieren." name="power_user_confirm_check"/>
+      <check_box label="Power User Funktionen bestätigen" tool_tip="Bestätigt Power User Funktionen. Aktiviere dies auf eingene Gefahr und benutze alle Features die aktiviert werden verantwortungsvoll. Die [SHORT_APP_NAME] Entwicker ersetzen nichts was durch die Benutzung dieser Funktionen zerstört wird. Wir empfehlen immer Backups von allem zu erstellen, um nicht Opfer dieser Funktionen zu werden. Im Gegensatz zu anderen Checkboxen, musst du erst Anwenden oder OK klicken um es zu aktivieren." name="power_user_confirm_check"/>
       <check_box label="Lade das Inventar automatisch im Hintergrund nach dem Login" tool_tip="Inventar wird vorgeladen beim Einloggen, damit du nicht zu lang darauf warten musst wenn du die erste Suche machst." name="fetch_inventory_on_login_check"/>
       <check_box label="Aktiviere Wind Effekte" name="enable_wind"/>
       <check_box label="Aktiviere Wolken" name="enable_clouds"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/de/panel_preferences_ascent_vanity.xml
index c0dcbb781..92fec0dc5 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_ascent_vanity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Aussehen" name="ascvan">
-  <tab_container label="Singularity System" name="Ascent Vanity">
+  <tab_container label="System" name="Ascent Vanity">
     <panel label="Haupt" name="General">
       <check_box label="Wo möglich, speichere Einstellungen pro Account." tool_tip="Speichere Einstellungen pro akkount, erlaubt das einfache ändern für Alt Accounts." name="use_account_settings_check"/>
       <check_box label="Verstecke den TP Bildschirm." tool_tip="If checked, the viewer will hide the teleport progress screen, allowing you to continue to read IMs." name="disable_tp_screen_check"/>
@@ -17,7 +17,7 @@
     </panel>
     <panel label="Tags/Colors" name="TagsColors">
       <!-- Client tag options -->
-      <check_box label="Broadcast Client Tag:" tool_tip="Choose whether others see that you enjoy Singularity." name="show_my_tag_check"/>
+      <check_box label="Broadcast Client Tag:" tool_tip="Choose whether others see that you enjoy [SHORT_APP_NAME]." name="show_my_tag_check"/>
       <combo_box tool_tip="The client tag (And subsequent color) to broadcast. Overridden locally by Custom Tag/Color." name="tag_spoofing_combobox">
         <combo_item name="Singularity">Singularity</combo_item>
       </combo_box>
@@ -34,7 +34,7 @@
       <check_box label="Display client tag for others" tool_tip="Enabling this will show client tag names on others' avatar names." name="show_other_tag_check"/>
       <check_box label="Display client tag color for others" tool_tip="Enabling this sets others' avatar name color to their client's color." name="show_client_tag_color_check"/>
       <check_box label="Show Idle Time" tool_tip="Enabling this will show the amount of time an avatar has been idle." name="show_idle_time_check"/>
-      <check_box label="Automatically check website for updates to client definitions" tool_tip="Enabling this will allow Singularity to download fresh definitions when needed." name="update_tags_check"/>
+      <check_box label="Automatically check website for updates to client definitions" tool_tip="Enabling this will allow [SHORT_APP_NAME] to download fresh definitions when needed." name="update_tags_check"/>
       <button name="update_clientdefs" label="Manual Update"/>
       <!-- End of Client Tag settings -->
       <text name="effects_color_textbox">Color For My Effects:</text>
diff --git a/indra/newview/skins/default/xui/en-us/menu_login.xml b/indra/newview/skins/default/xui/en-us/menu_login.xml
index 35ac6f7e3..666cce9b4 100644
--- a/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -25,7 +25,7 @@
 		     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
 			<on_click function="ShowFloater" userdata="help f1" />
 		</menu_item_call-->
-		<menu_item_call bottom="-48" enabled="true" height="19" label="About [APP_NAME]..." left="0"
+		<menu_item_call bottom="-48" enabled="true" height="19" label="About [SHORT_APP_NAME]..." left="0"
 		     mouse_opaque="true" name="About Second Life..." width="166">
 			<on_click function="ShowFloater" userdata="about" />
 		</menu_item_call>
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index 037516e29..5194b4c6b 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -3237,10 +3237,10 @@ Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and othe
    icon="alertmodal.tga"
    name="WebLaunchSinguIssue"
    type="alertmodal">
-Visit the Singularity Issue Tracker, to report bugs and issues with Singularity Viewer.
+Visit the [SHORT_APP_NAME] Issue Tracker, to report bugs and issues with [SHORT_APP_NAME] Viewer.
 Please be sure that your report won't be a duplicate of an existing one.
     <usetemplate
-     ignoretext="When launching web browser to view Singularity Issue Tracker"
+     ignoretext="When launching web browser to view [SHORT_APP_NAME] Issue Tracker"
      name="okcancelignore"
      notext="Cancel"
      yestext="Go to page"/>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
index d11f594a8..080049793 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel top="20" left="10" height="400" width="517" border="true" label="System" name="ascsys">
-  <tab_container label="Singularity System" bottom="0" height="440" width="497" left="0" name="Ascent System" tab_min_width="70" tab_position="top">
+  <tab_container label="System" bottom="0" height="440" width="497" left="0" name="Ascent System" tab_min_width="70" tab_position="top">
 
     <panel border="true" left="1" bottom="-408" height="408" width="500" label="General" name="User Interface">
       <check_box left="10" bottom_delta="-25" control_name="DoubleClickTeleport" follows="top" initial_value="false"
@@ -27,7 +27,7 @@
       <check_box bottom_delta="-18" follows="left|top" initial_value="true"
         label="Enable Power User functionality" tool_tip="Adds features deemed too dangerous for normal use. These features can wreak havoc or do bad things if misused - Mostly to yourself or your belongings. If you're sure, activate the checkbox below as well." name="power_user_check"/>
       <check_box bottom_delta="-18" enabled="true" follows="top" left="20" initial_value="true"
-        label="Confirm Power User functionality" tool_tip="Confirms Power User activation. Turn this on at your own risk, and use any features it enables responsibly. Singularity devs won't replace anything you break. We recommend having a backup copy of anything to be victim to these powers. Unlike most checkboxes, you must click Apply or OK before this will activate." name="power_user_confirm_check"/>
+        label="Confirm Power User functionality" tool_tip="Confirms Power User activation. Turn this on at your own risk, and use any features it enables responsibly. [SHORT_APP_NAME] devs won't replace anything you break. We recommend having a backup copy of anything to be victim to these powers. Unlike most checkboxes, you must click Apply or OK before this will activate." name="power_user_confirm_check"/>
       <check_box bottom_delta="-18" control_name="FetchInventoryOnLogin" follows="top" left="10" initial_value="true"
         label="Automatically fetch the inventory in the background after login" tool_tip="Inventory will preload when you log in, so you don't have to wait for it to load when doing an initial search." name="fetch_inventory_on_login_check"/>
       <check_box bottom_delta="-18" control_name="WindEnabled" follows="left|top" initial_value="false" label="Enable Wind Effects" name="enable_wind"/>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
index 5201a0bcd..783d8a9b9 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
@@ -1,6 +1,6 @@
 <?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="0">
+  <tab_container label="Vanity" bottom="0" height="440" width="497" name="Ascent Vanity" tab_min_width="0">
     <panel border="true" left="1" bottom="-190" height="180" width="500" label="Main" name="General">
       <check_box bottom_delta="-25" control_name="AscentStoreSettingsPerAccount" follows="top" height="16" initial_value="true" label="Where applicable, save Vanity settings per-account." left="10" tool_tip="Saves settings per-account, allowing easier customization for alts." name="use_account_settings_check"/>
       <check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" follows="top" height="16" initial_value="true" label="Hide the Teleport progress screens" tool_tip="If checked, the viewer will hide the teleport progress screen, allowing you to continue to read IMs." name="disable_tp_screen_check"/>
@@ -17,7 +17,7 @@
     </panel>
     <panel border="true" left="1" bottom="-190" height="180" width="500" label="Tags/Colors" name="TagsColors">
       <!-- Client tag options -->
-      <check_box bottom_delta="-25" control_name="AscentBroadcastTag" follows="top" height="16" initial_value="true" label="Broadcast Client Tag:" left="10" tool_tip="Choose whether others see that you enjoy Singularity." name="show_my_tag_check"/>
+      <check_box bottom_delta="-25" control_name="AscentBroadcastTag" follows="top" height="16" initial_value="true" label="Broadcast Client Tag:" left="10" tool_tip="Choose whether others see that you enjoy [SHORT_APP_NAME]." name="show_my_tag_check"/>
       <combo_box follows="top" bottom_delta="-24" height="18" left_delta="24" max_chars="32" tool_tip="The client tag (And subsequent color) to broadcast. Overridden locally by Custom Tag/Color." name="tag_spoofing_combobox" width="130">
         <combo_item name="Singularity" value="f25263b7-6167-4f34-a4ef-af65213b2e39">Singularity</combo_item>
       </combo_box>
@@ -34,7 +34,7 @@
       <check_box bottom_delta="-8" control_name="AscentShowOthersTag" follows="top" height="16" initial_value="true" label="Display client tag for others" left_delta="-205" tool_tip="Enabling this will show client tag names on others' avatar names." name="show_other_tag_check"/>
       <check_box bottom_delta="-20" control_name="AscentShowOthersTagColor" follows="top" height="16" initial_value="true" label="Display client tag color for others" left_delta="0" tool_tip="Enabling this sets others' avatar name color to their client's color." name="show_client_tag_color_check"/>
       <check_box bottom_delta="-20" control_name="AscentShowIdleTime" follows="top" height="16" initial_value="true" label="Show Idle Time" tool_tip="Enabling this will show the amount of time an avatar has been idle." name="show_idle_time_check"/>
-      <check_box bottom_delta="-40" control_name="AscentUpdateTagsOnLoad" follows="top" height="16" initial_value="true" label="Automatically check website for updates to client definitions" left_delta="-230" tool_tip="Enabling this will allow Singularity to download fresh definitions when needed." name="update_tags_check"/>
+      <check_box bottom_delta="-40" control_name="AscentUpdateTagsOnLoad" follows="top" height="16" initial_value="true" label="Automatically check website for updates to client definitions" left_delta="-230" tool_tip="Enabling this will allow [SHORT_APP_NAME] to download fresh definitions when needed." name="update_tags_check"/>
       <button bottom_delta="0" control_name="ManualUpdate" name="update_clientdefs" follows="top" label="Manual Update" height="18" left_delta="340" width="110"/>
       <!-- End of Client Tag settings -->
       <text bottom_delta="-25" follows="top" height="10" left="20" name="effects_color_textbox">Color For My Effects:</text>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
index f47912224..21df1ad7a 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
@@ -3,7 +3,7 @@
 	<radio_group bottom="-45" draw_border="false" height="40" left="12"
 	     name="use_external_browser" width="480">
 		<radio_item bottom="-20" height="20" name="external" width="480" tool_tip="Use the default system web browser for help, web links, etc. Not recommended if running full screen.">Use external web browser (Firefox, Safari, Internet Explorer)</radio_item>
-		<radio_item bottom="-40" height="20" name="internal" width="480" tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside Singularity.">Use built-in web browser</radio_item>
+		<radio_item bottom="-40" height="20" name="internal" width="480" tool_tip="Use the built-in web browser for help, web links, etc. This browser opens as a new window inside [SHORT_APP_NAME].">Use built-in web browser</radio_item>
 	</radio_group>
 	<text bottom_delta="-25" follows="top" height="10" left="15" name="cache_size_label_l">Browser cache:</text>
 	<button bottom_delta="-10" follows="top" height="22" label="Clear Now" left="140" name="clear_cache" scale_image="true" width="85"/>
diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml
index 1065b13f7..727121c42 100644
--- a/indra/newview/skins/default/xui/es/menu_login.xml
+++ b/indra/newview/skins/default/xui/es/menu_login.xml
@@ -8,6 +8,6 @@
 	</menu>
 	<menu name="Help" label="Ayuda" >
 		<menu_item_call name="Second Life Help" label="Ayuda de Second Life"/>
-		<menu_item_call name="About Second Life..." label="Acerca de [APP_NAME]..."/>
+		<menu_item_call name="About Second Life..." label="Acerca de [SHORT_APP_NAME]..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 76b3ead1f..b26e7e482 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -1835,9 +1835,9 @@ Esta actualización no es obligatoria, pero te sugerimos instalarla para mejorar
 	</notification>
 	
 	<notification name="WebLaunchSinguIssue">
-		Visita Singularity Issue Tracker (Seguimiento de incidencias del Visor Singularity), donde podrás informar de errores y otros asuntos del visor Singularity.
+		Visita [SHORT_APP_NAME] Issue Tracker (Seguimiento de incidencias del Visor [SHORT_APP_NAME]), donde podrás informar de errores y otros asuntos del visor [SHORT_APP_NAME].
 Por favor, asegurate de que tu reporte no será un duplicado de uno ya existente.		
-    <usetemplate ignoretext="Cuando se abra el navegador para ir al Issue Tracker de Singularity" name="okcancelignore" notext="Cancelar" yestext="Ir a la Página"/>
+    <usetemplate ignoretext="Cuando se abra el navegador para ir al Issue Tracker de [SHORT_APP_NAME]" name="okcancelignore" notext="Cancelar" yestext="Ir a la Página"/>
 	</notification>	
   
 	<notification name="WebLaunchPublicIssueHelp">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
index efb430895..8c61e60f4 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Sistema" name="ascsys">
-	<tab_container label="Sistema Singularity" name="Ascent System">
+	<tab_container label="Sistema" name="Ascent System">
 		<!-- =========================== -->
 		<panel label="General" name="User Interface">
 			<check_box label="Habilitar Teleporte con doble click" tool_tip="Haciendo doble click en un objeto o persona te transportará hacia su ubicación." name="double_click_teleport_check"/>
@@ -16,7 +16,7 @@
 			<check_box label="Permitir siempre volar" tool_tip="Te permite volar en lugares donde no está permitido. Utilizalo bajo tu responsabilidad, que puedas no significa que debas." name="always_fly_check"/>
 			<check_box label="Deshabilitar la Distancia Mínima de la Cámara" tool_tip="Permite a la cámara acercarse a los objetos." name="disable_camera_zoom_check"/>
 			<check_box label="Habilitar la funcionalidad Super Usuario" tool_tip="Agrega funciones consideradas demasiado peligrosas para un uso normal. Estas características pueden causar estragos, o hacer daño si son mal utilizadas - Principalmente para ti o tus pertenencias. Si estás seguro, activa la casilla de verificación a continuación." name="power_user_check"/>
-			<check_box label="Confirmar funcionalidad Super Usuario" tool_tip="Confirmar la activación de Super Usuario. Activalo bajo tu propio riesgo, y utiliza cualquier característica habilitada en forma responsable. Los desarrolladores de Singularity no reemplazarán nada que hayas arruinado. Te recomendamos hacer una copia de seguridad de todo aquello que será víctima de dichos poderes. A diferencia del resto de los items a marcar, debes hacer click en Aplicar o en OK después de activar esta función." name="power_user_confirm_check"/>
+			<check_box label="Confirmar funcionalidad Super Usuario" tool_tip="Confirmar la activación de Super Usuario. Activalo bajo tu propio riesgo, y utiliza cualquier característica habilitada en forma responsable. Los desarrolladores de [SHORT_APP_NAME] no reemplazarán nada que hayas arruinado. Te recomendamos hacer una copia de seguridad de todo aquello que será víctima de dichos poderes. A diferencia del resto de los items a marcar, debes hacer click en Aplicar o en OK después de activar esta función." name="power_user_confirm_check"/>
 			<check_box label="Descargar automáticamente el inventario en segundo plano al iniciar sesión" tool_tip="El inventario será precargado cuando inicies sesión, de esta manera no tienes que esperar que cargue cuando hagas una búsqueda por primera vez." name="fetch_inventory_on_login_check"/>
 			<check_box label="Activar Efectos del Viento" name="enable_wind"/>
 			<check_box label="Activar Nubes" name="enable_clouds"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
index 7e14d8aee..7757e3679 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Vanity" name="ascvan">
-	<tab_container label="Singularity Vanity" name="Ascent Vanity">
+	<tab_container label="Vanity" name="Ascent Vanity">
 		<panel label="General" name="General">
 			<check_box label="Cuando sea aplicable, guardar Ajustes Vanity por cuenta." tool_tip="Guarda ajustes individuales por cuenta, permitiendo una mas fácil personalización de Alts." name="use_account_settings_check"/>
 			<check_box label="Ocultar pantalla de progreso de Teleporte" tool_tip="Activado, el visor ocultará la pantalla de progreso de Teleportación, pemitiendo leer MIs.." name="disable_tp_screen_check"/>
@@ -41,7 +41,7 @@
 			<check_box label="Mostrar Tag de Visor de los demás" tool_tip="Activándolo mostrará el nombre de Tag de visor sobre los nombres de avatar de otros usuarios." name="show_other_tag_check"/>
 			<check_box label="Mostrar color de Tag de visor de los demás" tool_tip="Activándolo fijará el color del tag del visor de los demás a su propio color." name="show_client_tag_color_check"/>
 			<check_box label="Mostrar tiempo inactivo" tool_tip="Activándolo mostrará la cantidad de tiempo que el avatar está inactivo." name="show_idle_time_check"/>
-			<check_box label="Chequear automáticamente actualizaciones de clientes" tool_tip="Activándolo permite a Singularity descargar nuevas definiciones de clientes cuando sea necesario." name="update_tags_check"/>
+			<check_box label="Chequear automáticamente actualizaciones de clientes" tool_tip="Activándolo permite a [SHORT_APP_NAME] descargar nuevas definiciones de clientes cuando sea necesario." name="update_tags_check"/>
 			<button name="update_clientdefs" label="Actualización Manual" height="18" left_delta="310" width="150"/>
 			<!-- End of Client Tag settings -->
 			<text name="effects_color_textbox">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_web.xml b/indra/newview/skins/default/xui/es/panel_preferences_web.xml
index c4efa79ba..ff6bf3d3f 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_web.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_web.xml
@@ -4,7 +4,7 @@
 		<radio_item name="external" tool_tip="Usar el navegador predeterminado del sistema parar abrir la ayuda, páginas web, etc. No se recomienda si el visor se está ejecutando a Pantalla completa.">
 			Usar navegador externo (Firefox, Safari, Opera, Internet Explorer)
 		</radio_item>
-		<radio_item name="internal" tool_tip="Usar el navegador incorporado para abrir la ayuda, páginas web, etc. El navegador se abrirá en una nueva ventana dentro de Singularity.">
+		<radio_item name="internal" tool_tip="Usar el navegador incorporado para abrir la ayuda, páginas web, etc. El navegador se abrirá en una nueva ventana dentro de [SHORT_APP_NAME].">
 			Usar navegador incorporado
 		</radio_item>
 	</radio_group>
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
index 4d63f9f43..a17b78619 100644
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu_bar name="Login Menu">
 	<menu name="File" label="Fichier">
-		<menu_item_call name="Quit" label="Quitter">
-			<on_click function="File.Quit" userdata="" />
-		</menu_item_call>
+		<menu_item_call name="Quit" label="Quitter"/>
 	</menu>
 	<menu name="Edit" label="Edition">
-		<menu_item_call name="Preferences..." label="Pr&#xE9;f&#xE9;rences">
-			<on_click function="ShowFloater" userdata="preferences" />
-		</menu_item_call>
+		<menu_item_call name="Preferences..." label="Pr&#xE9;f&#xE9;rences"/>
 	</menu>
 	<menu name="Help" label="Aide">
-		<menu_item_call name="Second Life Help" label="Aide de Second Life">
-			<on_click function="ShowFloater" userdata="help f1" />
-		</menu_item_call>
-		<menu_item_call name="About Second Life..." label="A propos de [APP_NAME]">
-			<on_click function="ShowFloater" userdata="about" />
-		</menu_item_call>
+		<menu_item_call name="Second Life Help" label="Aide de Second Life"/>
+		<menu_item_call name="About Second Life..." label="A propos de [SHORT_APP_NAME]"/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 72a5bb51f..1ebf98b78 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -87,7 +87,7 @@ Aucun didacticiel n'est disponible actuellement.
 
 
 	<notification name="BadInstallation">
-Une erreur est survenue lors de la mise à jour de Singularity. Veuillez télécharger la dernière version depuis singularityviewer.org
+Une erreur est survenue lors de la mise à jour de [SHORT_APP_NAME]. Veuillez télécharger la dernière version depuis singularityviewer.org
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 
@@ -3124,10 +3124,10 @@ The folder '[FOLDERNAME]' is a system folder. Deleting system folders can cause
    icon="alertmodal.tga"
    name="WebLaunchSinguIssue"
    type="alertmodal">
-Visit the Singularity Issue Tracker, to report bugs and issues with Singularity Viewer.
+Visit the [SHORT_APP_NAME] Issue Tracker, to report bugs and issues with [SHORT_APP_NAME] Viewer.
 Please be sure that your report won't be a duplicate of an existing one.
     <usetemplate
-     ignoretext="Quand vous lancez votre navigateur pour aller sur le Singularity Public Issue Tracker"
+     ignoretext="Quand vous lancez votre navigateur pour aller sur le [SHORT_APP_NAME] Public Issue Tracker"
      name="okcancelignore"
      notext="Cancel"
      yestext="Go to page"/>
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 4768b0874..0e22f27d9 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,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Syst&#xE8;me" name="ascsys">
-  <tab_container label="Singularity System" name="Ascent System">
+  <tab_container label="System" name="Ascent System">
 
     <panel label="G&#xE9;n&#xE9;ral" name="User Interface">
       <check_box label="Activer le TP avec le double-clic" tool_tip="Activer le TP sur un objet/une personne avec le double-clic" name="double_click_teleport_check"/>
@@ -16,7 +16,7 @@
       <check_box label="Toujours permettre le mode vol (Fly)" tool_tip="Permet de voler quelques soient les droits de la sim, &#xE0; vos risques et p&#xE9;rils." name="always_fly_check"/>
       <check_box label="D&#xE9;sactiver la distance minimum de la cam&#xE9;ra" tool_tip="La cam&#xE9;ra zoome de tr&#xE9;s pr&#xE8;s." name="disable_camera_zoom_check"/>
       <check_box label="Activer les fonctions Power User - &#xE0; vos risques et p&#xE9;rils !" 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." name="power_user_check"/>
-      <check_box label="Confirmer les fonctions Power User" tool_tip="Confirme les fonctions Power User. A vos risques et p&#xE9;rils. Singularity n'est pas responsable de cette utilisation." name="power_user_confirm_check"/>
+      <check_box label="Confirmer les fonctions Power User" tool_tip="Confirme les fonctions Power User. A vos risques et p&#xE9;rils. [SHORT_APP_NAME] n'est pas responsable de cette utilisation." name="power_user_confirm_check"/>
       <check_box label="Pr&#xE9;charger l'inventaire &#xE0; la connection" tool_tip="R&#xE9;duit l'attente lors de votre recherche initiale dans l'inventaire" name="fetch_inventory_on_login_check"/>
       <check_box label="Activer les effets de vent" name="enable_wind"/>
       <check_box label="Activer les nuages" name="enable_clouds"/>
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 343163450..ce554a634 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Graphiques" name="Display panel">
-	<check_box label="Lancer Singularity dans une fen&#xEA;tre (non pas, PAR la fen&#xEA;tre)" name="windowed mode"/>
+	<check_box label="Lancer [SHORT_APP_NAME] dans une fen&#xEA;tre (non pas, PAR la fen&#xEA;tre)" name="windowed mode"/>
 	<button left="330" width="165" label="Param&#xE8;tres recommand&#xE9;s" tool_tip="Reset to recommended graphics settings" name="Defaults"/>
 	<text_editor bottom="-56" height="40" left="25" name="FullScreenInfo" width="460">
 		D&#xE9;cocher cette option pour passer en mode plein &#xE9;cran.
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_web.xml b/indra/newview/skins/default/xui/fr/panel_preferences_web.xml
index db1d56c4a..55d3f2507 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_web.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_web.xml
@@ -2,7 +2,7 @@
 <panel name="web">
 	<radio_group name="use_external_browser">
 		<radio_item name="external" tool_tip="Utilisez le navigateur web du système pour l'aide, les liens web etc. Déconseillé en mode plein écran.">Utiliser un navigateur web externe (Firefox, Safari, Opera, Internet Explorer)</radio_item>
-		<radio_item name="internal" tool_tip="Utilisez le navigateur web intégré pour l'aide, les liens etc. Ce navigateur s'ouvre dans une nouvelle fenêtre à l'intérieur de Singularity.">Utiliser le navigateur web intégré</radio_item>
+		<radio_item name="internal" tool_tip="Utilisez le navigateur web intégré pour l'aide, les liens etc. Ce navigateur s'ouvre dans une nouvelle fenêtre à l'intérieur de [SHORT_APP_NAME].">Utiliser le navigateur web intégré</radio_item>
 	</radio_group>
 	<text name="cache_size_label_l">Cache du navigateur:</text>
 	<button label="Vider" name="clear_cache"/>
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index 2fdf1dcd1..42b0fc959 100644
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -8,6 +8,6 @@
 	</menu>
 	<menu label="Aiuto" name="Help">
 		<menu_item_call label="Aiuto di Second Life" name="Second Life Help"/>
-		<menu_item_call label="Informazioni su [APP_NAME]..." name="About Second Life..."/>
+		<menu_item_call label="Informazioni su [SHORT_APP_NAME]..." name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
index 3bcc4dc6c..616983dfd 100644
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -8,6 +8,6 @@
 	</menu>
 	<menu label="Ajuda" name="Help">
 		<menu_item_call label="Ajuda do Second Life" name="Second Life Help"/>
-		<menu_item_call label="Sobre o [APP_NAME]..." name="About Second Life..."/>
+		<menu_item_call label="Sobre o [SHORT_APP_NAME]..." name="About Second Life..."/>
 	</menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 5b68de75b..d405906fb 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Gráficos" name="Display panel">
 	<button label="?" name="GraphicsPreferencesHelpButton"/>
-	<check_box label="Execute Singularity em uma janela" name="windowed mode"/>
+	<check_box label="Execute [SHORT_APP_NAME] em uma janela" name="windowed mode"/>
 	<text_editor bottom="-56" height="40" name="FullScreenInfo" width="480">
 		Se desmarcado, o visualizador irá exibir em tela inteira quando fizer o acesso.
 	</text_editor>