diff options
| author | prep <none@none> | 2012-03-13 15:48:24 -0400 |
|---|---|---|
| committer | prep <none@none> | 2012-03-13 15:48:24 -0400 |
| commit | fab57eea612f34ed9d8c8559674ead1760aab42b (patch) | |
| tree | 51394d44e1b89bb75d168464aec539f60f44f8cd /indra/newview/skins/default/xui/en/strings.xml | |
| parent | 87b414c4934d0d52eef0b323245568bb1e95ec70 (diff) | |
| parent | 00717147d2b832fa3239267edf409f0a1dfcd9fd (diff) | |
pull and merge from viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index d6b5f3559f..749f0e9ad9 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -369,6 +369,9 @@ Please try logging in again in a minute.</string> <string name="anim_yes_happy">Yes (Happy)</string> <string name="anim_yes_head">Yes</string> + <!-- build floater --> + <string name="multiple_textures">Multiple</string> + <!-- world map --> <string name="texture_loading">Loading...</string> <string name="worldmap_offline">Offline</string> @@ -3238,6 +3241,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="IM_to_label">To</string> <string name="IM_moderator_label">(Moderator)</string> <string name="Saved_message">(Saved [LONG_TIMESTAMP])</string> + <string name="IM_unblock_only_groups_friends">To see this message, you must uncheck 'Only friends and groups can call or IM me' in Preferences/Privacy.</string> <!-- voice calls --> <string name="answered_call">Your call has been answered</string> |