summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-06-12 17:29:03 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-06-12 17:29:03 -0700
commit5a76b1dc2fcb5b81c0c8f2a6c1539a23441260f6 (patch)
tree750f8dc51b0131917ca45c6a09f9adafae2be54f
parent32063b59994c4e08f37f59fddf6bb2e7af252a9d (diff)
EXP-1953: Updating copy after Leo creating the final copy in the jira.
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml13
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
2 files changed, 9 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 7b01b928b4..2376365505 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -6270,7 +6270,8 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
type="offer">
[NAME_SLURL] has offered to teleport you to their location:
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
<tag>confirm</tag>
<form name="form">
<button
@@ -6290,9 +6291,10 @@ Your object named &lt;nolink&gt;[OBJECTFROMNAME]&lt;/nolink&gt; has given you th
type="offer">
[NAME_SLURL] has offered to teleport you to their location:
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
-However, this region contains [REGION_CONTENT_MATURITY] content, but your current preferences are set to exclude [REGION_CONTENT_MATURITY] content. We can change your preferences and continue with the teleport, or you can cancel this teleport.
+This region contains [REGION_CONTENT_MATURITY] content, but your current preferences are set to exclude [REGION_CONTENT_MATURITY] content. We can change your preferences and continue with the teleport, or you can cancel this teleport.
<tag>confirm</tag>
<form name="form">
<button
@@ -6312,9 +6314,10 @@ However, this region contains [REGION_CONTENT_MATURITY] content, but your curren
type="notifytip">
[NAME_SLURL] has offered to teleport you to their location:
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
-However, this region contains [REGION_CONTENT_MATURITY] content, which is accessible to adults only.
+However, this region contains content accessible to adults only.
<tag>fail</tag>
</notification>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 206a7421d6..6afb9a136c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3757,6 +3757,6 @@ Try enclosing path to the editor with double quotes.
<string name="snapshot_quality_high">High</string>
<string name="snapshot_quality_very_high">Very High</string>
- <string name="TeleportMaturityExceeded">The user you have offered to teleport cannot view the region&apos;s content.</string>
+ <string name="TeleportMaturityExceeded">The Resident you have offered to teleport cannot view the region&apos;s content.</string>
</strings>