diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-02-09 09:50:29 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-09 09:50:29 -0800 |
commit | cf09a48bb21d553c837186cc2e7198801f06691a (patch) | |
tree | a668e28da71f9fafe6333784400dc8f24671fad6 /indra/newview/skins/default/xui/fr/floater_env_settings.xml | |
parent | 1c1ebd0365a115c736f62fadec37e006cbf43f44 (diff) | |
parent | 8fdb199707979916d4d3c23cd19fec9fed411aba (diff) |
Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-mediaclasses
Diffstat (limited to 'indra/newview/skins/default/xui/fr/floater_env_settings.xml')
-rw-r--r-- | indra/newview/skins/default/xui/fr/floater_env_settings.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/fr/floater_env_settings.xml b/indra/newview/skins/default/xui/fr/floater_env_settings.xml index 505c9236c7..dd714e85b6 100644 --- a/indra/newview/skins/default/xui/fr/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/fr/floater_env_settings.xml @@ -3,7 +3,7 @@ <floater.string name="timeStr"> [hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc] </floater.string> - <text bottom="-45" name="EnvTimeText"> + <text bottom="-45" name="EnvTimeText" top="29"> Heure de la journée </text> @@ -14,7 +14,7 @@ journée Couverture nuageuse </text> - <text bottom="-45" name="EnvWaterColorText"> + <text bottom="-45" name="EnvWaterColorText" top="29"> Couleur de l'eau </text> @@ -23,7 +23,7 @@ l'eau Brouillard dans l'eau </text> - <button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="145"/> + <button bottom="-144" label="Utiliser heure du domaine" name="EnvUseEstateTimeButton" width="152"/> <button label="Ciel avancé" left="162" name="EnvAdvancedSkyButton" width="145"/> <button label="Eau avancée" left="316" name="EnvAdvancedWaterButton" width="145"/> </floater> |