summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/notifications.xml
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-11-26 09:47:00 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2009-11-26 09:47:00 +0000
commit1942e607f8298870b10f4147388cb4f307a8c08e (patch)
tree4bff4261cf5536c210526e85e42fa3da10ffd5ae /indra/newview/skins/default/xui/en/notifications.xml
parent664b848bac30a7f3f1177a683e0913c9457dc041 (diff)
parent35e5a5005e7ab85a640aee08137a96c42e4d55ea (diff)
merge.
Diffstat (limited to 'indra/newview/skins/default/xui/en/notifications.xml')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml19
1 files changed, 12 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a87f05cbcc..6e178ad570 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -3939,6 +3939,18 @@ Would you like to leave Busy Mode before completing this transaction?
<notification
icon="alertmodal.tga"
+ name="ConfirmDeleteProtectedCategory"
+ type="alertmodal">
+The folder &apos;[FOLDERNAME]&apos; is a system folder. Deleting system folders can cause instability. Are you sure you want to delete it?
+ <usetemplate
+ ignoretext="Confirm before I delete a system folder"
+ name="okcancelignore"
+ notext="Cancel"
+ yestext="OK"/>
+ </notification>
+
+ <notification
+ icon="alertmodal.tga"
name="ConfirmEmptyTrash"
type="alertmodal">
Are you sure you want to permanently delete the contents of your Trash?
@@ -5810,13 +5822,6 @@ If you continue to have problems, please visit the [SUPPORT_SITE].
- Your system memory does not meet the minimum requirements.
</global>
- <global name="PermYes">
-Yes
- </global>
-
- <global name="PermNo">
-No
- </global>
<!-- this is alert string from server. the name needs to match entire the server string, and needs to be changed
whenever the server string changes -->
<global name="You can only set your 'Home Location' on your land or at a mainland Infohub.">