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_text_editor.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_text_editor.xml')
-rw-r--r-- | indra/newview/skins/default/xui/it/menu_text_editor.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/it/menu_text_editor.xml b/indra/newview/skins/default/xui/it/menu_text_editor.xml index baab233a21..4636ce9929 100644 --- a/indra/newview/skins/default/xui/it/menu_text_editor.xml +++ b/indra/newview/skins/default/xui/it/menu_text_editor.xml @@ -3,6 +3,6 @@ <menu_item_call label="Taglia" name="Cut"/> <menu_item_call label="Copia" name="Copy"/> <menu_item_call label="Incolla" name="Paste"/> - <menu_item_call label="Cancella" name="Delete"/> - <menu_item_call label="Seleziona Tutto" name="Select All"/> + <menu_item_call label="Elimina" name="Delete"/> + <menu_item_call label="Seleziona tutto" name="Select All"/> </context_menu> |