summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml50
1 files changed, 34 insertions, 16 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 92711d4397..9f103ea51a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3552,6 +3552,26 @@ If this is your first time using [SECOND_LIFE], you will need to create an accou
<notification
icon="alertmodal.tga"
+ name="LoginCantRemoveUsername"
+ type="alertmodal">
+ <tag>fail</tag>
+Already remembered user can be forgotten from Me &gt; Preferences &gt; Advanced &gt; Remembered Usernames.
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
+ name="LoginCantRemoveCurUsername"
+ type="alertmodal">
+ <tag>confirm</tag>
+Forgetting the logged-in user requires you to log out.
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="Confirm and log out"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="LoginPacketNeverReceived"
type="alertmodal">
<tag>fail</tag>
@@ -3605,6 +3625,18 @@ You can either check your Internet connection and try again in a few minutes or
<notification
icon="alertmodal.tga"
+ name="LoginRemoveMultiGridUserData"
+ type="alertmodal">
+ <tag>confirm</tag>
+Local Data you are deleting is shared between multiple grids, are you sure you want to delete it?
+ <usetemplate
+ name="okcancelbuttons"
+ notext="Cancel"
+ yestext="Confirm"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="WelcomeChooseSex"
type="alertmodal">
Your character will appear in a moment.
@@ -6062,7 +6094,7 @@ Would you like to turn off Do Not Disturb before completing this transaction?
name="ParcelPlayingMedia"
persist="false"
type="notify">
-This land has media:
+This location plays media:
[URL]
Would you like to play it?
<tag>confirm</tag>
@@ -6080,7 +6112,7 @@ Would you like to play it?
ignore="Ignore Media"
index="0"
name="No"
- text="Ignore"/>
+ text="Don't play"/>
</form>
</notification>
@@ -6811,20 +6843,6 @@ Please select at least one type of content to search (General, Moderate, or Adul
<notification
icon="notify.tga"
- name="FlickrConnect"
- type="notifytip">
- [MESSAGE]
- </notification>
-
- <notification
- icon="notify.tga"
- name="TwitterConnect"
- type="notifytip">
- [MESSAGE]
- </notification>
-
- <notification
- icon="notify.tga"
name="PaymentReceived"
log_to_im="true"
persist="true"