diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 18:28:19 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 18:28:19 -0800 |
commit | a9867b6437efd07ef9b18315d61155bd10860e13 (patch) | |
tree | d059f1d6a6809acbedd5ba2ea72c4f88acee2b1b /indra/newview/skins/default/xui/fr/floater_openobject.xml | |
parent | 6bb43e1369d957a041c796120e87a89ff3fa10ee (diff) | |
parent | 8a2404fa3341db0bd7a60459e008b8a3c6afad03 (diff) |
Automated merge
Diffstat (limited to 'indra/newview/skins/default/xui/fr/floater_openobject.xml')
-rw-r--r-- | indra/newview/skins/default/xui/fr/floater_openobject.xml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/fr/floater_openobject.xml b/indra/newview/skins/default/xui/fr/floater_openobject.xml index 5ffa2f236d..fa46f0cd17 100644 --- a/indra/newview/skins/default/xui/fr/floater_openobject.xml +++ b/indra/newview/skins/default/xui/fr/floater_openobject.xml @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="objectcontents" title="CONTENU DES OBJETS"> - <text name="object_name"> - [DESC]: - </text> - <button label="Copier vers l'inventaire" label_selected="Copier vers l'inventaire" name="copy_to_inventory_button" width="132" /> - <button label="Copier et porter" label_selected="Copier et porter" name="copy_and_wear_button" left="152"/> -</floater> +<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="objectcontents" title="CONTENU DES OBJETS">
+ <text name="object_name">
+ [DESC]:
+ </text>
+ <button label="Copier vers l'inventaire" label_selected="Copier vers l'inventaire" name="copy_to_inventory_button" width="132"/>
+ <button label="Copier et porter" label_selected="Copier et porter" left="152" name="copy_and_wear_button"/>
+</floater>
|