diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-11 17:32:22 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-11 17:32:22 -0800 |
| commit | 1307fad7c9f7a1130242a4de7e0144ba4dea6297 (patch) | |
| tree | 4fa6eb5cb33b6ecb6f0b2116f0a96a02ed649535 /indra/newview | |
| parent | 6452154b19c6592efaf27e07bbee3bc6bcd3a415 (diff) | |
EXP-1752 FIX -- Merchant outbox import completion success modal dialog needs checkbox to disable
EXP-1795 PROGRESS -- Update warning dialog for dragging and dropping no-copy items to Merchant Outbox
* The text associated with EXP-1795 has been updated but the "apply to all"
checkbox has not been implemented yet.
* Updated the "0 folders" text to be an empty string instead.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_merchant_outbox.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml index 741515d56c..c0f26413cb 100644 --- a/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml +++ b/indra/newview/skins/default/xui/en/floater_merchant_outbox.xml @@ -13,7 +13,7 @@ reuse_instance="true" title="MERCHANT OUTBOX" width="333" > - <string name="OutboxFolderCount0">0 folders</string> + <string name="OutboxFolderCount0"></string> <string name="OutboxFolderCount1">1 folder</string> <string name="OutboxFolderCountN">[NUM] folders</string> <string name="OutboxImporting">Sending folders...</string> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 657d9fe91a..387cee3cee 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -203,12 +203,13 @@ Save changes to current clothing/body part? icon="alertmodal.tga" name="ConfirmNoCopyToOutbox" type="alertmodal"> -You don't have permission to copy this item to the Marketplace Outbox. Are you sure you want to move the following item? +You don't have permission to copy this item to the Merchant Outbox. You can move it or leave it behind. + [ITEM_NAME] <usetemplate - name="okcancelbuttons" - notext="No" - yestext="Yes"/> + name="yesnocancelbuttons" + notext="Don't move item" + yestext="Move item"/> </notification> <notification @@ -220,7 +221,8 @@ Success All folders were successfully sent to the Marketplace. <usetemplate - name="okbutton" + ignoretext="All folders sent to the Marketplace" + name="okignore" yestext="OK"/> </notification> |