Skip to content
Snippets Groups Projects
Commit c4987fde authored by Tofu Linden's avatar Tofu Linden
Browse files

More PE merge (revert some of these to trunk versions - PE shouldn't be... 

More PE merge (revert some of these to trunk versions - PE shouldn't be changing the translated files I reckon)
parent 87c986dc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/skins/default/xui/en/panel_classified_info.xml
+ 96
− 4
View file @ c4987fde
...@@ -93,6 +93,17 @@ ...@@ -93,6 +93,17 @@
v_pad="0" v_pad="0"
value="[name]" value="[name]"
use_ellipses="true" /> use_ellipses="true" />
<text
follows="left|top"
font.style="BOLD"
height="10"
layout="topleft"
left="10"
name="classified_location_label"
text_color="white"
top_pad="10"
value="Location:"
width="250" />
<text_editor <text_editor
allow_scroll="false" allow_scroll="false"
bg_visible="false" bg_visible="false"
...@@ -103,10 +114,22 @@ ...@@ -103,10 +114,22 @@
left="10" left="10"
name="classified_location" name="classified_location"
read_only="true" read_only="true"
top_pad="5"
width="290" width="290"
word_wrap="true" word_wrap="true"
v_pad="0" v_pad="0"
value="[loading...]" /> value="[loading...]" />
<text
follows="left|top"
font.style="BOLD"
height="10"
layout="topleft"
left="10"
name="content_type_label"
text_color="white"
top_pad="10"
value="Content Type:"
width="250" />
<text_editor <text_editor
allow_scroll="false" allow_scroll="false"
bg_visible="false" bg_visible="false"
...@@ -121,6 +144,17 @@ ...@@ -121,6 +144,17 @@
top_pad="15" top_pad="15"
v_pad="0" v_pad="0"
value="[content type]" /> value="[content type]" />
<text
follows="left|top"
font.style="BOLD"
height="10"
layout="topleft"
left="10"
name="category_label"
text_color="white"
top_pad="10"
value="Category:"
width="250" />
<text_editor <text_editor
allow_html="true" allow_html="true"
allow_scroll="false" allow_scroll="false"
...@@ -136,6 +170,17 @@ ...@@ -136,6 +170,17 @@
top_pad="5" top_pad="5"
v_pad="0" v_pad="0"
value="[category]" /> value="[category]" />
<text
follows="left|top"
font.style="BOLD"
height="10"
layout="topleft"
left="10"
name="price_for_listing_label"
text_color="white"
top_pad="10"
value="Price for listing:"
width="250" />
<text_editor <text_editor
allow_scroll="false" allow_scroll="false"
bg_visible="false" bg_visible="false"
...@@ -150,17 +195,61 @@ ...@@ -150,17 +195,61 @@
top_pad="5" top_pad="5"
tool_tip="Price for listing." tool_tip="Price for listing."
v_pad="0" v_pad="0"
value="[price]"
width="105" /> width="105" />
<layout_stack
animate="false"
name="descr_stack"
layout="topleft"
follows="top|left"
orientation="vertical"
left="10"
top_pad="5"
width="290"
height="250">
<layout_panel
auto_resize="false"
name="price_layout_panel"
layout="topleft"
follows="top|left"
left="0"
top="0"
width="290"
height="26"
user_resize="false">
<check_box <check_box
enabled="false" enabled="false"
height="16" height="16"
label="Auto renew each week" label="Auto renew each week"
layout="topleft" layout="topleft"
left="10" follows="top|left"
left="0"
name="auto_renew" name="auto_renew"
top_pad="5" top="0"
v_pad="0" v_pad="0"
width="290" /> width="290" />
</layout_panel>
<layout_panel
name="descr_layout_panel"
layout="topleft"
follows="top|left"
left="0"
top="0"
width="290"
height="215"
user_resize="false">
<text
auto_resize="false"
follows="left|top"
font.style="BOLD"
height="10"
layout="topleft"
left="0"
name="classified_desc_label"
text_color="white"
top="0"
value="Description:"
width="250" />
<text_editor <text_editor
allow_html="true" allow_html="true"
allow_scroll="true" allow_scroll="true"
...@@ -168,15 +257,18 @@ ...@@ -168,15 +257,18 @@
follows="left|top|right" follows="left|top|right"
h_pad="0" h_pad="0"
height="200" height="200"
width="272"
layout="topleft" layout="topleft"
left="10" left="0"
max_length="1023" max_length="1023"
name="classified_desc" name="classified_desc"
read_only="true" read_only="true"
top_pad="5"
width="290"
v_pad="0" v_pad="0"
value="[description]" value="[description]"
word_wrap="true" /> word_wrap="true" />
</layout_panel>
</layout_stack>
</panel> </panel>
</scroll_container> </scroll_container>
<panel <panel
......
indra/newview/skins/default/xui/fr/floater_world_map.xml
+ 12
− 21
View file @ c4987fde
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="worldmap" title="CARTE DU MONDE"> <floater name="worldmap" title="CARTE DU MONDE">
<panel name="objects_mapview" width="542"/>
<panel name="layout_panel_1"> <panel name="layout_panel_1">
<text name="events_label"> <text name="events_label">
Légende Légende
</text> </text>
</panel> </panel>
<panel> <panel>
<button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l&apos;emplacement de mon avatar" width="165"/> <button label="Afficher mon emplacement" label_selected="Afficher mon emplacement" name="Show My Location" tool_tip="Centrer la carte sur l&apos;emplacement de mon avatar"/>
<text name="me_label"> <text name="me_label">
Moi Moi
</text> </text>
<check_box label="Résident" name="people_chk"/> <check_box label="Résident" name="people_chk"/>
<icon left="-262" name="person"/>
<text name="person_label"> <text name="person_label">
Résident Résident
</text> </text>
<check_box label="Infohub" name="infohub_chk"/> <check_box label="Infohub" name="infohub_chk"/>
<icon left="-266" name="infohub"/>
<text name="infohub_label"> <text name="infohub_label">
Infohub Infohub
</text> </text>
<check_box label="Terrain à vendre" name="land_for_sale_chk"/> <check_box label="Terrain à vendre" name="land_for_sale_chk"/>
<icon left="-266" name="landforsale"/>
<text name="land_sale_label"> <text name="land_sale_label">
Vente de terrains Vente de terrains
</text> </text>
<icon left="-270" name="square2"/>
<text name="by_owner_label"> <text name="by_owner_label">
par le propriétaire par le propriétaire
</text> </text>
<text name="auction_label"> <text name="auction_label">
enchères enchères
</text> </text>
<button label="Aller chez moi" label_selected="Aller chez moi" left="-120" name="Go Home" tool_tip="Me téléporter jusqu&apos;à mon domicile" width="108"/> <button label="Aller chez moi" label_selected="Aller chez moi" name="Go Home" tool_tip="Me téléporter jusqu&apos;à mon domicile"/>
<text name="Home_label"> <text name="Home_label">
Domicile Domicile
</text> </text>
<text left="-144" name="events_label"> <text name="events_label">
Événements : Événements :
</text> </text>
<check_box label="PG" name="event_chk"/> <check_box label="PG" name="event_chk"/>
<icon left="-132" name="event"/>
<text name="pg_label"> <text name="pg_label">
Général Général
</text> </text>
<check_box initial_value="true" label="Mature" name="event_mature_chk"/> <check_box initial_value="true" label="Mature" name="event_mature_chk"/>
<icon left="-132" name="events_mature_icon"/>
<text name="mature_label"> <text name="mature_label">
Modéré Modéré
</text> </text>
<check_box label="Adult" name="event_adult_chk"/> <check_box label="Adult" name="event_adult_chk"/>
<icon left="-132" name="events_adult_icon"/>
<text name="adult_label"> <text name="adult_label">
Adulte Adulte
</text> </text>
...@@ -62,23 +54,22 @@ ...@@ -62,23 +54,22 @@
</text> </text>
</panel> </panel>
<panel> <panel>
<combo_box label="Amis connectés" name="friend combo" tool_tip="Afficher les amis sur la carte" width="232"> <combo_box label="Amis connectés" name="friend combo" tool_tip="Afficher les amis sur la carte">
<combo_box.item label="Mes amis connectés" name="item1"/> <combo_box.item label="Mes amis connectés" name="item1"/>
</combo_box> </combo_box>
<icon left="-270" name="landmark_icon"/> <combo_box label="Mes repères" name="landmark combo" tool_tip="Repère à afficher sur la carte">
<combo_box label="Mes repères" name="landmark combo" tool_tip="Repère à afficher sur la carte" width="232">
<combo_box.item label="Mes repères" name="item1"/> <combo_box.item label="Mes repères" name="item1"/>
</combo_box> </combo_box>
<search_editor label="Régions par nom" name="location" tool_tip="Saisissez le nom d&apos;une région" width="155"/> <search_editor label="Régions par nom" name="location" tool_tip="Saisissez le nom d&apos;une région"/>
<button label="Trouver" label_selected="&gt;" left_delta="160" name="DoSearch" tool_tip="Recherchez sur la carte" width="75"/> <button label="Trouver" label_selected="&gt;" name="DoSearch" tool_tip="Recherchez sur la carte"/>
<button name="Clear" tool_tip="Effacer les lignes de suivi et réinitialiser la carte"/> <button name="Clear" tool_tip="Effacer les lignes de suivi et réinitialiser la carte"/>
<scroll_list left="-270" name="search_results" width="252"> <scroll_list name="search_results">
<scroll_list.columns label="" name="icon"/> <scroll_list.columns label="" name="icon"/>
<scroll_list.columns label="" name="sim_name"/> <scroll_list.columns label="" name="sim_name"/>
</scroll_list> </scroll_list>
<button label="Téléporter" label_selected="Téléporter" left="-270" name="Teleport" tool_tip="Téléporter à l&apos;endroit sélectionné"/> <button label="Téléporter" label_selected="Téléporter" name="Teleport" tool_tip="Téléporter à l&apos;endroit sélectionné"/>
<button label="Copier la SLurl" left="-270" name="copy_slurl" tool_tip="Copie l&apos;emplacement actuel sous la forme d&apos;une SLurl à utiliser sur le Web."/> <button label="Copier la SLurl" name="copy_slurl" tool_tip="Copie l&apos;emplacement actuel sous la forme d&apos;une SLurl à utiliser sur le Web."/>
<button label="Afficher la sélection" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centrer la carte sur l&apos;endroit sélectionné" width="165"/> <button label="Afficher la sélection" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centrer la carte sur l&apos;endroit sélectionné"/>
</panel> </panel>
<panel> <panel>
<text name="zoom_label"> <text name="zoom_label">
...@@ -86,6 +77,6 @@ ...@@ -86,6 +77,6 @@
</text> </text>
</panel> </panel>
<panel> <panel>
<slider label="Zoom" left="-270" name="zoom slider"/> <slider label="Zoom" name="zoom slider"/>
</panel> </panel>
</floater> </floater>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment