diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
commit | a65188d85f75e848d224bd335a00ed8aa51f945e (patch) | |
tree | f43b390cba45d047fc0fa31659f6969f62b925d1 /indra/newview/skins/default/xui/fr/panel_landmarks.xml | |
parent | 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (diff) | |
parent | 5ca943cd0279d35ffdf584fa0de3b795645f276c (diff) |
Merge from viewer2. Minor conflict resolved.
Diffstat (limited to 'indra/newview/skins/default/xui/fr/panel_landmarks.xml')
-rw-r--r-- | indra/newview/skins/default/xui/fr/panel_landmarks.xml | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/indra/newview/skins/default/xui/fr/panel_landmarks.xml b/indra/newview/skins/default/xui/fr/panel_landmarks.xml index 1da5eb8423..c4e90bed61 100644 --- a/indra/newview/skins/default/xui/fr/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/fr/panel_landmarks.xml @@ -1,14 +1,14 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="Landmarks">
- <accordion name="landmarks_accordion">
- <accordion_tab name="tab_favorites" title="Barre des Favoris"/>
- <accordion_tab name="tab_landmarks" title="Repères"/>
- <accordion_tab name="tab_inventory" title="Mon inventaire"/>
- <accordion_tab name="tab_library" title="Bibliothèque"/>
- </accordion>
- <panel name="bottom_panel">
- <button name="options_gear_btn" tool_tip="Afficher d'autres options"/>
- <button name="add_btn" tool_tip="Ajouter un nouveau repère"/>
- <dnd_button name="trash_btn" tool_tip="Supprimer le repère sélectionné"/>
- </panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<panel name="Landmarks"> + <accordion name="landmarks_accordion"> + <accordion_tab name="tab_favorites" title="Barre des Favoris"/> + <accordion_tab name="tab_landmarks" title="Repères"/> + <accordion_tab name="tab_inventory" title="Mon inventaire"/> + <accordion_tab name="tab_library" title="Bibliothèque"/> + </accordion> + <panel name="bottom_panel"> + <button name="options_gear_btn" tool_tip="Afficher d'autres options"/> + <button name="add_btn" tool_tip="Ajouter un nouveau repère"/> + <dnd_button name="trash_btn" tool_tip="Supprimer le repère sélectionné"/> + </panel> +</panel> |