summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/strings.xml
diff options
context:
space:
mode:
authorsimon <none@none>2013-05-09 13:14:49 -0700
committersimon <none@none>2013-05-09 13:14:49 -0700
commitc7f7c4bc4d9155f5e9cd83265e189f689739da62 (patch)
tree2d4c7e5996a2c5af92f45cf43b8b6dab2e03229f /indra/newview/skins/default/xui/en/strings.xml
parent5af5b49a6205c34b8787cd4ecb4bd1d94174663f (diff)
parentd8f00dd1d1d40ec387583575149b1bf9bae79f32 (diff)
Merge viewer-beta
Diffstat (limited to 'indra/newview/skins/default/xui/en/strings.xml')
-rwxr-xr-x[-rw-r--r--]indra/newview/skins/default/xui/en/strings.xml8
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 f4473dd0b1..c6ad9fc264 100644..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>