diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-29 18:41:08 +0300 |
commit | 6e0770908dc151b09a2863b95dc0c132d242acc0 (patch) | |
tree | c72c7070cc0438dc4165ef8d5c6b329fc16448b5 /indra/newview/skins/default/xui/it/panel_bottomtray.xml | |
parent | f55af5fcdfdd0b4520e382d315afefd41c534820 (diff) | |
parent | 61657d2e7904ba7274a0ab5d451669d2ee7bb7cc (diff) |
Manual merge from default branch
Resolved conflicts in indra/newview/llchathistory.cpp in favor of trunk version.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/it/panel_bottomtray.xml')
-rw-r--r-- | indra/newview/skins/default/xui/it/panel_bottomtray.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/it/panel_bottomtray.xml b/indra/newview/skins/default/xui/it/panel_bottomtray.xml index ccefc91ce1..c0218fad5e 100644 --- a/indra/newview/skins/default/xui/it/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/it/panel_bottomtray.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="bottom_tray"> <string name="SpeakBtnToolTip"> - Microfono on/off + Accende o spegne il microfono </string> <string name="VoiceControlBtnToolTip"> - Mostra/nascondi il pannello voice control + Mostra o nasconde il pannello di regolazione voce </string> <layout_stack name="toolbar_stack"> <layout_panel name="speak_panel"> @@ -13,13 +13,13 @@ </talk_button> </layout_panel> <layout_panel name="gesture_panel"> - <gesture_combo_list label="Gesture" name="Gesture" tool_tip="Mostra/nascondi gestures"/> + <gesture_combo_list label="Gesture" name="Gesture" tool_tip="Mostra o nasconde le gesture"/> </layout_panel> <layout_panel name="movement_panel"> - <button label="Sposta" name="movement_btn" tool_tip="Mostra/nascondi i controlli del movimento"/> + <button label="Sposta" name="movement_btn" tool_tip="Mostra o nasconde i comandi del movimento"/> </layout_panel> <layout_panel name="cam_panel"> - <button label="Visualizza" name="camera_btn" tool_tip="Mostra/nascondi i controlli della camera"/> + <button label="Visuale" name="camera_btn" tool_tip="Mostra o nasconde le regolazioni della visuale"/> </layout_panel> <layout_panel name="snapshot_panel"> <button label="" name="snapshots" tool_tip="Scatta una foto"/> |