diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_viewer.xml | 14 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 43 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_sound_devices.xml | 4 |
3 files changed, 20 insertions, 41 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 4cb0e67521..dd39be344a 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -173,13 +173,13 @@ <menu_item_call.on_click function="BuyCurrency" /> </menu_item_call> - <menu_item_call - label="Merchant Outbox..." - name="MerchantOutbox"> - <menu_item_call.on_click - function="Floater.ToggleOrBringToFront" - parameter="outbox" /> - </menu_item_call> + <menu_item_call + label="Marketplace listings..." + name="MarketplaceListings"> + <menu_item_call.on_click + function="Floater.ToggleOrBringToFront" + parameter="marketplace_listings" /> + </menu_item_call> <menu_item_call label="Marketplace listings..." name="MarketplaceListings"> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 5153c62885..cf6eac66b7 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -244,7 +244,7 @@ You don't have permission to copy one or more of these items to the Merchant Out <notification icon="OutboxStatus_Success" name="OutboxFolderCreated" - type="outbox"> + type="alertmodal"> <unique/> A new folder has been created for each item you have transferred into the top level of your Merchant Outbox. @@ -257,7 +257,7 @@ A new folder has been created for each item you have transferred into the top le <notification icon="OutboxStatus_Success" name="OutboxImportComplete" - type="outbox"> + type="alertmodal"> Success All folders were successfully sent to the Marketplace. @@ -271,7 +271,7 @@ All folders were successfully sent to the Marketplace. <notification icon="OutboxStatus_Warning" name="OutboxImportHadErrors" - type="outbox"> + type="alertmodal"> Some folders did not transfer Errors occurred when some folders were sent to the Marketplace. Those folders are still in your Merchant Outbox. @@ -286,7 +286,7 @@ See the [[MARKETPLACE_IMPORTS_URL] error log] for more information. <notification icon="OutboxStatus_Error" name="OutboxImportFailed" - type="outbox"> + type="alertmodal"> Transfer failed with error '[ERROR_CODE]' No folders were sent to the Marketplace because of a system or network error. Try again later. @@ -299,7 +299,7 @@ No folders were sent to the Marketplace because of a system or network error. T <notification icon="OutboxStatus_Error" name="OutboxInitFailed" - type="outbox"> + type="alertmodal"> Marketplace initialization failed with error '[ERROR_CODE]' Initialization with the Marketplace failed because of a system or network error. Try again later. @@ -312,7 +312,7 @@ Initialization with the Marketplace failed because of a system or network error. <notification icon="OutboxStatus_Error" name="StockPasteFailed" - type="outbox"> + type="alertmodal"> Copy or move to Stock Folder failed with error : '[ERROR_CODE]' @@ -325,7 +325,7 @@ Initialization with the Marketplace failed because of a system or network error. <notification icon="OutboxStatus_Error" name="MerchantPasteFailed" - type="outbox"> + type="alertmodal"> Copy or move to Marketplace Listings failed with error : '[ERROR_CODE]' @@ -338,7 +338,7 @@ Initialization with the Marketplace failed because of a system or network error. <notification icon="OutboxStatus_Error" name="MerchantTransactionFailed" - type="outbox"> + type="alertmodal"> The transaction with the Marketplace failed with the following error : Reason : '[ERROR_REASON]' @@ -352,7 +352,7 @@ Initialization with the Marketplace failed because of a system or network error. <notification icon="OutboxStatus_Error" name="MerchantUnprocessableEntity" - type="outbox"> + type="alertmodal"> We are unable to list this product or activate the version folder. Usually this is caused by missing information in the listing description form, but it may be due to errors in the folder structure. Either edit the listing or check the listing folder for errors. <usetemplate @@ -363,7 +363,7 @@ Initialization with the Marketplace failed because of a system or network error. <notification icon="OutboxStatus_Error" name="MerchantListingFailed" - type="outbox"> + type="alertmodal"> Listing to Marketplace failed with error : '[ERROR_CODE]' @@ -376,7 +376,7 @@ Initialization with the Marketplace failed because of a system or network error. <notification icon="OutboxStatus_Error" name="MerchantFolderActivationFailed" - type="outbox"> + type="alertmodal"> Activating this version folder failed with error : '[ERROR_CODE]' @@ -4172,27 +4172,6 @@ Leave Group? </notification> <notification - name="GroupDepartError" - type="alert"> -Unable to leave group: [reason]. - <tag>reason</tag> - <usetemplate - name="okbutton" - yestext="OK"/> - </notification> - - <notification - icon="alert.tga" - name="GroupDepart" - type="alert"> -You have left the group [group_name]. - <tag>group_name</tag> - <usetemplate - name="okbutton" - yestext="OK"/> - </notification> - - <notification icon="alert.tga" name="ConfirmKick" type="alert"> diff --git a/indra/newview/skins/default/xui/en/panel_sound_devices.xml b/indra/newview/skins/default/xui/en/panel_sound_devices.xml index 46cbc1e87f..3dbb7fb7fc 100644 --- a/indra/newview/skins/default/xui/en/panel_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/panel_sound_devices.xml @@ -98,7 +98,7 @@ name="My volume label" top_pad="14" width="200"> - My volume: + Mic volume: </text> <slider_bar control_name="AudioLevelMic" @@ -110,7 +110,7 @@ left_delta="95" max_val="2" name="mic_volume_slider" - tool_tip="Change the volume using this slider" + tool_tip="Change the mic level using this slider" top_pad="-18" width="110" /> <text |