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, 69 insertions, 0 deletions

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

+<panel label="Proprietà immobiliari" name="Estate">

+	<text name="estate_help_text">

+		I cambiamenti alle impostazioni in questa finestra avranno effetto su tutte

+le regioni della proprietà.

+	</text>

+	<text name="estate_text">

+		Proprietà immobiliari:

+	</text>

+	<text name="estate_name">

+		(sconosciuto)

+	</text>

+	<text name="owner_text">

+		Proprietario:

+	</text>

+	<text name="estate_owner">

+		(sconosciuto)

+	</text>

+	<check_box label="Usa orario globale" name="use_global_time_check"/>

+	<button label="?" name="use_global_time_help"/>

+	<check_box label="Sole fisso" name="fixed_sun_check"/>

+	<button label="?" name="fixed_sun_help"/>

+	<slider label="Fase" name="sun_hour_slider"/>

+	<check_box label="Permetti accesso pubblico" name="externally_visible_check"/>

+	<button label="?" name="externally_visible_help"/>

+	<text name="Only Allow">

+		Limita l&apos;accesso a:

+	</text>

+	<check_box label="residenti che hanno dato informazioni di pagamento" name="limit_payment" tool_tip="Blocca residenti non identificati."/>

+	<check_box label="Adulti con età verificata" name="limit_age_verified" tool_tip="Blocca residenti che non hanno verificato la loro età. Per maggiori informazioni vai a support.secondlife.com."/>

+	<check_box label="Permetti la chat voice" name="voice_chat_check"/>

+	<button label="?" name="voice_chat_help"/>

+	<check_box label="Permetti teleport diretto" name="allow_direct_teleport"/>

+	<button label="?" name="allow_direct_teleport_help"/>

+	<text name="abuse_email_text">

+		Indirizzo email per la denuncia di abuso:

+	</text>

+	<string name="email_unsupported">

+		Tipologia non supportata

+	</string>

+	<button label="?" name="abuse_email_address_help"/>

+	<button label="Applica" name="apply_btn"/>

+	<button label="Espelli persona dalle proprietà..." name="kick_user_from_estate_btn"/>

+	<button label="Manda un messaggio ai residenti di tutte le tue proprietà..." name="message_estate_btn"/>

+	<text name="estate_manager_label">

+		Manager delle proprietà:

+	</text>

+	<button label="?" name="estate_manager_help"/>

+	<button label="Rimuovi..." name="remove_estate_manager_btn"/>

+	<button label="Aggiungi..." name="add_estate_manager_btn"/>

+	<text name="allow_resident_label">

+		Residenti autorizzati:

+	</text>

+	<button label="?" name="allow_resident_help"/>

+	<button label="Rimuovi..." name="remove_allowed_avatar_btn"/>

+	<button label="Aggiungi..." name="add_allowed_avatar_btn"/>

+	<text name="allow_group_label">

+		Gruppi autorizzati:

+	</text>

+	<button label="?" name="allow_group_help"/>

+	<button label="Rimuovi..." name="remove_allowed_group_btn"/>

+	<button label="Aggiungi..." name="add_allowed_group_btn"/>

+	<text name="ban_resident_label">

+		Residenti bloccati:

+	</text>

+	<button label="?" name="ban_resident_help"/>

+	<button label="Rimuovi..." name="remove_banned_avatar_btn"/>

+	<button label="Aggiungi..." name="add_banned_avatar_btn"/>

+</panel>