QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3

svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql

1 files changed, 47 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/it/floater_inventory.xml b/indra/newview/skins/default/xui/it/floater_inventory.xml
new file mode 100644
index 0000000000..bb7d387f22
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_inventory.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="Inventory" title="Inventario">

+	<search_editor label="Scrivi qui per cercare" name="inventory search editor"/>

+	<tab_container name="inventory filter tabs">

+		<inventory_panel label="Tutti gli elementi" name="All Items"/>

+		<inventory_panel label="Elementi recenti" name="Recent Items"/>

+	</tab_container>

+	<menu_bar name="Inventory Menu">

+		<menu label="File" name="File">

+			<menu_item_call label="Apri" name="Open"/>

+			<menu_item_call label="Nuova finestra" name="New Window"/>

+			<menu_item_call label="Mostra Filtri" name="Show Filters"/>

+			<menu_item_call label="Azzera Filtri" name="Reset Current"/>

+			<menu_item_call label="Chiudi tutte le cartelle" name="Close All Folders"/>

+			<menu_item_call label="Svuota Cestino" name="Empty Trash"/>

+		</menu>

+		<menu label="Crea" name="Create">

+			<menu_item_call label="Nuova Cartella" name="New Folder"/>

+			<menu_item_call label="Nuovo Script" name="New Script"/>

+			<menu_item_call label="Nuova Nota" name="New Note"/>

+			<menu_item_call label="Nuova Gesture" name="New Gesture"/>

+			<menu name="New Clothes">

+				<menu_item_call label="Nuova Camicia" name="New Shirt"/>

+				<menu_item_call label="Nuovi Pantaloni" name="New Pants"/>

+				<menu_item_call label="Nuove Scarpe" name="New Shoes"/>

+				<menu_item_call label="Nuove Calze" name="New Socks"/>

+				<menu_item_call label="Nuova Giacca" name="New Jacket"/>

+				<menu_item_call label="Nuova Gonna" name="New Skirt"/>

+				<menu_item_call label="Nuovi Guanti" name="New Gloves"/>

+				<menu_item_call label="Nuova Canottiera" name="New Undershirt"/>

+				<menu_item_call label="Nuove Mutande" name="New Underpants"/>

+			</menu>

+			<menu name="New Body Parts">

+				<menu_item_call label="Nuova Forma del Corpo" name="New Shape"/>

+				<menu_item_call label="Nuova Pelle" name="New Skin"/>

+				<menu_item_call label="Nuovi Capelli" name="New Hair"/>

+				<menu_item_call label="Nuovi Occhi" name="New Eyes"/>

+			</menu>

+		</menu>

+		<menu label="Ordinamento" name="Sort">

+			<menu_item_check label="Per nome" name="By Name"/>

+			<menu_item_check label="Per data" name="By Date"/>

+			<menu_item_check label="Cartelle sempre per nome" name="Folders Always By Name"/>

+			<menu_item_check label="Cartelle di sistema sempre in cima" name="System Folders To Top"/>

+		</menu>

+	</menu_bar>

+</floater>