diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 14:26:34 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-12 14:26:34 +0300 |
| commit | d82d5c357a98745d265a839dd0242ec8a4994e86 (patch) | |
| tree | ac61ed5c7e676e438a80bedd3f14f41fa7f35975 /indra/newview/skins/default/xui/en/notifications.xml | |
| parent | 56101002a460ecd9bb7a264d55b6f8ecb9a348a0 (diff) | |
| parent | bd9add8fc77d7f39cb7c81972f72adbc3e6b5464 (diff) | |
Merge commit 'bd9add8fc7' into marchcat/c-develop
# Conflicts:
# autobuild.xml
# indra/llui/llmodaldialog.cpp
# indra/newview/llfloatermyenvironment.cpp
# indra/newview/llfloaterobjectweights.cpp
# indra/newview/llfloaterobjectweights.h
# indra/newview/llpanelgroupcreate.cpp
# indra/newview/llpanelgroupgeneral.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/tests/llviewerassetstats_test.cpp
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, 31 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 4d74261a9a..053eed6c00 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3129,9 +3129,13 @@ Would you be my friend? <input name="listname" type="text"/> <button default="true" - index="0" + index="1" name="SetName" text="OK"/> + <button + index="0" + name="Cancel" + text="Cancel"/> </form> </notification> @@ -3160,6 +3164,29 @@ Would you be my friend? <notification icon="alertmodal.tga" + label="Rename Auto-Replace List" + name="RemoveAutoReplaceList" + type="alertmodal"> +'[LIST_NAME]' contains [MAP_SIZE] entries. + +Are you sure you want to delete this list? + <tag>confirm</tag> + <form name="form"> + <button + default="true" + index="1" + name="DeleteList" + text="Delete"/> + <button + default="false" + index="0" + name="Cancel" + text="Cancel"/> + </form> + </notification> + + <notification + icon="alertmodal.tga" name="InvalidAutoReplaceEntry" type="alertmodal"> The keyword must be a single word, and the replacement may not be empty. @@ -4618,13 +4645,12 @@ You already have blocked this name. <notification icon="alert.tga" - name="RemoveItemWarn" + name="CantModifyContentInNoModTask" type="alert"> -Though permitted, deleting contents may damage the object. Do you want to delete that item? +You don't have permission to modify content of this object <tag>confirm</tag> <usetemplate - name="okcancelbuttons" - notext="Cancel" + name="okbutton" yestext="OK"/> </notification> |