diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-14 18:12:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-14 18:12:01 -0400 |
| commit | d2b947c1fa0757e94eb74429a339a8198531dd93 (patch) | |
| tree | fe66fe4a051ca1634a89ed121c169450f2d76967 /indra/newview/skins | |
| parent | 91c9cc4c33f68f4f39e23763317a76ccb573c38b (diff) | |
| parent | bf981db8b98cd9f8048a1a800d7e99907fecd1a8 (diff) | |
merge changes for STORM-1932
Diffstat (limited to 'indra/newview/skins')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 3030a1ae9f..fa4529e085 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2460,7 +2460,11 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale all estates that you manage for [OWNER] </string> <string name="RegionInfoAllowedResidents">Allowed Residents: ([ALLOWEDAGENTS], max [MAXACCESS])</string> - <string name="RegionInfoAllowedGroups">Allowed groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string> + <string name="RegionInfoAllowedGroups">Allowed Groups: ([ALLOWEDGROUPS], max [MAXACCESS])</string> + <string name="RegionInfoEstateManagers">Estate Managers: ([ESTATEMANAGERS], max [MAXMANAGERS])</string> + <string name="RegionInfoBannedResidents">Banned Residents: ([BANNEDAGENTS], max [MAXBANNED])</string> + <string name="RegionInfoListTypeAllowedAgents">Allowed Residents</string> + <string name="RegionInfoListTypeBannedAgents">Banned Residents</string> <!-- script limits floater --> <string name="ScriptLimitsParcelScriptMemory">Parcel Script Memory</string> |