diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:25:02 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-18 16:25:02 -0400 |
commit | 9c995e2a5ce45cc912605d077d704fa76ed904dd (patch) | |
tree | 2f790ce33f92bff08ee64c45cfee4ad8ea62f4a5 /indra/newview/skins/default/xui/it | |
parent | 853231580aa2a6bf2894c20495c549a9d5f3c673 (diff) | |
parent | 81676d4753a1abe347a69a95f234a005aad0659f (diff) |
merge up from viewer-development (with changes for storm-160 backed out)
Diffstat (limited to 'indra/newview/skins/default/xui/it')
-rw-r--r-- | indra/newview/skins/default/xui/it/panel_preferences_chat.xml | 3 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/it/panel_preferences_sound.xml | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml index 4a1bbdf64a..208dd5ed28 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml @@ -56,7 +56,8 @@ <radio_item label="Finestre separate" name="radio" value="0"/> <radio_item label="Schede" name="radio2" value="1"/> </radio_group> - <check_box label="Usa la traduzione meccanica durante le chat (tecnologia Google)" name="translate_chat_checkbox"/> + <check_box name="translate_chat_checkbox"/> + <text name="translate_chb_label" >Usa la traduzione meccanica durante le chat (tecnologia Google)</text> <text name="translate_language_text" width="110"> Traduci chat in: </text> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml index 6e70a314c5..e2332b63d0 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_sound.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Suoni" name="Preference Media panel"> <slider label="Vol. principale" name="System Volume"/> - <check_box initial_value="true" label="Disatt. se a icona" name="mute_when_minimized"/> + <check_box initial_value="true" label="" name="mute_when_minimized"/> + <text name="mute_chb_label">Disatt. se a icona</text> <slider label="Pulsanti" name="UI Volume"/> <slider label="Ambiente" name="Wind Volume"/> <slider label="Effetti sonori" name="SFX Volume"/> |