summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-08-02 19:45:35 -0700
committerRichard Nelson <none@none>2010-08-02 19:45:35 -0700
commitf9f3c5eeb2362e388c1d857626d276bbbd40edcf (patch)
tree989ba4c6ea9192330f2f70b0140aeacd759f0bf9 /indra/newview/skins
parent0791fd3c227f64116d98260dc5bfaf3424b73bff (diff)
parentb3b8ef25e192f5713c9d5ca47289499b17ff07d1 (diff)
merge from dessie/viewer-release
Diffstat (limited to 'indra/newview/skins')
-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é"/>