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_object.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_object.xml')
-rw-r--r-- | indra/newview/skins/default/xui/it/menu_object.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml index 955d4c8776..a830218c2d 100644 --- a/indra/newview/skins/default/xui/it/menu_object.xml +++ b/indra/newview/skins/default/xui/it/menu_object.xml @@ -4,21 +4,21 @@ <menu_item_call label="Modifica" name="Edit..."/> <menu_item_call label="Costruisci" name="Build"/> <menu_item_call label="Apri" name="Open"/> - <menu_item_call label="Siedi qui" name="Object Sit"/> - <menu_item_call label="Profilo oggetto" name="Object Inspect"/> + <menu_item_call label="Siediti qui" name="Object Sit"/> + <menu_item_call label="Profilo dell'oggetto" name="Object Inspect"/> <context_menu label="Metti >" name="Put On"> <menu_item_call label="Indossa" name="Wear"/> <context_menu label="Attacca >" name="Object Attach"/> <context_menu label="Attacca HUD >" name="Object Attach HUD"/> </context_menu> - <context_menu label="Togli >" name="Remove"> + <context_menu label="Rimuovi >" name="Remove"> <menu_item_call label="Prendi" name="Pie Object Take"/> - <menu_item_call label="Denuncia abuso" name="Report Abuse..."/> + <menu_item_call label="Segnala abuso" name="Report Abuse..."/> <menu_item_call label="Blocca" name="Object Mute"/> <menu_item_call label="Restituisci" name="Return..."/> - <menu_item_call label="Cancella" name="Delete"/> + <menu_item_call label="Elimina" name="Delete"/> </context_menu> <menu_item_call label="Prendi copia" name="Take Copy"/> <menu_item_call label="Paga" name="Pay..."/> - <menu_item_call label="Compra" name="Buy..."/> + <menu_item_call label="Acquista" name="Buy..."/> </context_menu> |