summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2018-03-09 09:08:02 -0500
committerOz Linden <oz@lindenlab.com>2018-03-09 09:08:02 -0500
commitaae241c43f66c3ef59cb076d00e42f9a857de354 (patch)
tree82da2afc116915897a3207cc8eed120aef5ef3fd /indra/newview/skins/default/xui/en
parent17bb7f4fc5463e9426179b0ded810b51ef291c79 (diff)
parentf8c76535a35aaf245e261357a59e977bac5b2501 (diff)
merge changes for 5.1.2-release
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rw-r--r--indra/newview/skins/default/xui/en/floater_avatar_picker.xml5
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_main_inventory.xml9
-rw-r--r--indra/newview/skins/default/xui/en/panel_notification.xml1
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
5 files changed, 7 insertions, 12 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
index dddb258ed9..af6d11f47e 100644
--- a/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_avatar_picker.xml
@@ -47,7 +47,6 @@
top="20"
width="500">
<panel
- border="none"
height="150"
label="Search"
layout="topleft"
@@ -108,7 +107,6 @@
</scroll_list>
</panel>
<panel
- border="none"
height="150"
label="Friends"
layout="topleft"
@@ -144,7 +142,6 @@
<scroll_list
follows="all"
height="120"
- border="false"
layout="topleft"
left="0"
name="Friends"
@@ -154,7 +151,6 @@
</panel>
<panel
- border="none"
height="150"
label="Near Me"
layout="topleft"
@@ -213,7 +209,6 @@
draw_heading="true"
follows="all"
height="100"
- border="false"
layout="topleft"
left="0"
name="NearMe"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 9e4cb4e267..6aa6653f42 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5928,7 +5928,7 @@ The folder &apos;[FOLDERNAME]&apos; is a system folder. Deleting system folders
icon="alertmodal.tga"
name="ConfirmEmptyTrash"
type="alertmodal">
-[COUNT] items will be permanently deleted. Are you sure you want to permanently delete the contents of your Trash?
+[COUNT] items and folders will be permanently deleted. Are you sure you want to permanently delete the contents of your Trash?
<tag>confirm</tag>
<usetemplate
name="okcancelbuttons"
diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
index df70398599..d77fbdec0a 100644
--- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml
@@ -13,26 +13,27 @@
</panel.string>
<panel.string
name="ItemcountFetching">
- Fetching [ITEM_COUNT] Items... [FILTER]
+ Fetching [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders... [FILTER]
</panel.string>
<panel.string
name="ItemcountCompleted">
- [ITEM_COUNT] Items [FILTER]
+ [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders [FILTER]
</panel.string>
<panel.string
name="ItemcountUnknown">
- Fetched [ITEM_COUNT] Items [FILTER]
+ Fetched [ITEM_COUNT] Items and [CATEGORY_COUNT] Folders [FILTER]
</panel.string>
<text
type="string"
length="1"
- follows="left|top"
+ follows="left|top|right"
height="13"
layout="topleft"
left="12"
name="ItemcountText"
font="SansSerifMedium"
text_color="EmphasisColor"
+ use_ellipses="true"
top_pad="0"
width="300">
Items:
diff --git a/indra/newview/skins/default/xui/en/panel_notification.xml b/indra/newview/skins/default/xui/en/panel_notification.xml
index 4d9316768b..c1a68fb9af 100644
--- a/indra/newview/skins/default/xui/en/panel_notification.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification.xml
@@ -71,7 +71,6 @@
mouse_opaque="false"
name="text_editor_box"
read_only="true"
- tab_stop="false"
text_color="White"
text_readonly_color="White"
top="10"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 807d116b3b..5f30a7e87d 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2329,7 +2329,7 @@ If you continue to receive this message, please contact Second Life support for
<string name="InventoryMarketplaceListingsNoItems">
Drag folders to this area to list them for sale on the [[MARKETPLACE_DASHBOARD_URL] Marketplace].
</string>
-
+ <string name="InventoryItemsCount">( [ITEMS_COUNT] Items )</string>
<string name="Marketplace Validation Log"></string>
<string name="Marketplace Validation Warning Stock">stock folder must be contained by a version folder</string>
<string name="Marketplace Validation Error Mixed Stock">: Error: all items in a stock folder must be no-copy and of the same type</string>