diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-24 18:04:26 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-24 18:04:26 +0200 |
| commit | d3a606f8323a32c660c71675257e3abd95cb097e (patch) | |
| tree | 11e272b194cb42bd9b11b861395f44793d3fa9f6 /indra/newview/skins/default/xui/es/panel_preferences_alerts.xml | |
| parent | 5f46430a1aa16212838dd7a9493a42fcb5e92ec3 (diff) | |
| parent | 7857f59f9e7c673f1ddbf32d6a66e85f78004445 (diff) | |
Manual merge from default branch.
Resolved conflicts in llpanellandmarks.cpp.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/es/panel_preferences_alerts.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/es/panel_preferences_alerts.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml index 0ccc307039..f34edf149e 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_alerts.xml @@ -4,7 +4,7 @@ Avisarme: </text> <check_box label="Cuando gaste o consiga L$" name="notify_money_change_checkbox"/> - <check_box label="Cuando mis amigos se conectan o desconectan" name="friends_online_notify_checkbox"/> + <check_box label="Cuando mis amigos se conecten o desconecten" name="friends_online_notify_checkbox"/> <text name="show_label" width="300"> Mostrar siempre: </text> |