diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:13:37 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:13:37 +0200 |
| commit | a52ef7ad60c8821fcb412988d838b58c0414ac8f (patch) | |
| tree | a6fe2e267b2e7bf70d4a8d8227e1bc1f1152574d /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | bc496f5f17a446af27b47cbe227e7e85089bab8d (diff) | |
| parent | 712164210cf57cfde3b17c3162dc4129d52e2780 (diff) | |
Merge branch 'DRTVWR-499' into DRTVWR-500
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 1c72aec700..e3776cdc1a 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 > Preferences > Advanced > 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> |