diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index bc1b95c6c9..1a00dcbbae 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -1244,10 +1244,10 @@ If you continue to receive this message, please contact Second Life support for
This resident has turned on Unavailable mode and will see your message later.
- The Resident you messaged has activated Firestorm viewer's 'autorespond mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.
- The Resident you messaged has activated Firestorm viewer's 'autorespond mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.
- The Resident you messaged has activated Firestorm viewer's 'reject all teleport offers and requests mode' which means they have requested not to be disturbed with teleport offers and requests. You may still send an IM message manually.
- The Resident you messaged has activated Firestorm viewer's 'reject all friendship requests mode' which means they have requested not to be disturbed with friendship requests. You may still send an IM message manually.
+ The Resident you messaged has activated [APP_NAME] viewer's 'autorespond mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.
+ The Resident you messaged has activated [APP_NAME] viewer's 'autorespond mode' which means they have requested not to be disturbed. Your message will still be shown in their IM panel for later viewing.
+ The Resident you messaged has activated [APP_NAME] viewer's 'reject all teleport offers and requests mode' which means they have requested not to be disturbed with teleport offers and requests. You may still send an IM message manually.
+ The Resident you messaged has activated [APP_NAME] viewer's 'reject all friendship requests mode' which means they have requested not to be disturbed with friendship requests. You may still send an IM message manually.
The Resident you messaged has blocked you from sending them any messages.
The Resident you messaged is currently away from keyboard. Your message will still be shown in their IM panel for later viewing.
@@ -2980,19 +2980,19 @@ and report the problem.
Ultra (7/7)
Unknown, beyond the normal range, check RenderQualityPerformance debug setting
- Firestorm cannot create the LSL bridge if "Enable LSL-Client Bridge" is disabled in Preferences.
- Firestorm could not create an LSL bridge. Please enable your library and relog.
+ [APP_NAME] cannot create the LSL bridge if "Enable LSL-Client Bridge" is disabled in Preferences.
+ [APP_NAME] could not create an LSL bridge. Please enable your library and relog.
Bridge creation in process, cannot start another. Please wait a few minutes before trying again.
Creating the bridge. This might take a moment, please wait.
Bridge not created. The bridge script could not be created.
- Bridge not created. The bridge is named incorrectly. Please use the Firestorm 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate the bridge.
- Bridge not created. The bridge couldn't be found in inventory. Please use the Firestorm 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate the bridge.
- Bridge failed to attach. This is not the current bridge version. Please use the Firestorm 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate the bridge.
- Bridge failed to attach. The bridge wasn't found in the right inventory location. Please use the Firestorm 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate the bridge.
- Bridge failed to attach. Something else was using the bridge attachment point. Please use the Firestorm 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate the bridge.
+ Bridge not created. The bridge is named incorrectly. Please use the [APP_NAME] 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate the bridge.
+ Bridge not created. The bridge couldn't be found in inventory. Please use the [APP_NAME] 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate the bridge.
+ Bridge failed to attach. This is not the current bridge version. Please use the [APP_NAME] 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate the bridge.
+ Bridge failed to attach. The bridge wasn't found in the right inventory location. Please use the [APP_NAME] 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate the bridge.
+ Bridge failed to attach. Something else was using the bridge attachment point. Please use the [APP_NAME] 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate the bridge.
The bridge object could not be found. Cannot proceed with its creation, exiting.
The bridge inventory contains unexpected items.
- The bridge has not finished creating, you may need to use the Firestorm 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate it before using.
+ The bridge has not finished creating, you may need to use the [APP_NAME] 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate it before using.
Bridge detached.
Bridge created.
Script info: '[OBJECT_NAME]': [[OBJECT_RUNNING_SCRIPT_COUNT]/[OBJECT_TOTAL_SCRIPT_COUNT]] running scripts, [OBJECT_SCRIPT_MEMORY] KB allowed memory size limit, [OBJECT_SCRIPT_TIME] ms of CPU time consumed.[PATHFINDING_TEXT]
@@ -3021,12 +3021,12 @@ Your current position: [AVATAR_POS]
Script info: Object to check is invalid or out of range.
Script info: Received malformed response from bridge. Try again.
- NOTICE: One or more scripts have been added to your Firestorm bridge! If you did not expect this message, use the Firestorm 'Avatar/Avatar Health/Recreate Bridge' menu option to re-create your bridge now.
- NOTICE: Bridge script is using old LSO (16 KB memory limit) instead of new Mono (64 KB memory limit) virtual machine, which creates high probability of stack-heap collision and bridge failure by running out of memory. Please use the Firestorm 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate the bridge. If you'll see this message again - please try again in a different region.
+ NOTICE: One or more scripts have been added to your [APP_NAME] bridge! If you did not expect this message, use the [APP_NAME] 'Avatar/Avatar Health/Recreate Bridge' menu option to re-create your bridge now.
+ NOTICE: Bridge script is using old LSO (16 KB memory limit) instead of new Mono (64 KB memory limit) virtual machine, which creates high probability of stack-heap collision and bridge failure by running out of memory. Please use the [APP_NAME] 'Avatar/Avatar Health/Recreate Bridge' menu option to recreate the bridge. If you'll see this message again - please try again in a different region.
- Firestorm Animation Overrider enabled.
- Firestorm Animation Overrider disabled.
+ [APP_NAME] Animation Overrider enabled.
+ [APP_NAME] Animation Overrider disabled.
Paused by scripted attachment.
Resumed by scripted attachment.
Standing animations paused by scripted attachment.
@@ -3190,7 +3190,7 @@ Your current position: [AVATAR_POS]
Noto Sans
Celestia Medium Redux
Unknown Mode
- Firestorm
+ [APP_NAME]
Phoenix
[VIEWER_GENERATION]
Hybrid