Automated merge with http://hg.secondlife.com/viewer-development

6 files changed, 5 insertions, 172 deletions

diff --git a/indra/newview/skins/default/xui/it/floater_camera.xml b/indra/newview/skins/default/xui/it/floater_camera.xml
index be4b8e210d..7e6ca4307e 100644
--- a/indra/newview/skins/default/xui/it/floater_camera.xml
+++ b/indra/newview/skins/default/xui/it/floater_camera.xml
@@ -9,15 +9,6 @@
 	<floater.string name="move_tooltip">
 		Muovi la telecamera su e giù e a sinistra e destra
 	</floater.string>
-	<floater.string name="camera_modes_title">
-		Modalità della fotocamera
-	</floater.string>
-	<floater.string name="pan_mode_title">
-		Ruota visuale - Ingrandisci - Panoramica
-	</floater.string>
-	<floater.string name="presets_mode_title">
-		Visuali predefinite
-	</floater.string>
 	<floater.string name="free_mode_title">
 		Vedi oggetto
 	</floater.string>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index e19b84912a..2db0892cd6 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -978,7 +978,7 @@ Offri l&apos;amicizia a [NAME]?
 		</form>
 	</notification>
 	<notification name="RemoveFromFriends">
-		Vuoi rimuovere [NAME] dalla lista dei tuoi amici?
+		Vuoi rimuovere &lt;nolink&gt;[NAME]&lt;/nolink&gt; dalla lista dei tuoi amici?
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="RemoveMultipleFromFriends">
@@ -2125,10 +2125,10 @@ Verrà avviato il browser Web.
 		Oggetto: [SUBJECT], Messaggio: [MESSAGE]
 	</notification>
 	<notification name="FriendOnline">
-		[NAME] è Online
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è Online
 	</notification>
 	<notification name="FriendOffline">
-		[NAME] è Offline
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è Offline
 	</notification>
 	<notification name="AddSelfFriend">
 		Anche se sei molto simpatico, non puoi aggiungere te stesso all&apos;elenco degli amici.
@@ -2520,10 +2520,10 @@ Riprova tra qualche istante.
 		</form>
 	</notification>
 	<notification name="FriendshipAccepted">
-		[NAME] ha accettato la tua offerta di amicizia.
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ha accettato la tua offerta di amicizia.
 	</notification>
 	<notification name="FriendshipDeclined">
-		[NAME] ha rifiutato la tua offerta di amicizia.
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ha rifiutato la tua offerta di amicizia.
 	</notification>
 	<notification name="FriendshipAcceptedByMe">
 		Offerta di amicizia accettata.
