diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-21 10:44:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-21 10:44:12 -0400 |
| commit | ba248b8b5da84b69a20aa3704a64e20907c95958 (patch) | |
| tree | 57faf1b0f03e5c289d4897bc1499b1bdc8b6d6a8 | |
| parent | c15d2e87acdfbaea8d144e7c22d2d3f29f3e3a66 (diff) | |
| parent | 9b23298970e930aff0f46b70724eaf110cb05d81 (diff) | |
merge changes for storm-1953
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/notifications.xml | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 64e861aa94..bb4450872f 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -656,6 +656,7 @@ Jonathan Yap STORM-1858 STORM-1862 OPEN-161 + STORM-1953 STORM-1957 Kadah Coba STORM-1060 diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 966de23c4b..1867141758 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2709,7 +2709,7 @@ Please enter a higher price. icon="alertmodal.tga" name="ConfirmItemDeleteHasLinks" type="alertmodal"> -At least one of the items you has link items that point to it. If you delete this item, its links will permanently stop working. It is strongly advised to delete the links first. +At least one of the items has links that point to it. If you delete this item, its links will permanently stop working. It is strongly advised to delete the links first. Are you sure you want to delete these items? <tag>confirm</tag> @@ -2751,7 +2751,7 @@ Are you sure you want to delete these items? icon="alertmodal.tga" name="ConfirmObjectDeleteNoOwn" type="alertmodal"> -You do not own least one of the items you have selected. +You do not own at least one of the items you have selected. Are you sure you want to delete these items? <tag>confirm</tag> @@ -2781,7 +2781,7 @@ Are you sure you want to delete these items? name="ConfirmObjectDeleteLockNoOwn" type="alertmodal"> At least one object is locked. -You do not own least one object. +You do not own at least one object. Are you sure you want to delete these items? <tag>confirm</tag> @@ -2796,7 +2796,7 @@ Are you sure you want to delete these items? name="ConfirmObjectDeleteNoCopyNoOwn" type="alertmodal"> At least one object is not copyable. -You do not own least one object. +You do not own at least one object. Are you sure you want to delete these items? <tag>confirm</tag> @@ -2812,13 +2812,13 @@ Are you sure you want to delete these items? type="alertmodal"> At least one object is locked. At least one object is not copyable. -You do not own least one object. +You do not own at least one object. Are you sure you want to delete these items? <tag>confirm</tag> <usetemplate name="okcancelbuttons" - notext="cancel" + notext="Cancel" yestext="OK"/> </notification> |