summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-08-03 17:03:22 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-08-03 17:03:22 +0300
commit497a151fb923675cc6fae139bcdde1678be195bd (patch)
treed50aaa0aa62da430d51d8497c0b02e2480fa2581 /indra/newview/skins/default
parent48ccc7ccfbe3e94f9dd78ced588e0a76d03fe070 (diff)
parentf9f3c5eeb2362e388c1d857626d276bbbd40edcf (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/panel_outfits_list.xml10
-rw-r--r--indra/newview/skins/default/xui/fr/panel_nearby_media.xml4
2 files changed, 5 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_list.xml b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
index 9833b1dccb..d18f0d57ca 100644
--- a/indra/newview/skins/default/xui/en/panel_outfits_list.xml
+++ b/indra/newview/skins/default/xui/en/panel_outfits_list.xml
@@ -14,6 +14,9 @@
background_visible="true"
bg_alpha_color="DkGray2"
bg_opaque_color="DkGray2"
+ no_matched_tabs_text.value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]."
+ no_matched_tabs_text.v_pad="10"
+ no_visible_tabs_text.value="You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]"
follows="all"
height="400"
layout="topleft"
@@ -21,13 +24,6 @@
name="outfits_accordion"
top="0"
width="309">
- <no_matched_tabs_text
- name="no_matched_outfits_msg"
- value="Didn't find what you're looking for? Try [secondlife:///app/search/all/[SEARCH_TERM] Search]."
- v_pad="10" />
- <no_visible_tabs_text
- name="no_outfits_msg"
- value="You don't have any outfits yet. Try [secondlife:///app/search/all/ Search]." />
</accordion>
<panel
background_visible="true"
diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
index 66bfd01a2a..978ca86d62 100644
--- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
+++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml
@@ -27,7 +27,7 @@
Médias proches
</text>
<text name="show_text">
- Voir :
+ Afficher :
</text>
<combo_box name="show_combo">
<combo_box.item label="Tout" name="All"/>
@@ -42,7 +42,7 @@
<scroll_list.columns label="Nom" name="media_name"/>
<scroll_list.columns label="Débogage" name="media_debug"/>
</scroll_list>
- <panel name="media_controls_panel">
+ <panel>
<layout_stack name="media_controls">
<layout_panel name="stop">
<button name="stop_btn" tool_tip="Arrêter le média sélectionné"/>