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/it/menu_avatar_self.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/it/menu_avatar_self.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/menu_avatar_self.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_self.xml b/indra/newview/skins/default/xui/it/menu_avatar_self.xml index b7a9f8efbe..d89741f8d0 100644 --- a/indra/newview/skins/default/xui/it/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/it/menu_avatar_self.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Self Pie"> <menu_item_call label="Alzati" name="Stand Up"/> - <context_menu label="Vola >" name="Take Off >"> + <context_menu label="Togli >" name="Take Off >"> <context_menu label="Abiti >" name="Clothes >"> - <menu_item_call label="Gonna" name="Shirt"/> + <menu_item_call label="Camicia" name="Shirt"/> <menu_item_call label="Pantaloni" name="Pants"/> <menu_item_call label="Gonna" name="Skirt"/> <menu_item_call label="Scarpe" name="Shoes"/> @@ -13,15 +13,15 @@ <menu_item_call label="Maglietta intima" name="Self Undershirt"/> <menu_item_call label="Slip" name="Self Underpants"/> <menu_item_call label="Tatuaggio" name="Self Tattoo"/> - <menu_item_call label="Alfa (trasparenza)" name="Self Alpha"/> + <menu_item_call label="Alpha (Trasparenza)" name="Self Alpha"/> <menu_item_call label="Tutti gli abiti" name="All Clothes"/> </context_menu> <context_menu label="HUD >" name="Object Detach HUD"/> <context_menu label="Stacca >" name="Object Detach"/> <menu_item_call label="Stacca tutto" name="Detach All"/> </context_menu> - <menu_item_call label="Il mio aspetto fisico" name="Appearance..."/> - <menu_item_call label="I miei amici" name="Friends..."/> + <menu_item_call label="Il mio aspetto" name="Appearance..."/> + <menu_item_call label="I miei amici..." name="Friends..."/> <menu_item_call label="I miei gruppi" name="Groups..."/> <menu_item_call label="Il mio profilo" name="Profile..."/> </context_menu> |