diff options
author | Oz Linden <oz@lindenlab.com> | 2013-05-07 13:38:39 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-05-07 13:38:39 -0400 |
commit | f382233fbb29bf81fc4009930dc134253d8ea250 (patch) | |
tree | 3cd29e1be8193941f582998bb72a100ea5fc6d6c /indra/newview/skins/default/xui/en/strings.xml | |
parent | f864a0b562855efc2539fffdb399863b882acb06 (diff) | |
parent | e921e51c18ca2a6f51a2871982629f23557ee262 (diff) |
merge changes for DRTVWR-315
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 7c08aef65e..3b57ff5fd6 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -61,6 +61,7 @@ <string name="Quit">Quit</string> <string name="create_account_url">http://join.secondlife.com/?sourceid=[sourceid]</string> + <string name="ViewerDownloadURL">http://secondlife.com/download</string> <string name="LoginFailedViewerNotPermitted"> The viewer you are using can no longer access Second Life. Please visit the following page to download a new viewer: http://secondlife.com/download @@ -410,7 +411,12 @@ Please try logging in again in a minute.</string> <string name="NotConnected">Not Connected</string> <string name="AgentNameSubst">(You)</string> <!-- Substitution for agent name --> <string name="TeleportYourAgent">Teleport you</string> - + <string name="JoinAnExperience">Join an experience</string> <!-- not used --> + <string name="SilentlyManageEstateAccess">Suppress alerts when managing estate access lists</string> + <string name="OverrideYourAnimations">Replace your default animations</string> + <string name="ScriptReturnObjects">Return objects on your behalf</string> + <string name="UnknownScriptPermission">(unknown)!</string> + <!-- Sim Access labels --> <string name="SIM_ACCESS_PG">General</string> <string name="SIM_ACCESS_MATURE">Moderate</string> |