diff options
author | Oz Linden <oz@lindenlab.com> | 2011-12-20 10:39:06 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-12-20 10:39:06 -0500 |
commit | b022ebf13c9a227f87a112419e237894a1231c8c (patch) | |
tree | 6d1ca1b205b92a07da124dac9730b67ca9e00dc4 /indra/newview/skins/default/xui | |
parent | 2667c6a80f70a2b3ca620184e109910933b10819 (diff) | |
parent | fdc223287ce25ffcb8a43936633eac2eac19b728 (diff) |
merge changes for storm-1734
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 9 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 0ba4b84abe..a7705c8bac 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5516,6 +5516,15 @@ Please select at least one type of content to search (General, Moderate, or Adul [MESSAGE] </notification> + <notification + icon="notify.tga" + name="PaymentFailure" + persist="true" + type="notify"> + <tag>funds</tag> +[MESSAGE] + </notification> + <!-- EventNotification couldn't be persist since server decide is it necessary to notify user about subscribed event via LLEventNotifier--> <notification diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 30697278c3..9752a07b66 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -3359,6 +3359,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="you_paid_ldollars_no_info">You paid L$[AMOUNT].</string> <string name="you_paid_ldollars_no_reason">You paid [NAME] L$[AMOUNT].</string> <string name="you_paid_ldollars_no_name">You paid L$[AMOUNT] [REASON].</string> + <string name="you_paid_failure_ldollars">You failed to pay [NAME] L$[AMOUNT] [REASON].</string> + <string name="you_paid_failure_ldollars_no_info">You failed to pay L$[AMOUNT].</string> + <string name="you_paid_failure_ldollars_no_reason">You failed to pay [NAME] L$[AMOUNT].</string> + <string name="you_paid_failure_ldollars_no_name">You failed to pay L$[AMOUNT] [REASON].</string> <string name="for item">for [ITEM]</string> <string name="for a parcel of land">for a parcel of land</string> <string name="for a land access pass">for a land access pass</string> |