diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-10-28 11:43:45 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-10-28 11:43:45 -0700 |
| commit | 8cc8e7dc77c7aff6d4698632d6a3bebe76698ff7 (patch) | |
| tree | d578ab68aedf55dc35d4ded7205396f88bb43be1 /indra/newview/skins/default/xui | |
| parent | 0784ee76042e4e24431a61f93fc56bda939aa934 (diff) | |
ACME-1601: Updated message to match behavior
ACME-1616: Change references of "Grid-Wide" to "Grid-Scope" and "non Grid-Wide"
to "Land-Scope"
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_experiences.xml | 8 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 8f208b979f..8960fad02b 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -7326,7 +7326,7 @@ You do not have access to this destination. You may be allowed into the region b name="ScriptQuestionExperience" persist="false" type="notify"> -'<nolink>[OBJECTNAME]</nolink>', an object owned by '[NAME]', requests your participation in the [GRID_WIDE]experience: +'<nolink>[OBJECTNAME]</nolink>', an object owned by '[NAME]', requests your participation in the [GRID_WIDE] experience: [EXPERIENCE] diff --git a/indra/newview/skins/default/xui/en/panel_region_experiences.xml b/indra/newview/skins/default/xui/en/panel_region_experiences.xml index ea57bdd164..9d06ce6b0c 100644 --- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml +++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml @@ -20,13 +20,13 @@ Additionally, if the estate does not allow public access, Residents participatin </panel.string> <panel.string name="allowed_estate_text"> -Only Experiences that are not Grid-Wide may be Allowed. +Only Experiences that are Land-Scope may be Allowed. Allowed Experiences have permission to run on this estate. </panel.string> <panel.string name="blocked_estate_text"> -Only Grid-Wide Experiences may be Blocked. +Only Grid-Scope Experiences may be Blocked. Blocked Experiences may not run on this estate. </panel.string> @@ -35,12 +35,12 @@ Blocked Experiences may not run on this estate. Changes to settings on this tab will affect all regions in the estate. </panel.string> <panel.string - name="allowed_parcel_text">Only Experiences that are not Grid-Wide may be Allowed. + name="allowed_parcel_text">Only Experiences that are Land-Scope may be Allowed. Allowed Experiences have permission to run on this parcel if they are not Blocked by the estate. </panel.string> <panel.string - name="blocked_parcel_text">Only Grid-Wide Experiences may be Blocked. + name="blocked_parcel_text">Any Resident Experience may be Blocked. Blocked Experiences may not run on this parcel. </panel.string> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index fbf696933b..65c95e9486 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4031,7 +4031,8 @@ Try enclosing path to the editor with double quotes. <string name="experience_tools_experience">Experience</string> <string name="ExperienceNameNull">(no experience)</string> <string name="ExperienceNameUntitled">(untitled experience)</string> - <string name="GRID_WIDE">Grid-wide</string> + <string name="Land-Scope">Land-Scope</string> + <string name="Grid-Scope">Grid-Scope</string> <string name="Allowed_Experiences_Tab">ALLOWED</string> <string name="Blocked_Experiences_Tab">BLOCKED</string> <string name="Contrib_Experiences_Tab">CONTRIBUTOR</string> |