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/floater_texture_ctrl.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/floater_texture_ctrl.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/floater_texture_ctrl.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml index e57c37073a..06418fa0ee 100644 --- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="texture picker" title="Foto: TEXTURE"> +<floater name="texture picker" title="PREFERITO: TEXTURE"> <string name="choose_picture"> Clicca per scegliere l'immagine </string> <text name="Multiple"> - Textures multiple + Texture multiple </text> <text name="unknown"> - Misura: [Dimensions] + Dimensioni: [DIMENSIONS] </text> <button label="Default" label_selected="Default" name="Default"/> <button label="Niente" label_selected="Niente" name="None"/> <button label="Vuoto" label_selected="Vuoto" name="Blank"/> <check_box label="Mostra cartelle" name="show_folders_check"/> - <search_editor label="Filtro Textures" name="inventory search editor"/> - <check_box label="Applica ora" name="apply_immediate_check"/> + <search_editor label="Filtro texture" name="inventory search editor"/> + <check_box label="Applica adesso" name="apply_immediate_check"/> <button label="Annulla" label_selected="Annulla" name="Cancel"/> <button label="Ok" label_selected="Ok" name="Select"/> <string name="pick title"> |