diff options
author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-03-30 14:09:50 +0300 |
---|---|---|
committer | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2023-03-30 14:09:50 +0300 |
commit | 198cd4df09d4d6aa9c5bbb6be9c4395d134f9f13 (patch) | |
tree | d4b87f39ab6353138594ca153ddadd5b217def00 /indra/newview/skins/default/xui/it | |
parent | e161b128c7eac6df63b6d9210f3bca6c3cbc77ea (diff) | |
parent | c7053a6928fd5eafdc935453742e92951ae4e0c1 (diff) |
Merge branch 'main' into DRTVWR-567
# Conflicts:
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
Diffstat (limited to 'indra/newview/skins/default/xui/it')
-rw-r--r-- | indra/newview/skins/default/xui/it/floater_tools.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml index a21ae9a485..f98a2da277 100644 --- a/indra/newview/skins/default/xui/it/floater_tools.xml +++ b/indra/newview/skins/default/xui/it/floater_tools.xml @@ -40,7 +40,7 @@ Clicca e trascina per selezionare il terreno </floater.string> <floater.string name="status_selectcount"> - [OBJ_COUNT] oggetti selezionati, impatto terreno [LAND_IMPACT] + [OBJ_COUNT] oggetti selezionati, impatto terreno [LAND_IMPACT] [secondlife:///app/openfloater/object_weights ?] </floater.string> <floater.string name="status_remaining_capacity"> Capacità restante [LAND_CAPACITY]. |