summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
authorDmitry Oleshko <doleshko@productengine.com>2009-10-26 19:03:55 +0200
committerDmitry Oleshko <doleshko@productengine.com>2009-10-26 19:03:55 +0200
commit1d4d4fec00aacb1e1e00a4f60a6af4d8ed3b8bde (patch)
tree800f9e701813376f460b40863821731db0efe407 /indra/newview/skins/default/xui/en/strings.xml
parentfa13628e9d56d473ae1fd8f4aa53afaf6a229e7b (diff)
parente874fbc8f052e3a7a16d4b4d61a35a4c49dab1cd (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4c19b22ac5..7efda2b882 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -264,10 +264,6 @@
<string name="TrackYourCamera">Track your camera</string>
<string name="ControlYourCamera">Control your camera</string>
- <!-- IM -->
- <string name="IM_logging_string">-- Instant message logging enabled --</string>
- <string name="Unnamed">(Unnamed)</string>
-
<!-- Sim Access labels -->
<string name="SIM_ACCESS_PG">PG</string>
<string name="SIM_ACCESS_MATURE">Mature</string>
@@ -2884,7 +2880,11 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
Failed to start viewer
</string>
- <!-- IM system messages -->
+ <!-- IM system messages -->
+ <string name="IM_logging_string">-- Instant message logging enabled --</string>
+ <string name="IM_typing_start_string">[NAME] is typing...</string>
+ <string name="Unnamed">(Unnamed)</string>
+
<string name="ringing-im">
Joining Voice Chat...
</string>