diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-09-07 14:47:24 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-09-07 14:47:24 -0400 |
| commit | 695c4135ff6fa0c50daa4c84f23096096ffd8a54 (patch) | |
| tree | a9b539e3ba588634fc493f2ed5ead21124e306ff /indra/newview/skins/default/xui/fr/floater_top_objects.xml | |
| parent | af6e665d5c9c9a5ea480389c284839f3945bf786 (diff) | |
| parent | b6f0921099b9b2a0a582886ebd6383fa20eac2b0 (diff) | |
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
Diffstat (limited to 'indra/newview/skins/default/xui/fr/floater_top_objects.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/fr/floater_top_objects.xml | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/fr/floater_top_objects.xml b/indra/newview/skins/default/xui/fr/floater_top_objects.xml index 42352e7c1e..aeeb462ac6 100644 --- a/indra/newview/skins/default/xui/fr/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/fr/floater_top_objects.xml @@ -1,16 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="top_objects" title="Objets les plus utilisés"> <floater.string name="top_scripts_title"> - Scripts principaux + Scripts les plus consommateurs </floater.string> <floater.string name="top_scripts_text"> [COUNT] scripts prenant un total de [TIME] ms </floater.string> <floater.string name="scripts_score_label"> - Heure - </floater.string> - <floater.string name="scripts_mono_time_label"> - Heure Mono + Temps </floater.string> <floater.string name="top_colliders_title"> Collisions les plus consommatrices @@ -32,9 +29,10 @@ <scroll_list.columns label="Nom" name="name"/> <scroll_list.columns label="Propriétaire" name="owner"/> <scroll_list.columns label="Lieu" name="location"/> - <scroll_list.columns label="Heure" name="time"/> - <scroll_list.columns label="Heure Mono" name="mono_time"/> + <scroll_list.columns label="Parcelle" name="parcel"/> + <scroll_list.columns label="Temps" name="time"/> <scroll_list.columns label="URL" name="URLs"/> + <scroll_list.columns label="Mémoire (Ko)" name="memory"/> </scroll_list> <text name="id_text"> ID de l'objet : @@ -43,11 +41,15 @@ <text name="obj_name_text"> Nom : </text> - <button label="Filtre" name="filter_object_btn"/> + <button label="Filtrer" name="filter_object_btn"/> <text name="owner_name_text"> Propriétaire : </text> <button label="Filtre" name="filter_owner_btn"/> + <text name="parcel_name_text"> + Parcelle : + </text> + <button label="Filtrer" name="filter_parcel_btn"/> <button label="Rafraîchir" name="refresh_btn"/> <button label="Renvoyer" name="return_selected_btn"/> <button label="Tout renvoyer" name="return_all_btn"/> |