diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 16:21:14 -0700 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-10-28 16:21:14 -0700 |
| commit | d993ce14d83530544c0e0f05af10d235999d9a5f (patch) | |
| tree | b1b9de442fb35d81ad73b1fc3391bc3bde71d878 /indra/newview/skins/default/xui/en/strings.xml | |
| parent | 9cfcb53d1904d868e1e3f640baf794aba9ffbb2a (diff) | |
| parent | 7d87e55c547a537526ee121dc68df6513d513f05 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e06e6a8b00..887c5b7e21 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> @@ -2883,7 +2879,14 @@ 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="IM_moderated_chat_label">(Moderated: Voices off by default)</string> + <string name="IM_unavailable_text_label">Text chat is not available for this call.</string> + + <string name="ringing-im"> Joining Voice Chat... </string> |