diff --git a/indra/newview/skins/default/xui/it/panel_my_profile.xml b/indra/newview/skins/default/xui/it/panel_my_profile.xml
deleted file mode 100644
index 094b97962f..0000000000
--- a/indra/newview/skins/default/xui/it/panel_my_profile.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Profilo" name="panel_profile">
-	<string name="no_partner_text" value="Nessuno"/>
-	<string name="no_group_text" value="Nessuno"/>
-	<string name="RegisterDateFormat">
-		[REG_DATE] ([AGE])
-	</string>
-	<string name="name_text_args">
-		[NAME]
-	</string>
-	<string name="display_name_text_args">
-		[DISPLAY_NAME]
-	</string>
-	<layout_stack name="layout">
-		<layout_panel name="profile_stack">
-			<scroll_container name="profile_scroll">
-				<panel name="scroll_content_panel">
-					<panel name="second_life_image_panel">
-						<text name="display_name_descr_text">
-							Nome utente
-						</text>
-						<text name="name_descr_text">
-							Nome visualizzato
-						</text>
-						<button label="Profilo" name="see_profile_btn" tool_tip="Visualizza profilo per questo avatar"/>
-					</panel>
-				</panel>
-			</scroll_container>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_notes.xml b/indra/newview/skins/default/xui/it/panel_notes.xml
deleted file mode 100644
index e127138277..0000000000
--- a/indra/newview/skins/default/xui/it/panel_notes.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Note e Privacy" name="panel_notes">
-	<layout_stack name="layout">
-		<layout_panel name="notes_stack">
-			<scroll_container name="profile_scroll">
-				<panel name="profile_scroll_panel">
-					<text name="status_message" value="Le mie note private:"/>
-					<text name="status_message2" value="Consenti a questa persona di:"/>
-					<check_box label="Vedere se sono online" name="status_check"/>
-					<check_box label="Vedermi sulla mappa" name="map_check"/>
-					<check_box label="Modificare, eliminare o prendere i miei oggetti" name="objects_check"/>
-				</panel>
-			</scroll_container>
-		</layout_panel>
-		<layout_panel name="notes_buttons_panel">
-			<layout_stack name="bottom_bar_ls">
-				<layout_panel name="add_friend_btn_lp">
-					<button label="Aggiungi come amico" name="add_friend" tool_tip="Offri amicizia a questo residente"/>
-				</layout_panel>
-				<layout_panel name="im_btn_lp">
-					<button label="IM" name="im" tool_tip="Apri una sessione messaggio istantaneo"/>
-				</layout_panel>
-				<layout_panel name="call_btn_lp">
-					<button label="Chiama" name="call" tool_tip="Chiama questo residente"/>
-				</layout_panel>
-				<layout_panel name="show_on_map_btn_lp">
-					<button label="Mappa" name="show_on_map_btn" tool_tip="Mostra il residente sulla mappa"/>
-				</layout_panel>
-				<layout_panel name="teleport_btn_lp">
-					<button label="Teleport" name="teleport" tool_tip="Offri teleport"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_profile.xml b/indra/newview/skins/default/xui/it/panel_profile.xml
deleted file mode 100644
index 309937c5a0..0000000000
--- a/indra/newview/skins/default/xui/it/panel_profile.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Profilo" name="panel_profile">
-	<string name="CaptionTextAcctInfo">
-		[ACCTTYPE]
-[PAYMENTINFO] [AGEVERIFICATION]
-	</string>
-	<string name="payment_update_link_url">
-		http://www.secondlife.com/account/billing.php?lang=it-IT
-	</string>
-	<string name="partner_edit_link_url">
-		http://www.secondlife.com/account/partners.php?lang=it
-	</string>
-	<string name="my_account_link_url" value="http://secondlife.com/my/account/index.php?lang=it-IT"/>
-	<string name="no_partner_text" value="Nessuno"/>
-	<string name="no_group_text" value="Nessuno"/>
-	<string name="RegisterDateFormat">
-		[REG_DATE] ([AGE])
-	</string>
-	<string name="name_text_args">
-		[NAME]
-	</string>
-	<string name="display_name_text_args">
-		[DISPLAY_NAME]
-	</string>
-	<layout_stack name="layout">
-		<layout_panel name="profile_stack">
-			<scroll_container name="profile_scroll">
-				<panel name="profile_scroll_panel">
-					<panel name="second_life_image_panel">
-						<text name="title_sl_descr_text" value="[SECOND_LIFE]:"/>
-					</panel>
-					<panel name="first_life_image_panel">
-						<text name="title_rw_descr_text" value="Mondo reale:"/>
-					</panel>
-					<text name="title_member_text" value="Residente dal:"/>
-					<text name="title_acc_status_text" value="Stato account:"/>
-					<text name="title_partner_text" value="Partner:"/>
-					<panel name="partner_data_panel">
-						<text initial_value="(recupero)" name="partner_text"/>
-					</panel>
-					<text name="title_groups_text" value="Gruppi:"/>
-				</panel>
-			</scroll_container>
-		</layout_panel>
-	</layout_stack>
-	<layout_stack name="layout_verb_buttons">
-		<layout_panel name="profile_buttons_panel">
-			<layout_stack name="bottom_bar_ls">
-				<layout_panel name="add_friend_btn_lp">
-					<button label="Aggiungi come amico" name="add_friend" tool_tip="Offri amicizia a questo residente"/>
-				</layout_panel>
-				<layout_panel name="im_btn_lp">
-					<button label="IM" name="im" tool_tip="Apri una sessione messaggio istantaneo"/>
-				</layout_panel>
-				<layout_panel name="call_btn_lp">
-					<button label="Chiama" name="call" tool_tip="Chiama questo residente"/>
-				</layout_panel>
-				<layout_panel name="chat_btn_lp">
-					<button label="Teleport" name="teleport" tool_tip="Offri teleport"/>
-				</layout_panel>
-				<layout_panel name="overflow_btn_lp">
-					<menu_button label="▼" name="overflow_btn" tool_tip="Paga del denaro o condividi qualcosa dall&apos;inventario con il residente"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="profile_me_buttons_panel">
-			<button label="Modifica profilo" name="edit_profile_btn" tool_tip="Modifica le tue informazioni personali"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_profile_view.xml b/indra/newview/skins/default/xui/it/panel_profile_view.xml
deleted file mode 100644
index 409eb5d1f4..0000000000
--- a/indra/newview/skins/default/xui/it/panel_profile_view.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_target_profile">
-	<string name="status_online">
-		Online
-	</string>
-	<string name="status_offline">
-		Offline
-	</string>
-	<text name="display_name_label" value="Nome visualizzato:"/>
-	<text name="solo_username_label" value="Nome utente:"/>
-	<text name="status" value="Online"/>
-	<text name="user_name_small" value="Jack guarda quanto è lungo questo splendido nome"/>
-	<text name="user_name" value="Jack Linden"/>
-	<button name="copy_to_clipboard" tool_tip="Copia negli appunti"/>
-	<text name="user_label" value="Nome utente:"/>
-	<text name="user_slid" value="jack.linden"/>
-	<tab_container name="tabs">
-		<panel label="PROFILO" name="panel_profile"/>
-		<panel label="LUOGHI CONSIGLIATI" name="panel_picks"/>
-		<panel label="NOTE E PRIVACY" name="panel_notes"/>
-	</tab_container>
-</panel>