diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-03-26 19:00:27 +0200 |
| commit | a5227864bd7ca930b41041ff80b20c30474f5f8c (patch) | |
| tree | 0a7f77c543184209717be29dfc24e1d05d320a00 /indra/newview/skins/default/xui/it/panel_region_covenant.xml | |
| parent | 3f3c9c7e255e090c7f09dafd08ec20f2d8a09c6d (diff) | |
| parent | b74e1d942352e81e0cc00e21ef3b351152b32248 (diff) | |
Manual merge from default branch
Resolved conflict in indra/newview/llviewerwindow.cpp.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins/default/xui/it/panel_region_covenant.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/it/panel_region_covenant.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/it/panel_region_covenant.xml b/indra/newview/skins/default/xui/it/panel_region_covenant.xml index f7aeef60b9..0d3117ca7a 100644 --- a/indra/newview/skins/default/xui/it/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/it/panel_region_covenant.xml @@ -31,7 +31,7 @@ della proprietà. </text> <text bottom_delta="-36" name="covenant_instructions"> - Trascina e inserisci un biglietto per cambiare il Regolamento di questa proprietà immobiliare. + Trascina e incolla un biglietto per cambiare il Regolamento di questa proprietà. </text> <text name="region_section_lbl"> Regione |