diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-05-27 11:02:59 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-05-27 11:02:59 +0300 |
| commit | 990e31bb692b62e05f6065b04207acb8ca50cce4 (patch) | |
| tree | 8bb88d17e763d1a0be37f3c3ff1056f5306a4e77 /indra/newview/skins/default/xui/fr/floater_preview_notecard.xml | |
| parent | 46de549bfba0b95b068b617026e095404ccff2f6 (diff) | |
| parent | f33fdbf0ef25c485bdd09faaf1177d2b2b1a7694 (diff) | |
Merge from default branch.
Incoming changes in (924d091c166c) moved SidebarCameraMovement logic out of special widget to camera setup code
are reset changes in (380b2422b864) EXT-7434 FIX Worldview rect wasn't updated when "SidebarCameraMovement" variable
But seems bug is not reproduced.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/fr/floater_preview_notecard.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/fr/floater_preview_notecard.xml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml index d6ec915fd1..5646ad45eb 100644 --- a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml @@ -9,9 +9,6 @@ <floater.string name="Title"> Note : [NAME] </floater.string> - <floater.string label="Enregistrer" label_selected="Enregistrer" name="Save"> - Enregistrer - </floater.string> <text name="desc txt"> Description : </text> @@ -19,4 +16,5 @@ Chargement... </text_editor> <button label="Enregistrer" label_selected="Enregistrer" name="Save"/> + <button label="Supprimer" label_selected="Supprimer" name="Delete"/> </floater> |