diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-10-15 17:47:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-10-15 17:47:37 -0400 |
| commit | 9c313aea13c70db145d3f2ba840fdc34ed8c8adf (patch) | |
| tree | 72b76053aac0fedf411145b0427b2239971034b1 /indra/newview/skins/default/xui/en/strings.xml | |
| parent | 1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (diff) | |
| parent | 8dc273b942ca3bae7469dcbaf7bab171b889eea1 (diff) | |
merge changes for DRTVWR-336
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, 6 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 5c23ffa1df..4d7daa1b51 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -387,7 +387,7 @@ Please try logging in again in a minute.</string> <!-- world map --> <string name="texture_loading">Loading...</string> <string name="worldmap_offline">Offline</string> - <string name="worldmap_item_tooltip_format">[AREA] m² L$[PRICE]</string> + <string name="worldmap_item_tooltip_format">[AREA] m² L$[PRICE] ([SQMPRICE] L$/m²)</string> <string name="worldmap_results_none_found">None found.</string> <!-- animations uploading status codes --> @@ -2472,7 +2472,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> |