diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
commit | b5ab9c07031ffadb77792c312ca2bb1131d90fb0 (patch) | |
tree | 499b01923892a406d306eadd4507e6d7a41b471b /indra/newview/skins/default/xui/fr/floater_pay_object.xml | |
parent | eb6153d2c3cb1e2105804e28f81f894873315545 (diff) | |
parent | c201038aba861b1166d367fcf5986e33644ec018 (diff) |
Manual merge from default branch
Resolved conflicts in llpaneloutfitedit.cpp
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/fr/floater_pay_object.xml')
-rw-r--r-- | indra/newview/skins/default/xui/fr/floater_pay_object.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/indra/newview/skins/default/xui/fr/floater_pay_object.xml index 9cac739ab0..bb8dee241f 100644 --- a/indra/newview/skins/default/xui/fr/floater_pay_object.xml +++ b/indra/newview/skins/default/xui/fr/floater_pay_object.xml @@ -22,7 +22,7 @@ <button label="10 L$" label_selected="10 L$" name="fastpay 10"/> <button label="20 L$" label_selected="20 L$" name="fastpay 20"/> <text halign="left" left="5" name="amount text"> - Ou choisissez un montant : + Ou choisir un montant : </text> <line_editor left="65" name="amount" width="50"/> <button label="Payer" label_selected="Payer" name="pay btn"/> |