diff --git a/indra/newview/skins/default/xui/de/floater_conversation_log.xml b/indra/newview/skins/default/xui/de/floater_conversation_log.xml
deleted file mode 100644
index 19620a0fc9..0000000000
--- a/indra/newview/skins/default/xui/de/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="UNTERHALTUNGSPROTOKOLL">
-	<panel name="buttons_panel">
-		<filter_editor label="Nach Personen filtern" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Aktionen für ausgewählte Person/Gruppe"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_conversation_preview.xml b/indra/newview/skins/default/xui/de/floater_conversation_preview.xml
deleted file mode 100644
index 010ad19076..0000000000
--- a/indra/newview/skins/default/xui/de/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="UNTERHALTUNG:">
-	<floater.string name="Title">
-		UNTERHALTUNG: [NAME]
-	</floater.string>
-	<text name="page_label" value="Seite"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_im_container.xml b/indra/newview/skins/default/xui/de/floater_im_container.xml
index 5bf916c8e9..95eda97938 100644
--- a/indra/newview/skins/default/xui/de/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="GESPRÄCHE">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-					<button name="add_btn" tool_tip="Neue Unterhaltung starten"/>
-					<button name="speak_btn" tool_tip="Über Ihr Mikrofon mit anderen sprechen"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Diese Liste schließen/erweitern"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Dieses Fenster schließen"/>
-					<text name="stub_textbox">
-						Diese Unterhaltung erscheint in einem separaten Fenster.   [secondlife:/// Zurückholen.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="GESPRÄCHE"/>
diff --git a/indra/newview/skins/default/xui/de/floater_im_session.xml b/indra/newview/skins/default/xui/de/floater_im_session.xml
index f96eb72cb1..abaf275651 100644
--- a/indra/newview/skins/default/xui/de/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/de/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] wurde zur Unterhaltung eingeladen."/>
-	<floater.string name="multiple_participants_added" value="[NAME] wurden zur Unterhaltung eingeladen."/>
-	<floater.string name="tooltip_to_separate_window" value="Diese Unterhaltung in separates Fenster verschieben"/>
-	<floater.string name="tooltip_to_main_window" value="Diese Unterhaltung zurück ins Hauptfenster verschieben"/>
-	<floater.string name="start_call_button_tooltip" value="Voice-Verbindung öffnen"/>
-	<floater.string name="end_call_button_tooltip" value="Voice-Verbindung schließen"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Dieses Fenster schließen"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Teilnehmerliste schließen"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Teilnehmerliste erweitern"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-				<menu_button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
-				<button name="add_btn" tool_tip="Jemanden zu dieser Unterhaltung hinzufügen"/>
-				<button name="voice_call_btn" tool_tip="Voice-Verbindung öffnen"/>
-				<button name="close_btn" tool_tip="Diese Unterhaltung beenden"/>
-				<button name="expand_collapse_btn" tool_tip="Dieses Fenster schließen/erweitern"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="An" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Nachrichtenfenster anzeigen/ausblenden"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="An" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_incoming_call.xml b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
index f13842f479..213d9f54f5 100644
--- a/indra/newview/skins/default/xui/de/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/de/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		Anonym
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		ruft Sie an.
+		ruft an.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ist einem Voice-Konferenz-Chat beigetreten.
@@ -25,9 +25,9 @@
 		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
 	</floater.string>
 	<text name="question">
-		Wenn Sie antworten, wird Ihre aktuelle Voice-Unterhaltung beendet.
+		Möchten Sie [CURRENT_CHAT] verlassen und diesem Voice-Chat beitreten?
 	</text>
-	<button label="Annehmen" label_selected="Annehmen" name="Accept"/>
-	<button label="Ignorieren" label_selected="Ignorieren" name="Reject"/>
-	<button label="Stattdessen IM öffnen" name="Start IM"/>
+	<button label="Akzeptieren" label_selected="Akzeptieren" name="Accept"/>
+	<button label="Ablehnen" label_selected="Ablehnen" name="Reject"/>
+	<button label="IM starten" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
index 88e9f53a4c..ebf8f01632 100644
--- a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Anzeigen:
 			</text>
-			<check_box label="Test" name="show_world"/>
+			<check_box label="Welt" name="show_world"/>
 			<check_box label="Nur bewegliche Objekte" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
index b794d879f0..9585622516 100644
--- a/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Leer" label_selected="Leer" name="Blank"/>
 	<button label="Keine" label_selected="Keine" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Jetzt übernehmen" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Live-Vorschau" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Vorschau deaktiviert"/>
 	<filter_editor label="Texturen filtern" name="inventory search editor"/>
 	<check_box initial_value="false" label="Ordner anzeigen" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
deleted file mode 100644
index 15259639e8..0000000000
--- a/indra/newview/skins/default/xui/de/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="VOICE-CHAT-LAUTSTÄRKE">
-	<slider label="Voice-Chat" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
index 8d37950480..413a46525c 100644
--- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Orte" name="voice_effects" title="VOICE-MORPHING-VORSCHAU">
+<floater label="Orte" name="voice_effects" title="VOICE MORPHING">
 	<string name="no_voice_effect">
 		(Kein Voice-Morphing)
 	</string>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_volume.xml b/indra/newview/skins/default/xui/de/floater_voice_volume.xml
deleted file mode 100644
index 258627c94f..0000000000
--- a/indra/newview/skins/default/xui/de/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="LAUTSTÄRKE">
-	<slider name="volume_slider" tool_tip="Lautstärke" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/menu_cof_gear.xml b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
index 2dd871b2ea..54b218d22f 100644
--- a/indra/newview/skins/default/xui/de/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear COF">
+<menu name="Gear COF">
 	<menu label="Neue Kleider" name="COF.Gear.New_Clothes"/>
-	<menu label="Neue Körperteile" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+	<menu label="Neue Körperteile" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation.xml b/indra/newview/skins/default/xui/de/menu_conversation.xml
deleted file mode 100644
index 30d3ab79e1..0000000000
--- a/indra/newview/skins/default/xui/de/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Unterhaltung schließen" name="close_conversation"/>
-	<menu_item_call label="Unterhaltung öffnen" name="open_voice_conversation"/>
-	<menu_item_call label="Voice-Verbindung trennen" name="disconnect_from_voice"/>
-	<menu_item_call label="Profil anzeigen" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
-	<menu_item_call label="Voice-Anruf" name="voice_call"/>
-	<menu_item_call label="Chatverlauf..." name="chat_history"/>
-	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
-	<menu_item_call label="Freund entfernen" name="remove_friend"/>
-	<menu_item_call label="Freunde entfernen" name="remove_friends"/>
-	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
-	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
-	<menu_item_call label="Karte" name="map"/>
-	<menu_item_call label="Freigeben" name="share"/>
-	<menu_item_call label="Bezahlen" name="pay"/>
-	<menu_item_check label="Voice ignorieren" name="block_unblock"/>
-	<menu_item_check label="Text ignorieren" name="MuteText"/>
-	<menu_item_call label="Gruppenprofil" name="group_profile"/>
-	<menu_item_call label="Gruppe aktivieren" name="activate_group"/>
-	<menu_item_call label="Gruppe verlassen" name="leave_group"/>
-	<context_menu label="Moderatoroptionen" name="Moderator Options">
-		<menu_item_check label="Text-Chat zulassen" name="AllowTextChat"/>
-		<menu_item_call label="Diesen Teilnehmer stummschalten" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Stummschaltung für diesen Teilnehmer aufheben" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Alle stummschalten" name="ModerateVoiceMute"/>
-		<menu_item_call label="Stummschaltung für alle aufheben" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
deleted file mode 100644
index 2ef8762128..0000000000
--- a/indra/newview/skins/default/xui/de/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM..." name="IM"/>
-	<menu_item_call label="Voice-Anruf..." name="Call"/>
-	<menu_item_call label="Chatverlauf öffnen..." name="Chat history"/>
-	<menu_item_call label="Profil anzeigen" name="View Profile"/>
-	<menu_item_call label="Teleport anbieten" name="teleport"/>
-	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
-	<menu_item_call label="Freund entfernen" name="remove_friend"/>
-	<menu_item_call label="In Gruppe einladen..." name="Invite"/>
-	<menu_item_call label="Karte" name="Map"/>
-	<menu_item_call label="Freigeben" name="Share"/>
-	<menu_item_call label="Bezahlen" name="Pay"/>
-	<menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
deleted file mode 100644
index ae3cc5bc97..0000000000
--- a/indra/newview/skins/default/xui/de/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
-	<menu_item_check label="Nach Datum sortieren" name="sort_by_date"/>
-	<menu_item_check label="Freunde oben anzeigen" name="sort_by_friends"/>
-	<menu_item_call label="Verlaufsliste für „Chat in der Nähe“ anzeigen..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_im_conversation.xml b/indra/newview/skins/default/xui/de/menu_im_conversation.xml
deleted file mode 100644
index 875524b19d..0000000000
--- a/indra/newview/skins/default/xui/de/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Profil anzeigen" name="View Profile"/>
-	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
-	<menu_item_call label="Freund entfernen" name="remove_friend"/>
-	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
-	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
-	<menu_item_call label="Chatverlauf..." name="chat_history"/>
-	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
-	<menu_item_call label="Karte" name="map"/>
-	<menu_item_call label="Freigeben" name="Share"/>
-	<menu_item_call label="Bezahlen" name="Pay"/>
-	<menu_item_check label="Voice ignorieren" name="Block/Unblock"/>
-	<menu_item_check label="Text ignorieren" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
deleted file mode 100644
index 48f62d29a1..0000000000
--- a/indra/newview/skins/default/xui/de/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Kompaktansicht" name="compact_view"/>
-	<menu_item_check label="Erweiterte Ansicht" name="expanded_view"/>
-	<menu_item_check label="Zeit anzeigen" name="IMShowTime"/>
-	<menu_item_check label="Namen in privaten Unterhaltungen anzeigen" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_object_icon.xml b/indra/newview/skins/default/xui/de/menu_object_icon.xml
index f92fa0f82b..8b6c558416 100644
--- a/indra/newview/skins/default/xui/de/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/de/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Objektprofil..." name="Object Profile"/>
 	<menu_item_call label="Ignorieren..." name="Block"/>
-	<menu_item_call label="Auf Karte anzeigen" name="show_on_map"/>
-	<menu_item_call label="Zu Objektposition teleportieren" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
index 0cf3c09882..d56c93533c 100644
--- a/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/de/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Neues Haar" name="New Hair"/>
 		<menu_item_call label="Neue Augen" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Alle Ordner erweitern" name="expand"/>
-	<menu_item_call label="Alle Ordner schließen" name="collapse"/>
 	<menu_item_call label="Outfit neu benennen" name="rename"/>
 	<menu_item_call label="Outfit löschen" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_participant_view.xml b/indra/newview/skins/default/xui/de/menu_participant_view.xml
deleted file mode 100644
index 6ceb9ac4c5..0000000000
--- a/indra/newview/skins/default/xui/de/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Unterhaltungen nach Typ sortieren" name="sort_sessions_by_type"/>
-	<menu_item_check label="Unterhaltungen nach Namen sortieren" name="sort_sessions_by_name"/>
-	<menu_item_check label="Unterhaltungen nach jüngster Aktivität sortieren" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Teilnehmer nach Namen sortieren" name="sort_participants_by_name"/>
-	<menu_item_check label="Teilnehmer nach jüngster Aktivität sortieren" name="sort_participants_by_recent"/>
-	<menu_item_call label="Chat-Einstellungen..." name="chat_preferences"/>
-	<menu_item_call label="Privatsphäre-Einstellungen..." name="privacy_preferences"/>
-	<menu_item_check label="Unterhaltungsprotokoll..." name="Conversation"/>
-	<menu_item_check label="Chat in der Nähe übersetzen" name="Translate_chat"/>
-	<menu_item_check label="Übersetzungseinstellungen..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
deleted file mode 100644
index f69a453e58..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="Nicht mehr ignorieren" name="unblock"/>
-	<menu_item_call label="Profil..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
deleted file mode 100644
index 041fde139d..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Einwohner nach Namen ignorieren..." name="block_resident_by_name"/>
-	<menu_item_call label="Objekt nach Namen ignorieren" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
deleted file mode 100644
index 1dae593ebe..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
-	<menu_item_check label="Nach Typ sortieren" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_friends_view.xml b/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
deleted file mode 100644
index da4890fe96..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
-	<menu_item_check label="Nach Status sortieren" name="sort_status"/>
-	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
-	<menu_item_check label="Erteilte Genehmigungen anzeigen" name="view_permissions"/>
-	<menu_item_check label="Unterhaltungsprotokoll anzeigen..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups.xml b/indra/newview/skins/default/xui/de/menu_people_groups.xml
index a69c82d3d8..76225ba241 100644
--- a/indra/newview/skins/default/xui/de/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Info anzeigen" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Voice-Anruf" name="Call"/>
+	<menu_item_call label="Anrufen" name="Call"/>
 	<menu_item_call label="Aktivieren" name="Activate"/>
 	<menu_item_call label="Verlassen" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_groups_view.xml b/indra/newview/skins/default/xui/de/menu_people_groups_view.xml
deleted file mode 100644
index 20386bba56..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Gruppensymbole anzeigen" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby.xml b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
index cdbb3ae917..1db964357f 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Profil anzeigen" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
-	<menu_item_call label="Voice-Anruf" name="voice_call"/>
-	<menu_item_call label="Chatverlauf anzeigen..." name="chat_history"/>
-	<menu_item_call label="Freund hinzufügen" name="add_friend"/>
-	<menu_item_call label="Freund entfernen" name="remove_friend"/>
-	<menu_item_call label="In Gruppe einladen..." name="invite_to_group"/>
-	<menu_item_call label="Hineinzoomen" name="zoom_in"/>
-	<menu_item_call label="Karte" name="map"/>
-	<menu_item_call label="Freigeben" name="share"/>
-	<menu_item_call label="Bezahlen" name="pay"/>
-	<menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="block_unblock"/>
+	<menu_item_call label="Profil anzeigen" name="View Profile"/>
+	<menu_item_call label="Freund hinzufügen" name="Add Friend"/>
+	<menu_item_call label="Freund entfernen" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Anrufen" name="Call"/>
+	<menu_item_call label="Karte" name="Map"/>
+	<menu_item_call label="Teilen" name="Share"/>
+	<menu_item_call label="Bezahlen" name="Pay"/>
+	<menu_item_check label="Ignorieren/Freischalten" name="Block/Unblock"/>
+	<menu_item_call label="Teleport anbieten" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
index ba6578e2d1..b6e99edfe1 100644
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/de/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Freunde hinzufügen" name="add_friends"/>
-	<menu_item_call label="Freunde entfernen" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Anrufen" name="call"/>
-	<menu_item_call label="Freigeben" name="share"/>
-	<menu_item_call label="Bezahlen" name="pay"/>
-	<menu_item_call label="Teleport anbieten" name="offer_teleport"/>
+	<menu_item_call label="Freunde hinzufügen" name="Add Friends"/>
+	<menu_item_call label="Freunde entfernen" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Anrufen" name="Call"/>
+	<menu_item_call label="Teilen" name="Share"/>
+	<menu_item_call label="Bezahlen" name="Pay"/>
+	<menu_item_call label="Teleport anbieten" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
deleted file mode 100644
index d38ec65037..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Nach letzten Sprechern sortieren" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
-	<menu_item_check label="Nach Nähe sortieren" name="sort_distance"/>
-	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
-	<menu_item_check label="Karte anzeigen" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_people_recent_view.xml b/indra/newview/skins/default/xui/de/menu_people_recent_view.xml
deleted file mode 100644
index a116ad0bc1..0000000000
--- a/indra/newview/skins/default/xui/de/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Nach jüngsten sortieren" name="sort_most"/>
-	<menu_item_check label="Nach Namen sortieren" name="sort_name"/>
-	<menu_item_check label="Symbole für Personen anzeigen" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_agent.xml b/indra/newview/skins/default/xui/de/menu_url_agent.xml
index c61ebb0eae..9a808088fb 100644
--- a/indra/newview/skins/default/xui/de/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Profil anzeigen" name="show_agent"/>
-	<menu_item_call label="IM senden..." name="send_im"/>
-	<menu_item_call label="Freund hinzufügen..." name="add_friend"/>
+	<menu_item_call label="Einwohnerprofil anzeigen" name="show_agent"/>
 	<menu_item_call label="Name in Zwischenablage kopieren" name="url_copy_label"/>
 	<menu_item_call label="SLurl in die Zwischenablage kopieren" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_objectim.xml b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
index 77b7004e44..90d3763d9c 100644
--- a/indra/newview/skins/default/xui/de/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/de/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Objektprofil..." name="show_object"/>
+	<menu_item_call label="Objektinformationen anzeigen" name="show_object"/>
 	<menu_item_call label="Auf Karte zeigen" name="show_on_map"/>
 	<menu_item_call label="Zu Objekt-Position teleportieren" name="teleport_to_object"/>
 	<menu_item_call label="Objektname in Zwischenablage kopieren" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 2c9d9fa7f1..845df1f050 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Animation meines Avatars stoppen" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Gehen/Rennen/Fliegen..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Status" name="Status"/>
+		<menu label="Status" name="Status">
+			<menu_item_call label="Abwesend" name="Set Away"/>
+			<menu_item_call label="Beschäftigt" name="Set Busy"/>
+		</menu>
 		<menu_item_call label="L$ kaufen..." name="Buy and Sell L$"/>
 		<menu_item_call label="Händler-Outbox..." name="MerchantOutbox"/>
 		<menu_item_call label="Kontoübersicht..." name="Manage My Account">
@@ -29,18 +32,14 @@
 		<menu_item_call label="[APP_NAME] schließen" name="Quit"/>
 	</menu>
 	<menu label="Unterhalten" name="Communicate">
-		<menu_item_check label="Unterhaltungen..." name="Conversations"/>
-		<menu_item_check label="Chat in der Nähe..." name="Nearby Chat"/>
+		<menu_item_check label="Chat..." name="Nearby Chat"/>
 		<menu_item_check label="Sprechen" name="Speak"/>
-		<menu label="Voice-Morphing" name="VoiceMorphing">
-			<menu_item_check label="Kein Voice-Morphing" name="NoVoiceMorphing"/>
-			<menu_item_check label="Vorschau..." name="Preview"/>
-			<menu_item_call label="Abonnieren..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Voice-Einstellungen..." name="Nearby Voice"/>
+		<menu_item_check label="Voice-Morphing..." name="ShowVoice"/>
 		<menu_item_check label="Gesten..." name="Gestures"/>
-		<menu_item_check label="Freunde" name="My Friends"/>
-		<menu_item_check label="Gruppen" name="My Groups"/>
-		<menu_item_check label="Leute in der Nähe" name="Active Speakers"/>
+		<menu_item_call label="Freunde" name="My Friends"/>
+		<menu_item_call label="Gruppen" name="My Groups"/>
+		<menu_item_call label="Leute in der Nähe" name="Active Speakers"/>
 		<menu_item_call label="Blockierliste" name="Block List"/>
 	</menu>
 	<menu label="Welt" name="World">
@@ -116,6 +115,7 @@
 			<menu_item_call label="Kaufen" name="Menu Object Buy"/>
 			<menu_item_call label="Nehmen" name="Menu Object Take"/>
 			<menu_item_call label="Kopie nehmen" name="Take Copy"/>
+			<menu_item_call label="Objekt wieder in meinem Inventar speichern" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Wieder in Objektinhalt speichern" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Objekt zurückgeben" name="Return Object back to Owner"/>
 		</menu>
@@ -130,7 +130,6 @@
 			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Figuren..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Anzeigen/Testen..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Region neu formen" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Optionen" name="Options">
 			<menu_item_check label="Erweiterte Berechtigungen anzeigen" name="DebugPermissions"/>
@@ -160,13 +159,6 @@
 	<menu label="Hilfe" name="Help">
 		<menu_item_call label="Anweisungen..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE]-Hilfe" name="Second Life Help"/>
-		<menu_item_call label="Benutzerhandbuch" name="User’s guide"/>
-		<menu_item_call label="Knowledge Base" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Community-Foren" name="Community Forums"/>
-		<menu_item_call label="Support-Portal" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE]-Neuigkeiten" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE]-Blogs" name="Second Life Blogs"/>
 		<menu_item_call label="Missbrauch melden" name="Report Abuse"/>
 		<menu_item_call label="Fehler melden" name="Report Bug"/>
 		<menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/>
@@ -393,14 +385,9 @@
 				<menu_item_call label="Weiblich testen" name="Test Female"/>
 				<menu_item_check label="Avatarauswahl zulassen" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Animationsgeschwindigkeit" name="Animation Speed">
-				<menu_item_call label="Alle Animationen 10 % schneller" name="All Animations 10 Faster"/>
-				<menu_item_call label="Alle Animationen 10 % langsamer" name="All Animations 10 Slower"/>
-				<menu_item_call label="Alle Animationsgeschwindigkeiten zurücksetzen" name="Reset All Animation Speed"/>
-				<menu_item_check label="Zeitlupen-Animationen" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Param auf Standard erzwingen" name="Force Params to Default"/>
 			<menu_item_check label="Animations-Info" name="Animation Info"/>
+			<menu_item_check label="Zeitlupen-Animationen" name="Slow Motion Animations"/>
 			<menu_item_check label="Kamerafokus anzeigen" name="Show Look At"/>
 			<menu_item_check label="Klickpunkt anzeigen??" name="Show Point At"/>
 			<menu_item_check label="Fehler in Landaktualisierung beseitigen" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index dc0d7dc6b4..4b7a60b4eb 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -523,24 +523,6 @@ Weitere Informationen finden Sie auf [_URL].
 		</url>
 		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip.  Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
-
-    Unter [_URL] nach aktualisierten Treibern suchen?
-		<url name="url">
-			http://support.amd.com/de/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip.  Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
-
-    Unter [_URL] nach aktualisierten Treibern suchen?
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=de-de
-		</url>
-		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
-	</notification>
 	<notification name="UnknownGPU">
 		Ihr System verwendet eine Grafikkarte, die [APP_NAME] nicht erkennt.
 Dies passiert dann, wenn die neue Hardware noch nicht mit [APP_NAME] getestet wurde.  Wahrscheinlich wird das Programm richtig ausgeführt, aber Sie müssen eventuell ein paar Grafikeinstellungen vornehmen.
@@ -1576,13 +1558,10 @@ Diese Gruppe verlassen?
 		Sie können gerade keine Freundschaft anbieten. Warten Sie kurz und versuchen Sie es dann noch einmal.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Nicht-stören-Modus ist aktiviert:  Sie erhalten keine Benachrichtigung über eingehende Kommunikation.
-
-- Andere Einwohner erhalten Ihre Nicht-stören-Antwort (festgelegt in Einstellungen &gt; Allgemein).
-- Teleport-Angebote werden abgelehnt.
-- Voice-Anrufe werden abgelehnt.
-		<usetemplate ignoretext="Ich ändere meinen Status zu „Nicht stören“" name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		Beschäftigt-Modus ist aktiviert.
+Chat und Instant Messages werden ausgeblendet. Instant Messages (Sofortnachrichten) erhalten Ihre Beschäftigt-Antwort. Alle Teleport-Angebote werden abgelehnt. Alle Inventar-Angebote werden in Ihren Papierkorb geschoben.
+		<usetemplate ignoretext="Ich ändere meinen Status zu Beschäftigt" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Sie haben die maximale Anzahl an Gruppen erreicht. Bitte verlassen Sie eine andere Gruppe, um dieser beitreten zu können oder lehnen Sie das Angebot ab.
@@ -2070,10 +2049,6 @@ Inventarobjekt(e) verschieben?
 		Möchten Sie Ihre [http://secondlife.com/account/ Startseite] aufrufen, um Ihre Konto-Statistik anzuzeigen?
 		<usetemplate ignoretext="Meinen Browser starten, um meine Konto-Statistik anzuzeigen" name="okcancelignore" notext="Abbrechen" yestext="Gehe zu Seite"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		Wenn Sie eine Person zu einer vorhandenen Unterhaltung hinzufügen, wird eine neue Unterhaltung erstellt.  Alle Teilnehmer erhalten neue Unterhaltungsbenachrichtigungen.
-		<usetemplate ignoretext="Hinzufügen von Chat-Teilnehmern bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		Wirklich beenden?
 		<usetemplate ignoretext="Bestätigen, bevor Sitzung beendet wird" name="okcancelignore" notext="Nicht beenden" yestext="Beenden"/>
@@ -2147,14 +2122,14 @@ Möchten Sie es mit dem ausgewählten Objekt ersetzen?
 			<button ignore="Nie ersetzen" name="No" text="Abbrechen"/>
 		</form>
 	</notification>
-	<notification label="Warnung für Nicht-stören-Modus" name="DoNotDisturbModePay">
-		Sie haben den Nicht-stören-Modus aktiviert. Sie erhalten keine Artikel, die im Gegenzug für diese Zahlung angeboten werden.
+	<notification label="Beschäftigt-Modus-Warnung" name="BusyModePay">
+		Sie sind im Beschäftigt-Modus, sodass Sie im Austausch für diese Zahlung keine Objekte erhalten können.
 
-Möchten Sie den Nicht-stören-Modus deaktivieren, bevor Sie diese Transaktion abschließen?
+Möchten Sie den Bechäftigt-Modus verlassen, bevor Sie diese Transaktion abschließen?
 		<form name="form">
-			<ignore name="ignore" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Nicht-stören-Modus bin."/>
-			<button ignore="„Nicht stören“-Modus immer verlassen" name="Yes" text="OK"/>
-			<button ignore="„Nicht stören“-Modus nie verlassen" name="No" text="Abbrechen"/>
+			<ignore name="ignore" save_option="true" text="Ich bin im Begriff eine Person oder ein Objekt zu bezahlen, während ich im Modus Beschäftigt bin."/>
+			<button ignore="Beschäftigt-Modus immer deaktivieren" name="Yes" text="OK"/>
+			<button ignore="Beschäftigt-Modus aktiviert lassen" name="No" text="Abbrechen"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2289,8 +2264,11 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies
 	<notification name="GroupNotice">
 		Betreff: [SUBJECT], Nachricht: [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist online
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; ist offline
 	</notification>
 	<notification name="AddSelfFriend">
 		Obwohl Sie ein sehr netter Mensch sind, können Sie sich nicht selbst als Freund hinzufügen.
@@ -2518,6 +2496,13 @@ Fliegen ist hier nicht möglich.
 	<notification name="DynamicPathfindingDisabled">
 		Dynamisches Pathfinding ist in dieser Region nicht aktiviert. Geskriptete Objekte, die Pathfinding-LSL-Aufrufe verwenden, funktionieren in dieser Region u. U. nicht wie erwartet.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		Wenn Sie bestimmte Objekte in dieser Region ändern, verhalten sich andere bewegliche Objekte u. U. inkorrekt. Um dieses Problem zu beheben, klicken Sie auf die Schaltfläche „Region neu formen“. Um weitere Informationen zu erhalten, klicken Sie auf „Hilfe“.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Hilfe" ignoretext="Wenn Sie bestimmte Objekte in dieser Region ändern, verhalten sich andere bewegliche Objekte u. U. inkorrekt." name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Fehler aufgetreten. Möglicherweise ist ein Netzwerk- oder Serverproblem aufgetreten oder Sie haben nicht die erforderlichen Baurechte. Dieses Problem lässt sich manchmal durch Ab- und Anmelden lösen.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2780,7 +2765,7 @@ Ist das OK?
 	<notification name="ScriptQuestionCaution">
 		Achtung: Das Objekt „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“ fordert uneingeschränkten Zugriff auf Ihr Linden-Dollar-Konto an. Wenn Sie Zugriff gewähren, kann dieses Objekt jederzeit und ohne weitere Warnung Ihr Konto belasten bzw. ganz leeren.
   
-Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist.
+Eine solche Anforderung ist nur in seltenen Fällen legitim. Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist.
 		<form name="form">
 			<button name="Grant" text="Uneingeschränkten Zugriff gewähren"/>
 			<button name="Deny" text="Verweigern"/>
@@ -3361,633 +3346,4 @@ Versuch abgebrochen.
 		Sie sind dabei, [NUM_ITEMS] Objekte zu löschen. Möchten Sie diesen Vorgang wirklich fortsetzen?
 		<usetemplate ignoretext="Möchten Sie wirklich mehrere Objekte löschen?" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] hat Sie eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] hat Sie [AV_FREEZE_TIME] Sekunden lang eingefroren. Sie können sich nicht bewegen oder mit der Welt interagieren.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Avatar eingefroren.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] hat Sie aufgetaut.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Avatar aufgetaut.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		Einfrieren fehlgeschlagen, da Sie keine Berechtigung für diese Parzelle haben.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		Sie sind nicht mehr eingefroren und können sich frei bewegen.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Dieser Benutzer kann nicht eingefroren werden.
-	</notification>
-	<notification name="NowOwnObject">
-		Sie sind jetzt Eigentümer des Objekts [OBJECT_NAME]
-	</notification>
-	<notification name="CantRezOnLand">
-		Objekt kann nicht an [OBJECT_POS] gerezzt werden, da der Landeigentümer dies nicht zulässt.  Machen Sie den Landeigentümer mit dem Landwerkzeug ausfindig.
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		Objekt kann nicht gerezzt werden, da zu viele Anforderungen vorliegen.
-	</notification>
-	<notification name="SitFailCantMove">
-		Sie können sich nicht hinsetzen, da Sie zur Zeit unbeweglich sind.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		Sie können sich nicht hinsetzen, da Sie auf diesem Land keine Berechtigung dazu haben.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Kommen Sie näher heran.  Sitzen auf Objekt nicht möglich, da
-es sich nicht in der gleichen Region befindet wie Sie.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		Neues Objekt kann nicht erstellt werden. Die Region ist voll.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Objekt konnte nicht an festgelegtem Ort platziert werden.  Versuchen Sie es erneut.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		Auf Land, das Sie nicht besitzen, können Sie keine Bäume und Gräser erstellen.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		Kopieren fehlgeschlagen, da Sie keine Berechtigung zum Kopieren des Objekts „OBJ_NAME]“ besitzen.
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ nicht an Sie übertragen werden kann.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		Kopieren fehlgeschlagen, weil Objekt „[OBJ_NAME]“ zum Navmesh beiträgt.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Ohne ausgewählte Hauptobjekte duplizieren.
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		Objekte können nicht dupliziert werden, da die Region voll ist.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		Objekte können nicht dupliziert werden, da die Parzelle, in der sie sich befinden, nicht auffindbar ist.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		Objekt kann nicht erstellt werden, da 
-die Parzelle voll ist.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Versuch zum Rezzen eines Objekts fehlgeschlagen.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		Objekt, das in dieser Region zu Problemen geführt hat, kann nicht erstellt werden.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		Dieses Inventarobjekt ist auf der schwarzen Liste.
-	</notification>
-	<notification name="NoCanRezObjects">
-		Sie können gegenwärtig keine Objekte erstellen.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Landsuche blockiert.
-Sie haben zu viele Landsuchen in zu kurzer Zeit durchgeführt.
-Warten Sie kurz und versuchen Sie es noch einmal.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Sie sind gestorben und wurden nach Hause teleportiert
-	</notification>
-	<notification name="EjectComingSoon">
-		Sie nicht hier nicht mehr zugelassen und haben [EJECT_TIME] Sekunden Zeit, um zu gehen.
-	</notification>
-	<notification name="NoEnterServerFull">
-		Sie können diese Region nicht betreten, da 
-der Server voll ist.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Erneutes Speichern im Inventar ist deaktiviert.
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		„[OBJ_NAME]“ kann nicht im Objektinhalt gespeichert werden, da das Objekt, aus dem es gerezzt wurde, nicht mehr existiert.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		„[OBJ_NAME]“ kann nicht in Objektinhalt gespeichert werden, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[DEST_NAME]“ besitzen.
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		„[OBJ_NAME]“ kann nicht erneut im Inventar gespeichert werden – dieser Vorgang wurde deaktiviert.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		Sie können Ihre Auswahl nicht kopieren, da Sie nicht die Berechtigung zum Kopieren des Objekts „[OBJ_NAME]“ haben.
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist.
-	</notification>
-	<notification name="NoTransNoCopy">
-		Sie können Ihre Auswahl nicht kopieren, da das Objekt „[OBJ_NAME]“ nicht übertragbar ist.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		Entfernen des Objekts „[OBJ_NAME]“ aus dem Simulator wird vom Berechtigungssystem nicht gestattet.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		Sie können Ihre Auswahl nicht speichern, da Sie keine Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ besitzen.
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		Ihre Auswahl kann nicht gespeichert werden, da das Objekt „[OBJ_NAME]“ nicht kopiert werden kann.
-	</notification>
-	<notification name="NoModNoTaking">
-		Sie können Ihre Auswahl nicht in Empfang nehmen, da Sie nicht die Berechtigung zum Modifizieren des Objekts „[OBJ_NAME]“ haben.
-	</notification>
-	<notification name="RezDestInternalError">
-		Interner Fehler: Unbekannter Zielttyp.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		Löschen fehlgeschlagen, da Objekt nicht gefunden wurde
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Dieser Benutzer kann nicht hinausgeworfen werden.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen.
-	</notification>
-	<notification name="HomeLocationLimits">
-		Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden.
-	</notification>
-	<notification name="HomePositionSet">
-		Position für Zuhause festgelegt.
-	</notification>
-	<notification name="AvatarEjected">
-		Avatar hinausgeworfen.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		Hinauswerfen fehlgeschlagen, da Sie keine Admin-Berechtigung für diese Parzelle haben.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		Objekt „[OBJECT_NAME]“ kann nicht nach
-[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die Parzelle voll ist.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		Objekt „[OBJECT_NAME]“ kann nicht nach
-[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Ihre Objekte auf dieser Parzelle nicht gestattet sind.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		Objekt „[OBJECT_NAME]“ kann nicht nach
-[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da nicht genügend Ressourcen für dieses Objekt auf dieser Parzelle vorhanden sind.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		Objekt „[OBJECT_NAME]“ kann nicht nach
-[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da die andere Region eine ältere Version verwendet, die das Empfangen dieses Objekts per Regionswechsel nicht unterstützt.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		Objekt „[OBJECT_NAME]“ kann nicht nach
-[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da Sie das Navmesh nicht regionsübergreifend modifizieren können.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		Objekt „[OBJECT_NAME]“ kann nicht nach
-[OBJ_POSITION] in Region [REGION_NAME] verschoben werden, da ein unbekannter Fehler vorliegt. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		Ihnen fehlt die Berechtigung zum Modifizieren dieses Objekts.
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		Physik kann nicht für ein Objekt aktiviert werden, das zum Navmesh beiträgt.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		Physik für Keyframe-Objekte kann nicht aktiviert werden.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		Physik für Objekte kann nicht aktiviert werden – nicht genügend Landressourcen.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		Physik für Objekt mit Physikressourcenkosten höher als [MAX_OBJECTS] kann nicht aktiviert werden.
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Dieses Objekt kann kein konkaves Teil enthalten, da es ein Phantom ist und zum Navmesh beiträgt.
-	</notification>
-	<notification name="UnableAddItem">
-		Objekt konnte nicht hinzugefügt werden.
-	</notification>
-	<notification name="UnableEditItem">
-		Kein Bearbeiten möglich.
-	</notification>
-	<notification name="NoPermToEdit">
-		Bearbeiten nicht gestattet.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		Kopieren dieses Inventars nicht gestattet.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		Kein Speichern in Objektinhalt möglich: Objekt nicht mehr vorhanden.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		Kein Speichern in Objektinhalt möglich: Artikel mit diesem Namen ist bereits im Inventar vorhanden.
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		Kein Speichern in Objektinhalt möglich: Dadurch würden die Anhängeberechtigungen geändert.
-	</notification>
-	<notification name="TooManyScripts">
-		Zu viele Skripts.
-	</notification>
-	<notification name="UnableAddScript">
-		Skript konnte nicht hinzugefügt werden.
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		Asset-Server hat nicht rechtzeitig reagiert.  Objekt wurde zum Sim zurückübertragen.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		In dieser Region sind keine Physikformen aktiviert.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		Sie können das Navmesh nicht regionsübergreifend modifizieren.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		Für diesen Objekttyp können keine Physikeigenschaften gesetzt werden.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		Hauptprim kann nicht auf formlos eingestellt werden.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		In dieser Region sind keine Physikmaterialien aktiviert.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		Nur bei Hauptprims können die Physikmaterialien angepasst werden.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		Die Anwendung von Physikmaterialien auf Personen wird noch nicht unterstützt.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Eine oder mehrere der angegebenen Eigenschaften für Physikmaterialien waren ungültig.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		Sie können den Nahttyp eines Mesh-Objekts nicht ändern.
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		Sie können die Form eines Mesh-Objekts nicht ändern.
-	</notification>
-	<notification name="FullRegionCantEnter">
-		Sie können diese Region nicht betreten, \nda die Region voll ist.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Verknüpfungsfehler – Eigentümer sind unterschiedlich
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Verknüpfungsfehler – Navmesh kann nicht regionsübergreifend modifiziert werden.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Verknüpfungsfehler, da Sie keine Berechtigung zum Bearbeiten haben.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Verknüpfungsfehler – zu viele Primitive
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Verknüpfungsfehler – nichtkopierfähige Objekte können nicht mit nichtübertragungsfähigen Objekten verknüpft werden
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Verknüpfungsfehler – nichts zum Verknüpfen vorhanden.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Verknüpfungsfehler – zu viele Pathfinding-Figuren
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Verknüpfungsfehler – nicht genügend Landressourcen
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		Objekt verwendet zu viele Physikressourcen – seine Dynamik wurde deaktiviert.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		Sie wurden vom Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ nach Hause teleportiert
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		Sie wurden von Objekt „[OBJECT_NAME]“ nach Hause teleportiert.
-	</notification>
-	<notification name="TeleportedByAttachment">
-		Sie wurden von einem Anhang an [ITEM_ID] teleportiert
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		Sie wurden von Objekt „[OBJECT_NAME]“ auf der Parzelle „[PARCEL_NAME]“ teleportiert
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Sie wurden von Objekt „[OBJECT_NAME]“, das [OWNER_ID] gehört, teleportiert
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Sie wurden von Objekt „[OBJECT_NAME]“, das einem unbekannten Benutzer gehört, teleportiert.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		Angefordertes Objekt kann nicht erstellt werden. Die Region ist voll.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		Sie können nicht mehrere Objekte an ein und derselben Stelle anhängen.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Sie können hier nicht mehrere Objekte erstellen.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		Angefordertes Objekt kann nicht erstellt werden. Objekt fehlt in Datenbank.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		Angefordertes Objekt kann nicht erstellt werden. Zeitüberschreitung bei Anforderung. Versuchen Sie es erneut.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		Angefordertes Objekt kann nicht erstellt werden. Versuchen Sie es erneut.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Fehler beim Rezzen; Laden des angeforderten Objekts hat zu lang gedauert.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Objekt konnte nicht an angegebenem Ort platziert werden.  Versuchen Sie es erneut.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		Auf diesem Land können keine Pflanzen erstellt werden.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		Objekt kann nicht wiederhergestellt werden. Keine Weltposition gefunden.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		Objekt kann nicht gerezzt werden, da seine Meshdaten ungültig sind.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		Objekt kann nicht gerezzt werden, da die Region bereits zu viele Skripts aufweist.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Ihr Zugangsberechtigungen gestatten nicht das Erstellen von Objekten an dieser Stelle.
-	</notification>
-	<notification name="CantCreateObject">
-		Sie können gegenwärtig keine Objekte erstellen.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Ungültige Objektparameter
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Ihre Zugangsberechtigungen gestatten nicht das Duplizieren von Objekten an dieser Stelle.
-	</notification>
-	<notification name="CantChangeShape">
-		Sie können diese Form nicht ändern.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Ihr Zugangsberechtigungen gestatten nicht das Beanspruchen von Objekten an dieser Stelle.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		Übertragung fehlgeschlagen, da Sie keine Berechtigung zum Übertragen von Objekten für Ihre Gruppe haben.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Ihr Zugangsberechtigungen gestatten nicht das Kaufen von Objekten an dieser Stelle.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		Objekt kann nicht angehängt werden, da ein Avatar darauf sitzt.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		Bäume und Gräser können nicht als Anhänge getragen werden.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		Objekte im Gruppenbesitz können nicht angehängt werden.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		Objekte, die Ihnen nicht gehören, können nicht angehängt werden.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		Objekte, die zum Navmesh beitragen, können nicht angehängt werden.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		Objekt kann nicht angehängt werden, weil Sie es nicht verschieben dürfen.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		Nicht genügend Skriptressourcen verfügbar, um Objekt anzuhängen.
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		Ablegen von Objekten hier nicht möglich; versuchen Sie es mit dem kostenlosen Testbereich.
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		Sie können keine Mesh-Anhänge ablegen. In Inventar zurückführen und inworld rezzen.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		Anhang konnte nicht abgelegt werden: Ihnen fehlt die Berechtigung zum Ablegen an dieser Stelle.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		Anhang konnte nicht abgelegt werden: nicht genügend Landressourcen verfügbar.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Anhänge konnten nicht abgelegt werden: nicht genügend Ressourcen.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		Objekt kann nicht hier abgelegt werden.  Die Parzelle ist voll.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		Dieses Objekt kann nicht berührt/angefasst werden, da Sie von der Landparzelle verbannt sind.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Grenzen Sie Ihre Löschparameter ein.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		Asset kann nicht hochgeladen werden.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		Keinen Benutzer zum Teleportieren nach Hause gefunden
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		Anforderdung nach übernatürlichen Kräften fehlgeschlagen
-	</notification>
-	<notification name="GenericRequestFailed">
-		generische Anforderdung fehlgeschlagen
-	</notification>
-	<notification name="CantUploadPostcard">
-		Postkarte kann nicht hochgeladen werden.  Versuchen Sie es später erneut.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		Inventardetails für Gruppenmitteilung kann nicht abgerufen werden.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		Gruppenmitteilung kann nicht gesendet werden – Vorgang nicht gestattet.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		Gruppenmitteilung kann nicht gesendet werden – Bauen von Inventar nicht möglich.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		Inventar in Mitteilung kann nicht geparst werden.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Fehler beim Hochladen von Terrain.
-	</notification>
-	<notification name="TerrainFileWritten">
-		Terraindatei geschrieben.
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		Terraindatei geschrieben, Download beginnt...
-	</notification>
-	<notification name="TerrainBaked">
-		Terrain geformt.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Nur die ersten 10 ausgewählten Objekte wurden deaktiviert. Aktualisieren Sie die Anzeige und wählen Sie ggf. weitere Objekte aus.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Um diese Parzelle zu kaufen, müssen Sie Ihren Viewer aktualisieren.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Kein Kauf möglich; die ausgewählte Parzelle steht nicht zum Verkauf.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		Kein Kauf möglich, da sich der Verkaufspreis oder die Fläche geändert haben.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		Sie sind nicht der autorisierte Käufer dieser Parzelle.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		Sie können diese Parzelle nicht kaufen, da sie bereits auf Kaufauthorisierung wartet.
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		Sie können hier keine Objekte bauen, denn dies würde den Rahmen der Parzelle sprengen.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		Sie haben Land mit unterschiedlichen Besitzern ausgewählt. Wählen Sie ein kleineres Gebiet aus und versuchen Sie es erneut.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		Auswahl enthält nicht genügend gemietete Parzellen zum Zusammenlegen.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		Land kann nicht geteilt werden.\nMehr als eine Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		Land kann nicht geteilt werden.\nParzelle nicht auffindbar.\nMelden Sie das Problem über „Hilfe“ -&gt; „Fehler melden“...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		Land kann nicht geteilt werden. Die gesamte Parzelle ist ausgewählt.\nWählen Sie ein kleineres Stück Land aus.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		Land wurde geteilt.
-	</notification>
-	<notification name="PassPurchased">
-		Sie haben einen Pass gekauft.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		Region lässt keine Werbung zu.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Ihr Pass für dieses Land läuft demnächst ab.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Keine geeignete Oberfläche zum Sitzen; probieren Sie es an einer anderen Stelle.
-	</notification>
-	<notification name="CantSitNoRoom">
-		Kein Platz zum Hinsetzen; probieren Sie es an einer anderen Stelle.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		Objektbeanspruchung fehlgeschlagen, da Sie keine Berechtigung haben.
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		Objektbeanspruchung fehlgeschlagen, da Sie nicht genügend L$ haben.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		Land in Gruppenbesitz kann nicht übertragen werden.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		Objektkauf fehlgeschlagen, da Sie nicht genügend L$ haben.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		Inventarkauf fehlgeschlagen, da Sie nicht genügend L$ haben.
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		Sie haben nicht genügend L$, um einen Pass für dieses Land zu kaufen.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		Passkauf momentan nicht möglich.  Versuchen Sie es später erneut.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		Objekt kann nicht erstellt werden, \nda die Parzelle voll ist.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Objekt konnte nicht an festgelegtem Ort platziert werden.  Versuchen Sie es erneut.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		Landmarke für dieses Ereignis kann nicht erstellt werden.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		Ihre übernatürlichen Kräfte heben das Einfrieren auf!
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Anforderung nach Superpower fehlgeschlagen. Diese Anforderung wurde protokolliert.
-	</notification>
-	<notification name="ExpireExplanation">
-		Das System kann Ihre Anfrage momentan nicht verarbeiten. Zeitüberschreitung bei Anforderung.
-	</notification>
-	<notification name="DieExplanation">
-		Das System kann Ihre Anfrage nicht verarbeiten.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		Sie haben nicht genügend Geld, um Primitive zu erstellen.
-	</notification>
-	<notification name="RezObjectFailure">
-		Sie haben nicht genügend Geld, um Objekt zu erstellen.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Zuhause-Position neu festlegen, da Zuhause nicht zulässig war.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		Sie können gegenwärtig niemanden an Ihren Standort einladen, da die Region voll ist. Versuchen Sie es später erneut.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Diese Region gestattet nicht, dass Sie hier Ihr Zuhause festlegen.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		Ihr Zuhause kann sich nur auf Ihrem eigenen Land oder in einem Infohub auf dem Mainland befinden.
-	</notification>
-	<notification name="SetHomePosition">
-		Position für Zuhause festgelegt.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		Aufgrund eines Inventarfehlers kann das Rezzen dieses Objekts nicht aufgehoben werden.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		Angefordertes Inventar kann nicht erstellt werden.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		Angeforderter Inventarordner kann nicht erstellt werden.
-	</notification>
-	<notification name="CantCreateInventory">
-		Dieses Inventar kann nicht erstellt werden.
-	</notification>
-	<notification name="CantCreateLandmark">
-		Landmarke kann nicht erstellt werden.
-	</notification>
-	<notification name="CantCreateOutfit">
-		Im Moment kann kein Outfit erstellt werden. Versuchen Sie es gleich noch einmal.
-	</notification>
-	<notification name="InventoryNotForSale">
-		Inventar steht nicht zum Verkauf.
-	</notification>
-	<notification name="CantFindInvItem">
-		Inventarobjekt kann nicht gefunden werden.
-	</notification>
-	<notification name="CantFindObject">
-		Objekt kann nicht gefunden werden.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		Geldüberweisungen an Objekte sind in dieser Region gegenwärtig deaktiviert.
-	</notification>
-	<notification name="CantPayNoAgent">
-		Nicht ersichtlich, wer bezahlt werden muss.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		Sie können öffentlichen Objekten keine L$ geben.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Inventarerstellung für Inworld-Objekt fehlgeschlagen.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Aufgrund eines internen Fehlers konnte Ihr Viewer nicht ordnungsgemäß aktualisiert werden.  Der in Ihrem Viewer angezeigte L$-Kontostand oder Parzellenbesitz stimmt möglicherweise nicht mit dem aktuellen Stand auf den Servern überein.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		Große Prims, die sich mit anderen Spielern überschneiden, können nicht erstellt werden.  Bitte erneut versuchen, wenn sich die anderen Spieler bewegt haben.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Dadurch werden die Protokolle vorheriger Unterhaltungen und alle Backups dieser Datei gelöscht.
-		<usetemplate ignoretext="Löschen des Protokolls vorheriger Unterhaltungen bestätigen." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Dadurch werden die Transkripte aller vorherigen Unterhaltungen gelöscht. Die Liste vergangener Unterhaltungen ist davon nicht betroffen. Alle Dateien mit den Suffixen .txt und txt.backup im Order [FOLDER] werden gelöscht.
-		<usetemplate ignoretext="Um Bestätigung bitten, bevor ich Transkripte lösche." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt.
-		<usetemplate ignoretext="Dateien können nicht verschoben werden. Vorheriger Pfad wurde wiederhergestellt." name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
index 79a2ebe9df..dcfcffa6e2 100644
--- a/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_avatar_list_item.xml
@@ -27,6 +27,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Dieser Freund kann Ihre Objekte bearbeiten, löschen und an sich nehmen"/>
 	<icon name="permission_map_icon" tool_tip="Dieser Freund kann Sie auf der Karte finden"/>
 	<icon name="permission_online_icon" tool_tip="Dieser Freund kann sehen, wenn Sie online sind"/>
-	<button name="info_btn" tool_tip="Mehr Infos"/>
 	<button name="profile_btn" tool_tip="Profil anzeigen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
index c105a5b8a3..2d140515d4 100644
--- a/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/de/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel" width="300">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Filtern" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Aktionen für ausgewählte(s) Person/Objekt"/>
-		<menu_button name="view_btn" tool_tip="Sortieroptionen"/>
-		<menu_button name="plus_btn" tool_tip="Einwohner oder Objekt zum ignorieren auswählen"/>
-		<button name="unblock_btn" tool_tip="Einwohner oder Objekt aus der Liste der ignorierten Einwohner oder Objekte entfernen"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/>
+	<text left_pad="5" name="title_text" width="260">
+		Liste der ignorierten Einwohner
+	</text>
+	<scroll_list name="blocked" tool_tip="Liste der zur Zeit ignorierten Einwohner" width="290"/>
+	<button label="Einwohner ignorieren" label_selected="Einwohner ignorieren..." name="Block resident..." tool_tip="Wählen Sie einen Einwohner, um ihn zu ignorieren"/>
+	<button label="Objekt nach Name ignorieren" label_selected="Objekt nach Name ignorieren..." name="Block object by name..." tool_tip="Ein Objekt auswählen, um nach Namen zu ignorieren."/>
+	<button label="Freischalten" label_selected="Freischalten" name="Unblock" tool_tip="Einwohner oder Objekt von der Liste der ignorierten Einwohner oder Objekte entfernen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
deleted file mode 100644
index a9bfe4754e..0000000000
--- a/indra/newview/skins/default/xui/de/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(laden)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
deleted file mode 100644
index afeaa14e81..0000000000
--- a/indra/newview/skins/default/xui/de/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="Enthielt eine Voice-Unterhaltung"/>
-	<icon name="unread_ims_icon" tool_tip="Nachrichten trafen ein, während Sie abgemeldet waren"/>
-	<button name="delete_btn" tool_tip="Diesen Eintrag entfernen"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_list_item.xml b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
index fc911a64df..d097a2b18c 100644
--- a/indra/newview/skins/default/xui/de/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Unbekannt"/>
-	<button name="info_btn" tool_tip="Mehr Infos"/>
 	<button name="profile_btn" tool_tip="Profil anzeigen"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 8c05ca2c24..4e76147746 100644
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -14,53 +14,81 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 	<string name="no_filtered_friends_msg">
 		Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/people/[SEARCH_TERM] Suche].
 	</string>
+	<string name="people_filter_label" value="Nach Leuten filtern"/>
+	<string name="groups_filter_label" value="Nach Gruppen filtern"/>
 	<string name="no_filtered_groups_msg" value="Sie haben nicht das Richtige gefunden? Versuchen Sie es mit der [secondlife:///app/search/groups/[SEARCH_TERM] Suche]."/>
 	<string name="no_groups_msg" value="Suchen Sie nach Gruppen? Versuchen Sie es mit der [secondlife:///app/search/groups Suche]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Doppelklicken, um Karte zu öffnen; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Doppelklicken, um zu teleportieren; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
+	<filter_editor label="Filter" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="IN DER NÄHE" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Nach Personen filtern" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
-				<menu_button name="nearby_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-				<button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Optionen"/>
+				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
 			</panel>
 		</panel>
-		<panel label="FREUNDE" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Nach Personen filtern" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
-				<menu_button name="friends_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-				<button name="friends_add_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
-				<dnd_button name="friends_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
-			</panel>
+		<panel label="MEINE FREUNDE" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Alle"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Bieten Sie einem Einwohner die Freundschaft an"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Ausgewählte Person aus Ihrer Freundesliste entfernen"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="GRUPPEN" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Nach Gruppen filtern" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Aktionen für ausgewählte Gruppe"/>
-				<menu_button name="groups_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-				<menu_button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
-				<dnd_button name="minus_btn" tool_tip="Ausgewählte Gruppe verlassen"/>
+		<panel label="MEINE GRUPPEN" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Optionen"/>
+				<button name="plus_btn" tool_tip="Gruppe beitreten/Neue Gruppe erstellen"/>
+				<button name="activate_btn" tool_tip="Ausgewählte Gruppe aktivieren"/>
 			</panel>
 		</panel>
 		<panel label="AKTUELL" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Nach Personen filtern" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Aktionen für ausgewählte Person"/>
-				<menu_button name="recent_view_btn" tool_tip="Anzeige-/Sortieroptionen"/>
-				<button name="add_friend_btn" tool_tip="Einem Einwohner die Freundschaft anbieten"/>
-				<dnd_button name="recent_del_btn" tool_tip="Ausgewählte Person als Freund entfernen"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Optionen"/>
+				<button name="add_friend_btn" tool_tip="Ausgewählten Einwohner zur Freundeliste hinzufügen"/>
 			</panel>
 		</panel>
-		<panel label="IGNORIERT" name="blocked_panel">
-			<panel label="Ignorierte Einwohner und Objekte" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Profil" name="view_profile_btn" tool_tip="Bilder, Gruppen und andere Einwohner-Informationen anzeigen"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="IM-Sitzung öffnen"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Anrufen" name="call_btn" tool_tip="Diesen Einwohner anrufen"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Freigeben" name="share_btn" tool_tip="Inventarobjekt freigeben"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Teleportieren" name="teleport_btn" tool_tip="Teleport anbieten"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Gruppenprofil" name="group_info_btn" tool_tip="Gruppeninformationen anzeigen"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Gruppen-Chat" name="chat_btn" tool_tip="Chat öffnen"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Gruppe anrufen" name="group_call_btn" tool_tip="Diese Gruppe anrufen"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
index 8193fd42c1..c9ae350147 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text-Chat" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
-		<check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
-		<check_box label="Nur IMs und Anrufe von Freunden oder Gruppen durchstellen" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Schriftgröße:
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Klein" name="Small" value="0"/>
-			<item label="Mittel" name="Medium" value="1"/>
-			<item label="Groß" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Blasen-Chat" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Benachrichtigungen
-		</text>
-		<text name="friend_ims">
-			IMs von Freunden:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
-			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			IMs von anderen:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
-			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
-		</combo_box>
-		<text name="conference_ims">
-			Konferenz-IMs:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
-			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
-		</combo_box>
-		<text name="group_chat">
-			Gruppen-Chat:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
-			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolbarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Chat in der Nähe:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Unterhaltungsfenster öffnen" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Nachricht in Popup anzeigen" name="PopUpMessage" value="toast"/>
-			<item label="Flash-Symbolleistenschaltfläche" name="FlashToolBarButton" value="flash"/>
-			<item label="None" name="None" value="none"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Um vorübergehend alle Benachrichtigungen zu stoppen, wählen Sie „Unterhalten“ &gt; „Nicht stören“.
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Sound abspielen:
-		</text>
-		<check_box label="Neue Unterhaltung" name="new_conversation"/>
-		<check_box label="Eingehender Anruf..." name="incoming_voice_call"/>
-		<check_box label="Teleport-Angebot" name="teleport_offer"/>
-		<check_box label="Inventarangebot" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Protokoll löschen..." name="clear_log"/>
-		<button label="Protokolle löschen..." name="delete_transcripts"/>
-		<button label="Durchsuchen..." label_selected="Durchsuchen" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Schriftgröße:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Klein" name="radio" value="0"/>
+		<radio_item label="Mittel" name="radio2" value="1"/>
+		<radio_item label="Groß" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="Beim Chatten Tippanimation abspielen" name="play_typing_animation"/>
+	<check_box label="IMs per Email zuschicken, wenn ich offline bin" name="send_im_to_email"/>
+	<check_box label="Kompakten IM- und Text-Chatverlauf aktivieren" name="plain_text_chat_history"/>
+	<check_box label="Blasen-Chat" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		IMs anzeigen in:
+	</text>
+	<text name="requires_restart_label">
+		(Neustart erforderlich)
+	</text>
+	<radio_group name="chat_window" tool_tip="Zeigen Sie Ihre Sofortnachrichten (Instant Messages) in einem anderen Fenster oder in einem einzigen Fenster mit vielen Registerkarten an (Neustart erforderlich).">
+		<radio_item label="Getrennte Fenster" name="radio" value="0"/>
+		<radio_item label="Registerkarten" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Popups für eingehende Chats aktivieren:
+	</text>
+	<check_box label="Gruppen-Chats" name="EnableGroupChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Gruppen-Chat-Message eintrifft"/>
+	<check_box label="IM-Chats" name="EnableIMChatPopups" tool_tip="Markieren, um Popups zu sehen, wenn Instant Message eintrifft"/>
+	<spinner label="Lebenszeit von Toasts für Chat in der Nähe:" name="nearby_toasts_lifetime"/>
+	<spinner label="Ein-/Ausblenddauer von Toasts für Chat in der Nähe:" name="nearby_toasts_fadingtime"/>
 	<button label="Übersetzen..." name="ok_btn"/>
 	<button label="Automatisch ersetzen..." name="autoreplace_showgui"/>
 	<button label="Rechtschreibprüfung..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 4e453b6969..979ccba48d 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="nie" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Nicht-stören-Antwort:
+		Antwort, wenn im „Beschäftigt“-Modus:
 	</text>
-	<text_editor name="do_not_disturb_response">
+	<text_editor name="busy_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
index 29239033fe..4c8d77d336 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Objekt kaufen" name="Buyobject"/>
 			<combo_box.item label="Objekt bezahlen" name="Payobject"/>
 			<combo_box.item label="Öffnen" name="Open"/>
-			<combo_box.item label="Zoomen" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index e142cb8029..79cb73ecf9 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -137,7 +137,7 @@
 		Beenden
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=de-DE&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Mit dem von Ihnen verwendeten Viewer ist der Zugriff auf Second Life nicht mehr möglich. Laden Sie von den folgenden Seite einen neuen Viewer herunter:
@@ -622,8 +622,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="AvatarAway">
 		Abwesend
 	</string>
-	<string name="AvatarDoNotDisturb">
-		Nicht stören
+	<string name="AvatarBusy">
+		Beschäftigt
 	</string>
 	<string name="AvatarMuted">
 		Ignoriert
@@ -859,12 +859,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ST_NO_JOINT">
 		HAUPTVERZEICHNIS oder VERBINDUNG nicht gefunden.
 	</string>
-	<string name="NearbyChatTitle">
-		Chat in der Nähe
-	</string>
-	<string name="NearbyChatLabel">
-		(Chat in der Nähe)
-	</string>
 	<string name="whisper">
 		flüstert:
 	</string>
@@ -928,15 +922,12 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="ControlYourCamera">
 		Kamerasteuerung
 	</string>
-	<string name="NotConnected">
-		Nicht verbunden
-	</string>
-	<string name="AgentNameSubst">
-		(Sie)
-	</string>
 	<string name="TeleportYourAgent">
 		Sie teleportieren
 	</string>
+	<string name="NotConnected">
+		Nicht verbunden
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Generell
 	</string>
@@ -1018,6 +1009,18 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="dictionary_files">
 		Wörterbücher
 	</string>
+	<string name="AvatarSetNotAway">
+		Nicht abwesend
+	</string>
+	<string name="AvatarSetAway">
+		Abwesend
+	</string>
+	<string name="AvatarSetNotBusy">
+		Nicht beschäftigt
+	</string>
+	<string name="AvatarSetBusy">
+		Beschäftigt
+	</string>
 	<string name="shape">
 		Form
 	</string>
@@ -1986,8 +1989,8 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="PanelContentsNewScript">
 		Neues Skript
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Dieser Einwohner hat den Nicht-stören-Modus aktiviert und wird Ihre Nachricht später sehen.
+	<string name="BusyModeResponseDefault">
+		Der Einwohner/Die Einwohnerin ist „beschäftigt”, d.h. er/sie möchte im Moment nicht gestört werden.  Ihre Nachricht wird dem Einwohner/der Einwohnerin als IM angezeigt, und kann später beantwortet werden.
 	</string>
 	<string name="MuteByName">
 		(Nach Namen)
@@ -2100,6 +2103,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		Inhalte
+	</string>
 	<string name="AcquiredItems">
 		Erworbene Artikel
 	</string>
@@ -3871,7 +3877,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Generelle Region
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Avatare in dieser Parzelle können von Avataren außerhalb dieser Parzelle weder gesehen noch gehört werden
+		Avatare sichtbar; Chat außerhalb dieser Parzelle gestattet
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Bewegliche Objekte verhalten sich in dieser Region u. U. erst dann korrekt, wenn die Region neu geformt wird.
@@ -3948,12 +3954,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="IM_unblock_only_groups_friends">
 		Wenn Sie diese Meldung sehen, müssen Sie unter „Einstellungen“ &gt; „Privatsphäre“ die Option „Nur IMs und Anrufe von Freunden oder Gruppen durchstellen“ deaktivieren.
 	</string>
-	<string name="OnlineStatus">
-		Online
-	</string>
-	<string name="OfflineStatus">
-		Offline
-	</string>
 	<string name="answered_call">
 		Ihr Anruf wurde entgegengenommen
 	</string>
@@ -3963,9 +3963,6 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="you_joined_call">
 		Sie sind dem Gespräch beigetreten
 	</string>
-	<string name="you_auto_rejected_call-im">
-		Sie haben den Voice-Anruf automatisch abgelehnt, während der Nicht-stören-Modus aktiviert war.
-	</string>
 	<string name="name_started_call">
 		[NAME] hat einen Voice-Anruf begonnen
 	</string>
@@ -3982,7 +3979,7 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 		Wird verbunden...
 	</string>
 	<string name="conference-title">
-		Chat mit mehreren Personen
+		Ad-hoc-Konferenz
 	</string>
 	<string name="conference-title-incoming">
 		Konferenz mit [AGENT_NAME]
@@ -4862,9 +4859,6 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
-	<string name="Command_Conversations_Label">
-		Unterhaltungen
-	</string>
 	<string name="Command_Compass_Label">
 		Kompass
 	</string>
@@ -4940,9 +4934,6 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Chat_Tooltip">
 		Mit Leuten in der Nähe chatten
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Mit allen unterhalten
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Kompass
 	</string>
@@ -5072,13 +5063,4 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="UserDictionary">
 		[Benutzer]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Unterhaltungen werden nicht protokolliert. Um ein Protokoll zu starten, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Es werden keine Unterhaltungen mehr protokolliert. Um weiterhin ein Protokoll zu führen, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Keine protokollierten Unterhaltungen verfügbar. Hier erscheint ein Protokolleintrag, wenn Sie eine Person kontaktieren oder von einer Person kontaktiert werden.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 3b56e974d2..2152a9f6e9 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -70,23 +70,26 @@
      top="0"
      left="0"
      right="-1"
-     bottom="-1">
+     bottom="-3">
         <layout_stack
          animate="false" 
          default_tab_group="2"
          follows="all"
          right="-5"
          bottom="-1"
+         top="0"
+         left="5"
+         border_size="0"
          layout="topleft"
          orientation="vertical"
          name="main_stack"
-         tab_group="1"
-         top="0"
-         left="5">
+         tab_group="1">
             <layout_panel
              auto_resize="false"
              name="toolbar_panel"
-             height="35">
+             height="35"
+             right="-1"
+             left="1">
                 <menu_button
                  menu_filename="menu_im_session_showmodes.xml"
                  follows="top|left"
@@ -164,7 +167,7 @@
                  image_unselected="Toolbar_Middle_Off"
                  layout="topleft"
                  top="5"
-                 right="-70"
+                 right="-67"
                  name="close_btn"
                  tool_tip="End this conversation"
                  width="31" />
@@ -196,7 +199,8 @@
             </layout_panel>
             <layout_panel
              name="body_panel"
-             height="235">
+             top="1"
+             bottom="-1">
                 <layout_stack
                  default_tab_group="2"
                  follows="all"
@@ -213,12 +217,14 @@
                      min_dim="0"
                      width="150" 
                      user_resize="true"
-                     auto_resize="false" />
+                     auto_resize="false" 
+                     bottom="-1" />
                     <layout_panel
                      default_tab_group="3"
                      tab_group="2"
                      name="right_part_holder"
-                     min_width="221">
+                     min_width="221"
+                     bottom="-1">
                         <layout_stack
                          animate="true" 
                          default_tab_group="2"
@@ -262,21 +268,28 @@
                 </layout_stack>
             </layout_panel>
             <layout_panel
-             height="35"
+             top_delta="0"
+             top="0"
+             height="26"
+             bottom="-1"
              auto_resize="false"
              name="chat_layout_panel">
                 <layout_stack
                  animate="false"
                  default_tab_group="2"
                  follows="all"
-                 right="-1"
                  orientation="horizontal"
                  name="input_panels"
                  top="0"
-                 bottom="-1"
-                 left="0">
+                 bottom="-2"
+                 left="0"
+                 right="-1">
                     <layout_panel
-                     name="input_editor_layout_panel">
+                     name="input_editor_layout_panel"
+                     auto_resize="true"
+                     user_resize="false"
+                     top="0"
+                     bottom="-1">
                         <chat_editor
                          layout="topleft"
                          expand_lines_count="5"
@@ -289,27 +302,32 @@
                          max_length="1023"
                          spellcheck="true"
                          tab_group="3"
-                         bottom="-8"
-                         left="5"
-                         right="-5"
+                         top="1"
+                         bottom="-2"
+                         left="4"
+                         right="-4"
                          wrap="true" />
                     </layout_panel>
                     <layout_panel
                      auto_resize="false"
+                     user_resize="false"
                      name="input_button_layout_panel"
-                     width="32">
+                     width="30"
+                     top="0"
+                     bottom="-1">
                         <button
+                         layout="topleft"
                          left="1"
-                         top="4"
+                         right="-1"
+                         top="1"
+                         height="22"
                          follows="left|right|top"
-                         height="25"
                          image_hover_unselected="Toolbar_Middle_Over"
                          image_overlay="Conv_expand_one_line"
                          image_selected="Toolbar_Middle_Selected"
                          image_unselected="Toolbar_Middle_Off"
                          name="minz_btn"
-                         tool_tip="Shows/hides message panel"
-                         width="28" />
+                         tool_tip="Shows/hides message panel" />
                     </layout_panel>
                 </layout_stack>
             </layout_panel>
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
index b46b62ec4d..46ba4bd29d 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml
@@ -79,6 +79,14 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
         </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
           name="Zoom In">
diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index b8128da358..28e032ce5f 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -123,6 +123,14 @@ name="Edit Outfit">
     <menu_item_call.on_visible
      function="IsGodCustomerService"/>
   </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
   <menu_item_separator
   layout="topleft" />
   <menu_item_call
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
index 276b5f106f..e7c2b80da2 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml
@@ -79,6 +79,14 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
         </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
 	    <menu_item_call
          label="Zoom In"
           name="Zoom In">
diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
index d9bdfece38..c1ff026a74 100644
--- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml
@@ -261,4 +261,12 @@
             <menu_item_call.on_visible
              function="IsGodCustomerService"/>
     </menu_item_call>
+    <menu_item_call
+		 label="Dump XML"
+         name="Dump XML">
+            <menu_item_call.on_click
+             function="Advanced.AppearanceToXML" />
+            <menu_item_call.on_visible
+             function="Advanced.EnableAppearanceToXML"/>
+    </menu_item_call>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 101e104eab..52c4fb1613 100644
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -180,7 +180,8 @@
        name="Set Logging Level"
        tear_off="true">
         <menu_item_check
-          label="Debug">
+         name="Debug"
+         label="Debug">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="0" />
@@ -189,7 +190,8 @@
            parameter="0" />
         </menu_item_check>
         <menu_item_check
-          label="Info">
+         name="Info"
+         label="Info">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="1" />
@@ -198,7 +200,8 @@
            parameter="1" />
         </menu_item_check>
         <menu_item_check
-          label="Warning">
+         name="Warning"
+         label="Warning">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="2" />
@@ -207,7 +210,8 @@
            parameter="2" />
         </menu_item_check>
         <menu_item_check
-          label="Error">
+         name="Error"
+         label="Error">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="3" />
@@ -216,7 +220,8 @@
            parameter="3" />
         </menu_item_check>
         <menu_item_check
-          label="None">
+         name="None"
+         label="None">
           <menu_item_check.on_check
             function="Develop.CheckLoggingLevel"
             parameter="4" />
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 544f06ac0c..a11cd13fdb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -131,6 +131,7 @@
        name="Status"
        tear_off="true">
         <menu_item_check
+         name="Away"
          label="Away">
           <menu_item_check.on_check
            function="View.Status.CheckAway" />
@@ -138,6 +139,7 @@
            function="World.SetAway" />
         </menu_item_check>
         <menu_item_check
+         name="Do Not Disturb"
          label="Do Not Disturb">
           <menu_item_check.on_check
            function="View.Status.CheckDoNotDisturb" />
@@ -257,6 +259,7 @@
              parameter="speak" />
         </menu_item_check>
         <menu_item_check
+         name="Conversation Log..."
          label="Conversation Log...">
             <menu_item_check.on_check
              function="Floater.Visible"
@@ -352,6 +355,7 @@
         </menu_item_call>
       <menu_item_separator/>
       <menu_item_check
+       name="Do Not Disturb"
        label="Do Not Disturb">
         <menu_item_check.on_check
          function="View.Status.CheckDoNotDisturb" />
@@ -3051,13 +3055,6 @@
                 <menu_item_call.on_click
                  function="Advanced.PrintAgentInfo" />
             </menu_item_call>
-            <menu_item_call
-             label="Memory Stats"
-             name="Memory Stats"
-             shortcut="control|alt|shift|M">
-                <menu_item_call.on_click
-                 function="Advanced.PrintTextureMemoryStats" />
-            </menu_item_call>
             <menu_item_check
              label="Region Debug Console"
              name="Region Debug Console"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 5aa743b32d..7c08aef65e 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2987,6 +2987,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 <string name="Higher">Higher</string>
 <string name="Hip Length">Hip Length</string>
 <string name="Hip Width">Hip Width</string>
+<string name="Hover">Hover</string>
 <string name="In">In</string>
 <string name="In Shdw Color">Inner Shadow Color</string>
 <string name="In Shdw Opacity">Inner Shadow Opacity</string>
diff --git a/indra/newview/skins/default/xui/es/floater_conversation_log.xml b/indra/newview/skins/default/xui/es/floater_conversation_log.xml
deleted file mode 100644
index 9202fab92d..0000000000
--- a/indra/newview/skins/default/xui/es/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="REGISTRO DE CONVERSACIONES">
-	<panel name="buttons_panel">
-		<filter_editor label="Filtrar la gente" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Opciones de vista/orden"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Acciones en la persona o el grupo seleccionado"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_conversation_preview.xml b/indra/newview/skins/default/xui/es/floater_conversation_preview.xml
deleted file mode 100644
index f579e720fb..0000000000
--- a/indra/newview/skins/default/xui/es/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="CONVERSACIÓN:">
-	<floater.string name="Title">
-		CONVERSACIÓN: [NAME]
-	</floater.string>
-	<text name="page_label" value="Página"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im_container.xml b/indra/newview/skins/default/xui/es/floater_im_container.xml
index f772441141..1cd752e6ec 100644
--- a/indra/newview/skins/default/xui/es/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSACIONES">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Opciones de vista/orden"/>
-					<button name="add_btn" tool_tip="Iniciar una conversación nueva"/>
-					<button name="speak_btn" tool_tip="Utiliza el micrófono para hablar con las personas"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Cerrar/expandir esta lista"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Cerrar este panel"/>
-					<text name="stub_textbox">
-						Esta conversación está en una ventana aparte.   [secondlife:/// Traerla de vuelta.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="CONVERSACIONES"/>
diff --git a/indra/newview/skins/default/xui/es/floater_im_session.xml b/indra/newview/skins/default/xui/es/floater_im_session.xml
index 5f38fbd615..3d9d17fc81 100644
--- a/indra/newview/skins/default/xui/es/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/es/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] ha sido invitado a la conversación."/>
-	<floater.string name="multiple_participants_added" value="[NAME] han sido invitados a la conversación."/>
-	<floater.string name="tooltip_to_separate_window" value="Mover esta conversación a otra ventana"/>
-	<floater.string name="tooltip_to_main_window" value="Volver a poner esta conversación en la ventana principal"/>
-	<floater.string name="start_call_button_tooltip" value="Abrir conexión de voz"/>
-	<floater.string name="end_call_button_tooltip" value="Cerrar la conexión de voz"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Cerrar este panel"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Cerrar la lista de participantes"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir la lista de participantes"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Opciones de vista/orden"/>
-				<menu_button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
-				<button name="add_btn" tool_tip="Añadir alguien a esta conversación"/>
-				<button name="voice_call_btn" tool_tip="Abrir conexión de voz"/>
-				<button name="close_btn" tool_tip="Finalizar esta conversación"/>
-				<button name="expand_collapse_btn" tool_tip="Cerrar/expandir este panel"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Traducir el chat" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="A" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Muestra/oculta el panel de mensajes"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="A" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_incoming_call.xml b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
index acbb25b713..b5b756abb6 100644
--- a/indra/newview/skins/default/xui/es/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/es/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anónimo
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		te está llamando.
+		está llamando.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ha entrado en un chat de voz en multiconferencia.
@@ -25,9 +25,9 @@
 		¿Quieres dejar [CURRENT_CHAT] y entrar en este chat de voz?
 	</floater.string>
 	<text name="question">
-		Si respondes, te desconectarás de la conversación de voz actual.
+		¿Quieres dejar [CURRENT_CHAT] y entrar a este chat de voz?
 	</text>
-	<button label="Responder" label_selected="Responder" name="Accept"/>
-	<button label="Ignorar" label_selected="Ignorar" name="Reject"/>
-	<button label="Abrir MI en su lugar" name="Start IM"/>
+	<button label="Aceptar" label_selected="Aceptar" name="Accept"/>
+	<button label="Rechazar" label_selected="Rechazar" name="Reject"/>
+	<button label="Comenzar un MI" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
index 3602270e5a..e93ecc9e10 100644
--- a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Mostrar:
 			</text>
-			<check_box label="Prueba" name="show_world"/>
+			<check_box label="Mundo virtual" name="show_world"/>
 			<check_box label="Solamente los objetos movibles" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
index 01b024bc3e..93bc9f293c 100644
--- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Blanca" label_selected="Blanca" name="Blank"/>
 	<button label="Ninguna" label_selected="Ninguna" left="90" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Aplicarlo ahora" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Vista previa inmediata" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Vista previa inhabilitada"/>
 	<filter_editor label="Filtrar las texturas" name="inventory search editor"/>
 	<check_box initial_value="false" label="Ver las carpetas" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
deleted file mode 100644
index 1115d67239..0000000000
--- a/indra/newview/skins/default/xui/es/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="VOLUMEN DE CHAT DE VOZ">
-	<slider label="Chat de voz" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
index 02ebe80ff7..1a265845af 100644
--- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="PROBAR TRANSFORMACIÓN DE VOZ">
+<floater label="Lugares" name="voice_effects" title="TRANSFORMACIÓN DE VOZ">
 	<string name="no_voice_effect">
 		(Sin transformación de voz)
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_volume.xml b/indra/newview/skins/default/xui/es/floater_voice_volume.xml
deleted file mode 100644
index 0ebc511887..0000000000
--- a/indra/newview/skins/default/xui/es/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="VOLUMEN DE VOZ">
-	<slider name="volume_slider" tool_tip="Volumen de la voz" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/menu_cof_gear.xml b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
index a889992b8a..ff8ad0977a 100644
--- a/indra/newview/skins/default/xui/es/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear COF">
+<menu name="Gear COF">
 	<menu label="Ropas nuevas" name="COF.Gear.New_Clothes"/>
-	<menu label="Nuevas partes del cuerpo" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+	<menu label="Nuevas partes del cuerpo" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation.xml b/indra/newview/skins/default/xui/es/menu_conversation.xml
deleted file mode 100644
index e4e9a0bf63..0000000000
--- a/indra/newview/skins/default/xui/es/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Cerrar conversación" name="close_conversation"/>
-	<menu_item_call label="Abrir conversación de voz" name="open_voice_conversation"/>
-	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
-	<menu_item_call label="Ver el perfil" name="view_profile"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
-	<menu_item_call label="Llamada de voz" name="voice_call"/>
-	<menu_item_call label="Historial del chat..." name="chat_history"/>
-	<menu_item_call label="Añadir como amigo" name="add_friend"/>
-	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
-	<menu_item_call label="Quitar amigos" name="remove_friends"/>
-	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
-	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
-	<menu_item_call label="Mapa" name="map"/>
-	<menu_item_call label="Compartir" name="share"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_check label="Ignorar la voz" name="block_unblock"/>
-	<menu_item_check label="Ignorar el texto" name="MuteText"/>
-	<menu_item_call label="Perfil del grupo" name="group_profile"/>
-	<menu_item_call label="Activar el grupo" name="activate_group"/>
-	<menu_item_call label="Abandonar el grupo" name="leave_group"/>
-	<context_menu label="Opciones del moderador" name="Moderator Options">
-		<menu_item_check label="Permitir el chat de texto" name="AllowTextChat"/>
-		<menu_item_call label="Ignorar a este participante" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Quitar el silencio a este participante" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Silenciar a todos" name="ModerateVoiceMute"/>
-		<menu_item_call label="Quitar el silencio a todos" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
deleted file mode 100644
index 090e6fb0bf..0000000000
--- a/indra/newview/skins/default/xui/es/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="MI..." name="IM"/>
-	<menu_item_call label="Llamada de voz..." name="Call"/>
-	<menu_item_call label="Abrir el historial de chat..." name="Chat history"/>
-	<menu_item_call label="Ver el perfil" name="View Profile"/>
-	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
-	<menu_item_call label="Añadir como amigo" name="add_friend"/>
-	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
-	<menu_item_call label="Invitar al grupo..." name="Invite"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartir" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
deleted file mode 100644
index b8b4616b2d..0000000000
--- a/indra/newview/skins/default/xui/es/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
-	<menu_item_check label="Ordenar por fecha" name="sort_by_date"/>
-	<menu_item_check label="Ordenar con los amigos al principio" name="sort_by_friends"/>
-	<menu_item_call label="Ver el historial de chat..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_im_conversation.xml b/indra/newview/skins/default/xui/es/menu_im_conversation.xml
deleted file mode 100644
index 5ba0fb898e..0000000000
--- a/indra/newview/skins/default/xui/es/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Ver el perfil" name="View Profile"/>
-	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
-	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
-	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
-	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
-	<menu_item_call label="Historial del chat..." name="chat_history"/>
-	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
-	<menu_item_call label="Mapa" name="map"/>
-	<menu_item_call label="Compartir" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Ignorar la voz" name="Block/Unblock"/>
-	<menu_item_check label="Ignorar el texto" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
deleted file mode 100644
index 6ea970b826..0000000000
--- a/indra/newview/skins/default/xui/es/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Vista compacta" name="compact_view"/>
-	<menu_item_check label="Vista ampliada" name="expanded_view"/>
-	<menu_item_check label="Mostrar tiempo" name="IMShowTime"/>
-	<menu_item_check label="Mostrar los nombres en las conversaciones individuales" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_object_icon.xml b/indra/newview/skins/default/xui/es/menu_object_icon.xml
index a99c889bb0..7e4578b950 100644
--- a/indra/newview/skins/default/xui/es/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/es/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Perfil del objeto..." name="Object Profile"/>
 	<menu_item_call label="Ignorar..." name="Block"/>
-	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
-	<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
index 56e64c729f..558ff6afd3 100644
--- a/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/es/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Pelo nuevo" name="New Hair"/>
 		<menu_item_call label="Ojos nuevos" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Abrir todas las carpetas" name="expand"/>
-	<menu_item_call label="Cerrar todas las carpetas" name="collapse"/>
 	<menu_item_call label="Renombrar el vestuario" name="rename"/>
 	<menu_item_call label="Borrar el vestuario" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_participant_view.xml b/indra/newview/skins/default/xui/es/menu_participant_view.xml
deleted file mode 100644
index fcfeeb922b..0000000000
--- a/indra/newview/skins/default/xui/es/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Ordenar las conversaciones por tipo" name="sort_sessions_by_type"/>
-	<menu_item_check label="Ordenar las conversaciones por nombre" name="sort_sessions_by_name"/>
-	<menu_item_check label="Ordenar las conversaciones por actividad reciente" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Ordenar los participantes por nombre" name="sort_participants_by_name"/>
-	<menu_item_check label="Ordenar los participantes por actividad reciente" name="sort_participants_by_recent"/>
-	<menu_item_call label="Preferencias de chat..." name="chat_preferences"/>
-	<menu_item_call label="Preferencias de privacidad..." name="privacy_preferences"/>
-	<menu_item_check label="Registro de conversaciones..." name="Conversation"/>
-	<menu_item_check label="Traducir el chat" name="Translate_chat"/>
-	<menu_item_check label="Configuración de traducción..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
deleted file mode 100644
index 986389a4fe..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="No ignorar" name="unblock"/>
-	<menu_item_call label="Perfil..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
deleted file mode 100644
index 10f6a3fc14..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Ignorar residentes según el nombre..." name="block_resident_by_name"/>
-	<menu_item_call label="Ignorar objetos según el nombre" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
deleted file mode 100644
index bc557c7ec1..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
-	<menu_item_check label="Ordenar por tipo" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_friends_view.xml b/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
deleted file mode 100644
index ad896c1b74..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
-	<menu_item_check label="Ordenar por estatus" name="sort_status"/>
-	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
-	<menu_item_check label="Ver permisos concedidos" name="view_permissions"/>
-	<menu_item_check label="Ver el registro de conversaciones..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups.xml b/indra/newview/skins/default/xui/es/menu_people_groups.xml
index 125e25cd1a..51bd2c7208 100644
--- a/indra/newview/skins/default/xui/es/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Ver la información" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Llamada de voz" name="Call"/>
+	<menu_item_call label="Llamar" name="Call"/>
 	<menu_item_call label="Activar" name="Activate"/>
 	<menu_item_call label="Dejar" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_groups_view.xml b/indra/newview/skins/default/xui/es/menu_people_groups_view.xml
deleted file mode 100644
index c3973625b0..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Mostrar los iconos de grupo" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby.xml b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
index 09bb119d5a..dc1486d879 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Ver el perfil" name="view_profile"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
-	<menu_item_call label="Llamada de voz" name="voice_call"/>
-	<menu_item_call label="Ver el historial de chat..." name="chat_history"/>
-	<menu_item_call label="Añadir como amigo" name="add_friend"/>
-	<menu_item_call label="Quitarle como amigo" name="remove_friend"/>
-	<menu_item_call label="Invitar al grupo..." name="invite_to_group"/>
-	<menu_item_call label="Acercar el zoom" name="zoom_in"/>
-	<menu_item_call label="Mapa" name="map"/>
-	<menu_item_call label="Compartir" name="share"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_check label="Ignorar / No ignorar" name="block_unblock"/>
+	<menu_item_call label="Ver el perfil" name="View Profile"/>
+	<menu_item_call label="Añadir como amigo" name="Add Friend"/>
+	<menu_item_call label="Quitarle como amigo" name="Remove Friend"/>
+	<menu_item_call label="MI" name="IM"/>
+	<menu_item_call label="Llamar" name="Call"/>
+	<menu_item_call label="Mapa" name="Map"/>
+	<menu_item_call label="Compartir" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Ignorar / No ignorar" name="Block/Unblock"/>
+	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
index 9df160f5ad..227c5ebe58 100644
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/es/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Añadir como amigos" name="add_friends"/>
-	<menu_item_call label="Quitar amigos" name="remove_friends"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Visita" name="call"/>
-	<menu_item_call label="Compartir" name="share"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_call label="Ofrecer teleporte" name="offer_teleport"/>
+	<menu_item_call label="Añadir como amigos" name="Add Friends"/>
+	<menu_item_call label="Quitar amigos" name="Remove Friend"/>
+	<menu_item_call label="MI" name="IM"/>
+	<menu_item_call label="Llamar" name="Call"/>
+	<menu_item_call label="Compartir" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_call label="Ofrecer teleporte" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
deleted file mode 100644
index c2fb360dd1..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar según las intervenciones recientes" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
-	<menu_item_check label="Ordenar según distancia" name="sort_distance"/>
-	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
-	<menu_item_check label="Ver mapa" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_people_recent_view.xml b/indra/newview/skins/default/xui/es/menu_people_recent_view.xml
deleted file mode 100644
index f0ffd14024..0000000000
--- a/indra/newview/skins/default/xui/es/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por más reciente" name="sort_most"/>
-	<menu_item_check label="Ordenar alfabéticamente" name="sort_name"/>
-	<menu_item_check label="Ver los iconos de la gente" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_agent.xml b/indra/newview/skins/default/xui/es/menu_url_agent.xml
index 69a03671ab..a089c8f68e 100644
--- a/indra/newview/skins/default/xui/es/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Ver el perfil" name="show_agent"/>
-	<menu_item_call label="Enviar un MI..." name="send_im"/>
-	<menu_item_call label="Añadir como amigo..." name="add_friend"/>
+	<menu_item_call label="Mostrar el perfil del Residente" name="show_agent"/>
 	<menu_item_call label="Copiar el nombre al portapapeles" name="url_copy_label"/>
 	<menu_item_call label="Copiar la SLurl al portapapeles" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_objectim.xml b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
index e78fdec558..8791a290af 100644
--- a/indra/newview/skins/default/xui/es/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/es/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Perfil del objeto..." name="show_object"/>
+	<menu_item_call label="Mostrar la información del objeto" name="show_object"/>
 	<menu_item_call label="Mostrar en el mapa" name="show_on_map"/>
 	<menu_item_call label="Teleportarse a la posición del objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar el nombre del objeto al portapapeles" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 30842f53f2..d80150ef6d 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Parar mis animaciones" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Caminar / Correr / Volar..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Estado" name="Status"/>
+		<menu label="Estado" name="Status">
+			<menu_item_call label="Ausente" name="Set Away"/>
+			<menu_item_call label="Ocupado" name="Set Busy"/>
+		</menu>
 		<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Panel de control de la cuenta..." name="Manage My Account">
 			<menu_item_call.on_click name="ManageMyAccount_url" parameter="WebLaunchJoinNow,http://secondlife.com/account/index.php?lang=es"/>
@@ -28,18 +31,14 @@
 		<menu_item_call label="Salir de [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicarme" name="Communicate">
-		<menu_item_check label="Conversaciones..." name="Conversations"/>
 		<menu_item_check label="Chat..." name="Nearby Chat"/>
 		<menu_item_check label="Hablar" name="Speak"/>
-		<menu label="Transformación de voz" name="VoiceMorphing">
-			<menu_item_check label="Sin transformación de voz" name="NoVoiceMorphing"/>
-			<menu_item_check label="Probar..." name="Preview"/>
-			<menu_item_call label="Suscribir..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Configuración de voz..." name="Nearby Voice"/>
+		<menu_item_check label="Transformación de voz..." name="ShowVoice"/>
 		<menu_item_check label="Gestos..." name="Gestures"/>
-		<menu_item_check label="Amigos" name="My Friends"/>
-		<menu_item_check label="Grupos" name="My Groups"/>
-		<menu_item_check label="Gente cerca" name="Active Speakers"/>
+		<menu_item_call label="Amigos" name="My Friends"/>
+		<menu_item_call label="Grupos" name="My Groups"/>
+		<menu_item_call label="Gente cerca" name="Active Speakers"/>
 		<menu_item_call label="Lista de ignorados" name="Block List"/>
 	</menu>
 	<menu label="Mundo" name="World">
@@ -115,6 +114,7 @@
 			<menu_item_call label="Comprar" name="Menu Object Buy"/>
 			<menu_item_call label="Tomar" name="Menu Object Take"/>
 			<menu_item_call label="Coger una copia" name="Take Copy"/>
+			<menu_item_call label="Guardar una copia en mi inventario" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Guardar una copia del objeto en los contenidos de donde salió" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Devolver objeto" name="Return Object back to Owner"/>
 		</menu>
@@ -129,7 +129,6 @@
 			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personajes..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Ver/probar..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Recargar la región" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Opciones" name="Options">
 			<menu_item_check label="Mostrar los permisos avanzados" name="DebugPermissions"/>
@@ -159,13 +158,6 @@
 	<menu label="Ayuda" name="Help">
 		<menu_item_call label="Cómo..." name="How To"/>
 		<menu_item_call label="Ayuda de [SECOND_LIFE]" name="Second Life Help"/>
-		<menu_item_call label="Guía del usuario" name="User’s guide"/>
-		<menu_item_call label="Base de Conocimientos" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Foros comunitarios" name="Community Forums"/>
-		<menu_item_call label="Portal de soporte" name="Support portal"/>
-		<menu_item_call label="Noticias de [SECOND_LIFE]" name="Second Life News"/>
-		<menu_item_call label="Blogs de [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Denunciar una infracción" name="Report Abuse"/>
 		<menu_item_call label="Informar de un fallo" name="Report Bug"/>
 		<menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/>
@@ -343,14 +335,9 @@
 				<menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/>
 				<menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Velocidad de animación" name="Animation Speed">
-				<menu_item_call label="Acelerar todas las animaciones un 10%" name="All Animations 10 Faster"/>
-				<menu_item_call label="Ralentizar todas las animaciones un 10%" name="All Animations 10 Slower"/>
-				<menu_item_call label="Restablecer la velocidad de todas las animaciones" name="Reset All Animation Speed"/>
-				<menu_item_check label="Animaciones a cámara lenta" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Force Params to Default" name="Force Params to Default"/>
 			<menu_item_check label="Animation Info" name="Animation Info"/>
+			<menu_item_check label="Slow Motion Animations" name="Slow Motion Animations"/>
 			<menu_item_check label="Disable Level Of Detail" name="Disable LOD"/>
 			<menu_item_check label="Show Collision Skeleton" name="Show Collision Skeleton"/>
 			<menu_item_check label="Display Agent Target" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 05455f54c3..7dfb27717d 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -511,24 +511,6 @@ El objeto debe de haber sido borrado o estar fuera de rango (&apos;out of range&
 		</url>
 		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
-
-    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		Probablemente ya existe un controlador más reciente para tu procesador de gráficos.  La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
-
-    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=es
-		</url>
-		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
-	</notification>
 	<notification name="UnknownGPU">
 		Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce.
 Suele suceder con hardware nuevo que todavía no ha sido probado con [APP_NAME].  Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas.
@@ -1571,13 +1553,10 @@ Debemos reiniciar [APP_NAME] para instalar la actualización.
 		En este momento, no se puede ofrecer el ser amigo. Por favor, vuelve a intentarlo en un momento.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Está activado No molestar. No obtendrás un aviso cuando recibas comunicaciones.
-
-- Los otros residentes recibirán tu respuesta de No molestar (se configura en Preferencias &gt; General).
-- Se rehusarán los ofrecimientos de teleporte.
-- Se rechazarán las llamadas de voz.
-		<usetemplate ignoretext="Cambio mi estado al modo No molestar" name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		Pasar al modo ocupado.
+Se ocultará el chat y los mensajes instantáneos   (éstos recibirán tu Respuesta en el modo ocupado). Se rehusarán todos los ofrecimientos de teleporte. Todas las ofertas de inventario irán a tu Papelera.
+		<usetemplate ignoretext="Cambio mi estado al modo ocupado" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Has superado tu número máximo de grupos. Por favor, sal de al menos uno antes de entrar en éste, o rehúsa la oferta.
@@ -2064,10 +2043,6 @@ Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar u
 		¿Ir a tu [http://secondlife.com/account/ Panel de Control] para ver el historial de tu cuenta?
 		<usetemplate ignoretext="Abrir mi navegador para ver el historial de mi cuenta" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		Si agregas una persona a una conversación en curso, se creará una conversación nueva. Todos los participantes recibirán notificaciones de la nueva conversación.
-		<usetemplate ignoretext="Confirmar agregar participantes al chat" name="okcancelignore" notext="Cancelar" yestext="Aceptar"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		¿Estás seguro de que quieres salir?
 		<usetemplate ignoretext="Confirmar antes de salir" name="okcancelignore" notext="No salir" yestext="Salir"/>
@@ -2141,14 +2116,14 @@ Linden Lab
 			<button ignore="Nunca reemplazar" name="No" text="Cancelar"/>
 		</form>
 	</notification>
-	<notification label="Advertencia del modo No molestar" name="DoNotDisturbModePay">
-		Tienes activado No molestar. No podrás recibir ningún objeto ofrecido a cambio de este pago.
+	<notification label="¡Aviso! Modo Ocupado" name="BusyModePay">
+		Estás en el modo Ocupado. Por tanto, no recibirás ningún ítem a cambio de este pago.
 
-¿Deseas desactivar No molestar antes de finalizar esta transacción?
+¿Quieres salir del modo Ocupado antes de completar esta transacción?
 		<form name="form">
-			<ignore name="ignore" text="Voy a pagar a una persona u objeto mientras estoy en el modo No molestar"/>
-			<button ignore="Salir siempre del modo No molestar" name="Yes" text="OK"/>
-			<button ignore="No salir nunca del modo No molestar" name="No" text="Cancelar"/>
+			<ignore name="ignore" save_option="true" text="Voy a pagar a una persona u objeto mientras estoy en el modo ocupado"/>
+			<button ignore="Siempre salir del modo Ocupado" name="Yes" text="OK"/>
+			<button ignore="Nunca salir del modo Ocupado" name="No" text="Cancelar"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2283,8 +2258,11 @@ Publícala en una página web para que otros puedan acceder fácilmente a esta p
 	<notification name="GroupNotice">
 		Asunto: [SUBJECT], Mensaje: [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está conectado
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está desconectado
 	</notification>
 	<notification name="AddSelfFriend">
 		Aunque eres muy agradable, no puedes añadirte como amigo a ti mismo.
@@ -2512,6 +2490,13 @@ Aquí no puedes volar.
 	<notification name="DynamicPathfindingDisabled">
 		Esta región no tiene activado el pathfinding dinámico. Los objetos programados que utilicen llamadas LSL de pathfinding pueden tener un comportamiento inesperado en ella.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		Si cambias ciertos objetos en esta región, otros objetos móviles podrían tener un comportamiento incorrecto. Para que los objetos móviles se comporten correctamente, pulsa el botón “Recargar la región”. Si quieres más información, elige “Ayuda”.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Ayuda" ignoretext="Si cambias ciertos objetos en esta región, otros objetos móviles podrían tener un comportamiento incorrecto." name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Se ha producido un error. Puede haber ocurrido un problema en la red o el servidor, o quizás no tengas derechos de construcción. Este problema podría resolverse cerrando la sesión e iniciando una sesión nueva.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2772,9 +2757,9 @@ Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME]?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso pleno a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, cuando lo desee y sin más advertencias.
+		Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso total a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, de manera permanente y sin más advertencias.
   
-No autorices el acceso a tu cuenta si no conoces cuál es la razón exacta.
+Estas solicitudes pocas veces son legítimas. No autorices el acceso si no conoces la razón exacta por la que desea el acceso a tu cuenta.
 		<form name="form">
 			<button name="Grant" text="Permitir acceso total"/>
 			<button name="Deny" text="Denegar"/>
@@ -3346,633 +3331,4 @@ Intento cancelado.
 		Vas a eliminar [NUM_ITEMS] objetos. ¿Estás seguro de que deseas continuar?
 		<usetemplate ignoretext="¿Estás seguro de que quieres eliminar varios elementos?" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] te ha congelado. No puedes moverte ni interactuar con el mundo.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] te ha congelado durante [AV_FREEZE_TIME] segundos. No puedes moverte ni interactuar con el mundo.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Avatar congelado.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] te ha descongelado.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Avatar descongelado.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		Error al congelar: no tienes permisos de administrador en esa parcela.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		La congelación ha terminado, puedes seguir con tus asuntos.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Lo sentimos, ese usuario no se puede congelar.
-	</notification>
-	<notification name="NowOwnObject">
-		Ahora eres el propietario del objeto [OBJECT_NAME]
-	</notification>
-	<notification name="CantRezOnLand">
-		No se puede colocar el objeto en [OBJECT_POS] porque el propietario de ese terreno no lo permite. Usa la herramienta de terreno para ver quién es el propietario.
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		El objeto no se puede colocar porque hay demasiadas solicitudes.
-	</notification>
-	<notification name="SitFailCantMove">
-		No te puedes sentar porque en este momento no puedes desplazarte.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		No te puedes sentar porque no tienes permiso para estar en ese terreno.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Acércate. No te puedes sentar en el objeto porque
-no está en la misma región que tú.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		No se puede crear el nuevo objeto. La región está llena.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Error al colocar el objeto en el lugar especificado.  Vuelve a intentarlo.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		No puedes crear árboles y hierba en un terreno que no es tuyo.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		Error al copiar: careces de permiso para copiar el objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		Error al copiar: no se te puede transferir el objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		Error al copiar porque el objeto &apos;[OBJ_NAME]&apos; contribuye al navmesh.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Duplicación sin objetos raíz seleccionados.
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		No se pueden duplicar objetos porque la región está llena.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		No se pueden duplicar los objetos: no se encuentra la parcela en la que se hallan.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		No se puede crear el objeto porque 
-la parcela está llena.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Error al intentar colocar un objeto.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		No se puede crear un objeto que ha causado problemas en esta región.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		Ese objeto de inventario está en la lista negra.
-	</notification>
-	<notification name="NoCanRezObjects">
-		Actualmente no tienes autorización para crear objetos.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Búsqueda de terrenos bloqueada.
-Has realizado demasiadas búsquedas de terreno con excesiva rapidez.
-Prueba otra vez dentro de un minuto.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		No hay suficientes recursos de script disponibles para anexar el objeto
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Has muerto y te has teleportado a tu lugar de origen
-	</notification>
-	<notification name="EjectComingSoon">
-		Te han expulsado de aquí y tienes [EJECT_TIME] segundos para salir.
-	</notification>
-	<notification name="NoEnterServerFull">
-		No puedes entrar en esta región porque 
-el servidor está lleno.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Se ha deshabilitado Devolver el objeto a mi inventario.
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		No se puede guardar &apos;[OBJ_NAME]&apos; en el contenido del objeto porque el objeto desde el cual ha sido colocado ya no existe.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		No se puede guardar &apos;[OBJ_NAME]&apos; en el contenido del objeto porque no tienes permiso para modificar el objeto &apos;[DEST_NAME]&apos;.
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		No se puede guardar &apos;[OBJ_NAME]&apos; de nuevo en el inventario; esta operación está desactivada.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		No se puede copiar tu selección porque no tienes permiso para copiar el objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		No se puede copiar tu selección porque el objeto &apos;[OBJ_NAME]&apos; es intransferible.
-	</notification>
-	<notification name="NoTransNoCopy">
-		No se puede copiar tu selección porque el objeto &apos;[OBJ_NAME]&apos; es intransferible.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		El sistema de permisos no admite la eliminación del objeto &apos;[OBJ_NAME]&apos; del simulador.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		No se puede guardar tu selección porque no tienes permiso para modificar el objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		No se puede guardar tu selección porque el objeto &apos;[OBJ_NAME]&apos; no se puede copiar.
-	</notification>
-	<notification name="NoModNoTaking">
-		No se puede aceptar tu selección porque no tienes permiso para modificar el objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="RezDestInternalError">
-		Error interno: tipo de destino desconocido.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		Error al borrar: el objeto no se encuentra
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Lo sentimos, ese usuario no se puede expulsar.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Esta región no te permite configurar aquí tu lugar de origen.
-	</notification>
-	<notification name="HomeLocationLimits">
-		Tu &apos;Lugar de origen&apos; solo se puede configurar en tu terreno o en un punto de información del continente.
-	</notification>
-	<notification name="HomePositionSet">
-		Posición de origen ajustada.
-	</notification>
-	<notification name="AvatarEjected">
-		Avatar expulsado.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		Error al expulsar: no tienes permiso de administrador en esa parcela.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] en la región [REGION_NAME] porque la parcela está llena.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] de la región [REGION_NAME] porque tus objetos no están permitidos en esta parcela.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] de la región [REGION_NAME] porque no hay suficientes recursos para este objeto en esta parcela.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] de la región [REGION_NAME] porque la otra región ejecuta una versión más antigua que no admite la recepción de este objeto atravesando regiones.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] en la región [REGION_NAME] porque no puedes modificar el navmesh a través de límites de región.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		No se puede mover el objeto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] en la región [REGION_NAME] por un motivo desconocido. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		No tienes permiso para modificar ese objeto
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		No se puede habilitar la física para un objeto que contribuye al navmesh.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		No se puede activar la física para los objetos con fotogramas clave.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		No se puede habilitar la física para el objeto: recursos de terreno insuficientes.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		No se puede activar la física para un objeto con un coste de recursos de física mayor que [MAX_OBJECTS]
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Este objeto no puede tener una pieza cóncava porque es inmaterial y contribuye al navmesh.
-	</notification>
-	<notification name="UnableAddItem">
-		¡No se puede añadir un objeto!
-	</notification>
-	<notification name="UnableEditItem">
-		¡No se puede editar esto!
-	</notification>
-	<notification name="NoPermToEdit">
-		No puedes editar esto.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		No está permitido copiar ese inventario.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		No se puede guardar en el contenido del objeto: el objeto ya no existe.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		No se puede guardar en el contenido del objeto: el inventario ya contiene un objeto con ese nombre
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		No se puede guardar en el contenido del objeto: se modificarían los permisos de anexo.
-	</notification>
-	<notification name="TooManyScripts">
-		Demasiados scripts.
-	</notification>
-	<notification name="UnableAddScript">
-		¡No se puede añadir un script!
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		El servidor de objetos no respondió puntualmente. El objeto se ha devuelto al sim.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		Esta región no tiene habilitadas las formas de física.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		No se puede modificar el navmesh a través de límites de región.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		No se pueden establecer propiedades de física en ese tipo de objeto.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		No se puede establecer que un prim raíz no tenga forma.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		Esta región no tiene habilitados los materiales de física.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		Solo se pueden ajustar los materiales de física de las prims raíces.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		Aun no es posible configurar materiales de física para los personajes.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Una o varias de las propiedades de los materiales de física especificados no son válidas.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		No se puede cambiar el tipo de unión de un objeto de la malla.
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		No se puede cambiar la forma de un objeto de la malla
-	</notification>
-	<notification name="FullRegionCantEnter">
-		No puedes entrar en esta región porque \nla región está llena.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Error de vínculo: los propietarios son diferentes
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Error de vínculo: no se puede modificar el navmesh a través de límites de región.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Error de vínculo: no tienes permiso de edición.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Error de vínculo: demasiadas primitivas
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Error de vínculo: no se pueden vincular &apos;no copiable&apos; y &apos;no transferible&apos;
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Error de vínculo: no hay objetos que se puedan vincular.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Error de vínculo: demasiados personajes de pathfinding
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Error de vínculo: recursos de terreno insuficientes
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		El objeto utiliza una cantidad excesiva de recursos de física; se ha desactivado su dinámica.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		Has sido teleportado al origen por el objeto &apos;[OBJECT_NAME]&apos; de la parcela &apos;[PARCEL_NAME]&apos;
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		Has sido teleportado a tu origen por el objeto &apos;[OBJECT_NAME]&apos;
-	</notification>
-	<notification name="TeleportedByAttachment">
-		Has sido teleportado por un anexo de [ITEM_ID]
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; de la parcela &apos;[PARCEL_NAME]&apos;
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; que es propiedad de [OWNER_ID]
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Has sido teleportado por el objeto &apos;[OBJECT_NAME]&apos; cuyo propietario es un usuario desconocido.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		No se puede crear el objeto solicitado. La región está llena.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		No puedes anexar varios objetos a un solo lugar.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Aquí no se pueden crear varios objetos.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		No se puede crear el objeto solicitado. El objeto no se encuentra en la base de datos.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		No se puede crear el objeto solicitado. Ha expirado el tiempo de la solicitud. Vuelve a intentarlo.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		No se puede crear el objeto solicitado. Vuelve a intentarlo.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Error al colocar: la carga del objeto solicitado ha tardado demasiado.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Error al colocar el objeto en el lugar especificado. Vuelve a intentarlo.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		No se pueden crear plantas en este terreno.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		No se puede restaurar el objeto. No se ha encontrado una posición del mundo.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		No se puede colocar el objeto porque sus datos de malla no son válidos.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		No se puede colocar el objeto porque la región ya contiene demasiados scripts.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Tus privilegios de acceso no te permiten crear objetos allí.
-	</notification>
-	<notification name="CantCreateObject">
-		Actualmente no tienes autorización para crear objetos.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Los parámetros de objeto no son válidos
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Tus privilegios de acceso no te permiten duplicar objetos aquí.
-	</notification>
-	<notification name="CantChangeShape">
-		No tienes permiso para cambiar esta forma.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Tus privilegios de acceso no te permiten reclamar objetos aquí.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		Error de transferencia: no tienes permiso para transferir objetos para tu grupo.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Tus privilegios de acceso no te autorizan a comprar objetos aquí.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		No se puede anexar el objeto porque un avatar está sentado en él.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		No te puedes poner árboles y hierba como anexos.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		No se pueden anexar objetos que son propiedad de grupos.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		No puedes anexar objetos de los que no eres propietario.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		No se pueden anexar objetos que contribuyen al navmesh.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		No se puede anexar el objeto porque no tienes permiso para moverlo.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		No hay suficientes recursos de script disponibles para anexar el objeto
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		No se pueden soltar objetos aquí; inténtalo en la zona de prueba gratuita.
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		No se pueden soltar anexos de la malla. Quítalos en el inventario y después colócalos en el mundo.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		Error al soltar el anexo: no tienes permiso para soltarlo allí.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		Error al soltar el anexo: recurso de terreno disponible insuficiente.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Error al soltar los anexos: los recursos disponibles son insuficientes.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		No se puede soltar el objeto aquí. La parcela está llena.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		No puedes tocar/agarrar este objeto porque tienes prohibida la entrada en la parcela de terreno.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Acota los parámetros de eliminación.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		No se puede subir el activo.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		No se ha podido encontrar el usuario para teleportarlo al origen
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		error en la solicitud de superpoderes
-	</notification>
-	<notification name="GenericRequestFailed">
-		error de solicitud genérico
-	</notification>
-	<notification name="CantUploadPostcard">
-		No se puede subir la postal. Vuelve a intentarlo más tarde.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		No se pueden obtener los datos de inventario del aviso de grupo.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		No se puede enviar el aviso de grupo: no está permitido.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		No se puede enviar el aviso del grupo: el inventario no se puede construir.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		No se puede analizar el inventario del aviso.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Error al subir terreno.
-	</notification>
-	<notification name="TerrainFileWritten">
-		Se ha registrado el archivo de terreno.
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		Archivo de terreno registrado, iniciando la descarga...
-	</notification>
-	<notification name="TerrainBaked">
-		Terreno predeterminado.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Solamente se han desactivado los 10 primeros objetos seleccionados. Si es preciso, actualiza y selecciona otros objetos.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Para comprar esta parcela debes actualizar el visor.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Error al comprar: esta parcela no está en venta.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		No se puede comprar: el precio de venta o la superficie del terreno han cambiado.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		No eres el comprador autorizado de esta parcela.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		No puedes comprar esta parcela porque ya está en espera de una autorización de compra
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		No se pueden construir objetos aquí porque se desbordaría la parcela.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		Has seleccionado un terreno con propietarios diferentes. Selecciona un área más pequeña y repite la operación.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		La selección no contiene suficientes parcelas alquiladas para unirlas.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		No se puede dividir el terreno.\nHay varias parcelas seleccionadas.\nPrueba a seleccionar un terreno más pequeño.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		No se puede dividir el terreno.\nNo se encuentra la parcela.\nAvísanos con Ayuda -&gt; Notificar fallo...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		No se puede dividir el terreno. Está seleccionada la parcela completa.\nPrueba a seleccionar un terreno más pequeño.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		El terreno se ha dividido.
-	</notification>
-	<notification name="PassPurchased">
-		Has comprado un pase.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		La región no permite anuncios.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Tu pase para este terreno está a punto de caducar.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Esta superficie no es adecuada para sentarse, prueba en otro sitio.
-	</notification>
-	<notification name="CantSitNoRoom">
-		No hay sitio para sentarse aquí, prueba en otro lugar.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		Error al reclamar el objeto: no tienes permiso
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		Error al reclamar el objeto: no tienes suficientes L$.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		No se puede transferir un terreno propiedad de un grupo.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		Error al comprar el objeto, no tienes suficientes L$.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		Error al comprar el inventario: no tienes suficientes L$.
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		No tienes suficientes L$ para comprar un pase a este terreno.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		No se puede comprar el pase ahora mismo. Vuelve a intentarlo más tarde.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		No se puede crear el objeto porque \nla parcela está llena.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Error al colocar el objeto en el lugar especificado.  Vuelve a intentarlo.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		No se puede crear un hito para el evento.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		¡Tus superpoderes anulan la congelación!
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Error en la solicitud de poderes especiales. Esta solicitud se ha registrado.
-	</notification>
-	<notification name="ExpireExplanation">
-		El sistema actualmente no puede procesar tu solicitud. Ha expirado el tiempo de la solicitud.
-	</notification>
-	<notification name="DieExplanation">
-		El sistema no puede procesar tu solicitud.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		Dinero insuficiente para crear la primitiva.
-	</notification>
-	<notification name="RezObjectFailure">
-		Dinero insuficiente para crear el objeto.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Se ha restaurado la posición de origen, puesto que dicha posición no era válida.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		Actualmente no puedes invitar a nadie a tu ubicación, puesto que la región está llena. Vuelve a intentarlo más tarde.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Esta región no te permite configurar aquí tu lugar de origen.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		Tu &apos;Lugar de origen&apos; solo se puede configurar en tu terreno o en un punto de información del continente.
-	</notification>
-	<notification name="SetHomePosition">
-		Posición de origen ajustada.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		No se puede quitar el objeto por un error del inventario.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		No se puede crear el inventario solicitado.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		No se puede crear la carpeta de inventario solicitada.
-	</notification>
-	<notification name="CantCreateInventory">
-		No se puede crear el inventario.
-	</notification>
-	<notification name="CantCreateLandmark">
-		No se puede crear un hito.
-	</notification>
-	<notification name="CantCreateOutfit">
-		No se puede crear el vestuario en este momento. Prueba otra vez dentro de un minuto.
-	</notification>
-	<notification name="InventoryNotForSale">
-		El inventario no está en venta.
-	</notification>
-	<notification name="CantFindInvItem">
-		No se encuentra el objeto del inventario.
-	</notification>
-	<notification name="CantFindObject">
-		No se puede encontrar el objeto.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		En esta región actualmente no están activadas las transferencias de dinero a los objetos.
-	</notification>
-	<notification name="CantPayNoAgent">
-		No se ha averiguado a quién se debe pagar.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		No se pueden dar L$ a los objetos públicos.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Error al crear un inventario de objeto del mundo virtual.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Un error interno nos ha impedido actualizar tu visor correctamente. El saldo en L$ o las parcelas en propiedad presentadas en el visor podrían no coincidir con tu saldo real en los servidores.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		No se pueden crear prims grandes que intersectan a otros jugadores. Reinténtalo cuando se hayan movido otros jugadores.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Esto eliminará los registros de conversaciones anteriores y las copias de seguridad de ese archivo.
-		<usetemplate ignoretext="Confirmar antes de eliminar el registro de conversaciones anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Esta acción eliminará las transcripciones de todas las conversaciones anteriores. La lista de conversaciones pasadas no resultará afectada. Se eliminarán de la carpeta [FOLDER] todos los archivos que tengan el sufijo .txt y txt.backup.
-		<usetemplate ignoretext="Confirmar antes de eliminar transcripciones." name="okcancelignore" notext="Cancelar" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		No se pueden mover los archivos. Ruta anterior restaurada.
-		<usetemplate ignoretext="No se pueden mover los archivos. Ruta anterior restaurada." name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
index c73e34b299..5220df5d21 100644
--- a/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_avatar_list_item.xml
@@ -26,6 +26,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Este amigo puede editar, eliminar o manipular tus objetos"/>
 	<icon name="permission_map_icon" tool_tip="Este amigo puede encontrarte en el mapa"/>
 	<icon name="permission_online_icon" tool_tip="Este amigo puede ver cuándo estás conectado"/>
-	<button name="info_btn" tool_tip="Más información"/>
 	<button name="profile_btn" tool_tip="Ver el perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
index a3de14ae67..cddbad1195 100644
--- a/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/es/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Filtro" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Acciones en la persona o el objeto seleccionado"/>
-		<menu_button name="view_btn" tool_tip="Opciones de clasificación"/>
-		<menu_button name="plus_btn" tool_tip="Elige un residente o un objeto para ignorarlo"/>
-		<button name="unblock_btn" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
+	<text name="title_text">
+		Lista de ignorados
+	</text>
+	<scroll_list name="blocked" tool_tip="Lista de los residentes ignorados actualmente"/>
+	<button label="Ignorar al residente..." label_selected="Ignorar al residente..." name="Block resident..." tool_tip="Elige a un Residente para ignorarle"/>
+	<button label="Ignorar objetos según el nombre..." label_selected="Ignorar objetos según el nombre..." name="Block object by name..."/>
+	<button label="No ignorar" label_selected="No ignorar" name="Unblock" tool_tip="Quita al Residente o al objeto de la lista de ignorados"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
deleted file mode 100644
index cc4a7e951d..0000000000
--- a/indra/newview/skins/default/xui/es/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(cargando)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
deleted file mode 100644
index 2fc8cd3aff..0000000000
--- a/indra/newview/skins/default/xui/es/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="La conversación incluía voz"/>
-	<icon name="unread_ims_icon" tool_tip="Han llegado mensajes mientras no tenías conexión"/>
-	<button name="delete_btn" tool_tip="Quitar esta entrada"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_list_item.xml b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
index 4d682068d7..5c9f1c3688 100644
--- a/indra/newview/skins/default/xui/es/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Desconocido"/>
-	<button name="info_btn" tool_tip="Más información"/>
 	<button name="profile_btn" tool_tip="Ver el perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 7a7dfca0b8..a9d38dca25 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -14,53 +14,81 @@
 	<string name="no_filtered_friends_msg">
 		¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/people/[SEARCH_TERM] Buscar].
 	</string>
+	<string name="people_filter_label" value="Filtrar a la gente"/>
+	<string name="groups_filter_label" value="Filtrar a los grupos"/>
 	<string name="no_filtered_groups_msg" value="¿No encuentras lo que buscas? Prueba con [secondlife:///app/search/groups/[SEARCH_TERM] Buscar]."/>
 	<string name="no_groups_msg" value="¿Buscas grupos en que participar? Prueba la [secondlife:///app/search/groups Búsqueda]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Pulsa dos veces para abrir el mapa, pulsa mayús y arrastra para obtener una panorámica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Pulsa dos veces para teleportarte, pulsa mayús y arrastra para obtener una panorámica)"/>
+	<filter_editor label="Filtrar" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="CERCANA" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Filtrar la gente" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
-				<menu_button name="nearby_view_btn" tool_tip="Opciones de vista/orden"/>
-				<button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Opciones"/>
+				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
 			</panel>
 		</panel>
-		<panel label="AMIGOS" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Filtrar la gente" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
-				<menu_button name="friends_view_btn" tool_tip="Opciones de vista/orden"/>
-				<button name="friends_add_btn" tool_tip="Ofrecer amistad a un residente"/>
-				<dnd_button name="friends_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
-			</panel>
+		<panel label="MIS AMIGOS" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Conectado"/>
 				<accordion_tab name="tab_all" title="Todos"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="Ver más opciones"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Ofrecer amistad a un Residente"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Quitar a la persona seleccionada de tu lista de amigos"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="GRUPOS" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Filtrar los grupos" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Acciones en el grupo seleccionado"/>
-				<menu_button name="groups_view_btn" tool_tip="Opciones de vista/orden"/>
-				<menu_button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
-				<dnd_button name="minus_btn" tool_tip="Dejar el grupo seleccionado"/>
+		<panel label="MIS GRUPOS" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Opciones"/>
+				<button name="plus_btn" tool_tip="Entrar en un grupo o crear uno"/>
+				<button name="activate_btn" tool_tip="Activar el grupo seleccionado"/>
 			</panel>
 		</panel>
 		<panel label="RECIENTE" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Filtrar la gente" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Acciones en la persona seleccionada"/>
-				<menu_button name="recent_view_btn" tool_tip="Opciones de vista/orden"/>
-				<button name="add_friend_btn" tool_tip="Ofrecer amistad a un residente"/>
-				<dnd_button name="recent_del_btn" tool_tip="Quitar la persona seleccionada de la lista de amigos"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Opciones"/>
+				<button name="add_friend_btn" tool_tip="Añadir al Residente seleccionado a la lista de tus amigos"/>
 			</panel>
 		</panel>
-		<panel label="BLOQUEADO" name="blocked_panel">
-			<panel label="Residentes y objetos ignorados" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Perfil" name="view_profile_btn" tool_tip="Mostrar imágenes, grupos y otra información del Residente"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="MI" name="im_btn" tool_tip="Abrir una sesión de mensajes instantáneos"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Llamar" name="call_btn" tool_tip="Llamar a este Residente"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Compartir" name="share_btn" tool_tip="Compartir un objeto del inventario"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Teleporte" name="teleport_btn" tool_tip="Ofrecer teleporte"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Perfil del grupo" name="group_info_btn" tool_tip="Ver la información del grupo"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Chat de grupo" name="chat_btn" tool_tip="Abrir el chat"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Llamar al grupo" name="group_call_btn" tool_tip="Llama a este grupo"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index 28bc98f988..b0b6114e88 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat de texto" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
-		<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
-		<check_box label="Sólo pueden llamarme o mandarme un MI mis amigos y grupos" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Tamaño de la fuente:
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Pequeña" name="Small" value="0"/>
-			<item label="Mediana" name="Medium" value="1"/>
-			<item label="Grande" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Notificaciones
-		</text>
-		<text name="friend_ims">
-			MI de amigos:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
-			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			MI de no amigos:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
-			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
-		</combo_box>
-		<text name="conference_ims">
-			MI de conferencia:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
-			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
-		</combo_box>
-		<text name="group_chat">
-			Chat de grupo:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
-			<item label="Botón de la barra de herramientas de Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Chat:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Ventana Conversaciones abiertas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mensaje en ventana emergente" name="PopUpMessage" value="toast"/>
-			<item label="Botón de la barra de herramientas de Flash" name="FlashToolBarButton" value="flash"/>
-			<item label="Ninguno" name="None" value="ninguno"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Para suspender provisionalmente todas las notificaciones, usa Comunicarme &gt; No molestar.
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Reproducir sonido:
-		</text>
-		<check_box label="Nueva conversación" name="new_conversation"/>
-		<check_box label="Llamada de voz entrante" name="incoming_voice_call"/>
-		<check_box label="Oferta de teleporte" name="teleport_offer"/>
-		<check_box label="Oferta de inventario" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Limpiar el registro..." name="clear_log"/>
-		<button label="Eliminar transcripciones..." name="delete_transcripts"/>
-		<button label="Examinar..." label_selected="Examinar" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Tamaño de la fuente:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Disminuir" name="radio" value="0"/>
+		<radio_item label="Medio" name="radio2" value="1"/>
+		<radio_item label="Aumentar" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/>
+	<check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/>
+	<check_box label="Permitir el historial de MI y chat en texto sin formato" name="plain_text_chat_history"/>
+	<check_box label="Bocadillos del chat" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		Mostrar los MI en:
+	</text>
+	<text name="requires_restart_label">
+		(requiere reiniciar)
+	</text>
+	<radio_group name="chat_window" tool_tip="Muestra tus mensajes instantáneos en varias ventanas flotantes o en una sola con varias pestañas (requiere que reinicies)">
+		<radio_item label="Ventanas distintas" name="radio" value="0"/>
+		<radio_item label="Pestañas" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Permitir ventanas de chat emergentes:
+	</text>
+	<check_box label="Chats de grupo" name="EnableGroupChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje de un grupo de chat"/>
+	<check_box label="Chats de MI" name="EnableIMChatPopups" tool_tip="Activa esta casilla para ver una ventana emergente cada vez que recibas un mensaje instantáneo"/>
+	<spinner label="Duración de los interlocutores favoritos:" name="nearby_toasts_lifetime"/>
+	<spinner label="Tiempo de los otros interlocutores:" name="nearby_toasts_fadingtime"/>
 	<button label="Traducción…" name="ok_btn"/>
 	<button label="Reemplazo automático..." name="autoreplace_showgui"/>
 	<button label="Revisión ortográfica..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index 98b0081da9..4fc163f5b6 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -69,9 +69,6 @@
 		<combo_box.item label="nunca" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Respuesta de No molestar:
+		Respuesta cuando estoy en modo ocupado:
 	</text>
-	<text_editor name="do_not_disturb_response">
-		log_in_to_change
-	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
index cb061796e7..9da2958953 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Comprar el objeto" name="Buyobject"/>
 			<combo_box.item label="Pagar el objeto" name="Payobject"/>
 			<combo_box.item label="Abrir" name="Open"/>
-			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 937433e210..52bcab54e5 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -128,7 +128,7 @@
 		Salir
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=es-ES&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
@@ -610,8 +610,8 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="AvatarAway">
 		Ausente
 	</string>
-	<string name="AvatarDoNotDisturb">
-		No molestar
+	<string name="AvatarBusy">
+		Ocupado
 	</string>
 	<string name="AvatarMuted">
 		Ignorado
@@ -844,12 +844,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ST_NO_JOINT">
 		No se puede encontrar ROOT o JOINT.
 	</string>
-	<string name="NearbyChatTitle">
-		Chat
-	</string>
-	<string name="NearbyChatLabel">
-		(Chat)
-	</string>
 	<string name="whisper">
 		susurra:
 	</string>
@@ -913,9 +907,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="ControlYourCamera">
 		Controlar su cámara
 	</string>
-	<string name="AgentNameSubst">
-		(Tú)
-	</string>
 	<string name="TeleportYourAgent">
 		Teleportarte
 	</string>
@@ -1000,6 +991,18 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="dictionary_files">
 		Diccionarios
 	</string>
+	<string name="AvatarSetNotAway">
+		Salir del estado ausente
+	</string>
+	<string name="AvatarSetAway">
+		Pasar al estado ausente
+	</string>
+	<string name="AvatarSetNotBusy">
+		Salir del estado ocupado
+	</string>
+	<string name="AvatarSetBusy">
+		Pasar al estado ocupado
+	</string>
 	<string name="shape">
 		Forma
 	</string>
@@ -1956,8 +1959,8 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="PanelContentsNewScript">
 		Script nuevo
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Este residente tiene activado &apos;No molestar&apos; y verá tu mensaje más tarde.
+	<string name="BusyModeResponseDefault">
+		El Residente al que has enviado un mensaje ha solicitado que no se le moleste porque está en modo ocupado. Podrá ver tu mensaje más adelante, ya que éste aparecerá en su panel de MI.
 	</string>
 	<string name="MuteByName">
 		(Por el nombre)
@@ -2070,6 +2073,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		Contenidos
+	</string>
 	<string name="AcquiredItems">
 		Artículos adquiridos
 	</string>
@@ -3787,7 +3793,7 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 		Región General
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Los avatares que están en esta parcela no pueden ser vistos ni escuchados por los que están fuera de ella
+		Los avatares están visibles y está permitido el chat fuera de esta parcela
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Los objetos que se mueven pueden presentar un comportamiento incorrecto en la región hasta que ésta se recargue.
@@ -3861,12 +3867,6 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="Saved_message">
 		(Guardado [LONG_TIMESTAMP])
 	</string>
-	<string name="OnlineStatus">
-		Conectado/a
-	</string>
-	<string name="OfflineStatus">
-		Desconectado/a
-	</string>
 	<string name="answered_call">
 		Han respondido a tu llamada
 	</string>
@@ -3876,9 +3876,6 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Has entrado en la llamada de voz
 	</string>
-	<string name="you_auto_rejected_call-im">
-		Rechazaste la llamada de voz automáticamente porque estaba activado &apos;No molestar&apos;.
-	</string>
 	<string name="name_started_call">
 		[NAME] inició una llamada de voz
 	</string>
@@ -3891,9 +3888,6 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Se colgó la llamada de voz
 	</string>
-	<string name="conference-title">
-		Chat multi-persona
-	</string>
 	<string name="conference-title-incoming">
 		Conferencia con [AGENT_NAME]
 	</string>
@@ -4772,9 +4766,6 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
-	<string name="Command_Conversations_Label">
-		Conversaciones
-	</string>
 	<string name="Command_Compass_Label">
 		Brújula
 	</string>
@@ -4850,9 +4841,6 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Command_Chat_Tooltip">
 		Habla por chat de texto con las personas próximas
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Conversar con todos
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Brújula
 	</string>
@@ -4982,13 +4970,4 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="UserDictionary">
 		[Usuario]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		No se están registrando las conversaciones. Para empezar a grabar un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		No se registrarán más conversaciones. Para reanudar la grabación de un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		No hay conversaciones grabadas. Después de contactar con una persona, o de que alguien contacte contigo, aquí se mostrará una entrada de registro.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_log.xml b/indra/newview/skins/default/xui/fr/floater_conversation_log.xml
deleted file mode 100644
index e9017c79b1..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="JOURNAL DES CONVERSATIONS">
-	<panel name="buttons_panel">
-		<filter_editor label="Filtrer les personnes" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Actions sur la personne ou le groupe sélectionné"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
deleted file mode 100644
index 9a486a84c6..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="CONVERSATION:">
-	<floater.string name="Title">
-		CONVERSATION: [NAME]
-	</floater.string>
-	<text name="page_label" value="Page"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_container.xml b/indra/newview/skins/default/xui/fr/floater_im_container.xml
index f0b17e8437..5ea073365e 100644
--- a/indra/newview/skins/default/xui/fr/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSATIONS">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Options d&apos;affichage/de tri"/>
-					<button name="add_btn" tool_tip="Commencer une nouvelle conversation"/>
-					<button name="speak_btn" tool_tip="Parler aux personnes en utilisant votre micro"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Réduire/Développer cette liste"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Réduire ce panneau"/>
-					<text name="stub_textbox">
-						Cette conversation s&apos;affiche dans une fenêtre distincte.   [secondlife:/// la rattacher.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="CONVERSATIONS"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_im_session.xml b/indra/newview/skins/default/xui/fr/floater_im_session.xml
index 8ab98b8e4e..516eb41362 100644
--- a/indra/newview/skins/default/xui/fr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] a été invité à la conversation."/>
-	<floater.string name="multiple_participants_added" value="[NAME] ont été invités à la conversation."/>
-	<floater.string name="tooltip_to_separate_window" value="Déplacer cette conversation dans une fenêtre distincte"/>
-	<floater.string name="tooltip_to_main_window" value="Replacer cette conversation dans la fenêtre principale"/>
-	<floater.string name="start_call_button_tooltip" value="Ouvrir une connexion vocale"/>
-	<floater.string name="end_call_button_tooltip" value="Fermer la connexion vocale"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Réduire ce panneau"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Réduire la liste des participants"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Développer la liste des participants"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Options d&apos;affichage/de tri"/>
-				<menu_button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
-				<button name="add_btn" tool_tip="Ajouter un participant à cette conversation"/>
-				<button name="voice_call_btn" tool_tip="Ouvrir une connexion vocale"/>
-				<button name="close_btn" tool_tip="Mettre fin à cette conversation"/>
-				<button name="expand_collapse_btn" tool_tip="Réduire/Développer ce panneau"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Traduire le chat" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="À" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Affiche/Masque le panneau des messages"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="À" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
index 9e6946ba9e..7594eec5f2 100644
--- a/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/fr/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonyme
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		vous appelle.
+		appelle.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		a rejoint un chat vocal avec conférence.
@@ -25,9 +25,9 @@
 		Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ?
 	</floater.string>
 	<text name="question">
-		Si vous répondez, vous serez déconnecté de votre conversation vocale actuelle.
+		Voulez-vous quitter [CURRENT_CHAT] et rejoindre ce chat vocal ?
 	</text>
-	<button label="Répondre" label_selected="Répondre" name="Accept"/>
-	<button label="Ignorer" label_selected="Ignorer" name="Reject"/>
-	<button label="Ouvrir IM à la place" name="Start IM"/>
+	<button label="Accepter" label_selected="Accepter" name="Accept"/>
+	<button label="Refuser" label_selected="Refuser" name="Reject"/>
+	<button label="Lancer IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
index 0bcf55aba5..02d969dc08 100644
--- a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Afficher :
 			</text>
-			<check_box label="Test" name="show_world"/>
+			<check_box label="Monde" name="show_world"/>
 			<check_box label="Mobiles uniquement" name="show_world_movables_only"/>
 			<check_box label="Maillage de navigation" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index eace67026c..f86c1a4217 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
 	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
 	<button bottom="-240" label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Aperçu direct" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Aperçu désactivé"/>
 	<filter_editor label="Filtrer les textures" name="inventory search editor"/>
 	<check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
deleted file mode 100644
index f4f452eea7..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="VOLUME DU CHAT VOCAL">
-	<slider label="Chat vocal" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
index f9a76d127e..671fb5c14d 100644
--- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Endroits" name="voice_effects" title="APERÇU DES EFFETS DE VOIX">
+<floater label="Endroits" name="voice_effects" title="EFFET DE VOIX">
 	<string name="no_voice_effect">
 		(Aucun effet de voix)
 	</string>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_volume.xml b/indra/newview/skins/default/xui/fr/floater_voice_volume.xml
deleted file mode 100644
index bf91a5bb79..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="VOLUME DE LA VOIX">
-	<slider name="volume_slider" tool_tip="Volume de la voix" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
index fea0486d8a..8276d57025 100644
--- a/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear COF">
+<menu name="Gear COF">
 	<menu label="Nouveaux habits" name="COF.Gear.New_Clothes"/>
-	<menu label="Nouvelles parties du corps" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+	<menu label="Nouvelles parties du corps" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation.xml b/indra/newview/skins/default/xui/fr/menu_conversation.xml
deleted file mode 100644
index 857ead603b..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Fermer la conversation" name="close_conversation"/>
-	<menu_item_call label="Ouvrir une conversation vocale" name="open_voice_conversation"/>
-	<menu_item_call label="Se déconnecter de la conversation et du canal vocal" name="disconnect_from_voice"/>
-	<menu_item_call label="Voir le profil" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
-	<menu_item_call label="Appel" name="voice_call"/>
-	<menu_item_call label="Historique du chat..." name="chat_history"/>
-	<menu_item_call label="Devenir amis" name="add_friend"/>
-	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
-	<menu_item_call label="Supprimer ces amis" name="remove_friends"/>
-	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
-	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
-	<menu_item_call label="Carte" name="map"/>
-	<menu_item_call label="Partager" name="share"/>
-	<menu_item_call label="Payer" name="pay"/>
-	<menu_item_check label="Bloquer le chat vocal" name="block_unblock"/>
-	<menu_item_check label="Ignorer le texte" name="MuteText"/>
-	<menu_item_call label="Profil du groupe" name="group_profile"/>
-	<menu_item_call label="Activer le groupe" name="activate_group"/>
-	<menu_item_call label="Quitter le groupe" name="leave_group"/>
-	<context_menu label="Options du modérateur" name="Moderator Options">
-		<menu_item_check label="Autoriser les chats écrits" name="AllowTextChat"/>
-		<menu_item_call label="Ignorer ce participant" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Ne plus ignorer ce participant" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Ignorer les autres" name="ModerateVoiceMute"/>
-		<menu_item_call label="Ne plus ignorer les autres" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
deleted file mode 100644
index 4e7e84199d..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM..." name="IM"/>
-	<menu_item_call label="Appel..." name="Call"/>
-	<menu_item_call label="Ouvrir l&apos;historique du chat..." name="Chat history"/>
-	<menu_item_call label="Voir le profil" name="View Profile"/>
-	<menu_item_call label="Téléporter" name="teleport"/>
-	<menu_item_call label="Devenir amis" name="add_friend"/>
-	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
-	<menu_item_call label="Inviter dans le groupe..." name="Invite"/>
-	<menu_item_call label="Carte" name="Map"/>
-	<menu_item_call label="Partager" name="Share"/>
-	<menu_item_call label="Payer" name="Pay"/>
-	<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
deleted file mode 100644
index c515a8e8e5..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Trier par nom" name="sort_by_name"/>
-	<menu_item_check label="Trier par date" name="sort_by_date"/>
-	<menu_item_check label="Trier avec les amis en haut" name="sort_by_friends"/>
-	<menu_item_call label="Afficher l&apos;historique du Chat près de moi" name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_conversation.xml b/indra/newview/skins/default/xui/fr/menu_im_conversation.xml
deleted file mode 100644
index 1ec5910c8f..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Voir le profil" name="View Profile"/>
-	<menu_item_call label="Devenir amis" name="Add Friend"/>
-	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
-	<menu_item_call label="Proposer une téléportation." name="offer_teleport"/>
-	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
-	<menu_item_call label="Historique du chat..." name="chat_history"/>
-	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
-	<menu_item_call label="Carte" name="map"/>
-	<menu_item_call label="Partager" name="Share"/>
-	<menu_item_call label="Payer" name="Pay"/>
-	<menu_item_check label="Bloquer le chat vocal" name="Block/Unblock"/>
-	<menu_item_check label="Ignorer le texte" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
deleted file mode 100644
index 03a091d1cc..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Vue compacte" name="compact_view"/>
-	<menu_item_check label="Vue développée" name="expanded_view"/>
-	<menu_item_check label="Afficher l’heure" name="IMShowTime"/>
-	<menu_item_check label="Afficher les noms dans les conversations privées" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_object_icon.xml b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
index 7c94930160..69f8e88a0d 100644
--- a/indra/newview/skins/default/xui/fr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Profil de l&apos;objet..." name="Object Profile"/>
 	<menu_item_call label="Ignorer..." name="Block"/>
-	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
-	<menu_item_call label="Me téléporter à l’emplacement de l&apos;objet" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
index 21b19eded6..b5181f4f82 100644
--- a/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/fr/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Nouveaux cheveux" name="New Hair"/>
 		<menu_item_call label="Nouveaux yeux" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Développer tous les dossiers" name="expand"/>
-	<menu_item_call label="Réduire tous les dossiers" name="collapse"/>
 	<menu_item_call label="Renommer la tenue" name="rename"/>
 	<menu_item_call label="Supprimer la tenue" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_participant_view.xml b/indra/newview/skins/default/xui/fr/menu_participant_view.xml
deleted file mode 100644
index 1811082c84..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Trier les conversations par type" name="sort_sessions_by_type"/>
-	<menu_item_check label="Trier les conversations par nom" name="sort_sessions_by_name"/>
-	<menu_item_check label="Trier les conversations par activité récente" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Trier les participants par nom" name="sort_participants_by_name"/>
-	<menu_item_check label="Trier les participants par activité récente" name="sort_participants_by_recent"/>
-	<menu_item_call label="Préférences pour le chat..." name="chat_preferences"/>
-	<menu_item_call label="Préférences pour la confidentialité" name="privacy_preferences"/>
-	<menu_item_check label="Journal des conversations..." name="Conversation"/>
-	<menu_item_check label="Traduire le Chat près de moi" name="Translate_chat"/>
-	<menu_item_check label="Paramètres de traduction" name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
deleted file mode 100644
index 47589572c2..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="Ne plus ignorer" name="unblock"/>
-	<menu_item_call label="Profil..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
deleted file mode 100644
index 79880dd16d..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Ignorer un résident par son nom…" name="block_resident_by_name"/>
-	<menu_item_call label="Ignorer un objet par son nom" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
deleted file mode 100644
index 13f1575090..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Trier par nom" name="sort_by_name"/>
-	<menu_item_check label="Trier par type" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
deleted file mode 100644
index cc81172462..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Trier par nom" name="sort_name"/>
-	<menu_item_check label="Trier par statut" name="sort_status"/>
-	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
-	<menu_item_check label="Afficher les droits octroyés" name="view_permissions"/>
-	<menu_item_check label="Afficher le journal des conversations..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups.xml b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
index 8e32f065fa..eb51b4cf7e 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Afficher les infos" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Appel" name="Call"/>
+	<menu_item_call label="Appeler" name="Call"/>
 	<menu_item_call label="Activer" name="Activate"/>
 	<menu_item_call label="Quitter" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
deleted file mode 100644
index 79ede5e22d..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Afficher les icônes des groupes" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
index 6f7d02ef74..26bd3978a9 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Voir le profil" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Téléporter" name="offer_teleport"/>
-	<menu_item_call label="Appel" name="voice_call"/>
-	<menu_item_call label="Afficher l&apos;historique du chat..." name="chat_history"/>
-	<menu_item_call label="Devenir amis" name="add_friend"/>
-	<menu_item_call label="Supprimer cet ami" name="remove_friend"/>
-	<menu_item_call label="Inviter dans le groupe..." name="invite_to_group"/>
-	<menu_item_call label="Zoomer en avant" name="zoom_in"/>
-	<menu_item_call label="Carte" name="map"/>
-	<menu_item_call label="Partager" name="share"/>
-	<menu_item_call label="Payer" name="pay"/>
-	<menu_item_check label="Ignorer/Ne plus ignorer" name="block_unblock"/>
+	<menu_item_call label="Voir le profil" name="View Profile"/>
+	<menu_item_call label="Devenir amis" name="Add Friend"/>
+	<menu_item_call label="Supprimer cet ami" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Appeler" name="Call"/>
+	<menu_item_call label="Carte" name="Map"/>
+	<menu_item_call label="Partager" name="Share"/>
+	<menu_item_call label="Payer" name="Pay"/>
+	<menu_item_check label="Ignorer/Ne plus ignorer" name="Block/Unblock"/>
+	<menu_item_call label="Proposer une téléportation" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
index 37abf831c2..8400ec0a14 100644
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/fr/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Devenir amis" name="add_friends"/>
-	<menu_item_call label="Supprimer des amis" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Appeler" name="call"/>
-	<menu_item_call label="Partager" name="share"/>
-	<menu_item_call label="Payer" name="pay"/>
-	<menu_item_call label="Téléporter" name="offer_teleport"/>
+	<menu_item_call label="Devenir amis" name="Add Friends"/>
+	<menu_item_call label="Supprimer des amis" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Appeler" name="Call"/>
+	<menu_item_call label="Partager" name="Share"/>
+	<menu_item_call label="Payer" name="Pay"/>
+	<menu_item_call label="Proposer une téléportation" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
deleted file mode 100644
index 086002dce5..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Trier par intervenants récents" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Trier par nom" name="sort_name"/>
-	<menu_item_check label="Trier par distance" name="sort_distance"/>
-	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
-	<menu_item_check label="Afficher la carte" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
deleted file mode 100644
index a7d698ab7c..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Trier en commençant par le plus récent" name="sort_most"/>
-	<menu_item_check label="Trier par nom" name="sort_name"/>
-	<menu_item_check label="Afficher les icônes des résidents" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_agent.xml b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
index d701b3a414..5ed627fbc3 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Voir le profil" name="show_agent"/>
-	<menu_item_call label="Envoyer IM..." name="send_im"/>
-	<menu_item_call label="Devenir amis..." name="add_friend"/>
+	<menu_item_call label="Voir le profil du résident" name="show_agent"/>
 	<menu_item_call label="Copier le nom dans le presse-papiers" name="url_copy_label"/>
 	<menu_item_call label="Copier la SLurl dans le presse-papiers" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
index 0a934d3e69..f581c3ef9d 100644
--- a/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/fr/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Profil de l&apos;objet…" name="show_object"/>
+	<menu_item_call label="Afficher les informations sur l&apos;objet" name="show_object"/>
 	<menu_item_call label="Voir sur la carte" name="show_on_map"/>
 	<menu_item_call label="Me téléporter à l&apos;emplacement de l&apos;objet" name="teleport_to_object"/>
 	<menu_item_call label="Copier le nom de l&apos;objet dans le presse-papiers" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 457b756c7d..85020afe25 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Arrêter mon animation" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Marcher / Courir / Voler..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Statut" name="Status"/>
+		<menu label="Statut" name="Status">
+			<menu_item_call label="Absent" name="Set Away"/>
+			<menu_item_call label="Occupé" name="Set Busy"/>
+		</menu>
 		<menu_item_call label="Acheter des L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Boîte d&apos;envoi vendeur..." name="MerchantOutbox"/>
 		<menu_item_call label="Page d&apos;accueil du compte..." name="Manage My Account">
@@ -29,18 +32,14 @@
 		<menu_item_call label="Quitter [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Communiquer" name="Communicate">
-		<menu_item_check label="Conversations..." name="Conversations"/>
-		<menu_item_check label="Chat près de moi..." name="Nearby Chat"/>
+		<menu_item_check label="Chat..." name="Nearby Chat"/>
 		<menu_item_check label="Parler" name="Speak"/>
-		<menu label="Effet de voix" name="VoiceMorphing">
-			<menu_item_check label="Aucun effet de voix" name="NoVoiceMorphing"/>
-			<menu_item_check label="Aperçu..." name="Preview"/>
-			<menu_item_call label="S&apos;abonner..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Paramètres vocaux..." name="Nearby Voice"/>
+		<menu_item_check label="Effet de voix..." name="ShowVoice"/>
 		<menu_item_check label="Gestes..." name="Gestures"/>
-		<menu_item_check label="Amis" name="My Friends"/>
-		<menu_item_check label="Groupes" name="My Groups"/>
-		<menu_item_check label="Personnes près de vous" name="Active Speakers"/>
+		<menu_item_call label="Amis" name="My Friends"/>
+		<menu_item_call label="Groupes" name="My Groups"/>
+		<menu_item_call label="Personnes près de vous" name="Active Speakers"/>
 		<menu_item_call label="Liste des ignorés" name="Block List"/>
 	</menu>
 	<menu label="Monde" name="World">
@@ -116,6 +115,7 @@
 			<menu_item_call label="Acheter" name="Menu Object Buy"/>
 			<menu_item_call label="Prendre" name="Menu Object Take"/>
 			<menu_item_call label="Prendre une copie" name="Take Copy"/>
+			<menu_item_call label="Enregistrer dans mon inventaire" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Enregistrer dans le contenu des objets" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Renvoi de l&apos;objet" name="Return Object back to Owner"/>
 		</menu>
@@ -130,7 +130,6 @@
 			<menu_item_call label="Groupes de liens..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personnages..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Vue / test..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Refiger la région" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Options" name="Options">
 			<menu_item_check label="Afficher les droits avancés" name="DebugPermissions"/>
@@ -160,13 +159,6 @@
 	<menu label="Aide" name="Help">
 		<menu_item_call label="Aide rapide..." name="How To"/>
 		<menu_item_call label="Aide de [SECOND_LIFE]" name="Second Life Help"/>
-		<menu_item_call label="Guide de l&apos;utilisateur" name="User’s guide"/>
-		<menu_item_call label="Base de connaissances" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Forums de la communauté" name="Community Forums"/>
-		<menu_item_call label="Portail d&apos;assistance" name="Support portal"/>
-		<menu_item_call label="Actualités [SECOND_LIFE]" name="Second Life News"/>
-		<menu_item_call label="Blogs [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Signaler une infraction" name="Report Abuse"/>
 		<menu_item_call label="Signaler un bug" name="Report Bug"/>
 		<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
@@ -393,14 +385,9 @@
 				<menu_item_call label="Test femme" name="Test Female"/>
 				<menu_item_check label="Autoriser la sélection de l&apos;avatar" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Vitesse d&apos;animation" name="Animation Speed">
-				<menu_item_call label="Toutes les animations 10 % plus rapides" name="All Animations 10 Faster"/>
-				<menu_item_call label="Toutes les animations 10 % plus lentes" name="All Animations 10 Slower"/>
-				<menu_item_call label="Réinitialiser la vitesse de toutes les animations" name="Reset All Animation Speed"/>
-				<menu_item_check label="Animations au ralenti" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Forcer les paramètres par défaut" name="Force Params to Default"/>
 			<menu_item_check label="Infos sur l&apos;animation" name="Animation Info"/>
+			<menu_item_check label="Animations au ralenti" name="Slow Motion Animations"/>
 			<menu_item_check label="Afficher la direction du regard" name="Show Look At"/>
 			<menu_item_check label="Afficher la direction du pointeur" name="Show Point At"/>
 			<menu_item_check label="Débogages des mises à jour" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index e73cc6e6e0..30154d1873 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -515,24 +515,6 @@ Consulter [_URL] pour en savoir plus ?
 		</url>
 		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		Il existe probablement un pilote plus récent pour votre puce graphique.  La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
-
-    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		Il existe probablement un pilote plus récent pour votre puce graphique.  La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
-
-    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=fr
-		</url>
-		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
-	</notification>
 	<notification name="UnknownGPU">
 		Votre système contient une carte graphique que [APP_NAME] ne reconnaît pas.
 Cela est souvent le cas avec le nouveau matériel qui n&apos;a pas encore été testé avec [APP_NAME].  Cela ne posera probablement pas de problème, mais vous devrez peut-être ajuster vos paramètres graphiques.
@@ -1561,13 +1543,10 @@ Quitter le groupe ?
 		Impossible de proposer votre amitié actuellement. Veuillez réessayer dans un moment.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Ne pas déranger est activé.  Vous ne recevrez pas les notifications de communications entrantes.
-
-- Les autres résidents recevront votre réponse Ne pas déranger (définie dans Préférences &gt; Général).
-- Toutes les offres de téléportation seront refusées.
-- Les appels vocaux seront refusés.
-		<usetemplate ignoretext="J&apos;ai changé mon statut et suis désormais en mode Ne pas déranger." name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		Le mode Occupé est sélectionné.
+Les chats et les messages instantanés ne s&apos;afficheront pas. Les messages instantanés génèreront la réponse en mode occupé que vous avez créée. Toutes les offres de téléportation seront refusées. Toutes les offres d&apos;inventaire iront dans la corbeille.
+		<usetemplate ignoretext="Je change mon statut en mode Occupé" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Vous avez atteint le nombre de groupes maximum. Avant de pouvoir rejoindre ce groupe, vous devez en quitter un ou refuser cette offre.
@@ -2054,10 +2033,6 @@ Déplacer les objets de l&apos;inventaire ?
 		Accéder à votre [http://secondlife.com/account/ Page d&apos;accueil] pour consulter l&apos;historique de votre compte ?
 		<usetemplate ignoretext="Lancer mon navigateur pour consulter l&apos;historique de mon compte" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		Quand vous ajoutez une personne à une conversation existante, une nouvelle conversation est créée.  Tous les participants recevront les notifications de nouvelle conversation.
-		<usetemplate ignoretext="Confirmer l&apos;ajout de participants au chat" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		Êtes-vous certain de vouloir quitter ?
 		<usetemplate ignoretext="Confirmer avant de quitter" name="okcancelignore" notext="Ne pas quitter" yestext="Quitter"/>
@@ -2132,14 +2107,14 @@ Voulez-vous le remplacer par l&apos;objet sélectionné ?
 			<button ignore="Ne jamais remplacer" name="No" text="Annuler"/>
 		</form>
 	</notification>
-	<notification label="Avertissement de mode Ne pas déranger" name="DoNotDisturbModePay">
-		Vous avez activé Ne pas déranger. Vous ne recevrez aucun article proposé en échange de ce paiement.
+	<notification label="Réponse si occupé(e)" name="BusyModePay">
+		Vous êtes en mode occupé et vous ne recevrez donc aucun objet en échange de ce paiement.
 
-Voulez-vous désactiver Ne pas déranger avant de terminer cette transaction ?
+Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ?
 		<form name="form">
-			<ignore name="ignore" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Ne pas déranger"/>
-			<button ignore="Toujours quitter le mode Ne pas déranger" name="Yes" text="OK"/>
-			<button ignore="Ne jamais quitter le mode Ne pas déranger" name="No" text="Annuler"/>
+			<ignore name="ignore" save_option="true" text="Je suis sur le point de payer une personne ou un objet mais suis en mode Occupé"/>
+			<button ignore="Toujours quitter le mode occupé" name="Yes" text="OK"/>
+			<button ignore="Ne jamais quitter le mode occupé" name="No" text="Annuler"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2274,8 +2249,11 @@ Liez-la à partir d&apos;une page web pour permettre aux autres résidents d&apo
 	<notification name="GroupNotice">
 		Sujet : [SUBJECT], Message : [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est en ligne
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; est hors ligne
 	</notification>
 	<notification name="AddSelfFriend">
 		Même si vous êtes extrêmement sympathique, vous ne pouvez pas devenir ami avec vous-même.
@@ -2504,6 +2482,13 @@ Vous ne pouvez pas voler ici.
 	<notification name="DynamicPathfindingDisabled">
 		La recherche de chemin dynamique n&apos;est pas activée dans cette région. Il se peut que les objets scriptés utilisant des appels LSL de recherche de chemin ne fonctionnent pas comme prévu pour cette région.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		La modification de certains objets de cette région risque d&apos;entraîner un comportement incorrect des autres objets mobiles. Pour que les objets mobiles se comportent correctement, cliquez sur Refiger la région. Pour plus d&apos;informations, choisissez Aide.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Aide" ignoretext="La modification de certains objets de cette région risque d&apos;entraîner un comportement incorrect des autres objets mobiles." name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Une erreur est survenue. Un problème réseau ou serveur s&apos;est peut-être produit ou vous ne disposez pas de droits de construction. Se déconnecter puis se reconnecter permet parfois de résoudre le problème.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2766,7 +2751,7 @@ Acceptez-vous ?
 	<notification name="ScriptQuestionCaution">
 		Avertissement : l&apos;objet &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt; souhaite un accès total à votre compte en Linden dollars. Si vous autorisez cet accès, il pourra supprimer des fonds de votre compte à tout moment ou le vider entièrement de façon continue sans avis préalable.
   
-N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l&apos;objet souhaite accéder à votre compte.
+Il est rare qu&apos;une telle demande soit légitime. N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l&apos;objet souhaite accéder à votre compte.
 		<form name="form">
 			<button name="Grant" text="Permettre un accès total"/>
 			<button name="Deny" text="Refuser"/>
@@ -3347,633 +3332,4 @@ Désactivation des mises à jour futures de ce fichier...
 		Vous allez supprimer [NUM_ITEMS] articles. Voulez-vous vraiment continuer ?
 		<usetemplate ignoretext="Voulez-vous vraiment supprimer plusieurs articles ?" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] vous a figé. Vous ne pouvez pas bouger ni interagir avec le monde.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] vous a figé pour une durée de [AV_FREEZE_TIME] secondes. Vous ne pouvez pas bouger ni interagir avec le monde.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Avatar figé.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] vous a libéré.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Avatar libéré.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		Vous n&apos;avez pas pu figer ce que vous vouliez car vous ne disposez pas des droits d&apos;admin pour cette parcelle.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		Vous n&apos;êtes plus figé, vous pouvez reprendre votre vie.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Impossible de figer cet utilisateur.
-	</notification>
-	<notification name="NowOwnObject">
-		Vous êtes désormais le propriétaire de l&apos;objet [OBJECT_NAME].
-	</notification>
-	<notification name="CantRezOnLand">
-		Impossible de rezzer l&apos;objet à [OBJECT_POS] car le propriétaire de ce terrain de l&apos;autorise pas.  Utilisez l&apos;outil Terrain pour voir à qui appartiennent les terrains.
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		Impossible de rezzer l&apos;objet car il y a trop de demandes.
-	</notification>
-	<notification name="SitFailCantMove">
-		Vous ne pouvez pas vous asseoir car vous ne pouvez actuellement pas bouger.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		Vous ne pouvez pas vous asseoir car votre présence sur ce terrain n&apos;est pas autorisée.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Essayez de vous rapprocher.  Impossible de vous asseoir sur l&apos;objet car
-il ne se trouve pas dans la même région que vous.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		Création d&apos;un nouvel objet impossible. La région est pleine.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		Vous ne pouvez pas créer d&apos;arbres ni d&apos;herbe sur un terrain qui ne vous appartient pas.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		Échec de la copie car vous ne disposez pas des droits requis pour copier l&apos;objet [OBJ_NAME].
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		Échec de la copie car l&apos;objet [OBJ_NAME] ne peut pas vous être transféré.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		Échec de la copie car l&apos;objet [OBJ_NAME] contribue au maillage de navigation.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Dupliquer sans objet racine sélectionné
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		Impossible de dupliquer les objets car la région est pleine.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		Impossible de dupliquer les objets - la parcelle sur laquelle ils sont est introuvable.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		Création de l&apos;objet impossible car 
-la parcelle est pleine.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Échec d&apos;une tentative pour rezzer un objet.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		Impossible de créer l&apos;article qui a provoqué des problèmes pour cette région.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		Cet article d&apos;inventaire a été placé sur liste noire.
-	</notification>
-	<notification name="NoCanRezObjects">
-		Vous n&apos;êtes actuellement pas autorisé à créer des objets.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Recherche de terrain bloquée.
-Vous avez effectué trop de recherches de terrain trop rapidement.
-Veuillez réessayer dans une minute.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		Ressources de script insuffisantes pour attacher cet objet.
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Vous êtes mort et avez été téléporté à votre domicile.
-	</notification>
-	<notification name="EjectComingSoon">
-		Votre présence ici n&apos;est plus autorisée et vous disposez de [EJECT_TIME] secondes pour partir.
-	</notification>
-	<notification name="NoEnterServerFull">
-		Vous ne pouvez pas pénétrer dans cette région car 
-le serveur est plein.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Le réenregistrement dans l&apos;inventaire a été désactivé.
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		Impossible d&apos;enregistrer [OBJ_NAME] dans le contenu des objets car l&apos;objet à partir duquel il a été rezzé n&apos;existe plus.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		Impossible d&apos;enregistrer [OBJ_NAME] dans le contenu des objets car vous ne disposez pas des droits requis pour modifier l&apos;objet [DEST_NAME].
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		Impossible de réenregistrer [OBJ_NAME] dans l&apos;inventaire -- cette opération a été désactivée.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		Vous ne pouvez pas copier votre sélection car vous n&apos;avez pas le droit de copier l&apos;objet [OBJ_NAME].
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		Vous ne pouvez pas copier votre sélection car l&apos;objet [OBJ_NAME] n&apos;est pas transférable.
-	</notification>
-	<notification name="NoTransNoCopy">
-		Vous ne pouvez pas copier votre sélection car l&apos;objet [OBJ_NAME] n&apos;est pas transférable.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		La suppression de l&apos;objet [OBJ_NAME] du simulateur n&apos;est pas autorisée par le système de droits.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		Vous ne pouvez pas enregistrer votre sélection car vous n&apos;avez pas le droit de modifier l&apos;objet [OBJ_NAME].
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		Vous ne pouvez pas enregistrer votre sélection car l&apos;objet [OBJ_NAME] ne peut pas être copié.
-	</notification>
-	<notification name="NoModNoTaking">
-		Vous ne pouvez pas prendre votre sélection car vous n&apos;avez pas le droit de modifier l&apos;objet [OBJ_NAME].
-	</notification>
-	<notification name="RezDestInternalError">
-		Erreur interne : type de destination inconnue.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		Échec de la suppression car l&apos;objet est introuvable
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Exclusion de cet utilisateur impossible.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Cette région ne vous permet pas d&apos;y définir votre domicile.
-	</notification>
-	<notification name="HomeLocationLimits">
-		Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent.
-	</notification>
-	<notification name="HomePositionSet">
-		Emplacement du domicile défini.
-	</notification>
-	<notification name="AvatarEjected">
-		Avatar expulsé.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		Vous n&apos;avez pas pu réaliser l&apos;exclusion car vous ne disposez pas des droits d&apos;admin pour cette parcelle.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
-[OBJ_POSITION] dans la région [REGION_NAME] car la parcelle est pleine.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
-[OBJ_POSITION] dans la région [REGION_NAME] car vos objets ne sont pas autorisés sur cette parcelle.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
-[OBJ_POSITION] dans la région [REGION_NAME] car il n&apos;y a pas suffisamment de ressources pour cet objet sur cette parcelle.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
-[OBJ_POSITION] dans la région [REGION_NAME] car l&apos;autre région exécute une version plus ancienne qui ne prend pas en charge la réception de cet objet via le passage à une autre région.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
-[OBJ_POSITION] dans la région [REGION_NAME] car vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		Impossible de déplacer [OBJECT_NAME] jusqu&apos;à
-[OBJ_POSITION] dans la région [REGION_NAME] pour une raison inconnue. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		Vous n&apos;êtes pas autorisé à modifier cet objet.
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		Impossible d&apos;activer les propriétés physiques pour un objet qui contribue au maillage de navigation.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		Impossible d&apos;activer les propriétés physiques pour les objets avec images-clés.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		Impossible d&apos;activer les propriétés physiques pour l&apos;objet -- ressources de terrain insuffisantes.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		Impossible d&apos;activer les propriétés physiques pour les objets avec un coût de ressources physiques supérieur à [MAX_OBJECTS]
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Cet objet ne peut pas contenir de morceau concave car c&apos;est un fantôme qui contribue au maillage de navigation.
-	</notification>
-	<notification name="UnableAddItem">
-		Ajout de l&apos;article impossible.
-	</notification>
-	<notification name="UnableEditItem">
-		Modification impossible
-	</notification>
-	<notification name="NoPermToEdit">
-		Modification interdite.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		Pas autorisé à copier cet inventaire.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		Impossible d&apos;enregistrer dans le contenu des objets : L&apos;article n&apos;existe plus.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		Impossible d&apos;enregistrer dans le contenu des objets : Un article avec ce nom existe déjà dans l&apos;inventaire.
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		Impossible d&apos;enregistrer dans le contenu des objets : cela modifierait les droits d&apos;attache.
-	</notification>
-	<notification name="TooManyScripts">
-		Trop de scripts.
-	</notification>
-	<notification name="UnableAddScript">
-		Ajout du script impossible.
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		Le serveur d&apos;actifs n&apos;a pas répondu assez vite.  Objet renvoyé dans le sim.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		Les formes physiques ne sont pas activées pour cette région.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		Vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		Impossible de définir les propriétés physiques pour ce type d&apos;objet.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		Vous devenez définir une forme pour la prim racine.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		Les matériaux physiques ne sont pas activés pour cette région.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		Les matériaux physiques ne peuvent être ajustés que pour les prims racines.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		La configuration de matériaux physiques sur les personnages n&apos;est pas prise en charge actuellement.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Une ou plusieurs propriétés des ressources physiques spécifiées n&apos;étaient pas valides.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		Vous ne pouvez pas changer le type de raccord d&apos;un objet avec maillage.
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		Vous ne pouvez pas changer la forme d&apos;un objet avec maillage.
-	</notification>
-	<notification name="FullRegionCantEnter">
-		Vous ne pouvez pas pénétrer dans cette région car \ncar la région est pleine.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Échec du lien -- les propriétaires sont différents
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Échec du lien -- vous ne pouvez pas modifier le maillage de navigation d&apos;une région à une autre.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Échec du lien car vous ne disposez pas des droits de modification.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Échec du lien -- trop de primitives
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Échec du lien -- impossible de lier pas de copie et pas de transfert
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Échec du lien - il n&apos;y a rien qui puisse être lié.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Échec du lien -- trop de personnages de recherche de chemin
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Échec du lien -- ressources de terrain insuffisantes
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		Cet objet utilise trop de ressources physiques - sa dynamique a été désactivée.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		Vous avez été téléporté chez vous par l&apos;objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME].
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		Vous avez été téléporté chez vous par l&apos;objet [OBJECT_NAME].
-	</notification>
-	<notification name="TeleportedByAttachment">
-		Vous avez été téléporté par un élément sur [ITEM_ID]
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] sur la parcelle [PARCEL_NAME].
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] appartenant à [OWNER_ID].
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Vous avez été téléporté par l&apos;objet [OBJECT_NAME] appartenant à un utilisateur inconnu.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		Création de l&apos;objet demandé impossible. La région est pleine.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		Vous ne pouvez pas attacher plusieurs objets au même endroit.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Vous ne pouvez pas créer plusieurs objets ici.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		Création de l&apos;objet demandé impossible. Objet absent de la base de données.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		Création de l&apos;objet demandé impossible. Délai d&apos;attente dépassé. Veuillez réessayer.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		Création de l&apos;objet demandé impossible. Veuillez réessayer.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Échec de l&apos;action « rezzer », le chargement de l&apos;objet demandé a pris trop longtemps.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		Vous ne pouvez pas créer de plantes sur ce terrain.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		Impossible de restaurer l&apos;objet. Position dans le monde introuvable.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		Impossible de rezzer l&apos;objet car ses données de maillage ne sont pas valides.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		Impossible de rezzer l&apos;objet car il y a déjà trop de scripts dans cette région.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Vos privilèges d&apos;accès ne vous autorisent pas à créer des objets à cet endroit.
-	</notification>
-	<notification name="CantCreateObject">
-		Vous n&apos;êtes actuellement pas autorisé à créer des objets.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Paramètres d&apos;objet non valides
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Vos privilèges d&apos;accès ne vous autorisent pas à dupliquer des objets ici.
-	</notification>
-	<notification name="CantChangeShape">
-		Vous n’êtes pas autorisé à modifier cette forme.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Vos privilèges d&apos;accès ne vous autorisent pas à revendiquer des objets ici.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		Échec de la cession car vous de disposez pas des droits de cession des objets pour votre groupe.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Vos privilèges d&apos;accès ne vous autorisent pas à acheter des objets ici.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		Impossible d&apos;attacher l&apos;objet car un avatar est assis dessus.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		Les arbres et les plantes ne peuvent pas être portés sous forme d&apos;éléments attachés.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		Impossible d&apos;attacher les objets appartenant au groupe.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		Vous ne pouvez pas attacher des objets qui ne vous appartiennent pas.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		Impossible d&apos;attacher les objets contribuant au maillage de navigation.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		Impossible d&apos;attacher l&apos;objet car vous n&apos;avez pas le droit de le déplacer.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		Ressources de script insuffisantes pour attacher cet objet.
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		Vous ne pouvez pas déposer d&apos;objets ici. Essayez la zone de période d&apos;essai gratuite.
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		Vous ne pouvez pas déposer les éléments attachés avec maillage. Détachez-les dans l&apos;inventaire puis rezzez-les dans le monde.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		L&apos;élément n&apos;a pas pu être déposé : vous n&apos;avez pas le droit de déposer des éléments à cet endroit.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		L&apos;élément n&apos;a pas pu être déposé : ressources de terrain disponibles insuffisantes.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Les éléments n&apos;ont pas pu être déposés : ressources disponibles insuffisantes.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		Impossible de déposer l&apos;objet ici.  La parcelle est pleine.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		Vous ne pouvez pas toucher/attraper cet objet car vous êtes banni de cette parcelle de terrain.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Veuillez affiner vos paramètres de suppression.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		Chargement de l&apos;actif impossible.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		Impossible de trouver l&apos;utilisateur à téléporter chez lui
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		échec de la demande de type divine
-	</notification>
-	<notification name="GenericRequestFailed">
-		échec de la demande générique
-	</notification>
-	<notification name="CantUploadPostcard">
-		Chargement de la carte postale impossible.  Réessayez ultérieurement.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		Impossible récupérer les détails de l&apos;inventaire pour la notice au groupe.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		Impossible d&apos;envoyer une notice au groupe -- ce n&apos;est pas autorisé.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		Impossible d&apos;envoyer une notice au groupe - échec de la construction de l&apos;inventaire.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		Impossible d&apos;analyser l&apos;inventaire dans la notice.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Échec du chargement du terrain.
-	</notification>
-	<notification name="TerrainFileWritten">
-		Fichier de terrain écrit
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		Fichier de terrain écrit, lancement du téléchargement...
-	</notification>
-	<notification name="TerrainBaked">
-		Terrain figé.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Seuls les 10 premiers objets sélectionnés ont été désactivés. Actualisez et effectuez des sélections supplémentaires si nécessaire.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Vous devez mettre votre client à jour pour acheter cette parcelle.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Achat impossible, cette parcelle n&apos;est pas à vendre.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		Achat impossible, le prix de vente ou la zone de terrain a changé.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		Vous n&apos;êtes pas un acheteur autorisé pour cette parcelle.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		Vous ne pouvez pas acheter cette parcelle car elle est déjà en attente d&apos;une autorisation d&apos;achat.
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		Vous ne pouvez pas construire d&apos;objets ici car cela saturerait la parcelle.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		Vous avez sélectionné des terrains avec des propriétaires différents. Sélectionnez une zone plus petite et réessayez.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		Pas suffisamment de parcelles louées dans la sélection pour effectuer la fusion.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		Division du terrain impossible.\nPlusieurs parcelles sont sélectionnées.\nVeuillez sélectionner un terrain plus petit.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		Division du terrain impossible.\nParcelle introuvable.\nSignalez-le en allant à Aide -&gt; Signaler un bug...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		Division du terrain impossible. Toute la parcelle est sélectionnée.\nVeuillez sélectionner un terrain plus petit.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		Le terrain a été divisé.
-	</notification>
-	<notification name="PassPurchased">
-		Vous avez acheté un pass.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		Cette région n&apos;autorise pas les petites annonces.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Votre pass pour ce terrain arrive à expiration.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Il n&apos;y a pas de surface appropriée sur laquelle s&apos;asseoir, essayez un autre endroit.
-	</notification>
-	<notification name="CantSitNoRoom">
-		Pas de place pour s&apos;asseoir ici, essayez un autre endroit.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		Échec de la revendication de l&apos;objet car vous ne disposez pas des droits requis.
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		Échec de la revendication de l&apos;objet car vous ne disposez pas de suffisamment de L$.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		Impossible de céder un terrain appartenant au groupe.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		Échec de l&apos;achat de l&apos;objet car vous ne disposez pas de suffisamment de L$.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		Échec de l&apos;achat d&apos;inventaire car vous ne disposez pas de suffisamment de L$.
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		Vous ne disposez pas de suffisamment de L$ pour acheter un pass pour ce terrain.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		Impossible d&apos;acheter le pass actuellement.  Réessayez ultérieurement.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		Création de l&apos;objet impossible car \nla parcelle est pleine.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Échec du placement de l&apos;objet à l&apos;emplacement spécifié.  Veuillez réessayer.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		Impossible de créer le repère pour l&apos;événement.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		Grâce à vos pouvoirs de type divin, vous n&apos;êtes plus figé.
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Échec de la demande de pouvoirs spéciaux. Cette demande a été archivée.
-	</notification>
-	<notification name="ExpireExplanation">
-		Le système ne peut pas traiter votre demande actuellement. Délai d&apos;attente dépassé.
-	</notification>
-	<notification name="DieExplanation">
-		Le système ne peut pas traiter votre demande.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		Fonds insuffisants pour créer la primitive.
-	</notification>
-	<notification name="RezObjectFailure">
-		Fonds insuffisants pour créer l&apos;objet.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Réinitialiser l&apos;emplacement du domicile car il n&apos;était pas légal.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		Vous ne pouvez pas inviter quiconque là où vous vous trouvez actuellement car la région est pleine. Réessayez ultérieurement.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Cette région ne vous permet pas d&apos;y définir votre domicile.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		Vous ne pouvez définir votre domicile que sur votre terrain ou un infohub du continent.
-	</notification>
-	<notification name="SetHomePosition">
-		Emplacement du domicile défini.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		Impossible de dérezzer l&apos;objet à cause d&apos;un défaut d&apos;inventaire.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		Création de l&apos;inventaire demandé impossible.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		Création du dossier d&apos;inventaire demandé impossible.
-	</notification>
-	<notification name="CantCreateInventory">
-		Création de cet inventaire impossible.
-	</notification>
-	<notification name="CantCreateLandmark">
-		Création du repère impossible.
-	</notification>
-	<notification name="CantCreateOutfit">
-		Création de la tenue impossible. Veuillez réessayer dans une minute.
-	</notification>
-	<notification name="InventoryNotForSale">
-		L&apos;inventaire n&apos;est pas à vendre.
-	</notification>
-	<notification name="CantFindInvItem">
-		Objet de l&apos;inventaire introuvable.
-	</notification>
-	<notification name="CantFindObject">
-		Objet introuvable.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		Les transferts d&apos;argent aux objets sont actuellement désactivés dans cette région.
-	</notification>
-	<notification name="CantPayNoAgent">
-		Impossible de savoir qui payer.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		Vous ne pouvez pas donner de L$ à des objets publics.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Échec de la création d&apos;inventaire sur l&apos;objet Second Life.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Une erreur interne nous a empêchés de mettre votre client à jour correctement.  Le solde de L$ et le patrimoine affichés dans votre client peuvent ne pas correspondre à votre solde réel sur les serveurs.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		Impossible de créer de grandes prims qui coupent d&apos;autres joueurs.  Réessayez une fois que les autres joueurs se seront déplacés.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Cela supprimera les journaux des conversations précédentes, ainsi que toute copie de sauvegarde de ce fichier.
-		<usetemplate ignoretext="Confirmer avant de supprimer le journal des conversations précédentes" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Cela supprimera les transcriptions de toutes les conversations précédentes. La liste des conversations passées ne sera pas affectée. Tous les fichiers avec les suffixes .txt et txt.backup dans le dossier [FOLDER] seront supprimés.
-		<usetemplate ignoretext="Confirmer avant la suppression des transcriptions" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		Impossible de déplacer les fichiers. Chemin précédent rétabli.
-		<usetemplate ignoretext="Impossible de déplacer les fichiers. Chemin précédent rétabli." name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
index c8fa9f340f..54b8f53e59 100644
--- a/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_avatar_list_item.xml
@@ -27,6 +27,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Cet(te) ami(e) peut modifier, supprimer ou prendre vos objets."/>
 	<icon name="permission_map_icon" tool_tip="Cet(te) ami(e) peut vous localiser sur la carte."/>
 	<icon name="permission_online_icon" tool_tip="Cet(te) ami(e) peut voir lorsque vous êtes en ligne."/>
-	<button name="info_btn" tool_tip="En savoir plus"/>
 	<button name="profile_btn" tool_tip="Voir le profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
index 0e2b5a9c93..96add2a74b 100644
--- a/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/fr/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Filtrer" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Actions sur la personne ou l&apos;objet sélectionné"/>
-		<menu_button name="view_btn" tool_tip="Options de tri"/>
-		<menu_button name="plus_btn" tool_tip="Choisir un résident ou un objet à ignorer"/>
-		<button name="unblock_btn" tool_tip="Enlever le résident ou l’objet de la liste des ignorés"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/>
+	<text name="title_text">
+		Liste des ignorés
+	</text>
+	<scroll_list name="blocked" tool_tip="Liste des résidents actuellement ignorés"/>
+	<button label="Ignorer une personne" label_selected="Ignorer le résident..." name="Block resident..." tool_tip="Choisir un résident à ignorer"/>
+	<button label="Ignorer un objet par son nom" label_selected="Ignorer un objet par son nom..." name="Block object by name..." tool_tip="Choisir un objet à ignorer par nom"/>
+	<button label="Ne plus ignorer" label_selected="Ne plus ignorer" name="Unblock" tool_tip="Enlever le résident ou l&apos;objet de la liste des ignorés"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
deleted file mode 100644
index ebf18f6483..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(chargement)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
deleted file mode 100644
index 9c277842b5..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="Incluait une conversation vocale"/>
-	<icon name="unread_ims_icon" tool_tip="Des messages sont arrivés pendant que vous étiez déconnecté."/>
-	<button name="delete_btn" tool_tip="Supprimer cette entrée"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
index b1b32af7c6..5fb69d1989 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Inconnu"/>
-	<button name="info_btn" tool_tip="En savoir plus"/>
 	<button name="profile_btn" tool_tip="Voir le profil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index 227ce26df7..f035853efc 100644
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -14,53 +14,81 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
 	<string name="no_filtered_friends_msg">
 		Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/people/[SEARCH_TERM] Rechercher].
 	</string>
+	<string name="people_filter_label" value="Filtrer les personnes"/>
+	<string name="groups_filter_label" value="Filtrer les groupes"/>
 	<string name="no_filtered_groups_msg" value="Vous n&apos;avez pas trouvé ce que vous cherchiez ? Essayez [secondlife:///app/search/groups/[SEARCH_TERM] Rechercher]."/>
 	<string name="no_groups_msg" value="Vous souhaitez trouver des groupes à rejoindre ? Utilisez [secondlife:///app/search/groups Rechercher]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Carte : double-clic ; Panoramique : Maj + faire glisser)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Téléportation : double-clic ; Panoramique : Maj + faire glisser)"/>
+	<filter_editor label="Filtre" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="PRÈS DE VOUS" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Filtrer les personnes" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
-				<menu_button name="nearby_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
-				<button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Options"/>
+				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
 			</panel>
 		</panel>
-		<panel label="AMIS" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Filtrer les personnes" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
-				<menu_button name="friends_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
-				<button name="friends_add_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
-				<dnd_button name="friends_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
-			</panel>
+		<panel label="MES AMIS" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="En ligne"/>
 				<accordion_tab name="tab_all" title="Tout"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="Afficher d&apos;autres options"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Proposer à un résident de devenir votre ami"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Supprimer le résident sélectionné de votre liste d&apos;amis."/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="GROUPES" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Filtrer les groupes" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Actions sur le groupe sélectionné"/>
-				<menu_button name="groups_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
-				<menu_button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
-				<dnd_button name="minus_btn" tool_tip="Quitter le groupe sélectionné"/>
+		<panel label="MES GROUPES" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Options"/>
+				<button name="plus_btn" tool_tip="Rejoindre/créer un nouveau groupe"/>
+				<button name="activate_btn" tool_tip="Activer le groupe sélectionné"/>
 			</panel>
 		</panel>
 		<panel label="RÉCENT" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Filtrer les personnes" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Actions sur la personne sélectionnée"/>
-				<menu_button name="recent_view_btn" tool_tip="Options d&apos;affichage/de tri"/>
-				<button name="add_friend_btn" tool_tip="Proposer à ce résident de devenir votre ami"/>
-				<dnd_button name="recent_del_btn" tool_tip="Supprimer la personne sélectionnée des amis"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Options"/>
+				<button name="add_friend_btn" tool_tip="Ajouter le résident sélectionné à votre liste d&apos;amis"/>
 			</panel>
 		</panel>
-		<panel label="BLOQUÉ" name="blocked_panel">
-			<panel label="Résidents et objets ignorés" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Profil" name="view_profile_btn" tool_tip="Afficher la photo, les groupes et autres infos des résidents"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="Ouvrir une session IM."/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Appel" name="call_btn" tool_tip="Appeler ce résident."/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Partager" name="share_btn" tool_tip="Partager un article de l&apos;inventaire."/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Téléporter" name="teleport_btn" tool_tip="Proposer une téléportation."/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Profil du groupe" name="group_info_btn" tool_tip="Afficher les informations sur le groupe"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Chat de groupe" name="chat_btn" tool_tip="Ouvrir une session de chat"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Appel de groupe" name="group_call_btn" tool_tip="Appeler ce groupe"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 972190dc15..550beb653e 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat écrit" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
-		<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
-		<check_box label="Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Taille de la police :
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Petite" name="Small" value="0"/>
-			<item label="Moyenne" name="Medium" value="1"/>
-			<item label="Grande" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Bulles de chat" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Notifications
-		</text>
-		<text name="friend_ims">
-			IM amis :
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			IM non amis :
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
-		</combo_box>
-		<text name="conference_ims">
-			IM conférence :
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
-		</combo_box>
-		<text name="group_chat">
-			Chat de groupe :
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolbarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Chat près de moi :
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Ouvrir la fenêtre Conversation" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Afficher le message dans une fenêtre popup" name="PopUpMessage" value="toast"/>
-			<item label="Bouton de la barre d&apos;outils Flash" name="FlashToolBarButton" value="clignote"/>
-			<item label="Aucun(e)" name="None" value="aucun(e)"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Pour suspendre temporairement toutes les notifications, utilisez Communication &gt; Ne pas déranger.
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Écouter le son :
-		</text>
-		<check_box label="Nouvelle conversation" name="new_conversation"/>
-		<check_box label="Appel entrant" name="incoming_voice_call"/>
-		<check_box label="Offre de téléportation" name="teleport_offer"/>
-		<check_box label="Offre d&apos;inventaire" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Effacer le journal..." name="clear_log"/>
-		<button label="Supprimer les transcriptions..." name="delete_transcripts"/>
-		<button label="Parcourir..." label_selected="Parcourir" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Taille de la police :
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Petite" name="radio" value="0"/>
+		<radio_item label="Moyenne" name="radio2" value="1"/>
+		<radio_item label="Grande" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="Exécuter l&apos;animation clavier quand vous écrivez" name="play_typing_animation"/>
+	<check_box label="M&apos;envoyer les IM par e-mail une fois déconnecté" name="send_im_to_email"/>
+	<check_box label="Activer l&apos;historique des chats et des IM en texte brut" name="plain_text_chat_history"/>
+	<check_box label="Bulles de chat" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		Afficher les IM dans :
+	</text>
+	<text name="requires_restart_label">
+		(redémarrage requis)
+	</text>
+	<radio_group name="chat_window" tool_tip="Afficher vos messages instantanés dans plusieurs fenêtres ou dans une seule fenêtre avec plusieurs onglets (redémarrage requis)">
+		<radio_item label="Plusieurs fenêtres" name="radio" value="0"/>
+		<radio_item label="Onglets" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Activer les popups de chat entrant :
+	</text>
+	<check_box label="Chats de groupe" name="EnableGroupChatPopups" tool_tip="Cocher cette case pour qu&apos;un popup s&apos;affiche à réception d&apos;un message de chat de groupe."/>
+	<check_box label="Chats IM" name="EnableIMChatPopups" tool_tip="Cocher cette case pour qu&apos;un popup s&apos;affiche à réception d&apos;un message instantané."/>
+	<spinner label="Durée de vie du popup Chat près de moi :" name="nearby_toasts_lifetime"/>
+	<spinner label="Disparition progressive du popup Chat près de moi :" name="nearby_toasts_fadingtime"/>
 	<button label="Traduction..." name="ok_btn"/>
 	<button label="Rechercher/Remplacer..." name="autoreplace_showgui"/>
 	<button label="Orthographe..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 533c392d6b..66b84af3aa 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="Jamais" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Réponse Ne pas déranger
+		Réponse si occupé(e) :
 	</text>
-	<text_editor name="do_not_disturb_response">
+	<text_editor name="busy_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
index 896dd932e3..60027d41cb 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Acheter l&apos;objet" name="Buyobject"/>
 			<combo_box.item label="Payer l&apos;objet" name="Payobject"/>
 			<combo_box.item label="Ouvrir" name="Open"/>
-			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 69ed20f376..6a2a3f559a 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -137,7 +137,7 @@
 		Quitter
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=fr-FR&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Le client que vous utilisez ne permet plus d&apos;accéder à Second Life. Téléchargez un nouveau client à la page suivante :
@@ -622,8 +622,8 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="AvatarAway">
 		Absent
 	</string>
-	<string name="AvatarDoNotDisturb">
-		Ne pas déranger
+	<string name="AvatarBusy">
+		Occupé
 	</string>
 	<string name="AvatarMuted">
 		Bloqué(e)
@@ -859,12 +859,6 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ST_NO_JOINT">
 		Impossible de trouver ROOT ou JOINT.
 	</string>
-	<string name="NearbyChatTitle">
-		Chat près de moi
-	</string>
-	<string name="NearbyChatLabel">
-		(Chat près de moi)
-	</string>
 	<string name="whisper">
 		chuchote :
 	</string>
@@ -928,15 +922,12 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="ControlYourCamera">
 		Contrôler votre caméra
 	</string>
-	<string name="NotConnected">
-		Pas connecté(e)
-	</string>
-	<string name="AgentNameSubst">
-		(Vous)
-	</string>
 	<string name="TeleportYourAgent">
 		Vous téléporter
 	</string>
+	<string name="NotConnected">
+		Pas connecté(e)
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Général
 	</string>
@@ -1018,6 +1009,18 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="dictionary_files">
 		Dictionnaires
 	</string>
+	<string name="AvatarSetNotAway">
+		Présent
+	</string>
+	<string name="AvatarSetAway">
+		Absent
+	</string>
+	<string name="AvatarSetNotBusy">
+		Pas occupé
+	</string>
+	<string name="AvatarSetBusy">
+		Occupé
+	</string>
 	<string name="shape">
 		Silhouette
 	</string>
@@ -1986,8 +1989,8 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="PanelContentsNewScript">
 		Nouveau script
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Ce résident a activé Ne pas déranger et verra votre message plus tard.
+	<string name="BusyModeResponseDefault">
+		Le résident auquel vous avez envoyé un message est en mode Occupé, ce qui signifie qu&apos;il a demandé à ne pas être dérangé.  Votre message restera affiché dans son panneau IM afin qu&apos;il puisse le lire ultérieurement.
 	</string>
 	<string name="MuteByName">
 		(par nom)
@@ -2100,6 +2103,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		Contenus
+	</string>
 	<string name="AcquiredItems">
 		Objets acquis
 	</string>
@@ -3871,7 +3877,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Région de type Général
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Les avatars à l&apos;extérieur de cette parcelle ne peuvent pas voir ni entendre les avatars qui se trouvent à l&apos;intérieur.
+		Avatars visibles et chat autorisé en dehors de cette parcelle
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Les objets mobiles risquent de ne pas se comporter correctement dans cette région tant qu&apos;elle n&apos;est pas refigée.
@@ -3948,12 +3954,6 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Pour afficher ce message, vous devez désactiver la case Seuls mes amis et groupes peuvent m&apos;appeler ou m&apos;envoyer un IM, sous Préférences/Confidentialité.
 	</string>
-	<string name="OnlineStatus">
-		En ligne
-	</string>
-	<string name="OfflineStatus">
-		Hors ligne
-	</string>
 	<string name="answered_call">
 		Votre appel a fait l&apos;objet d&apos;une réponse
 	</string>
@@ -3963,9 +3963,6 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Vous avez rejoint l&apos;appel
 	</string>
-	<string name="you_auto_rejected_call-im">
-		Vous avez automatiquement refusé l&apos;appel vocal quand le mode Ne pas déranger était activé.
-	</string>
 	<string name="name_started_call">
 		[NAME] appelle.
 	</string>
@@ -3982,7 +3979,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 		Connexion en cours...
 	</string>
 	<string name="conference-title">
-		Chat à plusieurs
+		Conférence ad-hoc
 	</string>
 	<string name="conference-title-incoming">
 		Conférence avec [AGENT_NAME]
@@ -4862,9 +4859,6 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
-	<string name="Command_Conversations_Label">
-		Conversations
-	</string>
 	<string name="Command_Compass_Label">
 		Boussole
 	</string>
@@ -4940,9 +4934,6 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Command_Chat_Tooltip">
 		Parler aux personnes près de vous par chat écrit
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Parler à quelqu&apos;un
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Boussole
 	</string>
@@ -5072,13 +5063,4 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Les conversations ne sont pas archivées. Pour commencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Aucune conversation ne sera plus enregistrée. Pour recommencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Il n&apos;y a aucune conversation enregistrée. Quand quelqu&apos;un vous contacte ou quand vous contactez quelqu&apos;un, une entrée de journal s&apos;affiche ici.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/it/floater_conversation_log.xml b/indra/newview/skins/default/xui/it/floater_conversation_log.xml
deleted file mode 100644
index 8354824ed1..0000000000
--- a/indra/newview/skins/default/xui/it/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="REGISTRO CONVERSAZIONI">
-	<panel name="buttons_panel">
-		<filter_editor label="Filtro persone" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Azioni sulla persona o gruppo selezionato"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_conversation_preview.xml b/indra/newview/skins/default/xui/it/floater_conversation_preview.xml
deleted file mode 100644
index d0e9c8ee0e..0000000000
--- a/indra/newview/skins/default/xui/it/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="CONVERSAZIONE:">
-	<floater.string name="Title">
-		CONVERSAZIONE: [NAME]
-	</floater.string>
-	<text name="page_label" value="Pagina"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_im_container.xml b/indra/newview/skins/default/xui/it/floater_im_container.xml
index 10cf1b7f7e..fb8e77b32f 100644
--- a/indra/newview/skins/default/xui/it/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSAZIONI">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Opzioni Mostra/Ordina"/>
-					<button name="add_btn" tool_tip="Avvia una nuova conversazione"/>
-					<button name="speak_btn" tool_tip="Parla con le persone usando il microfono"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo elenco"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Minimizza questo pannello"/>
-					<text name="stub_textbox">
-						Questa conversazione in una finestra separata.   [secondlife:/// Ripristina conversazione.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="CONVERSAZIONI"/>
diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml
index d38ec7a5fe..3d9d17fc81 100644
--- a/indra/newview/skins/default/xui/it/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] è stato invitato alla conversazione."/>
-	<floater.string name="multiple_participants_added" value="[NAME] sono stati invitati alla conversazione."/>
-	<floater.string name="tooltip_to_separate_window" value="Sposta questa conversazione in una finestra separata."/>
-	<floater.string name="tooltip_to_main_window" value="Sposta questa conversazione di nuovo nella finestra principale"/>
-	<floater.string name="start_call_button_tooltip" value="Apri collegamento voce"/>
-	<floater.string name="end_call_button_tooltip" value="Chiudi collegamento voce"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Minimizza questo pannello"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Minimizza elenco partecipanti"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Espandi l&apos;elenco dei partecipanti"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Opzioni Mostra/Ordina"/>
-				<menu_button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
-				<button name="add_btn" tool_tip="Aggiungi qualcuno a questa conversazione"/>
-				<button name="voice_call_btn" tool_tip="Apri collegamento voce"/>
-				<button name="close_btn" tool_tip="Termina questa conversazione"/>
-				<button name="expand_collapse_btn" tool_tip="Minimizza/espandi questo pannello"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Traduci chat" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="A" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Mostra/nascondi pannello messaggi"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="A" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_incoming_call.xml b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
index 566920209d..a95ed44662 100644
--- a/indra/newview/skins/default/xui/it/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/it/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonimo
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		ti sta chiamando.
+		sta chiamando.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		ha aderito ad una chiamata in chat vocale in conferenza.
@@ -25,9 +25,9 @@
 		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
 	</floater.string>
 	<text name="question">
-		Se rispondi, verrà interrotto il collegamento dalla conversazione a voce corrente.
+		Vuoi abbandonare [CURRENT_CHAT] e aderire a questa voice chat?
 	</text>
-	<button label="Risposta" label_selected="Risposta" name="Accept"/>
-	<button label="Ignora" label_selected="Ignora" name="Reject"/>
-	<button label="Apri invece IM" name="Start IM"/>
+	<button label="Accetta" label_selected="Accetta" name="Accept"/>
+	<button label="Rifiuta" label_selected="Rifiuta" name="Reject"/>
+	<button label="Inizia IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
index 7777444161..77be220a2a 100644
--- a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Mostra:
 			</text>
-			<check_box label="Test" name="show_world"/>
+			<check_box label="Mondo" name="show_world"/>
 			<check_box label="Solo elementi spostabili" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
index 27a17868a7..c97a91bb3f 100644
--- a/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Default" label_selected="Default" name="Default"/>
 	<button label="Vuoto" label_selected="Vuoto" name="Blank"/>
 	<button label="Niente" label_selected="Niente" name="None"/>
-	<check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Anteprima dal vivo" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Anteprima disattivata"/>
 	<filter_editor label="Filtro texture" name="inventory search editor"/>
 	<check_box initial_value="false" label="Mostra cartelle" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
deleted file mode 100644
index b168d067c2..0000000000
--- a/indra/newview/skins/default/xui/it/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="VOLUME CHAT VOCALE">
-	<slider label="Chat vocale" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
index f102622f5d..c83b11f698 100644
--- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Luoghi" name="voice_effects" title="ANTEPRIMA MANIPOLAZIONE VOCE">
+<floater label="Luoghi" name="voice_effects" title="MANIPOLAZIONE VOCE">
 	<string name="no_voice_effect">
 		(Nessuna manipolazione voce)
 	</string>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_volume.xml b/indra/newview/skins/default/xui/it/floater_voice_volume.xml
deleted file mode 100644
index eaeda7597f..0000000000
--- a/indra/newview/skins/default/xui/it/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="VOLUME VOCE">
-	<slider name="volume_slider" tool_tip="Volume voce" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/menu_cof_gear.xml b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
index 984e4a1611..10524ba92d 100644
--- a/indra/newview/skins/default/xui/it/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear COF">
+<menu name="Gear COF">
 	<menu label="Nuovi abiti" name="COF.Gear.New_Clothes"/>
-	<menu label="Nuove parti del corpo" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+	<menu label="Nuove parti del corpo" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation.xml b/indra/newview/skins/default/xui/it/menu_conversation.xml
deleted file mode 100644
index 46ced93f1d..0000000000
--- a/indra/newview/skins/default/xui/it/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Chiudi la conversazione" name="close_conversation"/>
-	<menu_item_call label="Apri conversazione a voce" name="open_voice_conversation"/>
-	<menu_item_call label="Interrompi collegamento a voce" name="disconnect_from_voice"/>
-	<menu_item_call label="Vedi profilo" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Offri teleport" name="offer_teleport"/>
-	<menu_item_call label="Chiamata a voce" name="voice_call"/>
-	<menu_item_call label="Cronologia chat..." name="chat_history"/>
-	<menu_item_call label="Aggiungi amico" name="add_friend"/>
-	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
-	<menu_item_call label="Rimuovi amici" name="remove_friends"/>
-	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
-	<menu_item_call label="Zoom avanti" name="zoom_in"/>
-	<menu_item_call label="Mappa" name="map"/>
-	<menu_item_call label="Condividi" name="share"/>
-	<menu_item_call label="Paga" name="pay"/>
-	<menu_item_check label="Blocca voce" name="block_unblock"/>
-	<menu_item_check label="Blocca testo" name="MuteText"/>
-	<menu_item_call label="Profilo del gruppo" name="group_profile"/>
-	<menu_item_call label="Attiva gruppo" name="activate_group"/>
-	<menu_item_call label="Lascia il gruppo" name="leave_group"/>
-	<context_menu label="Opzioni moderatore" name="Moderator Options">
-		<menu_item_check label="Consenti chat di testo" name="AllowTextChat"/>
-		<menu_item_call label="Disattiva audio di questo partecipante" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Riattiva audio di questo partecipante" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Disattiva audio di tutti" name="ModerateVoiceMute"/>
-		<menu_item_call label="Riattiva audio di tutti" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
deleted file mode 100644
index 5686a902eb..0000000000
--- a/indra/newview/skins/default/xui/it/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM..." name="IM"/>
-	<menu_item_call label="Chiamata a voce..." name="Call"/>
-	<menu_item_call label="Apro la cronologia delle chat..." name="Chat history"/>
-	<menu_item_call label="Vedi profilo" name="View Profile"/>
-	<menu_item_call label="Offri Teleport" name="teleport"/>
-	<menu_item_call label="Aggiungi come amico" name="add_friend"/>
-	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
-	<menu_item_call label="Invita al gruppo..." name="Invite"/>
-	<menu_item_call label="Mappa" name="Map"/>
-	<menu_item_call label="Condividi" name="Share"/>
-	<menu_item_call label="Paga" name="Pay"/>
-	<menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
deleted file mode 100644
index 73b05831ef..0000000000
--- a/indra/newview/skins/default/xui/it/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
-	<menu_item_check label="Ordina in base alla data" name="sort_by_date"/>
-	<menu_item_check label="Ordina con gli amici in alto" name="sort_by_friends"/>
-	<menu_item_call label="Mostra la cronologia delle chat vicine..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_im_conversation.xml b/indra/newview/skins/default/xui/it/menu_im_conversation.xml
deleted file mode 100644
index 1621d57e12..0000000000
--- a/indra/newview/skins/default/xui/it/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Vedi profilo" name="View Profile"/>
-	<menu_item_call label="Aggiungi come amico" name="Add Friend"/>
-	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
-	<menu_item_call label="Offri teleport" name="offer_teleport"/>
-	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
-	<menu_item_call label="Cronologia chat..." name="chat_history"/>
-	<menu_item_call label="Zoom avanti" name="zoom_in"/>
-	<menu_item_call label="Mappa" name="map"/>
-	<menu_item_call label="Condividi" name="Share"/>
-	<menu_item_call label="Paga" name="Pay"/>
-	<menu_item_check label="Blocca voce" name="Block/Unblock"/>
-	<menu_item_check label="Blocca testo" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
deleted file mode 100644
index 350fbc5c6f..0000000000
--- a/indra/newview/skins/default/xui/it/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Vista compatta" name="compact_view"/>
-	<menu_item_check label="Vista espansa" name="expanded_view"/>
-	<menu_item_check label="Mostra orario" name="IMShowTime"/>
-	<menu_item_check label="Mostra i nomi nelle conversazioni individuali" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_object_icon.xml b/indra/newview/skins/default/xui/it/menu_object_icon.xml
index 9623775af4..0f347b1a90 100644
--- a/indra/newview/skins/default/xui/it/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/it/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Profilo oggetto..." name="Object Profile"/>
 	<menu_item_call label="Blocca..." name="Block"/>
-	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
-	<menu_item_call label="Teleport sul luogo dell&apos;oggetto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
index 3ac0c5ce69..09fc867d7c 100644
--- a/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/it/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Nuovi capelli" name="New Hair"/>
 		<menu_item_call label="Nuovi occhi" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Apri tutte le cartelle" name="expand"/>
-	<menu_item_call label="Chiudi tutte le cartelle" name="collapse"/>
 	<menu_item_call label="Cambia nome del vestiario" name="rename"/>
 	<menu_item_call label="Elimina vestito" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_participant_view.xml b/indra/newview/skins/default/xui/it/menu_participant_view.xml
deleted file mode 100644
index c87cda57bf..0000000000
--- a/indra/newview/skins/default/xui/it/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Ordina le conversazioni in base al tipo" name="sort_sessions_by_type"/>
-	<menu_item_check label="Ordina le conversazioni in base al nome" name="sort_sessions_by_name"/>
-	<menu_item_check label="Ordina le conversazioni in base alle attività più recenti" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Ordina i partecipanti in base al nome" name="sort_participants_by_name"/>
-	<menu_item_check label="Ordina i partecipanti in base alle attività più recenti" name="sort_participants_by_recent"/>
-	<menu_item_call label="Preferenze chat..." name="chat_preferences"/>
-	<menu_item_call label="Preferenze privacy..." name="privacy_preferences"/>
-	<menu_item_check label="Registro conversazioni..." name="Conversation"/>
-	<menu_item_check label="Traduci chat vicina" name="Translate_chat"/>
-	<menu_item_check label="Impostazioni traduzione..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
deleted file mode 100644
index e9955923b2..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="Sblocca" name="unblock"/>
-	<menu_item_call label="Profilo..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
deleted file mode 100644
index cbcf084b86..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Blocca residente per nome..." name="block_resident_by_name"/>
-	<menu_item_call label="Blocca oggetto per nome" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
deleted file mode 100644
index fc80c73ae3..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
-	<menu_item_check label="Ordina in base al tipo" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_friends_view.xml b/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
deleted file mode 100644
index 972e359cfe..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
-	<menu_item_check label="Ordina in base allo stato" name="sort_status"/>
-	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
-	<menu_item_check label="Mostra le autorizzazioni concesse" name="view_permissions"/>
-	<menu_item_check label="Mostra il registro conversazioni..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups.xml b/indra/newview/skins/default/xui/it/menu_people_groups.xml
index 8ca7537ee0..30a97a1c72 100644
--- a/indra/newview/skins/default/xui/it/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Mostra informazioni" name="View Info"/>
 	<menu_item_call label="Chat" name="Chat"/>
-	<menu_item_call label="Chiamata a voce" name="Call"/>
+	<menu_item_call label="Chiama" name="Call"/>
 	<menu_item_call label="Attiva" name="Activate"/>
 	<menu_item_call label="Chiudi" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_groups_view.xml b/indra/newview/skins/default/xui/it/menu_people_groups_view.xml
deleted file mode 100644
index 56b9abbd3a..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Mostra le icone di gruppo" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby.xml b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
index 1c09b1cfe2..a974bd181d 100644
--- a/indra/newview/skins/default/xui/it/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Vedi profilo" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Offri Teleport" name="offer_teleport"/>
-	<menu_item_call label="Chiamata a voce" name="voice_call"/>
-	<menu_item_call label="Mostra la cronologia delle chat..." name="chat_history"/>
-	<menu_item_call label="Aggiungi come amico" name="add_friend"/>
-	<menu_item_call label="Rimuovi amico" name="remove_friend"/>
-	<menu_item_call label="Invita al gruppo..." name="invite_to_group"/>
-	<menu_item_call label="Zoom avanti" name="zoom_in"/>
-	<menu_item_call label="Mappa" name="map"/>
-	<menu_item_call label="Condividi" name="share"/>
-	<menu_item_call label="Paga" name="pay"/>
-	<menu_item_check label="Blocca/Sblocca" name="block_unblock"/>
+	<menu_item_call label="Vedi profilo" name="View Profile"/>
+	<menu_item_call label="Aggiungi amico" name="Add Friend"/>
+	<menu_item_call label="Rimuovi amico" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Chiama" name="Call"/>
+	<menu_item_call label="Mappa" name="Map"/>
+	<menu_item_call label="Condividi" name="Share"/>
+	<menu_item_call label="Paga" name="Pay"/>
+	<menu_item_check label="Blocca/Sblocca" name="Block/Unblock"/>
+	<menu_item_call label="Offri Teleport" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
index b9ce70167f..e0b9ceb63d 100644
--- a/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/it/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Aggiungi amici" name="add_friends"/>
-	<menu_item_call label="Rimuovi amici" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Chiama" name="call"/>
-	<menu_item_call label="Condividi" name="share"/>
-	<menu_item_call label="Paga" name="pay"/>
-	<menu_item_call label="Offri Teleport" name="offer_teleport"/>
+	<menu_item_call label="Aggiungi amici" name="Add Friends"/>
+	<menu_item_call label="Rimuovi amici" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Chiama" name="Call"/>
+	<menu_item_call label="Condividi" name="Share"/>
+	<menu_item_call label="Paga" name="Pay"/>
+	<menu_item_call label="Offri Teleport" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
deleted file mode 100644
index 223d88fee1..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordina in base a intervenuti recenti" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
-	<menu_item_check label="Ordina in base alla distanza" name="sort_distance"/>
-	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
-	<menu_item_check label="Mostra mappa" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_people_recent_view.xml b/indra/newview/skins/default/xui/it/menu_people_recent_view.xml
deleted file mode 100644
index fc6213bd08..0000000000
--- a/indra/newview/skins/default/xui/it/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Mostra prima i più recenti" name="sort_most"/>
-	<menu_item_check label="Ordina in base al nome" name="sort_name"/>
-	<menu_item_check label="Mostra le icone delle persone" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_agent.xml b/indra/newview/skins/default/xui/it/menu_url_agent.xml
index abfbab35a3..37755d5749 100644
--- a/indra/newview/skins/default/xui/it/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Vedi profilo" name="show_agent"/>
-	<menu_item_call label="Manda IM..." name="send_im"/>
-	<menu_item_call label="Aggiungi come amico..." name="add_friend"/>
+	<menu_item_call label="Mostra profilo residente" name="show_agent"/>
 	<menu_item_call label="Copia nome negli Appunti" name="url_copy_label"/>
 	<menu_item_call label="Copia SLurl negli Appunti" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_objectim.xml b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
index 8456d14b63..763e65f17c 100644
--- a/indra/newview/skins/default/xui/it/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/it/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Profilo oggetto..." name="show_object"/>
+	<menu_item_call label="Mostra informazioni oggetto" name="show_object"/>
 	<menu_item_call label="Mostra sulla mappa" name="show_on_map"/>
 	<menu_item_call label="Teleport sul luogo dell&apos;oggetto" name="teleport_to_object"/>
 	<menu_item_call label="Copia nome oggetto negli Appunti" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index c93b92029f..547c5a9b73 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Ferma animazione" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Cammina / corri / vola..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Stato" name="Status"/>
+		<menu label="Stato" name="Status">
+			<menu_item_call label="Assente" name="Set Away"/>
+			<menu_item_call label="Non disponibile" name="Set Busy"/>
+		</menu>
 		<menu_item_call label="Acquista L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Casella venditore in uscita..." name="MerchantOutbox"/>
 		<menu_item_call label="Dashboard dell&apos;account..." name="Manage My Account">
@@ -29,18 +32,14 @@
 		<menu_item_call label="Esci da [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunica" name="Communicate">
-		<menu_item_check label="Conversazioni..." name="Conversations"/>
-		<menu_item_check label="Chat nei dintorni..." name="Nearby Chat"/>
+		<menu_item_check label="Chat..." name="Nearby Chat"/>
 		<menu_item_check label="Parla" name="Speak"/>
-		<menu label="Manipolazione voce" name="VoiceMorphing">
-			<menu_item_check label="Nessuna manipolazione voce" name="NoVoiceMorphing"/>
-			<menu_item_check label="Anteprima..." name="Preview"/>
-			<menu_item_call label="Abbonati..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Impostazioni voce..." name="Nearby Voice"/>
+		<menu_item_check label="Manipolazione voce..." name="ShowVoice"/>
 		<menu_item_check label="Gesture..." name="Gestures"/>
-		<menu_item_check label="Amici" name="My Friends"/>
-		<menu_item_check label="Gruppi" name="My Groups"/>
-		<menu_item_check label="Persone vicine" name="Active Speakers"/>
+		<menu_item_call label="Amici" name="My Friends"/>
+		<menu_item_call label="Gruppi" name="My Groups"/>
+		<menu_item_call label="Persone vicine" name="Active Speakers"/>
 		<menu_item_call label="Blocca lista" name="Block List"/>
 	</menu>
 	<menu label="Mondo" name="World">
@@ -116,6 +115,7 @@
 			<menu_item_call label="Acquista" name="Menu Object Buy"/>
 			<menu_item_call label="Prendi" name="Menu Object Take"/>
 			<menu_item_call label="Prendi copia" name="Take Copy"/>
+			<menu_item_call label="Salva nell&apos;inventario" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Salva nei contenuti oggetto" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Restituisci oggetto" name="Return Object back to Owner"/>
 		</menu>
@@ -130,7 +130,6 @@
 			<menu_item_call label="Set collegati..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personaggi..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Visualizza / test..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Rebake regione" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Opzioni" name="Options">
 			<menu_item_check label="Mostra autorizzazioni avanzate" name="DebugPermissions"/>
@@ -160,13 +159,6 @@
 	<menu label="Aiuto" name="Help">
 		<menu_item_call label="Istruzioni..." name="How To"/>
 		<menu_item_call label="Aiuto di [SECOND_LIFE]" name="Second Life Help"/>
-		<menu_item_call label="Guida dell&apos;utente" name="User’s guide"/>
-		<menu_item_call label="Base di conoscenza" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Forum della comunità" name="Community Forums"/>
-		<menu_item_call label="Portale assistenza" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] Notizie" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE] Blog" name="Second Life Blogs"/>
 		<menu_item_call label="Segnala abuso" name="Report Abuse"/>
 		<menu_item_call label="Segnala bug" name="Report Bug"/>
 		<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
@@ -344,14 +336,9 @@
 				<menu_item_call label="Alterna la geometria dei personaggi" name="Toggle Character Geometry"/>
 				<menu_item_check label="Consenti selezione avatar" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Velocità animazione" name="Animation Speed">
-				<menu_item_call label="Accelera tutte le animazioni del 10%" name="All Animations 10 Faster"/>
-				<menu_item_call label="Rallenta tutte le animazioni del 10%" name="All Animations 10 Slower"/>
-				<menu_item_call label="Ripristina la velocità di tutte le animazioni" name="Reset All Animation Speed"/>
-				<menu_item_check label="Animazioni lente" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Forza i parametri sui valori predefiniti" name="Force Params to Default"/>
 			<menu_item_check label="Informazioni sull&apos;animazione" name="Animation Info"/>
+			<menu_item_check label="Animazioni lente" name="Slow Motion Animations"/>
 			<menu_item_check label="Disabilita livello di dettaglio" name="Disable LOD"/>
 			<menu_item_check label="Mostra schemi collisione" name="Show Collision Skeleton"/>
 			<menu_item_check label="Mostra bersaglio" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 8adbebb62a..d5fdde4e7d 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -513,24 +513,6 @@ Visitare [_URL] per ulteriori informazioni?
 		</url>
 		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
-
-    Visitare [_URL] per cercare un aggiornamento del driver?
-		<url name="url">
-			http://support.amd.com/it/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
-
-    Visitare [_URL] per cercare un aggiornamento del driver?
-		<url name="url">
-			http://www.nvidia.it/Download/index.aspx?lang=it
-		</url>
-		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
-	</notification>
 	<notification name="UnknownGPU">
 		Il tuo sistema utilizza una scheda grafica che [APP_NAME] non riconosce.
 Questo succede spesso con un nuovo hardware che non è stato ancora testato con [APP_NAME].  Probabilmente tutto andrà bene, ma devi riconfigurare le tue impostazioni grafiche.
@@ -1566,13 +1548,10 @@ Vuoi cancellare quell&apos;elemento?
 		Impossibile offrire l&apos;amicizia in questo momento. Riprova fra poco.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Non disturbare è attivo.  Non riceverai la notifica delle comunicazioni in arrivo.
-
-- Gli altri residenti riceveranno la tua risposta Non disturbare (impostata in Preferenze &gt; Generali).
-- Le offerte di teleport verranno rifiutate.
-- Le chiamate voce verranno rifiutate.
-		<usetemplate ignoretext="Io cambio il mio stato alla modalità Non disturbare." name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		È stata impostata la modalità Non disponibile.
+La chat e gli IM verranno nascosti. Gli IM riceveranno la tua risposta di Non disponibile. Tutte le offerte di teleport verranno rifiutate. Tutte le offerte di Inventario andranno nel Cestino.
+		<usetemplate ignoretext="Cambio il mio stato sulla modalità Non disponibile" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Hai raggiunto il numero massimo di gruppi. Per favore abbandona almeno un gruppo prima di aderire a questo, oppure declina l&apos;offerta.
@@ -2060,10 +2039,6 @@ Trasferisci gli elementi nell&apos;inventario?
 		Vai al [http://secondlife.com/account/ Dashboard] per vedere la cronologia del tuo account?
 		<usetemplate ignoretext="Lancia il browser per vedere la cronologia del mio account" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		Quando aggiungi una persona a una conversazione esistente, viene creata una nuova conversazione.  Tutti i partecipanti riceveranno notifiche per la nuova conversazione.
-		<usetemplate ignoretext="Conferma l&apos;aggiunta dei partecipanti alla chat" name="okcancelignore" notext="Annulla" yestext="Ok"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		Confermi di voler uscire?
 		<usetemplate ignoretext="Conferma prima di uscire" name="okcancelignore" notext="Non uscire" yestext="Esci"/>
@@ -2138,14 +2113,14 @@ Vuoi sostituirlo con l&apos;oggetto selezionato?
 			<button ignore="Never Replace" name="No" text="Annulla"/>
 		</form>
 	</notification>
-	<notification label="Avviso modalità Non disturbare" name="DoNotDisturbModePay">
-		Hai attivato la modalità Non disturbare. Non riceverai alcun oggetto offerto in cambio di questo pagamento.
+	<notification label="Avviso di &apos;Occupato&apos;" name="BusyModePay">
+		Sei in modalità &apos;Occupato&apos;, ciò significa che non riceverai ciò che attendi per questo pagamento.
 
-Vuoi disattivare la modalità Non disturbare prima di completare questa transazione?
+Desideri abbandonare la modalità &apos;Occupato&apos; prima di completare questa transazione?
 		<form name="form">
-			<ignore name="ignore" text="Sto per pagare una persona o un oggetto mentre sono in modalità Non disturbare"/>
-			<button ignore="Lascia sempre la modalità Non disturbare" name="Yes" text="OK"/>
-			<button ignore="Non lasciare mai la modalità Non disturbare" name="No" text="Annulla"/>
+			<ignore name="ignore" save_option="true" text="Sto per pagare una persona o un oggetto mentro sono in modalià Non disponibile"/>
+			<button ignore="Always leave Busy Mode" name="Yes" text="OK"/>
+			<button ignore="Never leave Busy Mode" name="No" text="Abbandona"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2280,8 +2255,11 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica
 	<notification name="GroupNotice">
 		Oggetto: [SUBJECT], Messaggio: [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; è online
+	</notification>
+	<notification name="FriendOffline">
+		&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.
@@ -2509,6 +2487,13 @@ Qui non puoi volare.
 	<notification name="DynamicPathfindingDisabled">
 		Il pathfinding dinamico non è attivato in questa regione.  Gli oggetti scriptati che usano chiamate LSL di pathfinding potrebbero non funzionare come previsto in questa regione.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		Se modifichi alcuni oggetti in questa regione, ciò potrebbe causare il comportamento errato di altri oggetti in movimento.  Per fare in modo che gli oggetti in movimento si comportino correttamente, fai clic sul pulsante &quot;Rebake regione&quot;.  Per maggiori informazioni, seleziona la guida
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Guida" ignoretext="Se modifichi alcuni oggetti in questa regione, ciò potrebbe causare il comportamento errato di altri oggetti in movimento." name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Si è verificato un errore.  Potrebbe trattarsi di un problema di rete o del server, oppure potresti non avere le autorizzazioni necessarie per la costruzione.  A volte il problema viene risolto uscendo ed eseguendo nuovamente l&apos;accesso.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2769,9 +2754,9 @@ OK?
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Avviso: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qualunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
+		Attenzione: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qalunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
   
-Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account.
+Raramente questo tipo di richiesta è legittima. Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account.
 		<form name="form">
 			<button name="Grant" text="Consenti accesso totale"/>
 			<button name="Deny" text="Nega"/>
@@ -3353,633 +3338,4 @@ Tentativo annullato.
 		Stai per cancellare [NUM_ITEMS] elementi.  Vuoi continuare?
 		<usetemplate ignoretext="Sei sicuro di volere eliminare più oggetti?" name="okcancelignore" notext="No" yestext="Sì"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] ti ha congelato. Non ti puoi muovere o interagire con il mondo.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] ti ha congelato per [AV_FREEZE_TIME] secondi. Non ti puoi muovere o interagire con il mondo.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Avatar congelato.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] ti ha scongelato.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Avatar scongelato.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		La congelazione non ha avuto successo perché non hai le autorizzazioni dell&apos;amministratore per quel lotto.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		Non sei più congelato, puoi continuare.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Non puoi congelare quell&apos;utente.
-	</notification>
-	<notification name="NowOwnObject">
-		Sei ora il proprietario dell&apos;oggetto [OBJECT_NAME]
-	</notification>
-	<notification name="CantRezOnLand">
-		Non puoi rezzare l&apos;oggetto a [OBJECT_POS] perché non è consentito dal proprietario del terreno.  Usa lo strumento terreno per visualizzare a chi appartiene il terreno.
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		Oggetto non razzato perché ci sono troppe richieste.
-	</notification>
-	<notification name="SitFailCantMove">
-		Non puoi sederti perché al momento non puoi muoverti.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		Non puoi sederti perché non ti è consentito entrare in quel terreno.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Proba ad avvicinarti.  Non puoi sederti su un oggetto perché
-non è nella stessa regione in cui ti trovi.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		Impossibile creare il nuovo oggetto. La regione è piena.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		Non puoi creare alberi ed erba su terreni che non sono di tua proprietà.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		Copia non riuscita perché non hai l&apos;autorizzazione necessaria per copiare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		La copia non è riuscita perché &apos;[OBJ_NAME]&apos; non può essere trasferito a te.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		La copia non è riuscita perché &apos;[OBJ_NAME]&apos; contribuisce al navmesh.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Duplicato senza oggetto principale selezionato.
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		Impossibile duplicare gli oggetti perché la regione è piena.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		Impossibile duplicare gli oggetti - Impossibile trovare i lotti in cui si trovano.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		Impossibile creare l&apos;oggetto perché 
-il lotto è pieno.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Tentativo di rezzare un oggetto non riuscito.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		Impossibile creare un oggetto che ha causato problemi in questa regione.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		L&apos;oggetto dell&apos;inventario è stato aggiunto alla blacklist.
-	</notification>
-	<notification name="NoCanRezObjects">
-		Al momento non ti è consentito creare oggetti.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Ricerca terreno bloccata.
-Hai eseguito troppe ricerche terreno in un breve tempo.
-Riprova tra un minuto.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		Risorse di script non sufficienti per collegare l&apos;oggetto.
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Sei deceduto e sei stato teleportato alla tua posizione iniziale
-	</notification>
-	<notification name="EjectComingSoon">
-		Non sei più benvenuto qui e hai [EJECT_TIME] secondi per andartene.
-	</notification>
-	<notification name="NoEnterServerFull">
-		Non puoi entrare in questa regione perché 
-il server è pieno.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Opzione Salva nell&apos;inventario disattivata
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		Impossibile salvare &apos;[OBJ_NAME]&apos; nei contenuti dell&apos;oggetto perché l&apos;oggetto da cui è stato razzato non esiste più.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		Impossibile salvare &apos;[OBJ_NAME]&apos; nei contenuti dell&apos;oggetto perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[DEST_NAME]&apos;.
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		Impossibile riportare &apos;[OBJ_NAME]&apos; nell&apos;inventario -- questa operazione è stata disattivata.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		Non puoi copiare l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per copiare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		Non puoi copiare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere trasferito.
-	</notification>
-	<notification name="NoTransNoCopy">
-		Non puoi copiare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere trasferito.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		La rimozione dell&apos;oggetto &apos;[OBJ_NAME]&apos; dal simulatore non è consentita dal sistema delle autorizzazioni.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		Non puoi salvare l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		Non puoi salvare la selezione perché l&apos;oggetto &apos;[OBJ_NAME]&apos; non può essere copiato.
-	</notification>
-	<notification name="NoModNoTaking">
-		Non puoi prendere l&apos;elemento selezionato perché non hai l&apos;autorizzazione necessaria per modificare l&apos;oggetto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="RezDestInternalError">
-		Errore interno: Tipo di destinazione sconosciuto.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		Cancellazione non riuscita perché l&apos;oggetto non è stato trovato.
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Non puoi espellere quell&apos;utente.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Questa regione non ti consente di impostare qui la tua posizione iniziale.
-	</notification>
-	<notification name="HomeLocationLimits">
-		Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma.
-	</notification>
-	<notification name="HomePositionSet">
-		Posizione di base impostata.
-	</notification>
-	<notification name="AvatarEjected">
-		Avatar espulso.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		L&apos;espulsione non ha avuto successo perché non hai l&apos;autorizzazione dell&apos;amministratore del lotto.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] nella regione [REGION_NAME] perché il lotto è pieno.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] nella regione [REGION_NAME] perché i tuoi oggetti non sono ammessi su questo lotto.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] nella regione [REGION_NAME] perché non ci sono risorse sufficienti per l&apos;oggetto su questo lotto.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] nella regione [REGION_NAME] perché nell&apos;altra regione è in esecuzione una versione precedente che non consente la ricezione di questo oggetto attraverso i confini tra regioni.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] nella regione [REGION_NAME] perché non puoi modificare il navmesh attraverso il confine tra regioni.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		Impossibile muovere l&apos;oggetto &apos;[OBJECT_NAME]&apos; a
-[OBJ_POSITION] nella regione [REGION_NAME] per un motivo sconosciuto. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		Non hai l&apos;autorizzazione necessaria per modificare questa immagine
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		Non è possibile attivare la fisica per un oggetto che contribuisce al navmesh.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		Impossibile attivare la fisica per oggetti keyframe.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		Impossibile attivare la fisica per l&apos;oggetto -- risorse di terreno insufficienti.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		Impossibile attivare la fisica per un oggetto con un costo delle risorse della fisica maggiore di [MAX_OBJECTS]
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Questo oggetto non può avere un pezzo concavo perché è un oggetto fantasma e contribuisce al navmesh.
-	</notification>
-	<notification name="UnableAddItem">
-		Aggiunta elemento non riuscita
-	</notification>
-	<notification name="UnableEditItem">
-		Impossibile modificare questo elemento.
-	</notification>
-	<notification name="NoPermToEdit">
-		Non sei autorizzato a modificare questo elemento.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		Non ti è permesso copiare quell&apos;inventario.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		Impossibile salvare i contenuti dell&apos;oggetto: L&apos;elemento non esiste più.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		Impossibile salvare i contenuti dell&apos;oggetto: Nell&apos;inventario esiste già un elemento con quel nome.
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		Impossibile salvare i contenuti dell&apos;oggetto: Verrebbero modificate le autorizzazioni per il collegamento.
-	</notification>
-	<notification name="TooManyScripts">
-		Troppi script.
-	</notification>
-	<notification name="UnableAddScript">
-		Aggiunta script non riuscita.
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		Il server degli asset non ha inviato una risposta entro il tempo massimo.  Oggetto restituito al sim.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		In questa regione non sono attivate le forme per la fisica.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		Non puoi modificare il navmesh attraverso il confine tra le regioni.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		Impossibile impostare le proprietà della fisica per quel tipo di oggetto.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		impossibile impostare un prim principale senza forma.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		In questa regione non sono attivati i materiali per la fisica.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		I materiali per la fisica possono essere modificati solo i prim principali.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		L&apos;impostazione dei materiali per la fisica nei caratteri non è ancora supportata.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Almeno una delle proprietà dei materiali per la fisica non è valida.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		Non puoi alterare il tipo di punto di un oggetto con reticolo
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		Non puoi alterare la forma di un oggetto con reticolo
-	</notification>
-	<notification name="FullRegionCantEnter">
-		Non puoi entrare in questa regione perché è piena.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Collegamento non riuscito -- i proprietari non corrispondono
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Collegamento non riuscito -- non puoi modificare il navmesh attraverso il confine tra le regioni.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Collegamento non riuscito perché non hai le autorizzazioni necessarie per la modifica.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Collegamento non riuscito -- troppe primitive.
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Collegamento non riuscito -- impossibile collegare elementi senza copia ed elementi senza trasferimento
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Collegamento non riuscito -- niente di collegabile.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Collegamento non riuscito -- troppi personaggi con pathfinding
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Collegamento non riuscito -- risorse terreno non sufficienti
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		L&apos;oggetto usa troppe risorse per la fisica -- le sue dinamiche sono state disattivate.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		Sei stato teleportato nella posizione iniziale dall&apos;oggetto &apos;[OBJECT_NAME]&apos; del lotto &apos;[PARCEL_NAME]&apos;
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		Sei stato teleportato nella tua posizione iniziale dall&apos;oggetto &apos;[OBJECT_NAME]&apos;
-	</notification>
-	<notification name="TeleportedByAttachment">
-		Sei stato teletrasportato da un elemento collegato a [ITEM_ID]
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; sul lotto &apos;[PARCEL_NAME]&apos;
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; di proprietà di [OWNER_ID]
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Sei stato teleportato dall&apos;oggetto &apos;[OBJECT_NAME]&apos; di proprietà di un utente sconosciuto.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		Impossibile creare l&apos;oggetto richiesto. La regione è piena.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		Non puoi collegare più oggetti a un singolo luogo.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Non puoi creare oggetti multipli in questa posizione.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		Impossibile creare l&apos;oggetto richiesto. L&apos;oggetto non è presente nel database.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		Impossibile creare l&apos;oggetto richiesto. Tempo scaduto per la richiesta. Riprova.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		Impossibile creare l&apos;oggetto richiesto. Riprova.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Rezzing non riuscito. Il caricamento dell&apos;oggetto richiesto è durato troppo a lungo.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		Non puoi creare piante su questo terreno.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		Impossibile ripristinare l&apos;oggetto. Nessuna posizione trovata nel mondo virtuale.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		Impossibile rezzare l&apos;oggetto perché i dati del reticolo non sono validi.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		Impossibile rezzare l&apos;oggetto perché ci sono già troppi script in questa regione.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Le tue autorizzazioni di accesso non ti permettono di creare oggetti in quella posizione.
-	</notification>
-	<notification name="CantCreateObject">
-		Al momento non ti è consentito creare oggetti.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Parametri oggetto non validi
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Le tue autorizzazioni di accesso non ti permettono di duplicare oggetti in questa posizione.
-	</notification>
-	<notification name="CantChangeShape">
-		Non ti è consentito modificare questa forma.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Le tue autorizzazioni di accesso non ti permettono di richiedere oggetti in questa posizione.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		Assegnazione non riuscita perché non hai l&apos;autorizzazione necessaria per assegnare oggetti per il tuo gruppo.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Le tue autorizzazioni di accesso non ti permettono di acquistare oggetti in questa posizione.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		Impossibile collegare l&apos;oggetto perché un avatar è seduto sopra.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		Alberi ed erba non possono essere indossati come collegati.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		Impossibile collegare oggetti di proprietà di un gruppo.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		Non puoi collegare oggetti che non sono di tua proprietà.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		Impossibile collegare oggetti che contribuiscono a navmesh.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		L&apos;oggetto non può essere collegato perché non sei autorizzato a muoverlo.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		Risorse di script non sufficienti per collegare l&apos;oggetto.
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		Non puoi lasciare oggetti qui, prova la zona Prova gratuita.
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		Non puoi lasciare elementi collegati con reticolo. Separa nell&apos;inventario e quindi rezza nel mondo virtuale.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		Impossibile rimuovere l&apos;elemento collegato: non hai l&apos;autorizzazione necessaria per rimuoverlo qui.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		Impossibile rimuovere l&apos;elemento collegato: risorse terreno disponibili non sufficienti.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Impossibile rimuovere gli elementi collegati: risorse disponibili non sufficienti.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		Non puoi lasciare l&apos;oggetto qui.  Il lotto è pieno.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		Non puoi toccare/afferrare questo oggetto perché sei stato bandito dal lotto di terreno.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Limita i parametri per la cancellazione.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		Impossibile caricare l&apos;asset.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		Utente da teleportare alla posizione iniziale non trovato
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		richiesta superpoteri non riuscita
-	</notification>
-	<notification name="GenericRequestFailed">
-		richiesta generica non riuscita
-	</notification>
-	<notification name="CantUploadPostcard">
-		Impossibile caricare la cartolina.  Riprova più tardi.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		I dettagli dell&apos;inventario per la notifica di gruppo non sono stati trovati.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		Impossibile inviare la notifica di gruppo -- non consentita.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		Impossibile inviare la notifica di gruppo -- impossibile costruire l&apos;inventario.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		Impossibile analizzare l&apos;inventario nella notifica.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Caricamento terreno non riuscito.
-	</notification>
-	<notification name="TerrainFileWritten">
-		File terreno scritto.
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		File terreno generato, avvio del download...
-	</notification>
-	<notification name="TerrainBaked">
-		Baking terreno completata.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Sono stati disattivati solo i primi 10 oggetti. Se necessario, aggiorna e seleziona nuovamente.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Devi aggiornare il Viewer per poter acquistare questo lotto.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Impossibile acquistare, questo lotto non è in vendita.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		Impossibile acquistare. Il prezzo o l&apos;area del terreno sono stati cambiati.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		Non sei l&apos;acquirente autorizzato di questo lotto.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		Non puoi acquistare questo lotto perché è in attesa di autorizzazione all&apos;acquisto
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		Non puoi costruire oggetti qui perché si supererebbe il limite per il lotto.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		hai selezionato terreni con proprietari diversi. Seleziona un&apos;area più piccola e riprova.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		Non sono stati selezionati abbastanza lotti affittati da collegare.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		Terreno non divisibile.\nHai selezionato più di un lotto.\nProva a selezionare una quantità di terreno più piccola.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		impossibile suddividere il terreno.\nimpossibile trovare il lotto.\nInvia una segnalazione con Aiuto -&gt; Segnala bug...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		Impossibile suddividere il terreno. È stato selezionato l&apos;intero lotto.\nProva a selezionare un pezzo di terreno più piccolo.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		Il terreno è stato diviso.
-	</notification>
-	<notification name="PassPurchased">
-		Hai acquistato un pass.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		Nella regione non sono permessi gli annunci pubblicitari.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Il tuo pass per questo terreno è quasi scaduto.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Nessuna superficie adatta a sedersi, prova un altro luogo.
-	</notification>
-	<notification name="CantSitNoRoom">
-		Non c&apos;è posto per sedersi, prova un altro luogo.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		La richiesta dell&apos;oggetto non ha avuto successo perché non hai l&apos;autorizzazione necessaria.
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		La richiesta dell&apos;oggetto non ha avuto successo perché non hai L$ sufficienti.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		Non puoi assegnare terreno di proprietà di un gruppo.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		L&apos;acquisto dell&apos;oggetto non ha avuto successo perché non hai L$ sufficienti.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		L&apos;acquisto dell&apos;inventario non ha avuto successo perché non hai L$ sufficienti.
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		Non hai abbastanza L$ per acquistare un pass per questo terreno.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		Al momento non puoi acquistare un pass.  Riprova più tardi.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		Impossibile creare l&apos;oggetto perché il lotto è pieno.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Il posizionamento dell&apos;oggetto nella posizione specificata non è riuscito.  Riprova.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		Impossibile creare il punto di riferimento per l&apos;evento.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		I tuoi superpoteri hanno interrotto la congelazione.
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Richiesta di poteri speciali non riuscita. La richiesta è stata registrata.
-	</notification>
-	<notification name="ExpireExplanation">
-		Al momento il sistema non è in grado di elaborare la tua richiesta. Tempo scaduto per la richiesta.
-	</notification>
-	<notification name="DieExplanation">
-		Il sistema non è in grado di elaborare la tua richiesta.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		Denaro insufficiente per creare una primitiva.
-	</notification>
-	<notification name="RezObjectFailure">
-		Denaro insufficiente per creare un oggetto.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Posizione iniziale ripristinata perché non era valida.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		Al momento non puoi invitare nessuno alla tua posizione perché la regione è piena. Riprova più tardi.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Questa regione non ti consente di impostare qui la tua posizione iniziale.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		Puoi impostare la tua posizione iniziale nel tuo terreno o in un Infohub sulla terraferma.
-	</notification>
-	<notification name="SetHomePosition">
-		Posizione di base impostata.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		Impossibile derazzare l&apos;oggetto a causa di un errore nell&apos;inventario.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		Impossibile creare l&apos;inventario richiesto.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		Impossibile creare la cartella dell&apos;inventario richiesta.
-	</notification>
-	<notification name="CantCreateInventory">
-		Impossibile creare quell&apos;inventario.
-	</notification>
-	<notification name="CantCreateLandmark">
-		Impossibile creare il punto di riferimento.
-	</notification>
-	<notification name="CantCreateOutfit">
-		Il vestiario non può essere creato in questo momento. Riprova tra un minuto.
-	</notification>
-	<notification name="InventoryNotForSale">
-		L&apos;inventario non è in vendita.
-	</notification>
-	<notification name="CantFindInvItem">
-		Impossibile trovare l&apos;elemento nell&apos;inventario.
-	</notification>
-	<notification name="CantFindObject">
-		Impossibile trovare l&apos;oggetto.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		Il trasferimento di denaro agli oggetti è attualmente disattivato in questa regione.
-	</notification>
-	<notification name="CantPayNoAgent">
-		Non si capisce chi deve essere pagato.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		Non puoi dare L$ a oggetti pubblici.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Creazione inventario non riuscito per un oggetto nel mondo virtuale.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Un errore interno ha impedito l&apos;aggiornamento del Viewer.  Il saldo in L$ o i lotti posseduti mostrati nel Viewer potrebbero non corrispondere ai valori correnti sui server.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		Non puoi creare prim grandi che intersecano altri giocatori.  Riprova quando gli altri giocatori si sono spostati.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Verranno cancellati i registri delle conversazioni precedenti e tutti gli eventuali backup di quel file.
-		<usetemplate ignoretext="Conferma prima di cancellare il registro delle conversazioni precedenti." name="okcancelignore" notext="Annulla" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Verranno cancellate le trascrizioni di tutte le conversazioni precedenti. L&apos;elenco delle conversazioni passate non cambierà. Tutti i file con i suffissi .txt e txt.backup nella cartella [FOLDER] verranno cancellati.
-		<usetemplate ignoretext="Conferma prima di cancellare le trascrizioni." name="okcancelignore" notext="Annulla" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		Impossibile spostare i file. Il percorso precedente è stato ripristinato.
-		<usetemplate ignoretext="Impossibile spostare i file. Il percorso precedente è stato ripristinato." name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
index cfceb5b982..ede19b9e5a 100644
--- a/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_avatar_list_item.xml
@@ -26,6 +26,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Questo amico può modificare, cancellare o prendere i tuoi oggetti"/>
 	<icon name="permission_map_icon" tool_tip="Questo amico può identificarti sulla mappa"/>
 	<icon name="permission_online_icon" tool_tip="Questo amico può vedere se sei online"/>
-	<button name="info_btn" tool_tip="Maggiori informazioni"/>
 	<button name="profile_btn" tool_tip="Vedi profilo"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
index 7ca2d3b57b..610f561a65 100644
--- a/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/it/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Filtro" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Azioni sulla persona o oggetto selezionato"/>
-		<menu_button name="view_btn" tool_tip="Opzioni Ordina"/>
-		<menu_button name="plus_btn" tool_tip="Seleziona un residente o un oggetto da bloccare"/>
-		<button name="unblock_btn" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/>
+	<text name="title_text">
+		Blocca lista
+	</text>
+	<scroll_list name="blocked" tool_tip="Lista degli attuali residenti bloccati"/>
+	<button label="Blocca il residente..." label_selected="Blocca il residente..." name="Block resident..." tool_tip="Scegli un residente da bloccare"/>
+	<button label="Blocca l&apos;oggetto per nome..." label_selected="Blocca l&apos;oggetto per nome..." name="Block object by name..."/>
+	<button label="Sblocca" label_selected="Sblocca" name="Unblock" tool_tip="Rimuovi un residente o un oggetto dalla lista bloccati"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
deleted file mode 100644
index ca6b65300a..0000000000
--- a/indra/newview/skins/default/xui/it/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(caricamento in corso)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
deleted file mode 100644
index 624eaa639c..0000000000
--- a/indra/newview/skins/default/xui/it/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="La conversazione includeva la voce"/>
-	<icon name="unread_ims_icon" tool_tip="Sono arrivati dei messaggi mentre eri via"/>
-	<button name="delete_btn" tool_tip="Elimina questo elemento"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_list_item.xml b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
index 72e644008c..7cdc4c7ff6 100644
--- a/indra/newview/skins/default/xui/it/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Sconosciuto"/>
-	<button name="info_btn" tool_tip="Maggiori informazioni"/>
 	<button name="profile_btn" tool_tip="Vedi profilo"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index e1468db76e..f903ae6e2c 100644
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -14,53 +14,81 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 	<string name="no_filtered_friends_msg">
 		Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/people/[SEARCH_TERM] Cerca].
 	</string>
+	<string name="people_filter_label" value="Filtro persone"/>
+	<string name="groups_filter_label" value="Filtro gruppi"/>
 	<string name="no_filtered_groups_msg" value="Non riesci a trovare quello che cerchi? Prova [secondlife:///app/search/groups/[SEARCH_TERM] Cerca]."/>
 	<string name="no_groups_msg" value="Stai cercando gruppi di cui far parte? Prova [secondlife:///app/search/groups Cerca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Fai doppio clic per aprire la Mappa, premi il tasto Maiusc e trascina per la panoramica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Fai doppio clic per teleportarti, premi il tasto Maiusc e trascina per la panoramica)"/>
+	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="NELLE VICINANZE" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Filtro persone" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
-				<menu_button name="nearby_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
-				<button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Opzioni"/>
+				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
 			</panel>
 		</panel>
-		<panel label="AMICI" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Filtro persone" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
-				<menu_button name="friends_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
-				<button name="friends_add_btn" tool_tip="Offri amicizia a un residente"/>
-				<dnd_button name="friends_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
-			</panel>
+		<panel label="I MIEI AMICI" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Tutto"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="Mostra ulteriori opzioni"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Offri amicizia a un residente"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Rimuovi la persona selezionata dalla lista degli amici"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="GRUPPI" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Filtro gruppi" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Azioni per il gruppo selezionato:"/>
-				<menu_button name="groups_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
-				<menu_button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
-				<dnd_button name="minus_btn" tool_tip="Lascia il gruppo selezionato"/>
+		<panel label="I MIEI GRUPPI" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Opzioni"/>
+				<button name="plus_btn" tool_tip="Aderisci al gruppo/Crea nuovo gruppo"/>
+				<button name="activate_btn" tool_tip="Attiva il gruppo selezionato"/>
 			</panel>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Filtro persone" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Azioni per la persona selezionata:"/>
-				<menu_button name="recent_view_btn" tool_tip="Opzioni Mostra/Ordina"/>
-				<button name="add_friend_btn" tool_tip="Offri amicizia a un residente"/>
-				<dnd_button name="recent_del_btn" tool_tip="Rimuovi la persona selezionata dagli amici"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Opzioni"/>
+				<button name="add_friend_btn" tool_tip="Aggiungi il residente selezionato alla tua lista degli amici"/>
 			</panel>
 		</panel>
-		<panel label="BLOCCATO" name="blocked_panel">
-			<panel label="Residenti e oggetti bloccati" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Profilo" name="view_profile_btn" tool_tip="Mostra immagine, gruppi e altre informazioni del residente"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="Apri una sessione messaggio istantaneo"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Chiama" name="call_btn" tool_tip="Chiama questo residente"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Condividi" name="share_btn" tool_tip="Condividi un oggetto dell&apos;inventario"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Teleport" name="teleport_btn" tool_tip="Offri teleport"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Profilo del gruppo" name="group_info_btn" tool_tip="Mostra informazioni gruppo"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Chat di gruppo" name="chat_btn" tool_tip="Apri sessione chat"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Chiamata al gruppo" name="group_call_btn" tool_tip="Chiama questo gruppo"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
index c2ac6e97a9..0c9c4027e5 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Text Chat" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
-		<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
-		<check_box label="Solo amici e gruppi possono chiamarmi o mandarmi IM" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Dimensioni caratteri:
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Piccolo" name="Small" value="0"/>
-			<item label="Medio" name="Medium" value="1"/>
-			<item label="Grande" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Chat a vignetta" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Notifiche
-		</text>
-		<text name="friend_ims">
-			IM degli amici:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
-			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			IM non di amici:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
-			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
-		</combo_box>
-		<text name="conference_ims">
-			IM conferenza:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
-			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
-		</combo_box>
-		<text name="group_chat">
-			Chat di gruppo:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
-			<item label="Pulsante barra strumenti Flash" name="FlashToolbarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Chat nei dintorni:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Apri finestra Conversazioni" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mostra il messaggio in una finestra pop-up" name="PopUpMessage" value="toast"/>
-			<item label="Pulsante barra strumenti Flash" name="FlashToolBarButton" value="flash"/>
-			<item label="Nessuno" name="None" value="none"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Per interrompere temporaneamente le notifiche, usa Comunica &gt; Non disturbare.
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Riproduci suono:
-		</text>
-		<check_box label="Nuova conversazione" name="new_conversation"/>
-		<check_box label="Chiamata voce in arrivo" name="incoming_voice_call"/>
-		<check_box label="Offerta di Teleport" name="teleport_offer"/>
-		<check_box label="Offerta inventario" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Cancella registro..." name="clear_log"/>
-		<button label="Cancella trascrizioni..." name="delete_transcripts"/>
-		<button label="Sfoglia..." label_selected="Sfoglia" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Dimensioni caratteri:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Piccola" name="radio" value="0"/>
+		<radio_item label="Media" name="radio2" value="1"/>
+		<radio_item label="Grande" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="Simula la battitura tasti quando scrivi" name="play_typing_animation"/>
+	<check_box label="Quando sono OFF-LINE, spediscimi gli IM in una e-mail" name="send_im_to_email"/>
+	<check_box label="Attiva IM in testo semplice e cronologia chat" name="plain_text_chat_history"/>
+	<check_box label="Chat a vignetta" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		Mostra gli IM in:
+	</text>
+	<text name="requires_restart_label">
+		(richiede il riavvio)
+	</text>
+	<radio_group name="chat_window" tool_tip="Mostra i tuoi messaggi istantanei in diverse finestre, o in una finestra con più schede (richiede il riavvio)">
+		<radio_item label="Finestre separate" name="radio" value="0"/>
+		<radio_item label="Schede" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Attiva popup per chat in arrivo:
+	</text>
+	<check_box label="Chat di gruppo" name="EnableGroupChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva una chat di gruppo"/>
+	<check_box label="Chat IM" name="EnableIMChatPopups" tool_tip="Seleziona per vedere una finestra popup quando arriva un messaggio IM"/>
+	<spinner label="Durata chat vicine:" name="nearby_toasts_lifetime"/>
+	<spinner label="Durata dissolvenza chat vicine:" name="nearby_toasts_fadingtime"/>
 	<button label="Traduzione..." name="ok_btn"/>
 	<button label="Sostituzione automatica..." name="autoreplace_showgui"/>
 	<button label="Correzione ortografica..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_general.xml b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
index 45cc06c2ea..90a833471c 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_general.xml
@@ -69,9 +69,6 @@
 		<combo_box.item label="mai" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Risposta Non disturbare:
+		Risposta in modalità occupato:
 	</text>
-	<text_editor name="do_not_disturb_response">
-		log_in_to_change
-	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
index 5f912dd126..8a0f93e650 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Acquista oggetto" name="Buyobject"/>
 			<combo_box.item label="Paga oggetto" name="Payobject"/>
 			<combo_box.item label="Apri" name="Open"/>
-			<combo_box.item label="Ingrandisci" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index f95318542b..fb1e387468 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -134,7 +134,7 @@
 		Esci
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=it-IT&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Il viewer utilizzato non è più in grado di accedere a Second Life. Visita la parina seguente per scaricare un nuovo viewer:
@@ -616,8 +616,8 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="AvatarAway">
 		Assente
 	</string>
-	<string name="AvatarDoNotDisturb">
-		Non disturbare
+	<string name="AvatarBusy">
+		Occupato
 	</string>
 	<string name="AvatarMuted">
 		Mutato
@@ -853,12 +853,6 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ST_NO_JOINT">
 		Impossibile trovare ROOT o JOINT.
 	</string>
-	<string name="NearbyChatTitle">
-		Chat nei dintorni
-	</string>
-	<string name="NearbyChatLabel">
-		(Chat nei dintorni)
-	</string>
 	<string name="whisper">
 		sussurra:
 	</string>
@@ -922,9 +916,6 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="ControlYourCamera">
 		Controllare la tua fotocamera
 	</string>
-	<string name="AgentNameSubst">
-		(Tu)
-	</string>
 	<string name="TeleportYourAgent">
 		Teleportarti
 	</string>
@@ -1009,6 +1000,18 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="dictionary_files">
 		Dizionari
 	</string>
+	<string name="AvatarSetNotAway">
+		Imposta come non assente
+	</string>
+	<string name="AvatarSetAway">
+		Imposta come assente
+	</string>
+	<string name="AvatarSetNotBusy">
+		Imposta come non occupato
+	</string>
+	<string name="AvatarSetBusy">
+		Imposta come occupato
+	</string>
 	<string name="shape">
 		Figura corporea
 	</string>
@@ -1965,8 +1968,8 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="PanelContentsNewScript">
 		Nuovo script
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Questo residente ha attivato la modalità &apos;Non disturbare&apos; e vedrà il tuo messaggio più tardi.
+	<string name="BusyModeResponseDefault">
+		Il residente al quale hai inviato un messaggio è in modalità &apos;occupato&apos;, ovvero ha chiesto di non essere disturbato.  Il tuo messaggio comparirà nel suo pannello IM, dove potrà essere letto in un secondo momento.
 	</string>
 	<string name="MuteByName">
 		(In base al nome)
@@ -2079,6 +2082,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		Contenuto
+	</string>
 	<string name="AcquiredItems">
 		Oggetti acquisiti
 	</string>
@@ -3793,7 +3799,7 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 		Regione generale
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Gli avatar in questo lotto non possono essere visti o sentiti da avatar all&apos;esterno del lotto
+		Avatar visibili e chat consentita fuori di questo lotto
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Gli oggetti che si muovono potrebbero non comportarsi correttamente in questa regione fino a quando non viene eseguito il rebake della regione.
@@ -3870,12 +3876,6 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Per vedere questo messaggio, devi deselezionare &apos;Solo amici e gruppi possono chiamarmi o mandarmi IM&apos; in Preferenze/Privacy.
 	</string>
-	<string name="OnlineStatus">
-		Online
-	</string>
-	<string name="OfflineStatus">
-		Offline
-	</string>
 	<string name="answered_call">
 		Risposto alla chiamata
 	</string>
@@ -3885,9 +3885,6 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Ti sei collegato alla chiamata in voce
 	</string>
-	<string name="you_auto_rejected_call-im">
-		Hai rifiutato automaticamente la chiamata voce mentre era attivata la modalità &apos;Non disturbare&apos;.
-	</string>
 	<string name="name_started_call">
 		[NAME] ha iniziato una chiamata vocale
 	</string>
@@ -3900,9 +3897,6 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Chiusa la chiamata
 	</string>
-	<string name="conference-title">
-		Chat con più persone
-	</string>
 	<string name="conference-title-incoming">
 		Chiamata in conferenza con [AGENT_NAME]
 	</string>
@@ -4775,9 +4769,6 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Chat_Label">
 		Chat
 	</string>
-	<string name="Command_Conversations_Label">
-		Conversazioni
-	</string>
 	<string name="Command_Compass_Label">
 		Bussola
 	</string>
@@ -4853,9 +4844,6 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Command_Chat_Tooltip">
 		Chatta con persone vicine usando il testo
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Conversa con chiunque
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Bussola
 	</string>
@@ -4985,13 +4973,4 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Le conversazioni non vengono registrate. Per iniziare a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Non verranno registrate più le conversazioni. Per riprendere a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Nessuna conversazione in registro. Dopo che hai contattato qualcuno o se qualcuno ti contatta, una voce del registro verrà mostrata qui.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml b/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
deleted file mode 100644
index 98b1a59a0d..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="会話ログ">
-	<panel name="buttons_panel">
-		<filter_editor label="人をフィルター" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-		<menu_button name="conversations_gear_btn" tool_tip="選択した住人・グループに対するアクション"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
deleted file mode 100644
index ea0b23de48..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="会話:">
-	<floater.string name="Title">
-		会話:[NAME]
-	</floater.string>
-	<text name="page_label" value="ページ"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_container.xml b/indra/newview/skins/default/xui/ja/floater_im_container.xml
index a155efdc1e..06b65e27f0 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="会話">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="オプションの表示 / 並べ替え"/>
-					<button name="add_btn" tool_tip="新しい会話を開始"/>
-					<button name="speak_btn" tool_tip="マイクを使って人と話す"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="このリストを閉じる / 開く"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="このペインを閉じる"/>
-					<text name="stub_textbox">
-						この会話は、別のウィンドウに表示されます。[secondlife:/// 戻る.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="会話"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_im_session.xml b/indra/newview/skins/default/xui/ja/floater_im_session.xml
index a44c843df7..dfa1c85ca2 100644
--- a/indra/newview/skins/default/xui/ja/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ja/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] は会話に招待されました。"/>
-	<floater.string name="multiple_participants_added" value="[NAME] は会話に招待されました。"/>
-	<floater.string name="tooltip_to_separate_window" value="この会話を別のウィンドウへ移動する"/>
-	<floater.string name="tooltip_to_main_window" value="この会話をメインウィンドウへ戻す"/>
-	<floater.string name="start_call_button_tooltip" value="会話の接続を開く"/>
-	<floater.string name="end_call_button_tooltip" value="会話の接続を閉じる"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="このペインを閉じる"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="参加者リストを閉じる"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="参加者リストを開く"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<menu_button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<button name="add_btn" tool_tip="この会話に他の人を追加する"/>
-				<button name="voice_call_btn" tool_tip="会話の接続を開く"/>
-				<button name="close_btn" tool_tip="この会話を終了する"/>
-				<button name="expand_collapse_btn" tool_tip="このペインを閉じる / 開く"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="宛先" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="メッセージパネルの表示 / 非表示"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="宛先" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
index 308f6f9a3d..f152fcd738 100644
--- a/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ja/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		匿名ユーザー
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		からコールを受けています。
+		がコールしています。
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		がコンファレンスチャットで、ボイスチャットに参加しました。
@@ -25,9 +25,9 @@
 		[CURRENT_CHAT]を退席して、このボイスチャットに参加しますか？
 	</floater.string>
 	<text name="question">
-		コールに応答すると、現在のボイスチャットから切断されます。
+		[CURRENT_CHAT] を退席して、このボイスチャットに参加しますか？
 	</text>
-	<button label="取る" label_selected="取る" name="Accept"/>
-	<button label="無視" label_selected="無視" name="Reject"/>
-	<button label="代わりに IM を開く" name="Start IM"/>
+	<button label="はい" label_selected="はい" name="Accept"/>
+	<button label="いいえ" label_selected="いいえ" name="Reject"/>
+	<button label="IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
index 9733c61918..ec107f3e6b 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				表示：
 			</text>
-			<check_box label="テスト" name="show_world"/>
+			<check_box label="世界" name="show_world"/>
 			<check_box label="可動物のみ" name="show_world_movables_only"/>
 			<check_box label="ナビメッシュ" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
index 37233d3e68..3773812bb6 100644
--- a/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
@@ -20,7 +20,7 @@
 	<button label="ブランク" label_selected="ブランク" name="Blank"/>
 	<button label="なし" label_selected="なし" name="None"/>
 	<button label="" label_selected="" name="Pipette"/>
-	<check_box initial_value="true" label="今すぐ適用" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="ライブプレビュー" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="プレビュー無効"/>
 	<filter_editor label="テクスチャをフィルター" name="inventory search editor"/>
 	<check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
deleted file mode 100644
index 44e96c35ad..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="ボイスチャットの音量">
-	<slider label="ボイスチャット" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
index b38ea9331a..ee675e143b 100644
--- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="場所" name="voice_effects" title="ボイスモーフィングのプレビュー">
+<floater label="場所" name="voice_effects" title="ボイスモーフィング">
 	<string name="no_voice_effect">
 		（ボイスモーフィングなし）
 	</string>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml b/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
deleted file mode 100644
index a380615d5a..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="ボイス音量">
-	<slider name="volume_slider" tool_tip="ボイス音量" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
index 07bcefd9b3..a071abbd2e 100644
--- a/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear COF">
+<menu name="Gear COF">
 	<menu label="衣類" name="COF.Gear.New_Clothes"/>
-	<menu label="新しい身体部位" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+	<menu label="新しい身体部位" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation.xml b/indra/newview/skins/default/xui/ja/menu_conversation.xml
deleted file mode 100644
index c7df20d252..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="会話を終える" name="close_conversation"/>
-	<menu_item_call label="ボイスチャットを始める" name="open_voice_conversation"/>
-	<menu_item_call label="ボイスチャットを切断する" name="disconnect_from_voice"/>
-	<menu_item_call label="プロフィールを表示" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-	<menu_item_call label="ボイスコール" name="voice_call"/>
-	<menu_item_call label="チャットの履歴..." name="chat_history"/>
-	<menu_item_call label="フレンドを追加" name="add_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friends"/>
-	<menu_item_call label="グループに招待..." name="invite_to_group"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="地図" name="map"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="支払い" name="pay"/>
-	<menu_item_check label="ボイスをブロック" name="block_unblock"/>
-	<menu_item_check label="文字をブロックする" name="MuteText"/>
-	<menu_item_call label="グループ情報" name="group_profile"/>
-	<menu_item_call label="グループをアクティブにする" name="activate_group"/>
-	<menu_item_call label="グループから脱退する" name="leave_group"/>
-	<context_menu label="モデレーターのオプション" name="Moderator Options">
-		<menu_item_check label="文字チャットを許可" name="AllowTextChat"/>
-		<menu_item_call label="この参加者をミュートする" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="この参加者のミュートを解除する" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="全員の音声をミュートする" name="ModerateVoiceMute"/>
-		<menu_item_call label="全員のミュートを解除する" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
deleted file mode 100644
index c9d4f947a4..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM..." name="IM"/>
-	<menu_item_call label="ボイスコール..." name="Call"/>
-	<menu_item_call label="チャットの履歴を開く..." name="Chat history"/>
-	<menu_item_call label="プロフィールを表示" name="View Profile"/>
-	<menu_item_call label="テレポートを送る" name="teleport"/>
-	<menu_item_call label="フレンド登録" name="add_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="グループに招待..." name="Invite"/>
-	<menu_item_call label="地図" name="Map"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払い" name="Pay"/>
-	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
deleted file mode 100644
index bd4812603f..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
-	<menu_item_check label="日付で並べ替え" name="sort_by_date"/>
-	<menu_item_check label="上位のフレンドを並べ替え" name="sort_by_friends"/>
-	<menu_item_call label="近くのチャットの履歴を表示..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml b/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
deleted file mode 100644
index 55cd6610f7..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="プロフィールを表示" name="View Profile"/>
-	<menu_item_call label="フレンド登録" name="Add Friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-	<menu_item_call label="グループに招待..." name="invite_to_group"/>
-	<menu_item_call label="チャットの履歴..." name="chat_history"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="地図" name="map"/>
-	<menu_item_call label="共有" name="Share"/>
-	<menu_item_call label="支払い" name="Pay"/>
-	<menu_item_check label="ボイスをブロック" name="Block/Unblock"/>
-	<menu_item_check label="文字をブロックする" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
deleted file mode 100644
index 222a741718..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="簡略表示" name="compact_view"/>
-	<menu_item_check label="詳細表示" name="expanded_view"/>
-	<menu_item_check label="時間を表示" name="IMShowTime"/>
-	<menu_item_check label="1対1の会話で名前を表示" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_object_icon.xml b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
index 6448e9244e..8c4f328661 100644
--- a/indra/newview/skins/default/xui/ja/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="オブジェクトのプロフィール..." name="Object Profile"/>
 	<menu_item_call label="ブロック..." name="Block"/>
-	<menu_item_call label="地図に表示" name="show_on_map"/>
-	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
index 1969ae2a10..2bcbe1915b 100644
--- a/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ja/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="髪" name="New Hair"/>
 		<menu_item_call label="目" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="フォルダをすべて開く" name="expand"/>
-	<menu_item_call label="フォルダをすべて閉じる" name="collapse"/>
 	<menu_item_call label="アウトフィットの名前を変更する" name="rename"/>
 	<menu_item_call label="アウトフィットを削除する" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_participant_view.xml b/indra/newview/skins/default/xui/ja/menu_participant_view.xml
deleted file mode 100644
index 5816351d9d..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="会話をタイプで並べ替え" name="sort_sessions_by_type"/>
-	<menu_item_check label="会話を名前で並べ替え" name="sort_sessions_by_name"/>
-	<menu_item_check label="会話を最新アクティビティで並べ替え" name="sort_sessions_by_recent"/>
-	<menu_item_check label="参加者を名前で並べ替え" name="sort_participants_by_name"/>
-	<menu_item_check label="参加者を最新アクティビティで並べ替え" name="sort_participants_by_recent"/>
-	<menu_item_call label="チャットの環境設定..." name="chat_preferences"/>
-	<menu_item_call label="プライバシーの環境設定..." name="privacy_preferences"/>
-	<menu_item_check label="会話ログ..." name="Conversation"/>
-	<menu_item_check label="近くのチャットを翻訳" name="Translate_chat"/>
-	<menu_item_check label="翻訳の設定..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
deleted file mode 100644
index b5c9d11e02..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="ブロック解除" name="unblock"/>
-	<menu_item_call label="プロフィール..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
deleted file mode 100644
index 3e74b2ddff..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="名前で住人をブロック..." name="block_resident_by_name"/>
-	<menu_item_call label="名前でオブジェクトをブロック..." name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
deleted file mode 100644
index 4b86a353f4..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="名前で並べ替え" name="sort_by_name"/>
-	<menu_item_check label="タイプによる並べ替え" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
deleted file mode 100644
index b95d11fdbd..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="オンライン状況で並べ替え" name="sort_status"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_check label="与えられた権限を表示" name="view_permissions"/>
-	<menu_item_check label="会話ログを表示..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups.xml b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
index 2c0c85ba28..842d79dc4b 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="情報を表示" name="View Info"/>
 	<menu_item_call label="チャット" name="Chat"/>
-	<menu_item_call label="ボイスコール" name="Call"/>
+	<menu_item_call label="コール" name="Call"/>
 	<menu_item_call label="アクティブ" name="Activate"/>
 	<menu_item_call label="脱退" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
deleted file mode 100644
index 4a9e402fa4..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="グループアイコンを表示" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
index 972ab767bf..8d84b0e521 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="プロフィールを表示" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
-	<menu_item_call label="ボイスコール" name="voice_call"/>
-	<menu_item_call label="チャットの履歴を表示..." name="chat_history"/>
-	<menu_item_call label="フレンド登録" name="add_friend"/>
-	<menu_item_call label="フレンドを削除" name="remove_friend"/>
-	<menu_item_call label="グループに招待..." name="invite_to_group"/>
-	<menu_item_call label="ズームイン" name="zoom_in"/>
-	<menu_item_call label="地図" name="map"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="支払い" name="pay"/>
-	<menu_item_check label="ブロック・ブロック解除" name="block_unblock"/>
+	<menu_item_call label="プロフィールの表示" name="View Profile"/>
+	<menu_item_call label="フレンド登録" name="Add Friend"/>
+	<menu_item_call label="フレンドを削除" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="地図" name="Map"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払う" name="Pay"/>
+	<menu_item_check label="ブロック・ブロック解除" name="Block/Unblock"/>
+	<menu_item_call label="テレポートを送る" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
index fe85e278cf..3f20e5d3ab 100644
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="フレンド登録" name="add_friends"/>
-	<menu_item_call label="フレンドを削除" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="コール" name="call"/>
-	<menu_item_call label="共有" name="share"/>
-	<menu_item_call label="支払い" name="pay"/>
-	<menu_item_call label="テレポートを送る" name="offer_teleport"/>
+	<menu_item_call label="フレンド登録" name="Add Friends"/>
+	<menu_item_call label="フレンドを削除" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="コール" name="Call"/>
+	<menu_item_call label="共有" name="Share"/>
+	<menu_item_call label="支払う" name="Pay"/>
+	<menu_item_call label="テレポートを送る" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
deleted file mode 100644
index b7cccc4396..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="最近の発言者で並べ替え" name="sort_by_recent_speakers"/>
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="距離で並べ替え" name="sort_distance"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-	<menu_item_check label="地図を表示" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
deleted file mode 100644
index feaeba4398..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="新しい順に並べ替え" name="sort_most"/>
-	<menu_item_check label="名前で並べ替え" name="sort_name"/>
-	<menu_item_check label="人のアイコン表示" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_agent.xml b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
index 72722db7cc..92d118a5ae 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="プロフィールを表示" name="show_agent"/>
-	<menu_item_call label="IM を送信..." name="send_im"/>
-	<menu_item_call label="フレンドを追加..." name="add_friend"/>
+	<menu_item_call label="住人のプロフィールを表示" name="show_agent"/>
 	<menu_item_call label="名前をクリップボードにコピー" name="url_copy_label"/>
 	<menu_item_call label="SLurl をクリップボードにコピー" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
index 9e340e3239..d6a048dcfc 100644
--- a/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ja/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="オブジェクトのプロフィール..." name="show_object"/>
+	<menu_item_call label="オブジェクトの情報を表示" name="show_object"/>
 	<menu_item_call label="地図に表示" name="show_on_map"/>
 	<menu_item_call label="オブジェクトの場所にテレポート" name="teleport_to_object"/>
 	<menu_item_call label="オブジェクト名をクリップボードにコピー" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 6f650242b4..e60e6781c6 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="私のアニメーションを停止する" name="Stop Animating My Avatar"/>
 			<menu_item_call label="歩行／走行／飛行..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="ログイン" name="Status"/>
+		<menu label="ログイン" name="Status">
+			<menu_item_call label="一時退席中" name="Set Away"/>
+			<menu_item_call label="取り込み中" name="Set Busy"/>
+		</menu>
 		<menu_item_call label="L$ の購入..." name="Buy and Sell L$"/>
 		<menu_item_call label="マーチャントアウトボックス..." name="MerchantOutbox"/>
 		<menu_item_call label="マイアカウント..." name="Manage My Account">
@@ -29,18 +32,14 @@
 		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
 	</menu>
 	<menu label="コミュニケーション" name="Communicate">
-		<menu_item_check label="会話..." name="Conversations"/>
-		<menu_item_check label="近くのチャット..." name="Nearby Chat"/>
+		<menu_item_check label="チャット..." name="Nearby Chat"/>
 		<menu_item_check label="話す" name="Speak"/>
-		<menu label="ボイスモーフィング" name="VoiceMorphing">
-			<menu_item_check label="ボイスモーフィングなし" name="NoVoiceMorphing"/>
-			<menu_item_check label="プレビュー..." name="Preview"/>
-			<menu_item_call label="申し込む..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="ボイス設定..." name="Nearby Voice"/>
+		<menu_item_check label="ボイスモーフィング..." name="ShowVoice"/>
 		<menu_item_check label="ジェスチャー..." name="Gestures"/>
-		<menu_item_check label="フレンド" name="My Friends"/>
-		<menu_item_check label="グループ" name="My Groups"/>
-		<menu_item_check label="近くにいる人" name="Active Speakers"/>
+		<menu_item_call label="フレンド" name="My Friends"/>
+		<menu_item_call label="グループ" name="My Groups"/>
+		<menu_item_call label="近くにいる人" name="Active Speakers"/>
 		<menu_item_call label="リストをブロック" name="Block List"/>
 	</menu>
 	<menu label="世界" name="World">
@@ -116,6 +115,7 @@
 			<menu_item_call label="買う" name="Menu Object Buy"/>
 			<menu_item_call label="取る" name="Menu Object Take"/>
 			<menu_item_call label="コピーを取る" name="Take Copy"/>
+			<menu_item_call label="マイインベントリに保存" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="オブジェクトの中身に保存" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="オブジェクトを返却する" name="Return Object back to Owner"/>
 		</menu>
@@ -130,7 +130,6 @@
 			<menu_item_call label="リンクセット..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="キャラクター..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="表示/テスト..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="地域の再構築" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="オプション" name="Options">
 			<menu_item_check label="権限の詳細を表示する" name="DebugPermissions"/>
@@ -160,13 +159,6 @@
 	<menu label="ヘルプ" name="Help">
 		<menu_item_call label="ハウツー..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] ヘルプ" name="Second Life Help"/>
-		<menu_item_call label="ユーザーガイド" name="User’s guide"/>
-		<menu_item_call label="ナレッジベース" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="コミュニティフォーラム" name="Community Forums"/>
-		<menu_item_call label="日本語サポートページ" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] ニュース" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/>
 		<menu_item_call label="嫌がらせを報告する" name="Report Abuse"/>
 		<menu_item_call label="バグを報告する" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
@@ -393,14 +385,9 @@
 				<menu_item_call label="女性アバターのテスト" name="Test Female"/>
 				<menu_item_check label="選択アバター許可" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="アニメーションのスピード" name="Animation Speed">
-				<menu_item_call label="すべてのアニメーションのスピードを 10% アップ" name="All Animations 10 Faster"/>
-				<menu_item_call label="すべてのアニメーションのスピードを 10% ダウン" name="All Animations 10 Slower"/>
-				<menu_item_call label="すべてのアニメーションのスピードをリセット" name="Reset All Animation Speed"/>
-				<menu_item_check label="アニメーションをスローモーション" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default"/>
 			<menu_item_check label="アニメーション情報" name="Animation Info"/>
+			<menu_item_check label="スローモーションのアニメーション" name="Slow Motion Animations"/>
 			<menu_item_check label="見ているものを表示する" name="Show Look At"/>
 			<menu_item_check label="クリックした場所を表示する" name="Show Point At"/>
 			<menu_item_check label="結合部のアップデートのデバッグ" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 356506f191..d5cff18a24 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -538,24 +538,6 @@ L$ が不足しているのでこのグループに参加することができ
 		</url>
 		<usetemplate ignoretext="使用しているグラフィックドライバが古い場合" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。
-
-[_URL] へアクセスして、ドライバーを更新しますか。
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		お使いのグラフィックチップには最新のドライバが存在するようです。グラフィックドライバを更新すると、パフォーマンスが大幅に改善されます。
-
-[_URL] へアクセスして、ドライバーを更新しますか。
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=en-us
-		</url>
-		<usetemplate ignoretext="自分のグラフィックドライバが旧くなりました。" name="okcancelignore" notext="いいえ" yestext="はい"/>
-	</notification>
 	<notification name="UnknownGPU">
 		お使いのシステムには、[APP_NAME] が認識できないグラフィックカードが搭載されています。
 [APP_NAME] でまだテストされていない最新ハードウェアのためだと考えられます。  問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。
@@ -1600,13 +1582,10 @@ http://secondlife.com/download から最新バージョンをダウンロード
 		現在フレンドシップを送れません。数分後にもう一度お試しください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		「通知を受けない」がオンになります。着信通信はあなたには通知されません。
-
-- 他の住民は「通知を受けない」の応答（「設定」&gt;「一般」で設定）を受け取ることになります。
-- テレポートのオファーはすべて受け取り拒否となります。
-- ボイスコールは拒否されます。
-		<usetemplate ignoretext="マイ ログイン状態を「通知を受けない」モードに変更しました。" name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		取り込み中モードになりました。
+チャットとインスタントメッセージは表示されません。 受信するインスタントメッセージには取り込み中返答メッセージが表示されます。 テレポートのオファーは受け取り拒否となります。 アイテムのオファーはすべてごみ箱に入ります。
+		<usetemplate ignoretext="ログイン状態を取り込み中モードに変更するとき" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		加入できるグループの最大限に達しました。 このグループに加入するために他のグループを脱退するか、この申し入れを断ってください。
@@ -2097,10 +2076,6 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します
 		[http://jp.secondlife.com/account/ マイアカウント] ページに移動してアカウント履歴を確認しますか？
 		<usetemplate ignoretext="ブラウザを起動してアカウント履歴を見るとき" name="okcancelignore" notext="取り消し" yestext="ページに移動"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		既存の会話に人を加えると、新しい会話が作成されます。参加者全員に新しい会話についての通知が配信されます。
-		<usetemplate ignoretext="チャットの参加者の追加を確認してください" name="okcancelignore" notext="取り消し" yestext="OＫ"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		終了しようとしています。続けますか？
 		<usetemplate ignoretext="終了時の確認" name="okcancelignore" notext="終了しない" yestext="終了"/>
@@ -2178,14 +2153,14 @@ Linden Lab
 			<button ignore="交換しない" name="No" text="キャンセル"/>
 		</form>
 	</notification>
-	<notification label="「通知を受けない」モードの警告" name="DoNotDisturbModePay">
-		「通知を受けない」をオンにします。この支払との交換で提供されるアイテムが受信されなくなります。
+	<notification label="取り込み中の警告" name="BusyModePay">
+		現在、「取り込み中」モードのため、支払いと引き換えにアイテムを受け取ることができません。
 
-このトランザクションを完了するために、「通知を受けない」をオフにしてもよろしいですか。
+この取引を行うために「取り込み中」の設定を解除しますか？
 		<form name="form">
-			<ignore name="ignore" text="「通知を受けない」モード時に、人や物を支払う予定です。"/>
-			<button ignore="「通知を受けない」モードを維持しない" name="Yes" text="OK"/>
-			<button ignore="「通知を受けない」モードを維持する" name="No" text="取り消し"/>
+			<ignore name="ignore" save_option="true" text="取り込み中モード時に支払をするとき"/>
+			<button ignore="常に「取り込み中」の設定を解除" name="Yes" text="OK"/>
+			<button ignore="常に「取り込み中」の設定を継続" name="No" text="キャンセル"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2321,8 +2296,11 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 	<notification name="GroupNotice">
 		件名： [SUBJECT]、メッセージ： [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; は [STATUS] です
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; はオンラインです
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; はオフラインです
 	</notification>
 	<notification name="AddSelfFriend">
 		残念ながら自分自身をフレンド登録することはできません。
@@ -2552,6 +2530,13 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 	<notification name="DynamicPathfindingDisabled">
 		この地域（リージョン）でダイナミックパスファインディングが有効になっていません。パスファインディング LSL 呼び出しを使用するスクリプト化されたオブジェクトがこの地域（リージョン）では動作できません。
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		この地域（リージョン）のオブジェクトを変更すると、他の移動オブジェクトが正しく動作しなくなる恐れがあります。移動オブジェクトを正しく動作させるには、「地域の再構築」ボタンをクリックします。詳しい情報は見るには「ヘルプ」を選択してください。
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="ヘルプ" ignoretext="この地域（リージョン）のオブジェクトを変更すると、他の移動オブジェクトが正しく動作しなくなる恐れがあります。" name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		エラーが発生しました。ネットワークまたはサーバーに問題があるか、制作権がない可能性があります。この問題は、一度ログアウトしてから、ログインし直すと解決される場合があります。
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2812,9 +2797,9 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		警告:オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; は、あなたのリンデンドルアカウントへのフルアクセスを要求しています。アクセスを許可すると、このオブジェクトは、特に警告を発せずに単発で、随時アカウントから資金を削除するか、アカウントを完全に空にします。
+		警告：オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; はあなたのリンデンドルアカウントへのトータルアクセスを希望しています。アクセスを許可すると、このオブジェクトはいつでもあなたのアカウントから資金を削除したり、今後警告を表示することなく継続的にアカウントを完全に空にできるようになります。
   
-そのオブジェクトがアカウントへのアクセスを要求する理由がよくわからない場合は、アクセスを許可しないでください。
+このようなリクエストが正当であることは稀です。このオブジェクトがあなたのアカウントにアクセスしたい理由を完全に理解している場合を除き、アクセスの許可は避けてください。
 		<form name="form">
 			<button name="Grant" text="トータルアクセスを許可"/>
 			<button name="Deny" text="拒否"/>
@@ -3393,627 +3378,4 @@ M キーを押して変更します。
 		[NUM_ITEMS] 個のアイテムを削除中です。続けますか？
 		<usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] によってあなたはフリーズされています。世界を動かすことも、世界とインタラクションすることもできません。
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] によって、あなたは [AV_FREEZE_TIME] 秒間フリーズされました。世界を動かすことも、世界とインタラクションすることもできません。
-	</notification>
-	<notification name="YouFrozeAvatar">
-		アバターがフリーズされています。
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] によってフリーズが解除されています。
-	</notification>
-	<notification name="AvatarUnFrozen">
-		アバターのフリーズが解除されました。
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		その区画の管理権限を持っていないため、フリーズに失敗しました。
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		フリーズ期間が切れました。仕事に戻ってください。
-	</notification>
-	<notification name="AvatarCantFreeze">
-		残念ながら、そのユーザーをフリーズできません。
-	</notification>
-	<notification name="NowOwnObject">
-		これで、オブジェクト [OBJECT_NAME] の所有者になりました
-	</notification>
-	<notification name="CantRezOnLand">
-		この土地の所有者が許可していないため、[OBJECT_POS] でオブジェクトを Rez することができません。土地ツールを使用して、土地の所有を確認してください。
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		リクエストが多すぎて、オブジェクトを Rez することができません。
-	</notification>
-	<notification name="SitFailCantMove">
-		今回移動できなかったため、座ることができません。
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		その土地に対して許可を受けていないため、座ることができません。
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		移動して近づけてみてください。オブジェクトが同じリージョンにないため、オブジェクトを配置できません。
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		新しいオブジェクトを作成できません。リージョンが埋まっています。
-	</notification>
-	<notification name="FailedToPlaceObject">
-		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
-	</notification>
-	<notification name="NoOwnNoGardening">
-		所有していない土地に木や草を植えることはできません。
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		オブジェクト &apos;[OBJ_NAME]&apos; をコピーする権限がないため、コピーに失敗しました。
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		オブジェクト &apos;[OBJ_NAME]&apos; をあなたに転送できないため、コピーに失敗しました。
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		オブジェクト &apos;[OBJ_NAME]&apos; がナビメッシュに貢献しているため、コピーに失敗しました。
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		ルートオブジェクトを選択せずに複製します。
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		リージョンが埋まっているため、オブジェクトのコピーを作成することができません。
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		オブジェクトのコピーを作成できません。オブジェクトのある区画が見つかりません。
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		区画がいっぱいのため、
-オブジェクトを作成できません。
-	</notification>
-	<notification name="RezAttemptFailed">
-		オブジェクトへの Rez の試みに失敗しました。
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		このリージョンで問題を引き起こすアイテムは作成できません。
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		その持ち物アイテムはブラックリストに登録されています。
-	</notification>
-	<notification name="NoCanRezObjects">
-		現在あなたにはオブジェクトを作成するための許可がありません。
-	</notification>
-	<notification name="LandSearchBlocked">
-		土地の検索がブロックされました。
-短期間に多くの土地を検索したためです。
-しばらくしてから再度お試しください。
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		オブジェクトの着用に使用できるスクリプトリソースが足りません。
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		死んでしまったので、ホームにテレポートされました。
-	</notification>
-	<notification name="EjectComingSoon">
-		ここへの入場が許可されていないため、[EJECT_TIME] 秒後に追放されます。
-	</notification>
-	<notification name="NoEnterServerFull">
-		サーバーが埋まっているため、
-このリージョンに入場することはできません。
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		「「持ち物」に保存」が無効になっています。
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		&apos;[OBJ_NAME]&apos; の Rez 元であるオブジェクトが存在しないため、このオブジェクトをオブジェクトコンテンツに保存できません。
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		オブジェクト &apos;[DEST_NAME]&apos; を修正する権限がないため、オブジェクトのコンテンツに &apos;[OBJ_NAME]&apos; を保存できません。
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		インベントリに &apos;[OBJ_NAME]&apos; を保存することはできません - この操作が無効になっています。
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものをコピーできません。
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		オブジェクト &apos;[OBJ_NAME]&apos; を転送できないため、選択したものをコピーできません。
-	</notification>
-	<notification name="NoTransNoCopy">
-		オブジェクト &apos;[OBJ_NAME]&apos; を転送できないため、選択したものをコピーできません。
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		シミュレータからのオブジェクト &apos;[OBJ_NAME]&apos; の削除は、権限システムによって無効にされています。
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものを保存できません。
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		オブジェクト &apos;[OBJ_NAME]&apos; をコピーできないため、選択したものを保存できません。
-	</notification>
-	<notification name="NoModNoTaking">
-		オブジェクト &apos;[OBJ_NAME]&apos; を変更する権限を持っていないため、選択したものを取得できません。
-	</notification>
-	<notification name="RezDestInternalError">
-		内部エラー: 不明な宛先タイプ。
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		オブジェクトが見つからないため削除できませんでした。
-	</notification>
-	<notification name="SorryCantEjectUser">
-		残念ながら、そのユーザーを追放することはできません。
-	</notification>
-	<notification name="RegionSezNotAHome">
-		このリージョンでは、ここにホームの位置を設定できません。
-	</notification>
-	<notification name="HomeLocationLimits">
-		ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。
-	</notification>
-	<notification name="HomePositionSet">
-		家の配置の設定。
-	</notification>
-	<notification name="AvatarEjected">
-		アバターが追放されました。
-	</notification>
-	<notification name="AvatarEjectFailed">
-		その区画の管理権限がないため、追放できませんでした。
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		区画が埋まっているため、オブジェクト &apos;[OBJECT_NAME]&apos; を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		オブジェクト &apos;[OBJECT_NAME]&apos; は、この区画で許可されていないため、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		この区画でこのオブジェクトのリソースが不足しているため、オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動することはできません。他のリージョンでは、リージョンの境界をまたいだこのオブジェクトを受信することができない古いバージョンを実行しているためです。
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		リージョン境界をまたぐナビメッシュを変更できないため、オブジェクト &apos;[OBJECT_NAME]&apos; をリージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		不明な理由により、オブジェクト &apos;[OBJECT_NAME]&apos; を、リージョン [REGION_NAME] 内の [OBJ_POSITION] に移動できません。
-([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		そのオブジェクトを変更する権限がありません
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		ナビメッシュに貢献するオブジェクトに対して物理を有効にできません。
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		キーフレームオブジェクトのために物理を有効にできません。
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		土地のリソースが足りないため、オブジェクトの物理を有効にできません。
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		[MAX_OBJECTS] より大きい物理リソースコストを持つオブジェクトでは、物理を有効にできません。
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		このオブジェクトはファントムで、ナビメッシュに貢献しているため、くぼみを持たせることができません。
-	</notification>
-	<notification name="UnableAddItem">
-		アイテムを追加できません!
-	</notification>
-	<notification name="UnableEditItem">
-		これは編集できません!
-	</notification>
-	<notification name="NoPermToEdit">
-		これを編集する許可がありません。
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		そのインベントリをコピーすることは許可されません。
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		オブジェクトのコンテンツに保存できません。アイテムが存在していません。
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		オブジェクトのコンテンツに保存できません。同じ名前を持つアイテムがすでにインベントリに存在します。
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		オブジェクトのコンテンツに保存できません。このため、アタッチメントの権限が変更されます。
-	</notification>
-	<notification name="TooManyScripts">
-		スクリプトが多すぎます。
-	</notification>
-	<notification name="UnableAddScript">
-		テキストを追加できません!
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		資産サーバーがタイムリーに応答しませんでした。オブジェクトが sim に返されました。
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		このリージョンでは、物理的シェイプが有効にされていません。
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		リージョンの境界をまたぐナビメッシュは変更できません。
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		そのオブジェクトタイプの物理的プロパティを設定できません。
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		ルートプリムを設定できないため、シェイプがありません。
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		このリージョンでは、物理的素材が有効にされていません。
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		物理的素材を調整できるのは、ルートプリムだけです。
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		キャラクターへの物理的素材の設定はまだサポートされていません。
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		指定した物理的素材のプロパティが 1 つ以上無効です。
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		メッシュオブジェクトの縫い目のタイプを変更することはできません。
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		メッシュオブジェクトの形状を変更することはできません
-	</notification>
-	<notification name="FullRegionCantEnter">
-		リージョンが埋まっているため、\nこのリージョンに入場できません。
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		リンクエラー -- 所有者が違います
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		リンクエラー -- リージョンの境界をまたぐナビメッシュは変更できません。
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		リンクエラー -- 編集権限がありません。
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		リンクエラー -- プリミティブが多すぎます。
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		リンクエラー -- コピーなしと転送なしをリンクできません。
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		リンクエラー -- リンクできるものがありません。
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		リンクエラー -- パスファインディングの文字数が多すぎます
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		リンクエラー -- 土地のリソースが足りません
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		オブジェクトが使用している物理リソースが多すぎたため、ダイナミックスが無効にされました。
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		区画 &apos;[PARCEL_NAME]&apos; のオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはホームにテレポートされました。
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		​オブジェクト ​&apos;[OBJECT_NAME]&apos; によって、あなたはホームへテレポートされています。
-	</notification>
-	<notification name="TeleportedByAttachment">
-		[ITEM_ID] へのアタッチメントによって、あなたはテレポートされています。
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		区画 &apos;[PARCEL_NAME]&apos; のオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		[OWNER_ID] が所有しているオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		不明なユーザーが所有しているオブジェクト &apos;[OBJECT_NAME]&apos; によって、あなたはテレポートされています。
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		リクエストされたオブジェクトを作成できません。リージョンが埋まっています。
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		1 つの場所に複数のオブジェクトを着用することはできません。
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		ここでは、複数のオブジェクトを作成することはできません。
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		リクエストされたオブジェクトを作成できません。オブジェクトがデータベースに見つかりません。
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		リクエストされたオブジェクトを作成できません。リクエストがタイムアウトになりました。もう一度お試しください。
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		要求されたオブジェクトを作成できません。もう一度お試しください。
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		リクエストされたオブジェクトのロードに時間がかかりすぎたため、Rez に失敗しました。
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		この土地に木を植えることはできません。
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		オブジェクトをリストアできません。ワールドの位置が見つかりません。
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		メッシュデータが無効なため、オブジェクトを Rez することができません。
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		このリージョンに既に多くのスクリプトが存在するため、オブジェクトを Rez することができません。
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		現在のアクセス権限では、そこにオブジェクトを作成できません。
-	</notification>
-	<notification name="CantCreateObject">
-		現在あなたにはオブジェクト作成する許可がありません。
-	</notification>
-	<notification name="InvalidObjectParams">
-		無効なオブジェクトパラメーター
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		現在のアクセス権限では、ここにオブジェクトのコピーを作成できません。
-	</notification>
-	<notification name="CantChangeShape">
-		あなたにはこのシェイプを変更する許可がありません。
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		現在のアクセス権限では、ここにオブジェクトを取得できません。
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		あなたのグループにオブジェクトを譲渡する権限がないため、譲渡に失敗しました。
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		現在のアクセス権限では、ここでオブジェクトを購入できません。
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		アバターがオブジェクトに存在するため、オブジェクトを着用できません。
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		木や草をアタッチメントとして着用できません。
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		グループが所有しているオブジェクトは着用できません。
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		所有していないオブジェクトは着用できません。
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		ナビメッシュに貢献しているオブジェクトは着用できません。
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		あなたにはオブジェクトを移動する権限がないため、そのオブジェクト添付できません。
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		オブジェクトの着用に使用できるスクリプトリソースが足りません。
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		オブジェクトをここにドロップできません。フリートライアル領域をお試しください。
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		メッシュアタッチメントをドロップすることはできません。インベントリから切り離して、ワールドで Rez してください。
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		アタッチメントのドロップに失敗しました。そこへドロップする権限がありません。
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		アタッチメントのドロップに失敗しました。利用できる土地リソースの数が足りません。
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		利用できるリソースが足りないため、アタッチメントのドロップに失敗しました。
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		ここにオブジェクトをドロップできません。区画が埋まっています。
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		土地区画に入場することを禁止されているため、このオブジェクトを触ったり、つかむことができません。
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		削除パラメーターを絞ってください。
-	</notification>
-	<notification name="UnableToUploadAsset">
-		資産をアップロードできません。
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		ホームをテレポートするユーザーが見つかりませんでした。
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		過剰なリクエストが失敗しました
-	</notification>
-	<notification name="GenericRequestFailed">
-		一般的なリクエストに失敗しました
-	</notification>
-	<notification name="CantUploadPostcard">
-		ポストカードをアップロードできません。後でもう一度お試しください。
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		グループ通知のインベントリの詳細を取得できません。
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		グループ通知の送信が許可されないため、送信できません。
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		グループ通知を送信できません。持ち物を作成することもできません。
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		通知内の持ち物を検出できません。
-	</notification>
-	<notification name="TerrainUploadFailed">
-		地形のアップロードに失敗しました。
-	</notification>
-	<notification name="TerrainFileWritten">
-		地形ファイルが書き込まれました。
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		地形ファイルを書き出し、ダウンロードを開始しています...
-	</notification>
-	<notification name="TerrainBaked">
-		地形がベークされました。
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		選択された最初の 10 個のオブジェクトのみが無効にされました。必要に応じて、リフレッシュして選択内容を追加してください。
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		この区画を購入するには、ビューワをアップデートする必要があります。
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		購入することができません。この区画は販売対象ではありません。
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		販売価格または土地の面積が変わったため、購入できません。
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		あなたはこの区画の委任された買い手ではありません。
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		すでに購入の認証を待機しているため、この区画を購入できません。
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		区画をオーバーフローするため、ここでオブジェクトを構築することはできません。
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		所有者の違う土地を選びました。選択する面積を小さくして、もう一度試してください。
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		選択範囲のリース区画の数が少ないため、参加できません。
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		土地を分割できません。\n区画が複数選択されています。\nもっと小さい土地を選択してみてください。
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		土地を分解できません。\n区画が見つかりません。\n「Help」&gt;「Reprt Bug...」でレポートを行ってください。
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		土地を分割できません。区画全体を選択します。\n小さい土地を選択してみてください。
-	</notification>
-	<notification name="LandHasBeenDivided">
-		土地が分割されています。
-	</notification>
-	<notification name="PassPurchased">
-		入場許可を購入しました。
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		リージョンでは、クラシファイド広告を許可しません。
-	</notification>
-	<notification name="LandPassExpireSoon">
-		この土地への入場許可はまもなく期限が切れます。
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		配置に適した表面がありません。別の場所を試してみたください。
-	</notification>
-	<notification name="CantSitNoRoom">
-		ここには座る余地がありません。他の場所を試してください。
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		権限がないため、オブジェクトを取得できませんでした。
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		リンデンドルが足りないため、オブジェクトの取得に失敗しました。
-	</notification>
-	<notification name="CantDeedGroupLand">
-		グループ所有の土地は、譲渡できません。
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		リンデンドルが足りないため、オブジェクトの購入に失敗しました。
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		リンデンドルが不足しているため、インベントリを購入できませんでした。
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		リンデンドルが足りないため、この土地への入場許可を購入できません。
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		今すぐには入場許可を購入できません。後でもう一度お試しください。
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		区画が埋まっているため、オブジェクトを\n作成することができません。
-	</notification>
-	<notification name="FailedPlacingObject">
-		指定した場所にオブジェクトを配置できませんでした。もう一度お試しください。
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		イベントのためのランドマークを作成することができません。
-	</notification>
-	<notification name="GodBeatsFreeze">
-		強力な力でフリーズを解除します。
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		特殊な権限のリクエストに失敗しました。このリクエストはログに記録されています。
-	</notification>
-	<notification name="ExpireExplanation">
-		システムは、現在あなたのリクエストを処理できません。リクエストがタイムアウトになりました。
-	</notification>
-	<notification name="DieExplanation">
-		システムは、あなたのリクエストを処理できません。
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		プリミティブ広告を出すには、資金が足りません。
-	</notification>
-	<notification name="RezObjectFailure">
-		資金が足りないため、オブジェクトを作成できません。
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		ホームが不正なため、ホームの位置をリセットします。
-	</notification>
-	<notification name="CantInviteRegionFull">
-		リージョンが埋まっているため、現在の場所に誰かを招待することはできません。後でもう一度お試しください。
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		このリージョンでは、ここにホームの位置を設定できません。
-	</notification>
-	<notification name="ListValidHomeLocations">
-		ホームの場所を設定できるのは、自分の土地か、またはメインランドのインフォハブでのみです。
-	</notification>
-	<notification name="SetHomePosition">
-		家の配置の設定。
-	</notification>
-	<notification name="CantDerezInventoryError">
-		インベントリエラーのため、オブジェクトの Rez 解除ができません。
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		リクエストされたインベントリを作成できません。
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		リクエストされた持ち物フォルダーを作成できません。
-	</notification>
-	<notification name="CantCreateInventory">
-		そのインベントリを作成できません。
-	</notification>
-	<notification name="CantCreateLandmark">
-		ランドマークを作成できません。
-	</notification>
-	<notification name="CantCreateOutfit">
-		アウトフィットをすぐには作成できません。しばらくしてから再度お試しください。
-	</notification>
-	<notification name="InventoryNotForSale">
-		インベントリは販売対象ではありません。
-	</notification>
-	<notification name="CantFindInvItem">
-		持ち物アイテムを見つけることができません。
-	</notification>
-	<notification name="CantFindObject">
-		オブジェクトが見つかりません。
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		オブジェクトへの送金は、このリージョンでは現在無効にされています。
-	</notification>
-	<notification name="CantPayNoAgent">
-		支払いの相手を把握できませんでした。
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		パブリックオブジェクトにリンデンドルを与えることはできません。
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		インワールドオブジェクトでのインベントリ作成に失敗しました。
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		内部エラーが発生したため、ビューワを正しく更新できませんでした。ビューワに表示されるリンデンドルの残高または区画の所有は、サーバー上の実際の残高を反映していない可能性があります。
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		他のプレイヤーの関心を引く大きなプリムを作成できません。他のプレイヤーが移動したときに再試行してください。
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		これにより、過去の会話のログ、およびそのファイルのすべてのバックアップが削除されます。
-		<usetemplate ignoretext="以前の会話のログを削除する前に確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		これにより、以前のすべての会話のテキストが削除されます。過去の会話のリストには影響しません。.txt および txt.backup の拡張子が付いたすべてのファイルが [FOLDER] フォルダーから削除されます。
-		<usetemplate ignoretext="テキストを削除するまえに確認してください。" name="okcancelignore" notext="取り消し" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		ファイルを移動できません。以前のパスがリストアされました。
-		<usetemplate ignoretext="ファイルを移動できません。以前のパスがリストアされました。" name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
index 3ef8eba19f..70d37c3bad 100644
--- a/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml
@@ -27,6 +27,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="このフレンドは、あなたのオブジェクトを編集・削除・取得することができます"/>
 	<icon name="permission_map_icon" tool_tip="このフレンドは地図上であなたの位置を表示できます"/>
 	<icon name="permission_online_icon" tool_tip="このフレンドはあなたがオンラインにいることを確認できます"/>
-	<button name="info_btn" tool_tip="詳細"/>
 	<button name="profile_btn" tool_tip="プロフィールの表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
index 9263e5f347..5d6a6065ae 100644
--- a/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ja/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="フィルター" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="選択した住人・オブジェクトに対するアクション"/>
-		<menu_button name="view_btn" tool_tip="オプションを並べ替える"/>
-		<menu_button name="plus_btn" tool_tip="ブロックする住人・オブジェクトを選択"/>
-		<button name="unblock_btn" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
-	</panel>
-	<block_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
+	<text name="title_text">
+		ブロックリスト
+	</text>
+	<scroll_list name="blocked" tool_tip="現在ブロックされている住人一覧"/>
+	<button label="アバターをブロック" label_selected="住人をブロック..." name="Block resident..." tool_tip="ブロックしたい住人を選んでください"/>
+	<button label="名前でオブジェクトをブロック..." label_selected="名前でオブジェクトをブロック..." name="Block object by name..." tool_tip="名前でブロックしたいオブジェクトを選んでください"/>
+	<button label="ブロック解除" label_selected="ブロック解除" name="Unblock" tool_tip="ブロックリストから住人・オブジェクトを削除"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
deleted file mode 100644
index 09ffb92d36..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="（ローディング）"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
deleted file mode 100644
index e05a67e31d..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="ボイスチャット"/>
-	<icon name="unread_ims_icon" tool_tip="ログアウト時に表示されるメッセージ"/>
-	<button name="delete_btn" tool_tip="このエントリーを削除"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
index 77d3d8f391..4b548049c8 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="不明"/>
-	<button name="info_btn" tool_tip="詳細"/>
 	<button name="profile_btn" tool_tip="プロフィールの表示"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index 03ce87537a..88c31451b5 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- Side tray panel -->
 <panel label="人" name="people_panel">
 	<string name="no_recent_people" value="最近交流した人はいません。 一緒に何かする仲間をお探しですか？ [secondlife:///app/search/people 検索] か [secondlife:///app/worldmap 世界地図] をお試しください。"/>
@@ -14,53 +14,81 @@
 	<string name="no_filtered_friends_msg">
 		お探しのものは見つかりましたか？ [secondlife:///app/search/people/[SEARCH_TERM] 検索] をお試しください。
 	</string>
+	<string name="people_filter_label" value="人をフィルター"/>
+	<string name="groups_filter_label" value="グループをフィルター"/>
 	<string name="no_filtered_groups_msg" value="お探しのものは見つかりましたか？ [secondlife:///app/search/groups/[SEARCH_TERM] 検索] をお試しください。"/>
 	<string name="no_groups_msg" value="グループをお探しですか？ [secondlife:///app/search/groups 検索] をお試しください。"/>
 	<string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）"/>
 	<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）"/>
+	<filter_editor label="フィルター" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="近く" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="人をフィルター" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<menu_button name="nearby_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
-				<dnd_button name="nearby_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="オプション"/>
+				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
 			</panel>
 		</panel>
-		<panel label="フレンド" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="人をフィルター" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<menu_button name="friends_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<button name="friends_add_btn" tool_tip="フレンド登録を申し出ます"/>
-				<dnd_button name="friends_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
-			</panel>
+		<panel label="マイ フレンド" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="オンライン"/>
 				<accordion_tab name="tab_all" title="全員"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="オプションを表示します"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="フレンド登録を申し出る"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="選択した人をフレンドリストから削除"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="グループ" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="フィルターグループ" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="選択したグループに対するアクション"/>
-				<menu_button name="groups_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<menu_button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
-				<dnd_button name="minus_btn" tool_tip="選択したグループから脱退"/>
+		<panel label="マイ グループ" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="オプション"/>
+				<button name="plus_btn" tool_tip="グループに参加 / 新規グループを作成します"/>
+				<button name="activate_btn" tool_tip="選択したグループをアクティブにします"/>
 			</panel>
 		</panel>
 		<panel label="最新" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="人をフィルター" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="選択した人に対するアクション"/>
-				<menu_button name="recent_view_btn" tool_tip="表示 / 並べ替えのオプション"/>
-				<button name="add_friend_btn" tool_tip="フレンド登録を申し出ます"/>
-				<dnd_button name="recent_del_btn" tool_tip="フレンドとして選択されている人を削除"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="オプション"/>
+				<button name="add_friend_btn" tool_tip="選択した住人をフレンドリストに登録"/>
 			</panel>
 		</panel>
-		<panel label="停止" name="blocked_panel">
-			<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="プロフィール" name="view_profile_btn" tool_tip="写真、グループ、その他住人情報を表示"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="インスタントメッセージを開きます"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="コール" name="call_btn" tool_tip="この住人にコールする"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="共有" name="share_btn" tool_tip="インベントリのアイテムを共有する"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="テレポート" name="teleport_btn" tool_tip="テレポートを送ります"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="グループプロフィール" name="group_info_btn" tool_tip="グループプロフィールを表示します"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="グループチャット" name="chat_btn" tool_tip="チャットを開始します"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="グループコール" name="group_call_btn" tool_tip="このグループにコールする"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
index ae5391c7bd..b6e344ca48 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="チャット" name="chat">
-	<panel>
-		<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
-		<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
-		<check_box label="フレンドとグループ以外からはコールと IM を受信しない" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			文字の大きさ：
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="小規模" name="Small" value="0"/>
-			<item label="中" name="Medium" value="1"/>
-			<item label="大規模" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="吹き出しチャット" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			通知
-		</text>
-		<text name="friend_ims">
-			フレンド IM:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
-			<item label="フィルターなし" name="None" value="none"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			非フレンド IM:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
-			<item label="フィルターなし" name="None" value="none"/>
-		</combo_box>
-		<text name="conference_ims">
-			コンファレンス IM:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flashツールバーボタン" name="FlashToolbarButton" value="flash"/>
-			<item label="フィルターなし" name="None" value="none"/>
-		</combo_box>
-		<text name="group_chat">
-			グループチャット:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flash ツールバーボタン" name="FlashToolbarButton" value="flash"/>
-			<item label="なし" name="None" value="none"/>
-		</combo_box>
-		<text name="nearby_chat">
-			近くのチャット:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="会話ウィンドウを開く" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="メッセージのポップアップ" name="PopUpMessage" value="toast"/>
-			<item label="Flash ツールバーボタン" name="FlashToolBarButton" value="flash"/>
-			<item label="フィルターなし" name="None" value="none"/>
-		</combo_box>
-		<text name="notifications_alert">
-			すべての通知を一時的に受け付けないようにするには、「コミュニケート」&gt;「通知を受けない」を使用します。
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			音の再生:
-		</text>
-		<check_box label="新しい会話" name="new_conversation"/>
-		<check_box label="ボイスコールの着信" name="incoming_voice_call"/>
-		<check_box label="テレポートを渡す" name="teleport_offer"/>
-		<check_box label="アイテムのオファー" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="ログのクリア..." name="clear_log"/>
-		<button label="テキストの削除..." name="delete_transcripts"/>
-		<button label="参照..." label_selected="参照" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		文字の大きさ：
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="小" name="radio" value="0"/>
+		<radio_item label="中" name="radio2" value="1"/>
+		<radio_item label="大" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="チャット中にタイピング動作のアニメーションを再生" name="play_typing_animation"/>
+	<check_box label="オフライン時に受け取った IM をメールで受信" name="send_im_to_email"/>
+	<check_box label="IM とチャット履歴に文字だけ表示する" name="plain_text_chat_history"/>
+	<check_box label="吹き出しチャット" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		IM の表示方法：
+	</text>
+	<text name="requires_restart_label">
+		（再起動後に反映）
+	</text>
+	<radio_group name="chat_window" tool_tip="インスタントメッセージを別フローター、または1つのフローターに複数タブで表示します（要再起動）">
+		<radio_item label="別々のウィンドウ" name="radio" value="0"/>
+		<radio_item label="タブ" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		受信チャットのポップアップを有効にする
+	</text>
+	<check_box label="グループチャット" name="EnableGroupChatPopups" tool_tip="これを選択すると、グループチャットメッセージを受信した際にポップアップが表示されます"/>
+	<check_box label="IM チャット" name="EnableIMChatPopups" tool_tip="これを選択すると、インスタントメッセージを受信した際にポップアップが表示されます"/>
+	<spinner label="近くのチャットメッセージが表示される長さ：" name="nearby_toasts_lifetime"/>
+	<spinner label="近くのチャットメッセージが消えるまでの長さ：" name="nearby_toasts_fadingtime"/>
 	<button label="他の言語..." name="ok_btn"/>
 	<button label="自動置換..." name="autoreplace_showgui"/>
 	<button label="スペルチェック中..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index d70af7e099..91e1514e49 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -69,9 +69,9 @@
 		<combo_box.item label="一時退席設定なし" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		「通知を受けない」応答:
+		取り込み中モード時の返事：
 	</text>
-	<text_editor name="do_not_disturb_response">
+	<text_editor name="busy_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
index 4f65c8477b..c61c73657f 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="オブジェクトを買う" name="Buyobject"/>
 			<combo_box.item label="オブジェクトに支払う" name="Payobject"/>
 			<combo_box.item label="開く" name="Open"/>
-			<combo_box.item label="ズーム" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index b27904c4d7..50697e5500 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -137,7 +137,7 @@
 		終了
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=ja-JP&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		お使いの古いビューワでは Second Life にアクセスできません。以下のページから新しいビューワをダウンロードしてください：
@@ -622,8 +622,8 @@ support@secondlife.com にお問い合わせください。
 	<string name="AvatarAway">
 		一時退席中
 	</string>
-	<string name="AvatarDoNotDisturb">
-		通知を受けない
+	<string name="AvatarBusy">
+		取り込み中
 	</string>
 	<string name="AvatarMuted">
 		ブロック中
@@ -859,12 +859,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="ST_NO_JOINT">
 		ROOT または JOINT が見つかりません
 	</string>
-	<string name="NearbyChatTitle">
-		近くのチャット
-	</string>
-	<string name="NearbyChatLabel">
-		(近くのチャット)
-	</string>
 	<string name="whisper">
 		のささやき:
 	</string>
@@ -928,15 +922,12 @@ support@secondlife.com にお問い合わせください。
 	<string name="ControlYourCamera">
 		カメラのコントロール
 	</string>
-	<string name="NotConnected">
-		接続されていません
-	</string>
-	<string name="AgentNameSubst">
-		(あなた)
-	</string>
 	<string name="TeleportYourAgent">
 		あなたをテレポート
 	</string>
+	<string name="NotConnected">
+		接続されていません
+	</string>
 	<string name="SIM_ACCESS_PG">
 		General
 	</string>
@@ -1018,6 +1009,18 @@ support@secondlife.com にお問い合わせください。
 	<string name="dictionary_files">
 		辞書
 	</string>
+	<string name="AvatarSetNotAway">
+		一時退席中解除
+	</string>
+	<string name="AvatarSetAway">
+		一時退席中
+	</string>
+	<string name="AvatarSetNotBusy">
+		取り込み中解除
+	</string>
+	<string name="AvatarSetBusy">
+		取り込み中
+	</string>
 	<string name="shape">
 		シェイプ
 	</string>
@@ -1986,8 +1989,8 @@ support@secondlife.com にお問い合わせください。
 	<string name="PanelContentsNewScript">
 		新規スクリプト
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		この住民が「通知を受けない」をオンにすると、あなたのメッセージが後で表示されるようになります。
+	<string name="BusyModeResponseDefault">
+		メッセージを送った住人は、誰にも邪魔をされたくないため現在「取り込み中」モードです。  あなたのメッセージは、あとで確認できるように IM パネルに表示されます。
 	</string>
 	<string name="MuteByName">
 		（名称別）
@@ -2100,6 +2103,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="GroupMoneyDate">
 		[year,datetime,utc]年[mth,datetime,utc]月[day,datetime,utc]日[weekday,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		内容
+	</string>
 	<string name="AcquiredItems">
 		取得アイテム
 	</string>
@@ -3871,7 +3877,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		General リージョン
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		この区画内のアバターは、この区画の外にいるアバターからは見ることも聞くこともできません。
+		この区画外にアバターを見えるようにして、チャットも許可
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		地域（リージョン）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。
@@ -3948,12 +3954,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="IM_unblock_only_groups_friends">
 		このメッセージを表示するには、「環境設定」の「プライバシー」で「フレンドとグループ以外からはコールと IM を受信しない」チェックボックスをオフにします。
 	</string>
-	<string name="OnlineStatus">
-		オンライン
-	</string>
-	<string name="OfflineStatus">
-		オフライン
-	</string>
 	<string name="answered_call">
 		相手がコールを受けました
 	</string>
@@ -3963,9 +3963,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="you_joined_call">
 		ボイスコールに参加しました
 	</string>
-	<string name="you_auto_rejected_call-im">
-		「通知を受けない」がオンのときに、自動的にボイスコールを拒否しました。
-	</string>
 	<string name="name_started_call">
 		[NAME] はボイスコールを開始します
 	</string>
@@ -3982,7 +3979,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 		接続中...
 	</string>
 	<string name="conference-title">
-		複数人チャット
+		アドホックコンファレンス
 	</string>
 	<string name="conference-title-incoming">
 		[AGENT_NAME] とコンファレンスする
@@ -4862,9 +4859,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Command_Chat_Label">
 		チャット
 	</string>
-	<string name="Command_Conversations_Label">
-		会話
-	</string>
 	<string name="Command_Compass_Label">
 		コンパス
 	</string>
@@ -4940,9 +4934,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="Command_Chat_Tooltip">
 		近くの人と文字チャットする
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		全員との会話
-	</string>
 	<string name="Command_Compass_Tooltip">
 		コンパス
 	</string>
@@ -5072,13 +5063,4 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		会話はログに記録されていません。ログの記録を開始するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		これ以上の会話は記録されません。ログの記録を再開するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_log.xml b/indra/newview/skins/default/xui/pt/floater_conversation_log.xml
deleted file mode 100644
index ae7dd3c441..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="REGISTRO DE CONVERSA">
-	<panel name="buttons_panel">
-		<filter_editor label="Filtrar pessoas" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Opções de exibição/ordenação"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Ações em uma pessoa ou um grupo selecionado"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml b/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
deleted file mode 100644
index 97a2e8327c..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="CONVERSA:">
-	<floater.string name="Title">
-		CONVERSA: [NAME]
-	</floater.string>
-	<text name="page_label" value="Página"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_container.xml b/indra/newview/skins/default/xui/pt/floater_im_container.xml
index a1cea72b1e..0fbb826a96 100644
--- a/indra/newview/skins/default/xui/pt/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="CONVERSAS">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Opções de exibição/ordenação"/>
-					<button name="add_btn" tool_tip="Iniciar uma nova conversa"/>
-					<button name="speak_btn" tool_tip="Fale com pessoas usando seu microfone"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Recolher/expandir esta lista"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Recolher este painel"/>
-					<text name="stub_textbox">
-						Esta conversa está em uma janela separada.   [secondlife:/// Trazer de volta.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="CONVERSAS"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_im_session.xml b/indra/newview/skins/default/xui/pt/floater_im_session.xml
index 9f6a7a06ad..5543ffa41d 100644
--- a/indra/newview/skins/default/xui/pt/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/pt/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] foi convidado para a conversa."/>
-	<floater.string name="multiple_participants_added" value="[NAME] foram convidados para a conversa."/>
-	<floater.string name="tooltip_to_separate_window" value="Mover esta conversa para uma janela separada"/>
-	<floater.string name="tooltip_to_main_window" value="Mover esta conversa para a janela principal"/>
-	<floater.string name="start_call_button_tooltip" value="Abrir conexão por voz"/>
-	<floater.string name="end_call_button_tooltip" value="Encerrar conexão por voz"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Recolher este painel"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Recolher lista de participantes"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expandir a lista de participantes"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Opções de exibição/ordenação"/>
-				<menu_button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
-				<button name="add_btn" tool_tip="Adicionar alguém a esta conversa"/>
-				<button name="voice_call_btn" tool_tip="Abrir conexão por voz"/>
-				<button name="close_btn" tool_tip="Encerrar esta conversa"/>
-				<button name="expand_collapse_btn" tool_tip="Recolher/expandir este painel"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="Para" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Mostrar/ocultar painel de mensagens"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="Para" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
index 1e86f847ad..6344258fa0 100644
--- a/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/pt/floater_incoming_call.xml
@@ -25,9 +25,9 @@
 		Sair do [CURRENT_CHAT] e entrar neste bate-papo de voz?
 	</floater.string>
 	<text name="question">
-		Se você atender, será desconectado de suas conversas de voz atuais.
+		Sair do [CURRENT_CHAT] e entrar neste bate-papo?
 	</text>
-	<button label="Atender" label_selected="Atender" name="Accept"/>
-	<button label="Ignorar" label_selected="Ignorar" name="Reject"/>
-	<button label="Iniciar MI em vez disso" name="Start IM"/>
+	<button label="Aceitar" label_selected="Aceitar" name="Accept"/>
+	<button label="Rejeitar" label_selected="Rejeitar" name="Reject"/>
+	<button label="Enviar MI" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
index d04cf2a173..182f2513e0 100644
--- a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Exibir:
 			</text>
-			<check_box label="Testar" name="show_world"/>
+			<check_box label="Mundo" name="show_world"/>
 			<check_box label="Apenas móveis" name="show_world_movables_only"/>
 			<check_box label="Navmesh" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
index ba4ef0afde..a75cf34a94 100644
--- a/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Padrão" label_selected="Padrão" name="Default"/>
 	<button label="Branco" label_selected="Branco" name="Blank"/>
 	<button label="Nenhum" label_selected="Nenhum" name="None"/>
-	<check_box initial_value="true" label="Inscrever-se agora" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Visualização em tempo real" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Visualização desativada"/>
 	<filter_editor label="Filtrar texturas" name="inventory search editor"/>
 	<check_box initial_value="false" label="Exibir pastas" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
deleted file mode 100644
index de7aa2df12..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="VOLUME DO BATE-PAPO DE VOZ">
-	<slider label="Bate-papo de voz" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
index 71d3c33ae5..b29ca3d699 100644
--- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="AMOSTRA DE DISTORÇÃO DE VOZ">
+<floater label="Lugares" name="voice_effects" title="EFEITOS DE VOZ">
 	<string name="no_voice_effect">
 		(Não distorcer voz)
 	</string>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_volume.xml b/indra/newview/skins/default/xui/pt/floater_voice_volume.xml
deleted file mode 100644
index dae47a99ae..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="VOLUME DE VOZ">
-	<slider name="volume_slider" tool_tip="Volume de voz" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
index b59895573e..8716992a5e 100644
--- a/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Gear COF">
+<menu name="Gear COF">
 	<menu label="Roupas novas" name="COF.Gear.New_Clothes"/>
-	<menu label="Novas partes do corpo" name="COF.Gear.New_Body_Parts"/>
-</toggleable_menu>
+	<menu label="Nova parte do corpo" name="COF.Geear.New_Body_Parts"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation.xml b/indra/newview/skins/default/xui/pt/menu_conversation.xml
deleted file mode 100644
index 01316b887d..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Encerrar conversa" name="close_conversation"/>
-	<menu_item_call label="Abrir conversa de voz" name="open_voice_conversation"/>
-	<menu_item_call label="Desconectar de voz" name="disconnect_from_voice"/>
-	<menu_item_call label="Exibir perfil" name="view_profile"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
-	<menu_item_call label="Chamada de voz" name="voice_call"/>
-	<menu_item_call label="Histórico de bate-papo..." name="chat_history"/>
-	<menu_item_call label="Adicionar amigo" name="add_friend"/>
-	<menu_item_call label="Remover amigo" name="remove_friend"/>
-	<menu_item_call label="Remover amigos" name="remove_friends"/>
-	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
-	<menu_item_call label="Mais zoom" name="zoom_in"/>
-	<menu_item_call label="Mapa" name="map"/>
-	<menu_item_call label="Compartilhar" name="share"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_check label="Bloquear voz" name="block_unblock"/>
-	<menu_item_check label="Bloquear texto" name="MuteText"/>
-	<menu_item_call label="Perfil do grupo" name="group_profile"/>
-	<menu_item_call label="Ativar grupo" name="activate_group"/>
-	<menu_item_call label="Sair do grupo" name="leave_group"/>
-	<context_menu label="Opções do moderador &gt;" name="Moderator Options">
-		<menu_item_check label="Pode bater papo por escrito" name="AllowTextChat"/>
-		<menu_item_call label="Silenciar este participante" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Desfazer silenciar deste participante" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Silenciar todos" name="ModerateVoiceMute"/>
-		<menu_item_call label="Desfazer silenciar para todos" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
deleted file mode 100644
index 616e6db46e..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="MI..." name="IM"/>
-	<menu_item_call label="Chamada de voz..." name="Call"/>
-	<menu_item_call label="Abrir histórico de bate-papo..." name="Chat history"/>
-	<menu_item_call label="Exibir perfil" name="View Profile"/>
-	<menu_item_call label="Oferecer teletransporte" name="teleport"/>
-	<menu_item_call label="Adicionar amigo" name="add_friend"/>
-	<menu_item_call label="Remover amigo" name="remove_friend"/>
-	<menu_item_call label="Convidar para entrar no grupo..." name="Invite"/>
-	<menu_item_call label="Mapa" name="Map"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
deleted file mode 100644
index cab81175a0..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Ordenar por nome" name="sort_by_name"/>
-	<menu_item_check label="Ordenar por data" name="sort_by_date"/>
-	<menu_item_check label="Ordenar com amigos acima" name="sort_by_friends"/>
-	<menu_item_call label="Exibir histórico de Bate-papo local..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_conversation.xml b/indra/newview/skins/default/xui/pt/menu_im_conversation.xml
deleted file mode 100644
index a8434dc336..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Exibir perfil" name="View Profile"/>
-	<menu_item_call label="Adicionar amigo" name="Add Friend"/>
-	<menu_item_call label="Remover amigo" name="remove_friend"/>
-	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
-	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
-	<menu_item_call label="Histórico de bate-papo..." name="chat_history"/>
-	<menu_item_call label="Mais zoom" name="zoom_in"/>
-	<menu_item_call label="Mapa" name="map"/>
-	<menu_item_call label="Compartilhar" name="Share"/>
-	<menu_item_call label="Pagar" name="Pay"/>
-	<menu_item_check label="Bloquear voz" name="Block/Unblock"/>
-	<menu_item_check label="Bloquear texto" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
deleted file mode 100644
index 398b890f66..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Exibição compacta" name="compact_view"/>
-	<menu_item_check label="Exibição expandida" name="expanded_view"/>
-	<menu_item_check label="Mostrar hora" name="IMShowTime"/>
-	<menu_item_check label="Mostrar nomes em conversas individuais" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_object_icon.xml b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
index df224a88fa..7af760a6ee 100644
--- a/indra/newview/skins/default/xui/pt/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Perfil do objeto..." name="Object Profile"/>
 	<menu_item_call label="Bloquear..." name="Block"/>
-	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
-	<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
index 3602bdaac4..894f1d741c 100644
--- a/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/pt/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Novo cabelo" name="New Hair"/>
 		<menu_item_call label="Novos olhos" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Expandir todas as pastas" name="expand"/>
-	<menu_item_call label="Recolher todas as pastas" name="collapse"/>
 	<menu_item_call label="Renomear look" name="rename"/>
 	<menu_item_call label="Excluir visual" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_participant_view.xml b/indra/newview/skins/default/xui/pt/menu_participant_view.xml
deleted file mode 100644
index b61108cf54..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Ordenar conversas por tipo" name="sort_sessions_by_type"/>
-	<menu_item_check label="Ordenar conversas por nome" name="sort_sessions_by_name"/>
-	<menu_item_check label="Ordenar conversas por atividade recente" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Ordenar participantes por nome" name="sort_participants_by_name"/>
-	<menu_item_check label="Ordenar participantes por atividade recente" name="sort_participants_by_recent"/>
-	<menu_item_call label="Preferências de bate-papo..." name="chat_preferences"/>
-	<menu_item_call label="Preferências de privacidade..." name="privacy_preferences"/>
-	<menu_item_check label="Registro de conversas..." name="Conversation"/>
-	<menu_item_check label="Traduzir Bate-papo local" name="Translate_chat"/>
-	<menu_item_check label="Configurações de tradução..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
deleted file mode 100644
index 8bbde9b38c..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="Desbloquear" name="unblock"/>
-	<menu_item_call label="Perfil..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
deleted file mode 100644
index e69935995c..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Bloquear residente por nome..." name="block_resident_by_name"/>
-	<menu_item_call label="Bloquear objeto por nome" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
deleted file mode 100644
index b80d683c7b..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Ordenar por nome" name="sort_by_name"/>
-	<menu_item_check label="Ordenar por tipo" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml b/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
deleted file mode 100644
index 46caeae310..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por nome" name="sort_name"/>
-	<menu_item_check label="Ordenar por status" name="sort_status"/>
-	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
-	<menu_item_check label="Exibir permissões concedidas" name="view_permissions"/>
-	<menu_item_check label="Exibir registro de conversas..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups.xml b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
index 2ba7af17cd..9a924ad7b9 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Ver dados" name="View Info"/>
 	<menu_item_call label="Bate-papo" name="Chat"/>
-	<menu_item_call label="Chamada de voz" name="Call"/>
+	<menu_item_call label="Ligar" name="Call"/>
 	<menu_item_call label="Ativar" name="Activate"/>
 	<menu_item_call label="Sair" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml b/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
deleted file mode 100644
index 637e591ae1..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Mostrar ícones de grupos" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
index 51464fed68..7c720f262b 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Exibir perfil" name="view_profile"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
-	<menu_item_call label="Chamada de voz" name="voice_call"/>
-	<menu_item_call label="Exibir histórico de bate-papo..." name="chat_history"/>
-	<menu_item_call label="Adicionar amigo" name="add_friend"/>
-	<menu_item_call label="Remover amigo" name="remove_friend"/>
-	<menu_item_call label="Convidar para entrar no grupo..." name="invite_to_group"/>
-	<menu_item_call label="Mais zoom" name="zoom_in"/>
-	<menu_item_call label="Mapa" name="map"/>
-	<menu_item_call label="Compartilhar" name="share"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_check label="Bloquear/desbloquear" name="block_unblock"/>
+	<menu_item_call label="Ver perfil" name="View Profile"/>
+	<menu_item_call label="Adicionar amigo..." name="Add Friend"/>
+	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
+	<menu_item_call label="MI" name="IM"/>
+	<menu_item_call label="Ligar" name="Call"/>
+	<menu_item_call label="Mapa" name="Map"/>
+	<menu_item_call label="Compartilhar" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_check label="Bloquear/desbloquear" name="Block/Unblock"/>
+	<menu_item_call label="Teletransportar?" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
index 7f3c6ace27..79edb96b1c 100644
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/pt/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Adicionar amigo..." name="add_friends"/>
-	<menu_item_call label="Remover amigo..." name="remove_friends"/>
-	<menu_item_call label="MI" name="im"/>
-	<menu_item_call label="Ligar" name="call"/>
-	<menu_item_call label="Compartilhar" name="share"/>
-	<menu_item_call label="Pagar" name="pay"/>
-	<menu_item_call label="Oferecer teletransporte" name="offer_teleport"/>
+	<menu_item_call label="Adicionar amigo..." name="Add Friends"/>
+	<menu_item_call label="Remover amigo..." name="Remove Friend"/>
+	<menu_item_call label="MI" name="IM"/>
+	<menu_item_call label="Ligar" name="Call"/>
+	<menu_item_call label="Compartilhar" name="Share"/>
+	<menu_item_call label="Pagar" name="Pay"/>
+	<menu_item_call label="Teletransportar?" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
deleted file mode 100644
index bce015e732..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por conversas mais recentes" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ordenar por nome" name="sort_name"/>
-	<menu_item_check label="Ordenar por distância" name="sort_distance"/>
-	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
-	<menu_item_check label="Exibir mapa" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml b/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
deleted file mode 100644
index e4b368fe14..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ordenar por mais recente" name="sort_most"/>
-	<menu_item_check label="Ordenar por nome" name="sort_name"/>
-	<menu_item_check label="Exibir ícones de pessoas" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_agent.xml b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
index aa0a426405..ba5e055124 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Exibir perfil" name="show_agent"/>
-	<menu_item_call label="Enviar MI..." name="send_im"/>
-	<menu_item_call label="Adicionar amigo..." name="add_friend"/>
+	<menu_item_call label="Mostrar perfil de residente" name="show_agent"/>
 	<menu_item_call label="Copiar nome para área de transferência" name="url_copy_label"/>
 	<menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
index 247a92567a..c197444181 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Perfil do objeto..." name="show_object"/>
+	<menu_item_call label="Mostrar informações sobre o objeto" name="show_object"/>
 	<menu_item_call label="Mostrar no mapa" name="show_on_map"/>
 	<menu_item_call label="Teletransportar para lugar do objeto" name="teleport_to_object"/>
 	<menu_item_call label="Copiar nome do objeto para área de transferência" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 703df84efb..ca378c1b58 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Parar minha animação" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Andar/correr/voar..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Status" name="Status"/>
+		<menu label="Status" name="Status">
+			<menu_item_call label="Ausente" name="Set Away"/>
+			<menu_item_call label="Ocupado" name="Set Busy"/>
+		</menu>
 		<menu_item_call label="Comprar L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Caixa de saída do lojista..." name="MerchantOutbox"/>
 		<menu_item_call label="Painel da conta..." name="Manage My Account">
@@ -29,18 +32,14 @@
 		<menu_item_call label="Sair do [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicar" name="Communicate">
-		<menu_item_check label="Conversas..." name="Conversations"/>
-		<menu_item_check label="Bate-papo local..." name="Nearby Chat"/>
+		<menu_item_check label="Bate-papo..." name="Nearby Chat"/>
 		<menu_item_check label="Falar" name="Speak"/>
-		<menu label="Distorção de voz" name="VoiceMorphing">
-			<menu_item_check label="Não distorcer voz" name="NoVoiceMorphing"/>
-			<menu_item_check label="Visualizar..." name="Preview"/>
-			<menu_item_call label="Assinar..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Configurações de voz..." name="Nearby Voice"/>
+		<menu_item_check label="Distorção de voz..." name="ShowVoice"/>
 		<menu_item_check label="Gestos..." name="Gestures"/>
-		<menu_item_check label="Amigos" name="My Friends"/>
-		<menu_item_check label="Grupos" name="My Groups"/>
-		<menu_item_check label="Pessoas próximas" name="Active Speakers"/>
+		<menu_item_call label="Amigos" name="My Friends"/>
+		<menu_item_call label="Grupos" name="My Groups"/>
+		<menu_item_call label="Pessoas próximas" name="Active Speakers"/>
 		<menu_item_call label="Lista de bloqueados" name="Block List"/>
 	</menu>
 	<menu label="Mundo" name="World">
@@ -116,6 +115,7 @@
 			<menu_item_call label="Comprar" name="Menu Object Buy"/>
 			<menu_item_call label="Pegar" name="Menu Object Take"/>
 			<menu_item_call label="Pegar uma cópia" name="Take Copy"/>
+			<menu_item_call label="Salvar no meu inventário" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Salvar objeto de volta aos conteúdos do objeto" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Devolver objeto" name="Return Object back to Owner"/>
 		</menu>
@@ -130,7 +130,6 @@
 			<menu_item_call label="Linksets..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Personagens..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Visualização/teste..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Recarregar região" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Opções" name="Options">
 			<menu_item_check label="Mostrar permissões avançadas" name="DebugPermissions"/>
@@ -160,13 +159,6 @@
 	<menu label="Ajuda" name="Help">
 		<menu_item_call label="Como..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] Ajuda" name="Second Life Help"/>
-		<menu_item_call label="Guia do usuário" name="User’s guide"/>
-		<menu_item_call label="Base de conhecimento" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Fóruns da comunidade" name="Community Forums"/>
-		<menu_item_call label="Portal de suporte" name="Support portal"/>
-		<menu_item_call label="Notícias do [SECOND_LIFE]" name="Second Life News"/>
-		<menu_item_call label="Blogs do [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Denunciar abuso" name="Report Abuse"/>
 		<menu_item_call label="Relatar bug" name="Report Bug"/>
 		<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
@@ -344,14 +336,9 @@
 				<menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/>
 				<menu_item_check label="Allow Select Avatar" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Velocidade de animação" name="Animation Speed">
-				<menu_item_call label="Todas as animações 10% mais rápidas" name="All Animations 10 Faster"/>
-				<menu_item_call label="Todas as animações 10% mais lentas" name="All Animations 10 Slower"/>
-				<menu_item_call label="Redefinir todas as velocidades de animação" name="Reset All Animation Speed"/>
-				<menu_item_check label="Animações em câmera lenta" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Force Params to Default" name="Force Params to Default"/>
 			<menu_item_check label="Dados da animação" name="Animation Info"/>
+			<menu_item_check label="Mostrar animação de movimento" name="Slow Motion Animations"/>
 			<menu_item_check label="Disable Level Of Detail" name="Disable LOD"/>
 			<menu_item_check label="Show Collision Skeleton" name="Show Collision Skeleton"/>
 			<menu_item_check label="Display Agent Target" name="Display Agent Target"/>
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index d9f5e48745..ff7382bf80 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -510,24 +510,6 @@ Consultar [_URL] para mais informações?
 		</url>
 		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
-
-    Visitar [_URL] para verificar se há atualizações do driver?
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
-
-    Visitar [_URL] para verificar se há atualizações do driver?
-		<url name="url">
-			http://www.nvidia.com.br/Download/index.aspx?lang=br
-		</url>
-		<usetemplate ignoretext="Meu driver gráfico está desatualizado" name="okcancelignore" notext="Não" yestext="Sim"/>
-	</notification>
 	<notification name="UnknownGPU">
 		A placa de vídeo do seu sistema não é reconhecida pelo [APP_NAME].
 Isto acontece quando novos hardwares que ainda não foram testados no [APP_NAME].  Talvez isso não cause problemas, mas pode ser preciso checar as configurações de vídeo. 
@@ -1551,13 +1533,10 @@ Para instalar a atualização, será preciso reiniciar o [APP_NAME].
 		Não é possível oferecer amizade neste momento. Por favor, tente novamente em breve.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Não perturbe está ativado.  Você não será notificado de comunicações recebidas.
-
-- Outros residentes receberão a sua resposta de Não perturbe (definida em Preferências &gt; Geral).
-- As ofertas de teletransporte serão recusadas.
-- Chamadas de voz serão recusadas.
-		<usetemplate ignoretext="Altero meu status para o modo Não perturbe" name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		Modo ocupado ativado. 
+O bate-papo e MIs não serão exibidos.  MIs enviadas para você receberão sua resposta de modo ocupado.  Todas as ofertas de teletransporte serão recusadas.  Todas as ofertas de inventário serão colocadas na Lixeira.
+		<usetemplate ignoretext="Passar meu status para o modo ocupado" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Você atingiu o limite máximo de grupos. Saia de outro grupo para poder entrar nesse ou recuse o convite.
@@ -2043,10 +2022,6 @@ Mover para o inventário o(s) item(s)?
 		Deseja abrir o [http://secondlife.com/account/ Painel] para ver o histórico da sua conta?
 		<usetemplate ignoretext="Abrir o navegador para acessar minha conta" name="okcancelignore" notext="Cancelar" yestext="Ir para a página"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		Quando você adiciona uma pessoa a uma conversa existente, uma nova conversa é criada.  Todos os participantes recebem notificações sobre a nova conversa.
-		<usetemplate ignoretext="Confirme a inclusão de participantes no bate-papo" name="okcancelignore" notext="Cancelar" yestext="Ok"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		Tem certeza que deseja sair?
 		<usetemplate ignoretext="Confirmar antes de sair" name="okcancelignore" notext="Não sair" yestext="Sair"/>
@@ -2121,14 +2096,14 @@ Você deseja substituí-lo pelo objeto selecionado?
 			<button ignore="Never Replace" name="No" text="Não"/>
 		</form>
 	</notification>
-	<notification label="Aviso de modo Não perturbe" name="DoNotDisturbModePay">
-		Você ativou o Não perturbe. Você não receberá qualquer item oferecido em troca deste pagamento.
+	<notification label="Aviso de Modo Ocupado" name="BusyModePay">
+		Você está no modo Ocupado, o que significa que você não receberá quaisquer itens oferecidos em troca deste pagamento.
 
-Deseja desativar o Não perturbe antes de concluir esta transação?
+Você gostaria de deixar o modo Ocupado antes de completar esta transação?
 		<form name="form">
-			<ignore name="ignore" text="Estou prestes a pagar alguém ou um objeto no modo Não perturbe"/>
-			<button ignore="Sempre manter no modo Não perturbe" name="Yes" text="OK"/>
-			<button ignore="Nunca sair do modo Não perturbe" name="No" text="Cancelar"/>
+			<ignore name="ignore" save_option="true" text="Estou prestes a pagar alguém ou um objeto no modo ocupado"/>
+			<button ignore="Always leave Busy Mode" name="Yes" text="Sim"/>
+			<button ignore="Never leave Busy Mode" name="No" text="Não"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2263,8 +2238,11 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de
 	<notification name="GroupNotice">
 		Assunto: [SUBJECT], Mensagem: [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está online
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; está offline
 	</notification>
 	<notification name="AddSelfFriend">
 		Você é o máximo! Mesmo assim, não dá para adicionar a si mesmo(a) como amigo(a).
@@ -2489,6 +2467,13 @@ Logo, não é possível voar aqui.
 	<notification name="DynamicPathfindingDisabled">
 		O pathfinding dinâmico não está habilitado nesta região.  Os objetos com script usando chamadas LSL de pathfinding podem não operar como o esperado na região.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		A alteração de determinados objetos nesta região pode resultar no comportamento incorreto de outros objeto em movimento.  Para fazer com que os objetos em movimento se comportem corretamente, clique no botão “Recarregar região”.  Escolha “Ajuda” para obter mais informações.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Ajuda" ignoretext="A alteração de determinados objetos nesta região pode resultar no comportamento incorreto de outros objeto em movimento." name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Erro.  Pode haver um erro de rede ou do servidor, ou você pode não ter direitos de construção.  Às vezes, fazer login e logout novamente resolve este problema.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2751,7 +2736,7 @@ OK?
 	<notification name="ScriptQuestionCaution">
 		Aviso: O objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; deseja obter acesso total à sua conta de dólares Linden. Se você conceder acesso, ele poderá remover fundos de sua conta a qualquer momento ou esvaziar sua conta completamente, continuamente e sem avisos adicionais.
   
-Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta.
+Esse tipo de pedido raramente é legítimo. Não conceda acesso se você não entender completamente por que ele deseja acessar sua conta.
 		<form name="form">
 			<button name="Grant" text="Permitir acesso total"/>
 			<button name="Deny" text="Negar"/>
@@ -3325,633 +3310,4 @@ Tentativa cancelada.
 		Você está excluindo [NUM_ITEMS] itens.  Tem certeza de que deseja continuar?
 		<usetemplate ignoretext="Tem certeza de que deseja excluir múltiplos itens?" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] congelou você. Você não pode se mover ou interagir com o mundo.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] congelou você por [AV_FREEZE_TIME] segundos. Você não pode se mover ou interagir com o mundo.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Avatar congelado.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] descongelou você.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Avatar descongelado.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		O congelamento falhou porque você não tem permissão de administrador para esse lote.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		Seu congelamento expirou, vá cuidar da sua vida.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Não é possível congelar esse usuário.
-	</notification>
-	<notification name="NowOwnObject">
-		Agora você é o proprietário do objeto [OBJECT_NAME]
-	</notification>
-	<notification name="CantRezOnLand">
-		Não é possível renderizar objeto em [OBJECT_POS] porque o proprietário do terreno não permite.  Use a ferramenta de terrenos para ver a propriedade do terreno.
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		O objeto não pode ser renderizado porque há muitas solicitações.
-	</notification>
-	<notification name="SitFailCantMove">
-		Você não pode sentar porque não pode se mover no momento.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		Você não pode sentar porque não está autorizado a sentar nesse terreno.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Tente chegar mais perto.  Não é possível sentar no objeto porque
-ele não está na mesma região que você.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		Não foi possível criar um novo objeto. A região está cheia.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Falha ao posicionar objeto em local específico.  Tente novamente.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		Você não pode criar árvores e grama em terrenos que não são sua propriedade.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		A cópia falhou porque você não está autorizado a copiar o objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		A cópia falhou porque o objeto &apos;[OBJ_NAME]&apos; não pode ser transferido para você.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		A cópia falhou porque o objeto &apos;[OBJ_NAME]&apos; contribui para o navmesh.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Duplicar sem objetos raiz selecionados.
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		Não é possível duplicar objetos porque a região está cheia.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		Não é possível duplicar os objetos - não é possível encontrar o lote em que eles estão.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		Não é possível criar objeto porque 
-o lote está cheio.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Falha na tentativa de renderizar um objeto.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		Não é possível criar um item que causou problemas a essa região.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		Esse item do inventário foi incluído na lista.
-	</notification>
-	<notification name="NoCanRezObjects">
-		No momento, você não está autorizado a criar objetos.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Pesquisa de terreno bloqueada.
-Você realizou muitas pesquisas de terreno muito rápido.
-Tente novamente em instantes.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		Não há recursos de script disponíveis suficientes para anexar objeto!
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Você morreu e foi teletransportado para seu início
-	</notification>
-	<notification name="EjectComingSoon">
-		Você não tem mais permissão para ficar aqui e tem [EJECT_TIME] segundos para sair.
-	</notification>
-	<notification name="NoEnterServerFull">
-		Você não pode entrar nesta região porque 
-o servidor está cheio.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Salvar no inventário foi desativado.
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		Não é possível salvar &apos;[OBJ_NAME]&apos; no conteúdo do objeto porque o objeto do qual ele foi renderizado não existe mais.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		Não é possível salvar &apos;[OBJ_NAME]&apos; no conteúdo do objeto porque você não tem permissão para modificar o objeto &apos;[DEST_NAME]&apos;.
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		Não é possível salvar &apos;[OBJ_NAME]&apos; no inventário -- essa operação foi desativada.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		Você não pode copiar sua seleção porque não está autorizado a copiar o objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		Você não pode copiar a seleção porque o objeto &apos;[OBJ_NAME]&apos; não é transferível.
-	</notification>
-	<notification name="NoTransNoCopy">
-		Você não pode copiar a seleção porque o objeto &apos;[OBJ_NAME]&apos; não é transferível.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		A remoção do objeto &apos;[OBJ_NAME]&apos; do simulador é proibida pelo sistema de permissões.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		Você não pode salvar sua seleção porque não está autorizado a modificar o objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		Não é possível salvar sua seleção porque o objeto &apos;[OBJ_NAME]&apos; não é copiável.
-	</notification>
-	<notification name="NoModNoTaking">
-		Você não pode levar sua seleção porque não está autorizado a modificar o objeto &apos;[OBJ_NAME]&apos;.
-	</notification>
-	<notification name="RezDestInternalError">
-		Erro interno: tipo de destino desconhecido.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		A exclusão falhou porque o objeto não foi encontrado
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Não é possível expulsar esse usuário.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Esta região não permite que você a defina como seu início.
-	</notification>
-	<notification name="HomeLocationLimits">
-		Você só pode definir seu &quot;Início&quot; em seu terreno ou em um Infohub do continente.
-	</notification>
-	<notification name="HomePositionSet">
-		Posição de início definida.
-	</notification>
-	<notification name="AvatarEjected">
-		Avatar expulso.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		A expulsão falhou porque você não tem permissão de administrador para esse lote.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		Não é possível mover &apos;[OBJECT_NAME]&apos; para
-[OBJ_POSITION] na região [REGION_NAME] porque o lote está cheio.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		Não é possível mover &apos;[OBJECT_NAME]&apos; para
-[OBJ_POSITION] na região [REGION_NAME] porque seus objetos não são permitidos neste lote.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		Não é possível mover &apos;[OBJECT_NAME]&apos; para
-[OBJ_POSITION] na região [REGION_NAME] porque não há recursos suficientes para este objeto neste lote.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		Não é possível mover &apos;[OBJECT_NAME]&apos; para
-[OBJ_POSITION] na região [REGION_NAME] porque outra região está executando uma versão mais antiga, que não dá suporte o recebimento deste objeto por meio de passagem de regiões.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		Não é possível mover &apos;[OBJECT_NAME]&apos; para
-[OBJ_POSITION] na região [REGION_NAME] porque você não está autorizado a modificar o navmesh além dos limites da região.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		Não é possível mover &apos;[OBJECT_NAME]&apos; para
-[OBJ_POSITION] na região [REGION_NAME] por uma razão desconhecida. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		Você não está autorizado a modificar este objeto
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		Não é possível ativar propriedades físicas para um objeto que contribui para o navmesh.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		Não é possível ativar propriedades físicas para objetos keyframe.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		Não é possível ativar propriedades físicas para o objeto -- recursos de terreno insuficientes.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		Não é possível ativar propriedades físicas para objeto com custo de recursos físicos acima de [MAX_OBJECTS]
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Este objeto não pode ter uma peça côncava porque é phantom e contribui para o navmesh.
-	</notification>
-	<notification name="UnableAddItem">
-		Não é possível adicionar item!
-	</notification>
-	<notification name="UnableEditItem">
-		Não é possível editar isso!
-	</notification>
-	<notification name="NoPermToEdit">
-		Não é permitido editar isso.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		Não é permitido copiar esse inventário.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		Não é possível salvar no conteúdo do objeto: O item não existe mais.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		Não é possível salvar no conteúdo do objeto: já existe um item com esse nome no inventário
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		Não é possível salvar no conteúdo do objeto: isso modificaria as permissões de anexo.
-	</notification>
-	<notification name="TooManyScripts">
-		Muitos scripts.
-	</notification>
-	<notification name="UnableAddScript">
-		Não é possível adicionar script!
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		Servidor de objetos não respondeu a tempo.  Objeto retornado a sim.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		Esta região não tem formas físicas ativadas.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		Você não pode modificar o navmesh além dos limites da região.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		Não é possível definir as propriedades físicas neste tipo de objeto.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		Não é possível definir que um prim raiz não tenha forma.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		Esta região não tem materiais físicos ativados.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		Apenas prims raiz podem ter seus materiais físicos ajustados.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		Ainda não há suporte para a configuração dos materiais físicos em personagens.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Uma ou mais das propriedades do material físico são inválidas.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		Você não pode alterar o tipo de acabamento de um objeto mesh.
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		Você não pode alterar a forma de um objeto mesh
-	</notification>
-	<notification name="FullRegionCantEnter">
-		Você não pode entrar nesta região porque \nela está cheia.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Falha na vinculação -- proprietários diferentes
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Falha na vinculação -- não é possível modificar o navmesh além dos limites da região.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Ocorreu uma falha na vinculação porque você não tem permissão de edição.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Falha na vinculação -- muitos prims
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Falha na vinculação -- não é possível vincular itens com cópia proibida a itens com transferência proibida
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Falha na vinculação -- nada é vinculável.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Falha na vinculação -- muitos personagens com pathfinding
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Falha na vinculação -- recursos de terreno insuficientes
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		O objeto usa muitos recursos físicos – sua dinâmica foi desativada.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		Você foi teletransportado para seu início pelo objeto &apos;[OBJECT_NAME]&apos; no lote &apos;[PARCEL_NAME]&apos;
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		Você foi teletransportado para seu início pelo objeto &apos;[OBJECT_NAME]&apos;
-	</notification>
-	<notification name="TeleportedByAttachment">
-		Você foi teletransportado por um anexo em [ITEM_ID]
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; no lote &apos;[PARCEL_NAME]&apos;
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; de propriedade de [OWNER_ID]
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Você foi teletransportado pelo objeto &apos;[OBJECT_NAME]&apos; de propriedade de um usuário desconhecido.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		Não foi possível criar o objeto solicitado. A região está cheia.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		Não é possível anexar vários objetos a um local.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Você não pode criar vários objetos aqui.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		Não foi possível criar o objeto solicitado. Objeto ausente do banco de dados.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		Não foi possível criar o objeto solicitado. A solicitação expirou. Tente novamente.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		Não foi possível criar o objeto solicitado. Tente novamente.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Falha na renderização, objeto solicitado demorou muito a carregar.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Falha ao posicionar objeto em local específico.  Tente novamente.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		Você não pode criar plantas neste terreno.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		Não é possível restaurar o objeto. Nenhuma posição encontrada no mundo.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		Não é possível renderizar o objeto porque os dados de mesh são inválidos.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		Não foi possível renderizar objeto porque já há muitos scripts nesta região.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Seus privilégios de acesso não permitem que você crie objetos aqui.
-	</notification>
-	<notification name="CantCreateObject">
-		No momento, você não está autorizado a criar objetos.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Parâmetros de objeto inválidos
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Seus privilégios de acesso não permitem que você duplique objetos aqui.
-	</notification>
-	<notification name="CantChangeShape">
-		Você não está autorizado a alterar essa forma.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Seus privilégios de acesso não permitem que você reivindique objetos aqui.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		A doação falhou porque você não está autorizado a doar objetos ao seu grupo.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Seus privilégios de acesso não permitem que você compre objetos aqui.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		Não é possível anexar objeto porque um avatar está sentado nele.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		Árvores e grama não podem ser usadas como anexos.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		Não é possível anexar objetos de propriedade de um grupo.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		Não é possível anexar objetos que não sua propriedade.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		Não é possível anexar objetos que contribuem com o navmesh.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		Não é possível vincular objeto porque você não tem permissão para movê-lo.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		Não há recursos de script disponíveis suficientes para anexar objeto!
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		Não é possível largar objetos aqui. Tente a área de Avaliação grátis.
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		Você não pode largar anexos mesh. Separe para o inventário e depois renderize no mundo.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		Falha ao largar anexo: você não está autorizado a largá-lo aqui.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		Falha ao largar anexo: recursos de terreno disponíveis insuficientes.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Falha ao largar anexos: recursos disponíveis insuficientes.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		Não é possível largar objeto aqui.  O lote está cheio.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		Não é possível tocar/pegar este objeto porque você foi banido do lote de terreno.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Detalhe seus parâmetros de exclusão.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		Não é possível carregar objeto.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		Não foi possível encontrar usuário para teletransportar para início
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		solicitação de poderes de deus falhou
-	</notification>
-	<notification name="GenericRequestFailed">
-		falha em solicitação genérica
-	</notification>
-	<notification name="CantUploadPostcard">
-		Não foi possível carregar cartão postal.  Tente novamente mais tarde.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		Não foi possível obter detalhes de inventário para o anúncio de grupo.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		Não é possível enviar anúncio de grupo -- não permitido.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		Não é possível enviar anúncio de grupo -- não foi possível construir inventário.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		Não é possível processar o inventário do anúncio.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Falha no envio de terreno.
-	</notification>
-	<notification name="TerrainFileWritten">
-		Arquivo de terreno gravado.
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		Arquivo de terreno criado, iniciando o download...
-	</notification>
-	<notification name="TerrainBaked">
-		Terreno confeccionado.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Apenas os 10 primeiros objetos selecionados foram desativados. Atualize e faça novas seleções, se necessário.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Você precisa atualizar seu visualizador para comprar este lote.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Não é possível comprar, este lote não está à venda.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		Não é possível comprar, o preço de venda ou a área do terreno foram alterados.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		Você não é o comprador autorizado deste lote.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		Você não pode comprar este lote porque já está aguardando aut. de compra
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		Não é possível criar objeto aqui porque isso sobrecarregaria o lote.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		Você selecionou terreno com proprietários diferentes. Selecione uma área menor e tente novamente.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		Não há lotes alugados suficientes na seleção para reunir.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		Não é possível dividir o terreno.\nHá mais de um lote selecionado.\nTente selecionar um pedaço menor de terreno.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		Não é possível dividir o terreno.\nNão é possível encontrar o lote.\nComunique isso em Ajuda -&gt; Relatar bug...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		Não é possível dividir o terreno. O lote inteiro está selecionado.\nTente selecionar um pedaço menor do terreno.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		O terreno foi dividido.
-	</notification>
-	<notification name="PassPurchased">
-		Você comprou um passe.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		A região não permite classificados.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Seu passe para este terreno está prestes a expirar.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Não há uma superfície adequada para sentar, tente outro local.
-	</notification>
-	<notification name="CantSitNoRoom">
-		Não há espaço para sentar aqui, tente outro local.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		A reivindicação do objeto falhou porque você não tem permissão
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		A reivindicação do objeto falhou porque você não tem L$ suficiente.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		Não é possível doar terrenos de propriedade de um grupo.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		A compra do objeto falhou porque você não tem L$ suficientes.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		A compra do inventário falhou porque você não tem L$ suficiente
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		Você não tem L $ suficientes para comprar um passe para este terreno.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		Não é possível comprar passe no momento.  Tente novamente mais tarde.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		Não é possível criar objeto porque \no lote está cheio.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Falha ao posicionar objeto em local específico.  Tente novamente.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		Não é possível criar marco para o evento.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		Seus poderes de deus rompem o congelamento!
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Falha na solicitação de poderes especiais. Essa solicitação foi registrada.
-	</notification>
-	<notification name="ExpireExplanation">
-		O sistema não pode processar sua solicitação no momento. A solicitação expirou.
-	</notification>
-	<notification name="DieExplanation">
-		O sistema não pode processar sua solicitação.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		Fundos insuficientes para criar prim.
-	</notification>
-	<notification name="RezObjectFailure">
-		Fundos insuficientes para criar objeto.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Redefinir Início pois o Início não era legal.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		No momento, você não pode convidar ninguém para seu local pois a região está cheia. Tente novamente mais tarde.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Esta região não permite que você a defina como seu início.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		Você só pode definir seu &quot;Início&quot; em seu terreno ou em um Infohub do continente.
-	</notification>
-	<notification name="SetHomePosition">
-		Posição de início definida.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		Não é possível desrenderizar objeto devido a uma falha de inventário.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		Não é possível criar o inventário solicitado.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		Não é possível criar a pasta de inventário solicitada.
-	</notification>
-	<notification name="CantCreateInventory">
-		Não é possível criar esse inventário.
-	</notification>
-	<notification name="CantCreateLandmark">
-		Não é possível criar marco.
-	</notification>
-	<notification name="CantCreateOutfit">
-		Não é possível criar roupa agora. Tente novamente em instantes.
-	</notification>
-	<notification name="InventoryNotForSale">
-		O inventário não está à venda.
-	</notification>
-	<notification name="CantFindInvItem">
-		Não é possível encontrar item do inventário.
-	</notification>
-	<notification name="CantFindObject">
-		Não foi possível encontrar objeto.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		Transferências de dinheiro para objetos estão desativadas para esta região no momento.
-	</notification>
-	<notification name="CantPayNoAgent">
-		Não foi possível descobrir a quem pagar.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		Não é possível dar L$ a objetos públicos.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Falha na criação de inventário de objetos do mundo virtual.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Um erro interno impediu que seu visualizador fosse atualizado corretamente.  O saldo em L$ ou a propriedade de lotes exibidos em seu visualizador pode não refletir o saldo real nos servidores.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		Não é possível criar grandes prims que interceptam outros jogadores.  Tente novamente quando os outros jogadores tiverem se movido.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Isso excluirá os registros das conversas anteriores e qualquer backup desse arquivo.
-		<usetemplate ignoretext="Confirmar antes de excluir o registro com conversas anteriores." name="okcancelignore" notext="Cancelar" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Isso excluirá todas as transcrições de todas as conversas anteriores. A lista de conversas antigas não será afetada. Todos os arquivos com as extensões .txt e txt.backup na pasta [FOLDER] serão excluídos.
-		<usetemplate ignoretext="Confirmar antes de excluir transcrições." name="okcancelignore" notext="Cancelar" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		Não foi possível mover arquivos. Caminho anterior restaurado.
-		<usetemplate ignoretext="Não foi possível mover arquivos. Caminho anterior restaurado." name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
index 22eb23ebc5..b444593af8 100644
--- a/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_avatar_list_item.xml
@@ -26,6 +26,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Este amigo pode editar, excluir ou pegar seus pertences"/>
 	<icon name="permission_map_icon" tool_tip="Este amigo pode localizar você no mapa"/>
 	<icon name="permission_online_icon" tool_tip="Este amigo pode saber quando você estiver online"/>
-	<button name="info_btn" tool_tip="Mais informações"/>
 	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
index 2fcf6b9932..c5f93d719a 100644
--- a/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/pt/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Filtrar" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Ações em uma pessoa ou um objeto selecionado"/>
-		<menu_button name="view_btn" tool_tip="Opções de ordenação"/>
-		<menu_button name="plus_btn" tool_tip="Escolher um residente ou um objeto a ser bloqueado"/>
-		<button name="unblock_btn" tool_tip="Remover residente ou objeto da lista dos bloqueados"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/>
+	<text name="title_text">
+		Lista de bloqueados
+	</text>
+	<scroll_list name="blocked" tool_tip="Lista atual dos residentes bloqueados"/>
+	<button label="Bloquear residente..." label_selected="Bloquear residente..." name="Block resident..." tool_tip="Selecione o residente a bloquear"/>
+	<button label="Bloquear objeto por nome..." label_selected="Bloquear objeto por nome..." name="Block object by name..."/>
+	<button label="Desbloquear" label_selected="Desbloquear" name="Unblock" tool_tip="Remover residente ou objeto da lista dos bloqueados"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
deleted file mode 100644
index f56168c962..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(carregando)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
deleted file mode 100644
index 74daded58f..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="Uma conversa de voz foi incluída"/>
-	<icon name="unread_ims_icon" tool_tip="Chegaram mensagens enquanto você estava desconectado"/>
-	<button name="delete_btn" tool_tip="Remover esta entrada"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
index 0490878507..19c34d2f10 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Desconhecido"/>
-	<button name="info_btn" tool_tip="Mais informações"/>
 	<button name="profile_btn" tool_tip="Ver perfil"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index babb48c208..f3af15b991 100644
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -14,53 +14,81 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
 	<string name="no_filtered_friends_msg">
 		Não encontrou o que procura? Tente buscar no [secondlife:///app/search/people/[SEARCH_TERM] Search].
 	</string>
+	<string name="people_filter_label" value="Filtro de pessoas"/>
+	<string name="groups_filter_label" value="Filtro de grupos"/>
 	<string name="no_filtered_groups_msg" value="Não encontrou o que procura? Tente buscar no [secondlife:///app/search/groups/[SEARCH_TERM] Search]."/>
 	<string name="no_groups_msg" value="À procura de grupos interessantes? Tente fazer uma [secondlife:///app/search/groups Busca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Clique duas vezes para abrir o mapa, shift+arraste para a visão pan)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Clique duas vezes para teletransportar, shift+arraste para a visão pan)"/>
+	<filter_editor label="Filtro" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="PROXIMIDADE" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Filtrar pessoas" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
-				<menu_button name="nearby_view_btn" tool_tip="Opções de exibição/ordenação"/>
-				<button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Opções"/>
+				<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
 			</panel>
 		</panel>
-		<panel label="AMIGOS" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Filtrar pessoas" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
-				<menu_button name="friends_view_btn" tool_tip="Opções de exibição/ordenação"/>
-				<button name="friends_add_btn" tool_tip="Oferecer amizade ao residente"/>
-				<dnd_button name="friends_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
-			</panel>
+		<panel label="MEUS AMIGOS" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Online"/>
 				<accordion_tab name="tab_all" title="Todos"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="Mostrar opções adicionais"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Oferecer amizade para um residente"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Remover a pessoa selecionada da sua lista de amigos"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="GRUPOS" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Filtrar grupos" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Ações no grupo selecionado"/>
-				<menu_button name="groups_view_btn" tool_tip="Opções de exibição/ordenação"/>
-				<menu_button name="plus_btn" tool_tip="Entrar em um grupo/Criar novo grupo"/>
-				<dnd_button name="minus_btn" tool_tip="Sair do grupo selecionado"/>
+		<panel label="MEUS GRUPOS" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Opções"/>
+				<button name="plus_btn" tool_tip="Ingressar em um grupo/Criar novo grupo"/>
+				<button name="activate_btn" tool_tip="Ativar o grupo selecionado"/>
 			</panel>
 		</panel>
 		<panel label="RECENTE" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Filtrar pessoas" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Ações nas pessoas selecionadas"/>
-				<menu_button name="recent_view_btn" tool_tip="Opções de exibição/ordenação"/>
-				<button name="add_friend_btn" tool_tip="Oferecer amizade ao residente"/>
-				<dnd_button name="recent_del_btn" tool_tip="Remover a pessoa selecionada dos amigos"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Opções"/>
+				<button name="add_friend_btn" tool_tip="Adicionar o residente selecionado para sua lista de amigos"/>
 			</panel>
 		</panel>
-		<panel label="BLOQUEADA" name="blocked_panel">
-			<panel label="Residentes e objetos bloqueados" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Ligar" name="call_btn" tool_tip="Ligar para este residente"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Compartilhar" name="share_btn" tool_tip="Compartilhar item de inventário"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Teletransportar" name="teleport_btn" tool_tip="Oferecer teletransporte"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Perfil do grupo" name="group_info_btn" tool_tip="Exibir dados do grupo"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Bate-papo de grupo" name="chat_btn" tool_tip="Nova sessão de bate-papo"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Ligar para o grupo" name="group_call_btn" tool_tip="Ligar para este grupo"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
index baf14c2c23..350d53b81c 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Chat" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
-		<check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
-		<check_box label="Apenas amigos e grupos podem me ligar ou enviar MIs" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Tamanho da fonte:
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Pequeno" name="Small" value="0"/>
-			<item label="Médio" name="Medium" value="1"/>
-			<item label="Grande" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Notificações
-		</text>
-		<text name="friend_ims">
-			MIs de amigos:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			MIs de não amigos:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
-		</combo_box>
-		<text name="conference_ims">
-			MIs de conferências:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
-		</combo_box>
-		<text name="group_chat">
-			Bate-papo de grupo:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolbarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Bate-papo local:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Abrir janela Conversas" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Abrir pop up com mensagem" name="PopUpMessage" value="toast"/>
-			<item label="Piscar botão da barra de ferramentas" name="FlashToolBarButton" value="flash"/>
-			<item label="Nenhum" name="None" value="none"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Para interromper temporariamente todas as notificações, use Comunicar &gt; Não perturbe.
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Executar som:
-		</text>
-		<check_box label="Nova conversa" name="new_conversation"/>
-		<check_box label="Chamada de voz recebida" name="incoming_voice_call"/>
-		<check_box label="Oferta de teletransporte" name="teleport_offer"/>
-		<check_box label="Oferta de inventário" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Limpar registro..." name="clear_log"/>
-		<button label="Excluir transcrições..." name="delete_transcripts"/>
-		<button label="Procurar..." label_selected="Procurar" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Tamanho da fonte:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Pequeno" name="radio" value="0"/>
+		<radio_item label="Médio" name="radio2" value="1"/>
+		<radio_item label="Grande" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/>
+	<check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/>
+	<check_box label="Ativar MIs e bate-papos de texto simples" name="plain_text_chat_history"/>
+	<check_box label="Balão de bate-papo" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		Mostrar MIs em:
+	</text>
+	<text name="requires_restart_label">
+		(Reinicie para ativar)
+	</text>
+	<radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela separada ou exibir todos em uma única janela com uma aba para cada pessoa (requer reinício)">
+		<radio_item label="Janelas separadas" name="radio" value="0"/>
+		<radio_item label="Guias" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Ativar pop-ups de novos bate-papos:
+	</text>
+	<check_box label="Bate-papo de grupo" name="EnableGroupChatPopups" tool_tip="Exibir pop-up de bate-papos novos de grupos"/>
+	<check_box label="Bate-papos de MI" name="EnableIMChatPopups" tool_tip="Exibir pop-up de mensagens instantâneas novas"/>
+	<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_lifetime"/>
+	<spinner label="Transição de avisos de bate-papos por perto:" name="nearby_toasts_fadingtime"/>
 	<button label="Tradução..." name="ok_btn"/>
 	<button label="Substituição automática..." name="autoreplace_showgui"/>
 	<button label="Verificando a ortografia..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
index 8a0495f9bb..c53aa7d5f7 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml
@@ -69,9 +69,6 @@
 		<combo_box.item label="(nunca)" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Resposta de Não perturbe:
+		Mensagem do modo ocupado:
 	</text>
-	<text_editor name="do_not_disturb_response">
-		log_in_to_change
-	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
index f0fd438cef..3cfe0fe4f4 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Comprar objeto" name="Buyobject"/>
 			<combo_box.item label="Pagar por objeto" name="Payobject"/>
 			<combo_box.item label="Abrir" name="Open"/>
-			<combo_box.item label="Zoom" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index 4bf18aab70..bc72b86020 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -128,7 +128,7 @@
 		Sair
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=pt-BR&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		O visualizador utilizado já não é compatível com o Second Life.  Visite a página abaixo para baixar uma versão atual: http://secondlife.com/download
@@ -571,8 +571,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="AvatarAway">
 		Distante
 	</string>
-	<string name="AvatarDoNotDisturb">
-		Não perturbe
+	<string name="AvatarBusy">
+		Ocupado
 	</string>
 	<string name="AvatarMuted">
 		Mudo
@@ -808,12 +808,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ST_NO_JOINT">
 		Não é possível encontrar a raiz (ROOT) ou junção (JOINT).
 	</string>
-	<string name="NearbyChatTitle">
-		Bate-papo local
-	</string>
-	<string name="NearbyChatLabel">
-		(Bate-papo local)
-	</string>
 	<string name="whisper">
 		sussurra:
 	</string>
@@ -877,9 +871,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="ControlYourCamera">
 		Controle sua camera
 	</string>
-	<string name="AgentNameSubst">
-		(Você)
-	</string>
 	<string name="TeleportYourAgent">
 		Teletransportá-lo
 	</string>
@@ -964,6 +955,18 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="dictionary_files">
 		Dicionários
 	</string>
+	<string name="AvatarSetNotAway">
+		deixar como ausente
+	</string>
+	<string name="AvatarSetAway">
+		deixar como ausente
+	</string>
+	<string name="AvatarSetNotBusy">
+		deixar como não ocupado
+	</string>
+	<string name="AvatarSetBusy">
+		Deixar como ocupado
+	</string>
 	<string name="shape">
 		Silhueta
 	</string>
@@ -1920,8 +1923,8 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="PanelContentsNewScript">
 		Novo Script
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Este residente ativou o &quot;Não perturbe&quot; e verá sua mensagem mais tarde.
+	<string name="BusyModeResponseDefault">
+		O residente para o qual escreveu está no modo &apos;ocupado&apos;, ou seja, ele prefere não receber nada no momento. Sua mensagem será exibida como uma MI mais tarde.
 	</string>
 	<string name="MuteByName">
 		(por nome)
@@ -2034,6 +2037,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		Conteúdo
+	</string>
 	<string name="AcquiredItems">
 		Itens adquiridos
 	</string>
@@ -3747,7 +3753,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 		Região em geral
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Os avatares neste lote não podem ser vistos ou ouvidos por avatares fora dele
+		Avatar visíveis e bate-papo permitido fora deste terreno
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Os objetos que se movem podem não se comportar corretamente nesta região até que ela seja recarregada.
@@ -3824,12 +3830,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_unblock_only_groups_friends">
 		Para visualizar esta mensagem, você deve desmarcar &quot;Apenas amigos e grupos podem me ligar ou enviar MIs&quot; em Preferências/Privacidade.
 	</string>
-	<string name="OnlineStatus">
-		Conectado
-	</string>
-	<string name="OfflineStatus">
-		Desconectado
-	</string>
 	<string name="answered_call">
 		Ligação atendida
 	</string>
@@ -3839,9 +3839,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="you_joined_call">
 		Você entrou na ligação
 	</string>
-	<string name="you_auto_rejected_call-im">
-		Você recusou automaticamente a chamada de voz enquanto &quot;Não perturbe&quot; estava ativado.
-	</string>
 	<string name="name_started_call">
 		[NAME] iniciou uma ligação de voz
 	</string>
@@ -3854,9 +3851,6 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="hang_up-im">
 		Saiu da ligação de voz
 	</string>
-	<string name="conference-title">
-		Bate-papo com várias pessoas
-	</string>
 	<string name="conference-title-incoming">
 		Conversa com [AGENT_NAME]
 	</string>
@@ -4732,9 +4726,6 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Chat_Label">
 		Bate-papo
 	</string>
-	<string name="Command_Conversations_Label">
-		Conversas
-	</string>
 	<string name="Command_Compass_Label">
 		Bússola
 	</string>
@@ -4810,9 +4801,6 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Command_Chat_Tooltip">
 		Bater papo com pessoas próximas usando texto
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Conversar com todos
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Bússola
 	</string>
@@ -4942,13 +4930,4 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="UserDictionary">
 		[Usuário]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		As conversas não estão sendo registradas. Para começar a manter um registro, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Nenhuma conversa será registrada. Para recomeçar a gravação de registros, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Não há conversas registradas. Depois que você entrar em contato com alguém, ou alguém entrar em contato com você, um registro será exibido aqui.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_log.xml b/indra/newview/skins/default/xui/ru/floater_conversation_log.xml
deleted file mode 100644
index 090ac7193a..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="ЖУРНАЛ РАЗГОВОРА">
-	<panel name="buttons_panel">
-		<filter_editor label="Фильтр для людей" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Параметры просмотра/сортировки"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Действия с выбранным жителем или группой"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml b/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
deleted file mode 100644
index 23225fcf56..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="РАЗГОВОР:">
-	<floater.string name="Title">
-		РАЗГОВОР: [NAME]
-	</floater.string>
-	<text name="page_label" value="Страница"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_container.xml b/indra/newview/skins/default/xui/ru/floater_im_container.xml
index eba7a19cd4..b147cfa2b3 100644
--- a/indra/newview/skins/default/xui/ru/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="ОБЩЕНИЕ">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Параметры просмотра/сортировки"/>
-					<button name="add_btn" tool_tip="Начать разговор"/>
-					<button name="speak_btn" tool_tip="Разговаривать через микрофон"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Свернуть/развернуть этот список"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Свернуть эту панель"/>
-					<text name="stub_textbox">
-						Разговор отображается в отдельном окне.   [secondlife:/// Вернуть.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="ОБЩЕНИЕ"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_im_session.xml b/indra/newview/skins/default/xui/ru/floater_im_session.xml
index ea110ffb44..604d9dc6d3 100644
--- a/indra/newview/skins/default/xui/ru/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/ru/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] приглашен(а) на разговор."/>
-	<floater.string name="multiple_participants_added" value="[NAME] приглашены на разговор."/>
-	<floater.string name="tooltip_to_separate_window" value="Перенести этот разговор в отдельное окно"/>
-	<floater.string name="tooltip_to_main_window" value="Вернуть этот разговор в главное окно"/>
-	<floater.string name="start_call_button_tooltip" value="Открыть голосовое подключение"/>
-	<floater.string name="end_call_button_tooltip" value="Закрыть голосовое подключение"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Свернуть эту панель"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Свернуть список участников"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Развернуть список участников"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Параметры просмотра/сортировки"/>
-				<menu_button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
-				<button name="add_btn" tool_tip="Добавить участника в этот разговор"/>
-				<button name="voice_call_btn" tool_tip="Открыть голосовое подключение"/>
-				<button name="close_btn" tool_tip="Завершить этот разговор"/>
-				<button name="expand_collapse_btn" tool_tip="Развернуть/свернуть эту панель"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Переводить чат" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="Кому" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Показать/скрыть панель сообщений"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="Кому" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
index 3f61421d0c..072c20147d 100644
--- a/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/ru/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		анонимно
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		вызывает вас.
+		вызывает.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		теперь участвует в групповом голосовом чате.
@@ -25,9 +25,9 @@
 		Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату?
 	</floater.string>
 	<text name="question">
-		Если вы ответите, вы покинете текущий голосовой чат.
+		Хотите выйти из чата «[CURRENT_CHAT]» и присоединиться к этому голосовому чату?
 	</text>
-	<button label="Ответить" label_selected="Ответить" name="Accept"/>
-	<button label="Игнорировать" label_selected="Игнорировать" name="Reject"/>
-	<button label="Открыть IM" name="Start IM"/>
+	<button label="Принять" label_selected="Принять" name="Accept"/>
+	<button label="Отклонить" label_selected="Отклонить" name="Reject"/>
+	<button label="Начать IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
index 8faddb1805..fa72df04fd 100644
--- a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Показать:
 			</text>
-			<check_box label="Тест" name="show_world"/>
+			<check_box label="Мир" name="show_world"/>
 			<check_box label="Только перемещаемые предметы" name="show_world_movables_only"/>
 			<check_box label="Навигационная сетка" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
index a9a21e7d4a..db37089aeb 100644
--- a/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="По умолчанию" label_selected="По умолчанию" name="Default"/>
 	<button label="Очистить" label_selected="Очистить" name="Blank"/>
 	<button label="Нет" label_selected="Нет" name="None"/>
-	<check_box initial_value="истина" label="Применить сейчас" name="apply_immediate_check"/>
+	<check_box initial_value="истина" label="Просмотр вживую" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Просмотр отключен"/>
 	<filter_editor label="Фильтровать текстуры" name="inventory search editor"/>
 	<check_box initial_value="ложь" label="Показывать папки" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
deleted file mode 100644
index 5a7e7a7061..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСОВОГО ЧАТА">
-	<slider label="Голосовой чат" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
index d3cef042a3..1eb8a94d7a 100644
--- a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Места" name="voice_effects" title="ПРОСМОТР ИЗМЕНЕНИЯ ГОЛОСА">
+<floater label="Места" name="voice_effects" title="ИЗМЕНЕНИЕ ГОЛОСА">
 	<string name="no_voice_effect">
 		(Нет изменения голоса)
 	</string>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_volume.xml b/indra/newview/skins/default/xui/ru/floater_voice_volume.xml
deleted file mode 100644
index aca6bd518a..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="ГРОМКОСТЬ ГОЛОСА">
-	<slider name="volume_slider" tool_tip="Громкость голоса" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
index b7a32dfd75..0332c03a04 100644
--- a/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="Новая одежда" name="COF.Gear.New_Clothes"/>
-	<menu label="Новые части тела" name="COF.Gear.New_Body_Parts"/>
+	<menu label="Новые части тела" name="COF.Geear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation.xml b/indra/newview/skins/default/xui/ru/menu_conversation.xml
deleted file mode 100644
index 530b1ea704..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Закрыть разговор" name="close_conversation"/>
-	<menu_item_call label="Открыть голосовой чат" name="open_voice_conversation"/>
-	<menu_item_call label="Прекратить голосовой чат" name="disconnect_from_voice"/>
-	<menu_item_call label="Смотреть профиль" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
-	<menu_item_call label="Голосовой вызов" name="voice_call"/>
-	<menu_item_call label="Журнал чата..." name="chat_history"/>
-	<menu_item_call label="Добавить друга" name="add_friend"/>
-	<menu_item_call label="Удалить друга" name="remove_friend"/>
-	<menu_item_call label="Удалить друзей" name="remove_friends"/>
-	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
-	<menu_item_call label="Приблизить" name="zoom_in"/>
-	<menu_item_call label="Карта" name="map"/>
-	<menu_item_call label="Поделиться" name="share"/>
-	<menu_item_call label="Заплатить" name="pay"/>
-	<menu_item_check label="Блокировать голос" name="block_unblock"/>
-	<menu_item_check label="Блокировать текст" name="MuteText"/>
-	<menu_item_call label="Профиль группы" name="group_profile"/>
-	<menu_item_call label="Активировать группу" name="activate_group"/>
-	<menu_item_call label="Покинуть группу" name="leave_group"/>
-	<context_menu label="Параметры модератора" name="Moderator Options">
-		<menu_item_check label="Разрешить текстовый чат" name="AllowTextChat"/>
-		<menu_item_call label="Заглушить этого участника" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Позволить говорить этому участнику" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Заглушить всех" name="ModerateVoiceMute"/>
-		<menu_item_call label="Позволить говорить всем" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
deleted file mode 100644
index 3fbffbe038..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM..." name="IM"/>
-	<menu_item_call label="Голосовой вызов..." name="Call"/>
-	<menu_item_call label="Открыть журнал чата..." name="Chat history"/>
-	<menu_item_call label="Смотреть профиль" name="View Profile"/>
-	<menu_item_call label="Предложить телепорт" name="teleport"/>
-	<menu_item_call label="Добавить друга" name="add_friend"/>
-	<menu_item_call label="Удалить из друзей" name="remove_friend"/>
-	<menu_item_call label="Пригласить в группу..." name="Invite"/>
-	<menu_item_call label="Карта" name="Map"/>
-	<menu_item_call label="Поделиться" name="Share"/>
-	<menu_item_call label="Заплатить" name="Pay"/>
-	<menu_item_check label="Черный список" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
deleted file mode 100644
index 928146e273..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Сортировать по имени" name="sort_by_name"/>
-	<menu_item_check label="Сортировать по дате" name="sort_by_date"/>
-	<menu_item_check label="Сначала друзья" name="sort_by_friends"/>
-	<menu_item_call label="Посмотреть журнал локального чата..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_conversation.xml b/indra/newview/skins/default/xui/ru/menu_im_conversation.xml
deleted file mode 100644
index 1db0b8bae3..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Смотреть профиль" name="View Profile"/>
-	<menu_item_call label="Добавить друга" name="Add Friend"/>
-	<menu_item_call label="Удалить друга" name="remove_friend"/>
-	<menu_item_call label="Предложить телепортацию" name="offer_teleport"/>
-	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
-	<menu_item_call label="Журнал чата..." name="chat_history"/>
-	<menu_item_call label="Приблизить" name="zoom_in"/>
-	<menu_item_call label="Карта" name="map"/>
-	<menu_item_call label="Поделиться" name="Share"/>
-	<menu_item_call label="Заплатить" name="Pay"/>
-	<menu_item_check label="Блокировать голос" name="Block/Unblock"/>
-	<menu_item_check label="Блокировать текст" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
deleted file mode 100644
index 35cff8e4bf..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Компактный вид" name="compact_view"/>
-	<menu_item_check label="Развернутый вид" name="expanded_view"/>
-	<menu_item_check label="Показать время" name="IMShowTime"/>
-	<menu_item_check label="Показывать имена при разговорах" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_object_icon.xml b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
index 0c50abcfbd..6229b2e72f 100644
--- a/indra/newview/skins/default/xui/ru/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/ru/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Профиль объекта..." name="Object Profile"/>
 	<menu_item_call label="Блокировать..." name="Block"/>
-	<menu_item_call label="Показать на карте" name="show_on_map"/>
-	<menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
index d379a17216..93dbd7d6a7 100644
--- a/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/ru/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Новые волосы" name="New Hair"/>
 		<menu_item_call label="Новые глаза" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Открыть все папки" name="expand"/>
-	<menu_item_call label="Закрыть все папки" name="collapse"/>
 	<menu_item_call label="Переименовать костюм" name="rename"/>
 	<menu_item_call label="Удалить костюм" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_participant_view.xml b/indra/newview/skins/default/xui/ru/menu_participant_view.xml
deleted file mode 100644
index 851a42d428..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Сортировать разговоры по типу" name="sort_sessions_by_type"/>
-	<menu_item_check label="Сортировать разговоры по имени" name="sort_sessions_by_name"/>
-	<menu_item_check label="Сортировать разговоры по последнему действию" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Сортировать участников по имени" name="sort_participants_by_name"/>
-	<menu_item_check label="Сортировать участников по последнему действию" name="sort_participants_by_recent"/>
-	<menu_item_call label="Изменить настройки..." name="chat_preferences"/>
-	<menu_item_call label="Настройки приватности..." name="privacy_preferences"/>
-	<menu_item_check label="Журнал разговора..." name="Conversation"/>
-	<menu_item_check label="Перевести локальный чат" name="Translate_chat"/>
-	<menu_item_check label="Настройки перевода..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
deleted file mode 100644
index 157f2ad5e2..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="Разблокировать" name="unblock"/>
-	<menu_item_call label="Профиль…" name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
deleted file mode 100644
index f42e8f8609..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Блокировать жителя по имени..." name="block_resident_by_name"/>
-	<menu_item_call label="Блокировать объект по имени" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
deleted file mode 100644
index 8c0150e8ae..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Сортировать по имени" name="sort_by_name"/>
-	<menu_item_check label="Сортировать по типу" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml b/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
deleted file mode 100644
index 7b2dba0539..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Сортировать по имени" name="sort_name"/>
-	<menu_item_check label="Сортировать по статусу" name="sort_status"/>
-	<menu_item_check label="Показывать значки людей" name="view_icons"/>
-	<menu_item_check label="Показывать разрешенные действия" name="view_permissions"/>
-	<menu_item_check label="Посмотреть журнал разговора..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups.xml b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
index 78d73c9d1e..e734a83ef0 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Информация" name="View Info"/>
 	<menu_item_call label="Чат" name="Chat"/>
-	<menu_item_call label="Голосовой вызов" name="Call"/>
+	<menu_item_call label="Звонок" name="Call"/>
 	<menu_item_call label="Активация" name="Activate"/>
 	<menu_item_call label="Покинуть" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml b/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
deleted file mode 100644
index cbf1c64774..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Показывать значки группы" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
index d05b7e7d01..ebce959044 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Смотреть профиль" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Предложить телепорт" name="offer_teleport"/>
-	<menu_item_call label="Голосовой вызов" name="voice_call"/>
-	<menu_item_call label="Посмотреть журнал чата..." name="chat_history"/>
-	<menu_item_call label="Добавить друга" name="add_friend"/>
-	<menu_item_call label="Удалить из друзей" name="remove_friend"/>
-	<menu_item_call label="Пригласить в группу..." name="invite_to_group"/>
-	<menu_item_call label="Приблизить" name="zoom_in"/>
-	<menu_item_call label="Карта" name="map"/>
-	<menu_item_call label="Поделиться" name="share"/>
-	<menu_item_call label="Заплатить" name="pay"/>
-	<menu_item_check label="Черный список" name="block_unblock"/>
+	<menu_item_call label="Смотреть профиль" name="View Profile"/>
+	<menu_item_call label="В друзья" name="Add Friend"/>
+	<menu_item_call label="Удалить из друзей" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Звонок" name="Call"/>
+	<menu_item_call label="Карта" name="Map"/>
+	<menu_item_call label="Поделиться" name="Share"/>
+	<menu_item_call label="Заплатить" name="Pay"/>
+	<menu_item_check label="Черный список" name="Block/Unblock"/>
+	<menu_item_call label="Предложить телепорт" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
index 88eb56c9f5..0e8e0d4053 100644
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/ru/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Добавить в друзья" name="add_friends"/>
-	<menu_item_call label="Удалить из друзей" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="Звонок" name="call"/>
-	<menu_item_call label="Поделиться" name="share"/>
-	<menu_item_call label="Заплатить" name="pay"/>
-	<menu_item_call label="Предложить телепорт" name="offer_teleport"/>
+	<menu_item_call label="Добавить в друзья" name="Add Friends"/>
+	<menu_item_call label="Удалить из друзей" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="Звонок" name="Call"/>
+	<menu_item_call label="Поделиться" name="Share"/>
+	<menu_item_call label="Заплатить" name="Pay"/>
+	<menu_item_call label="Предложить телепорт" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
deleted file mode 100644
index 2bc353ad58..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Сортировать по недавно говорившим" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Сортировать по имени" name="sort_name"/>
-	<menu_item_check label="Сортировать по расстоянию" name="sort_distance"/>
-	<menu_item_check label="Показывать значки людей" name="view_icons"/>
-	<menu_item_check label="Смотреть карту" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml b/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
deleted file mode 100644
index a009cf081f..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Сортировать по времени" name="sort_most"/>
-	<menu_item_check label="Сортировать по имени" name="sort_name"/>
-	<menu_item_check label="Показывать значки людей" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_agent.xml b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
index 230d049fad..0ba3ee152a 100644
--- a/indra/newview/skins/default/xui/ru/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Смотреть профиль" name="show_agent"/>
-	<menu_item_call label="Отправить сообщение..." name="send_im"/>
-	<menu_item_call label="Добавить в друзья..." name="add_friend"/>
+	<menu_item_call label="Показать профиль жителя" name="show_agent"/>
 	<menu_item_call label="Копировать название в буфер обмена" name="url_copy_label"/>
 	<menu_item_call label="Копировать URL-адрес SL в буфер обмена" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
index 1326db708e..6e7800d3f5 100644
--- a/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/ru/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Профиль объекта..." name="show_object"/>
+	<menu_item_call label="Показать информацию об объекте" name="show_object"/>
 	<menu_item_call label="Показать на карте" name="show_on_map"/>
 	<menu_item_call label="Телепорт в местоположение объекта" name="teleport_to_object"/>
 	<menu_item_call label="Копировать название объекта в буфер обмена" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index d6625361c5..d9425937c3 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Остановить анимацию" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Ходьба / бег / полет..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Статус" name="Status"/>
+		<menu label="Статус" name="Status">
+			<menu_item_call label="Нет на месте" name="Set Away"/>
+			<menu_item_call label="Не беспокоить" name="Set Busy"/>
+		</menu>
 		<menu_item_call label="Купить L$..." name="Buy and Sell L$"/>
 		<menu_item_call label="Торговые исходящие..." name="MerchantOutbox"/>
 		<menu_item_call label="Информационная панель аккаунта..." name="Manage My Account"/>
@@ -27,18 +30,14 @@
 		<menu_item_call label="Выход из [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Общение" name="Communicate">
-		<menu_item_check label="Разговоры..." name="Conversations"/>
-		<menu_item_check label="Локальный чат..." name="Nearby Chat"/>
+		<menu_item_check label="Чат..." name="Nearby Chat"/>
 		<menu_item_check label="Говорить" name="Speak"/>
-		<menu label="Изменение голоса" name="VoiceMorphing">
-			<menu_item_check label="Без изменения голоса" name="NoVoiceMorphing"/>
-			<menu_item_check label="Просмотр..." name="Preview"/>
-			<menu_item_call label="Подписаться..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Настройки голоса..." name="Nearby Voice"/>
+		<menu_item_check label="Изменение голоса..." name="ShowVoice"/>
 		<menu_item_check label="Жесты..." name="Gestures"/>
-		<menu_item_check label="Друзья" name="My Friends"/>
-		<menu_item_check label="Группы" name="My Groups"/>
-		<menu_item_check label="Люди неподалеку" name="Active Speakers"/>
+		<menu_item_call label="Друзья" name="My Friends"/>
+		<menu_item_call label="Группы" name="My Groups"/>
+		<menu_item_call label="Люди неподалеку" name="Active Speakers"/>
 		<menu_item_call label="Черный список" name="Block List"/>
 	</menu>
 	<menu label="Мир" name="World">
@@ -114,6 +113,7 @@
 			<menu_item_call label="Купить" name="Menu Object Buy"/>
 			<menu_item_call label="Взять" name="Menu Object Take"/>
 			<menu_item_call label="Взять копию" name="Take Copy"/>
+			<menu_item_call label="Сохранить в моем инвентаре" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Сохранить в контенте объектов" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Вернуть объект" name="Return Object back to Owner"/>
 		</menu>
@@ -128,7 +128,6 @@
 			<menu_item_call label="Наборы связей..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Персонажи..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Просмотр/тестирование..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Восстановить регион" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Параметры" name="Options">
 			<menu_item_check label="Показать расширенные разрешения" name="DebugPermissions"/>
@@ -158,13 +157,6 @@
 	<menu label="Справка" name="Help">
 		<menu_item_call label="Инструкции..." name="How To"/>
 		<menu_item_call label="Справка по [SECOND_LIFE]" name="Second Life Help"/>
-		<menu_item_call label="Руководство пользователя" name="User’s guide"/>
-		<menu_item_call label="База знаний" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Форумы сообщества" name="Community Forums"/>
-		<menu_item_call label="Портал поддержки" name="Support portal"/>
-		<menu_item_call label="Новости [SECOND_LIFE]" name="Second Life News"/>
-		<menu_item_call label="Блоги [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Жалоба" name="Report Abuse"/>
 		<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
 		<menu_item_call label="О [APP_NAME]" name="About Second Life"/>
@@ -391,14 +383,9 @@
 				<menu_item_call label="Проверка женщины" name="Test Female"/>
 				<menu_item_check label="Разрешить выбор аватара" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Скорость анимации" name="Animation Speed">
-				<menu_item_call label="Ускорить все анимации на 10%" name="All Animations 10 Faster"/>
-				<menu_item_call label="Замедлить все анимации на 10%" name="All Animations 10 Slower"/>
-				<menu_item_call label="Восстановить скорость анимаций" name="Reset All Animation Speed"/>
-				<menu_item_check label="Анимация медленных движений" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Скинуть параметры" name="Force Params to Default"/>
 			<menu_item_check label="Данные об анимации" name="Animation Info"/>
+			<menu_item_check label="Анимация медленных движений" name="Slow Motion Animations"/>
 			<menu_item_check label="Показать взгляд" name="Show Look At"/>
 			<menu_item_check label="Показать указание" name="Show Point At"/>
 			<menu_item_check label="Отладка обновленных движений суставов" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 00ab0b5763..85b7074253 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -516,24 +516,6 @@
 		</url>
 		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
-
-    Проверить наличие обновления для драйвера по адресу [_URL]?
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		Возможно, для вашей видеокарты имеется более новый драйвер.  Обновление драйвера может существенно повысить быстродействие.
-
-    Проверить наличие обновления для драйвера по адресу [_URL]?
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=ru-ru
-		</url>
-		<usetemplate ignoretext="Мой графический драйвер устарел" name="okcancelignore" notext="Нет" yestext="Да"/>
-	</notification>
 	<notification name="UnknownGPU">
 		В вашей системе установлена графическая карта, которую [APP_NAME] не может распознать.
 Так часто бывает, если новое оборудование еще не было проверено на работу с [APP_NAME].  Скорее всего, оно будет работать нормально, но, возможно, придется отрегулировать параметры графики.
@@ -1564,13 +1546,10 @@ http://secondlife.com/download.
 		Сейчас невозможно предложить дружбу. Повторите попытку через минуту.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Режим «Не беспокоить» включен.  Вы не будете получать уведомлений о входящих вызовах.
-
-- Другие жители будут получать ваш ответ, установленный для режима «Не беспокоить» (Настройки &gt; Общие).
-- Предложения телепортации будут отклоняться.
-- Голосовые вызовы будут отклоняться.
-		<usetemplate ignoretext="Смена моего статуса на режим «Не беспокоить»" name="okignore" yestext="OK"/>
+	<notification name="BusyModeSet">
+		Установлен режим «Занят».
+Сообщения чата и IM будут скрыты. На IM-сообщения будет возвращаться заданный ответ в режиме «Занят». Все предложения телепортации будут отклоняться. Все предложения инвентаря будут направлены в корзину.
+		<usetemplate ignoretext="Смена моего статуса на режим «Занят»" name="okignore" yestext="OK"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Достигнуто максимальное количество групп. Выйдите из другой группы, прежде чем вступать в эту, или отклоните предложение.
@@ -2054,10 +2033,6 @@ http://secondlife.com/download.
 		Перейти на [http://secondlife.com/account/ информационную панель], чтобы увидеть историю аккаунта?
 		<usetemplate ignoretext="Запустить браузер для просмотра истории аккаунта" name="okcancelignore" notext="Отмена" yestext="Перейти на страницу"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		При добавлении участника в существующий разговор будет создан новый разговор.  Все участники получат уведомления о новом разговоре.
-		<usetemplate ignoretext="Подтвердите добавление участников чата" name="okcancelignore" notext="Отмена" yestext="ОК"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		Выйти из программы?
 		<usetemplate ignoretext="Подтверждать перед выходом" name="okcancelignore" notext="Не выходить" yestext="Выйти"/>
@@ -2132,14 +2107,14 @@ http://secondlife.com/download.
 			<button ignore="Не заменять" name="No" text="Отмена"/>
 		</form>
 	</notification>
-	<notification label="Предупреждение режима «Не беспокоить»" name="DoNotDisturbModePay">
-		Включен режим «Не беспокоить». Вы не будете получать никаких предметов, предлагаемых в обмен за этот платеж.
+	<notification label="Предупреждение о режиме «Занят»" name="BusyModePay">
+		У вас включен режим «Занят», поэтому вы не получите никаких предметов, предлагаемых в обмен на этот платеж.
 
-Отключить режим «Не беспокоить» перед завершением этой операции?
+Хотите отключить режим «Занят» до завершения этой транзакции?
 		<form name="form">
-			<ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Не беспокоить»"/>
-			<button ignore="Всегда выходить из режима «Не беспокоить»" name="Yes" text="OK"/>
-			<button ignore="Не выходить из режима «Не беспокоить»" name="No" text="Отмена"/>
+			<ignore name="ignore" text="Я собираюсь заплатить за пользователя или объект, когда включен режим «Занят»"/>
+			<button ignore="Всегда отключать режим «Занят»" name="Yes" text="OK"/>
+			<button ignore="Не отключать режим «Занят»" name="No" text="Отмена"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2274,8 +2249,11 @@ http://secondlife.com/download.
 	<notification name="GroupNotice">
 		Раздел: [SUBJECT], сообщение: [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; в сети
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; не в сети
 	</notification>
 	<notification name="AddSelfFriend">
 		Вы лучше всех, но нельзя добавить в друзья себя самого.
@@ -2504,6 +2482,13 @@ http://secondlife.com/download.
 	<notification name="DynamicPathfindingDisabled">
 		В этом регионе не разрешен динамический поиск пути.  Возможны нарушения работы скриптовых объектов с использованием вызовов LSL поиска пути.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		Изменение некоторых объектов в регионе может привести к неправильному поведению других подвижных объектов.  Чтобы исправить их поведение, нажмите кнопку «Восстановить регион».  Более подробная информация – по ссылке «Справка».
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Справка" ignoretext="Изменение некоторых объектов в регионе может привести к неправильному поведению других подвижных объектов." name="okhelpignore" yestext="OK"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Произошла ошибка.  Возможно, неполадка в сети или на сервере, или у вас нет прав на строительство.  Иногда для устранения этой проблемы достаточно выйти и снова войти.
 		<usetemplate name="okbutton" yestext="OK"/>
@@ -2766,7 +2751,7 @@ http://secondlife.com/download.
 	<notification name="ScriptQuestionCaution">
 		Предупреждение. Объект «&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;» требует полного доступа к вашему аккаунту для Linden-долларов. Если разрешить такой доступ, объект сможет в любое время снимать средства с вашего аккаунта или полностью опустошать его неоднократно и без предупреждения.
   
-Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту.
+Такое требование чаще всего незаконно. Не разрешайте доступ к своему аккаунту, если только не полностью осознаете, зачем он нужен этому объекту.
 		<form name="form">
 			<button name="Grant" text="Разрешить полный доступ"/>
 			<button name="Deny" text="Отклонить"/>
@@ -3348,632 +3333,4 @@ http://secondlife.com/download.
 		Вы удаляете несколько предметов ([NUM_ITEMS]).  Продолжить?
 		<usetemplate ignoretext="Удалить несколько предметов?" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] заморозил вас. В это время вы не можете перемещаться и выполнять другие действия с миром.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] заморозил вас на [AV_FREEZE_TIME] сек. В это время вы не можете перемещаться и выполнять другие действия с миром.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Аватар заморожен.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] разморозил вас.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Аватар разморожен.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		Не удалось заморозить: у вас нет прав администратора на этом участке.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		Заморозка кончилась, занимайтесь своим делом.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Невозможно заморозить этого пользователя.
-	</notification>
-	<notification name="NowOwnObject">
-		Вы стали владельцем объекта [OBJECT_NAME]
-	</notification>
-	<notification name="CantRezOnLand">
-		Нельзя выложить объект на [OBJECT_POS]: это не разрешено владельцем земли.  Узнать, кто владелец, можно с помощью инструмента «Земля».
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		Невозможно выложить объект: слишком много запросов.
-	</notification>
-	<notification name="SitFailCantMove">
-		Нельзя сесть: сейчас вы не можете двигаться.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		Вам не разрешено садиться на этой земле.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Попробуйте переместиться ближе.  Нельзя сесть на объект:
-он находится в другом регионе.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		Невозможно создать новый объект. Регион уже заполнен.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Не удалось поместить объект в указанное место.  Повторите попытку.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		Вы не можете создавать деревья и траву на чужой земле.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		Не удалось скопировать: вам не разрешено копировать объект «[OBJ_NAME]».
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		Не удалось скопировать: объект «[OBJ_NAME]» нельзя перенести к вам.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		Не удалось скопировать: объект «[OBJ_NAME]» относится к навигационной сетке.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Выбран дубликат без корневых объектов.
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		Невозможно дублировать объекты: регион заполнен.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		Невозможно дублировать объекты: не удалось найти их участок.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		Нельзя создать объект: 
-участок уже заполнен.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Не удалось выложить объект.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		Невозможно создать элемент, который вызвал проблемы в этом регионе.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		Этот предмет инвентаря находится в черном списке.
-	</notification>
-	<notification name="NoCanRezObjects">
-		Сейчас вам не разрешено создавать объекты.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Поиск по земле заблокирован.
-Вы провели слишком много операций поиска за короткое время.
-Повторите попытку через минуту.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		Недостаточно свободных ресурсов скриптинга для присоединения объекта!
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Вы умерли и были телепортированы в ваше домашнее местоположение
-	</notification>
-	<notification name="EjectComingSoon">
-		Вам запрещено здесь присутствовать; у вас есть [EJECT_TIME] сек, чтобы покинуть это место.
-	</notification>
-	<notification name="NoEnterServerFull">
-		Вам нет доступа в этот регион: 
-серпер переполнен.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Сохранение в инвентаре отключено.
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: объект, из которого оно было выложено, уже не существует.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		Нельзя сохранить «[OBJ_NAME]» в содержимом объекта: вам не разрешено изменять объект «[DEST_NAME]».
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		Невозможно сохранить «[OBJ_NAME]» в инвентаре: эта операция запрещена.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		Нельзя скопировать выбранное: вам не разрешено копировать объект «[OBJ_NAME]».
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится.
-	</notification>
-	<notification name="NoTransNoCopy">
-		Невозможно скопировать выбранный предмет: объект «[OBJ_NAME]» не переносится.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		Удаление объекта «[OBJ_NAME]» из симулятора запрещено системой разрешений.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		Нельзя сохранить выбранное: вам не разрешено изменять объект «[OBJ_NAME]».
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		Невозможно сохранить выбранный предмет: объект «[OBJ_NAME]» не копируется.
-	</notification>
-	<notification name="NoModNoTaking">
-		Нельзя забрать выбранное: вам не разрешено изменять объект «[OBJ_NAME]».
-	</notification>
-	<notification name="RezDestInternalError">
-		Внутренняя ошибка: неизвестный тип места назначения.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		Невозможно удалить: объект не найден
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Невозможно выбросить этого пользователя.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Вам не разрешено устанавливать свое домашнее местоположение в этом регионе.
-	</notification>
-	<notification name="HomeLocationLimits">
-		Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка.
-	</notification>
-	<notification name="HomePositionSet">
-		Задано положение дома.
-	</notification>
-	<notification name="AvatarEjected">
-		Аватар выброшен.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		Не удалось выбросить: у вас нет прав администратора на этом участке.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		Нельзя переместить объект «[OBJECT_NAME]» в позицию «[OBJ_POSITION]» региона [REGION_NAME]: участок уже заполнен.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		Нельзя переместить объект «[OBJECT_NAME]» в позицию
-«[OBJ_POSITION]» региона [REGION_NAME]: вашим объектам не разрешено присутствовать на этом участке.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		Нельзя переместить объект «[OBJECT_NAME]» в позицию
-«[OBJ_POSITION]» региона [REGION_NAME]: на этом участке недостаточно ресурсов для данного объекта.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		Нельзя переместить объект «[OBJECT_NAME]» в позицию
-[OBJ_POSITION] региона [REGION_NAME]: в другом регионе работает старая версия симулятора, которая не поддерживает прием этого объекта через границу регионов.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		Нельзя переместить объект «[OBJECT_NAME]» в позицию
-«[OBJ_POSITION]» региона [REGION_NAME]: вам не разрешено изменять навигационную сетку за пределами региона.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		Нельзя переместить объект «[OBJECT_NAME]» в позицию
-[OBJ_POSITION] региона [REGION_NAME] по неизвестной причине. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		У вас нет прав на изменение этого объекта
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		Нельзя включить физику для объекта, который относится к навигационной сетке.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		Нельзя включить физику для объектов с ключевыми кадрами.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		Нельзя включить физику для объекта -- недостаточно земельных ресурсов.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		Нельзя включить физику для объекта с расходом ресурсов физики больше [MAX_OBJECTS]
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Этот объект не может содержать вогнутых элементов: это фантом, который относится к навигационной сетке.
-	</notification>
-	<notification name="UnableAddItem">
-		Невозможно добавить предмет!
-	</notification>
-	<notification name="UnableEditItem">
-		Редактирование невозможно!
-	</notification>
-	<notification name="NoPermToEdit">
-		Редактирование не разрешено.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		Не разрешено копировать этот инвентарь.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		Нельзя сохранить в содержимом объекта: предмет уже не существует.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		Нельзя сохранить в содержимом объекта: предмет с таким названием уже есть в инвентаре
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		Нельзя сохранить в содержимом объекта: это приведет к изменению разрешений прикрепленного объекта.
-	</notification>
-	<notification name="TooManyScripts">
-		Слишком много скриптов.
-	</notification>
-	<notification name="UnableAddScript">
-		Невозможно добавить скрипт!
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		Сервер активов не ответил в заданное время.  Объект возвращен в симулятор.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		В этом регионе не разрешены фигуры с физическими данными.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		Нельзя изменять навигационную сетку за пределами региона.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		Нельзя задать свойства физики для объекта этого типа.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		Нельзя задать корневой примитив без фигуры.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		В этом регионе не разрешены материалы с физическими данными.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		Настройка материалов с физическими данными разрешена только для корневых примитивов.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		Присвоение персонажам материалов с физическими данными еще не поддерживается.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Одно или несколько свойств указанного материала с физическими данными недопустимы.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		Не разрешается изменять тип стыковки меш-объекта.
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		Не разрешается изменять форму меш-объекта
-	</notification>
-	<notification name="FullRegionCantEnter">
-		Вам нет доступа в этот регион: \nрегион заполнен.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Связь невозможна -- разные владельцы
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Связь невозможна – нельзя изменять навигационную сетку за пределами региона.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Связь невозможна: у вас нет разрешения на редактирование.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Связь невозможна -- слишком много примитивов
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Связь невозможна -- нельзя связать некопируемый и непереносимый объекты
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Связь невозможна -- нет связываемых объектов.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Связь невозможна -- слишком много персонажей с поиском пути
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Связь невозможна -- недостаточно земельных ресурсов
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		Объект использует слишком много ресурсов физики -- динамическое поведение отключено.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		Вы были телепортированы домой объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]»
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		Вы были телепортированы домой объектом «[OBJECT_NAME]»
-	</notification>
-	<notification name="TeleportedByAttachment">
-		Вы были телепортированы прикрепленным объектом [ITEM_ID]
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		Вы были телепортированы объектом «[OBJECT_NAME]» на участке «[PARCEL_NAME]»
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Вы были телепортированы объектом «[OBJECT_NAME]», владелец – [OWNER_ID]
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Вы были телепортированы объектом «[OBJECT_NAME]», владелец неизвестен.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		Невозможно создать запрошенный объект. Регион уже заполнен.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		Нельзя присоединить несколько объектов к одной точке.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Здесь нельзя создать несколько объектов.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		Невозможно создать запрошенный объект. Объекта нет в базе данных.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		Невозможно создать запрошенный объект. Истекло время запроса. Повторите попытку.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		Невозможно создать запрошенный объект. Повторите попытку.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Не удалось выложить, загрузка нужного объекта длится слишком долго.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Не удалось поместить объект в указанное место.  Повторите попытку.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		Вам нельзя создавать растения на этой земле.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		Невозможно восстановить объект. Не найдена позиция в игровом мире.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		Невозможно выложить объект: его данные сетки неверны.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		Невозможно выложить объект: в этом регионе уже сликом много скриптов.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Ваши привилегии доступа не разрешают создание объектов на этом месте.
-	</notification>
-	<notification name="CantCreateObject">
-		Сейчас вам не разрешено создавать объекты.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Неверные параметры объекта
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Ваши привилегии доступа не разрешают дублирование объектов на этом месте.
-	</notification>
-	<notification name="CantChangeShape">
-		Вам не разрешено изменять эту фигуру.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Ваши привилегии доступа не разрешают претендовать на объекты на этом месте.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		Не удалось передать: вам не разрешено передавать объекты для этой группы.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Ваши привилегии доступа не разрешают покупать объекты на этом месте.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		Невозможно присоединить объект: на нем сидит аватар.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		Деревья и траву нельзя носить как прикрепленные объекты.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		Нельзя присоединять объекты, принадлежащие группе.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		Нельзя прикреплять объекты, которыми вы не владеете.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		Невозможно присоединить объекты, которые относятся к навигационной сетке.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		Нельзя присоединить объект: вам не разрешено его перемещать.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		Недостаточно свободных ресурсов скриптинга для присоединения объекта!
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		Здесь нельзя сбрасывать объекты; перейдите в бесплатную область для гостей.
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		Нельзя сбрасывать прикрепленные меш-объекты. Отсоедините их в инвентарь, а затем выложите в игровой мир.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		Не удалось сбросить прикрепленный объект: вам не разрешено оставлять его здесь.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		Не удалось сбросить прикрепленный объект: не хватает свободных земельных ресурсов.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Не удалось сбросить прикрепленные объекты: не хватает свободных ресурсов.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		Нельзя сбросить объект здесь.  Участок уже заполнен.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		Нельзя коснуться/взять этот объект: вы забанены на этом участке.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Уточните параметры удаления.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		Невозможно отправить актив.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		Не удалось найти пользователя для телепортации домой
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		режим творца недоступен
-	</notification>
-	<notification name="GenericRequestFailed">
-		не удалось выполнить общий запрос
-	</notification>
-	<notification name="CantUploadPostcard">
-		Невозможно отправить открытку.  Повторите попытку позже.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		Невозможно получить данные инвентаря для группового уведомления.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		Невозможно отправить групповое уведомление -- не разрешено.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		Невозможно отправить групповое уведомление -- не удалось собрать инвентарь.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		Невозможно проанализировать инвентарь, указанный в уведомлении.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Не удалось загрузить ландшафт.
-	</notification>
-	<notification name="TerrainFileWritten">
-		Файл ландшафта записан.
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		Файл ландшафта записан, начинается загрузка...
-	</notification>
-	<notification name="TerrainBaked">
-		Ландшафт готов.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Отключены только первые 10 выбранных объектов. Обновите экран и выберите объекты снова, если требуется.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Для покупки этого участка необходимо обновить клиент.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Невозможно купить, этот участок не предназначен для продажи.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		Невозможно купить: цена или площадь земли изменились.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		Вам не разрешено покупать этот участок.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		Вы не можете приобрести этот участок: он уже ожидает подтверждения покупки
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		Здесь нельзя создавать объекты – участок будет переполнен.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		Вы выбрали землю с разными владельцами. Выберите меньшую область и повторите попытку.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		Выбрано недостаточно арендуемых участков для вступления.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		Нельзя разделить землю.\nВыбрано больше одного участка.\nВыберите меньшую территорию.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		Нельзя разделить землю.\nНе удалось найти участок.\nСообщите об этой неполадке: Справка -&gt; Сообщить об ошибке...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		Невозможно разделить землю. Выбран весь участок.\nПопробуйте выбрать территорию поменьше.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		Земля разделена.
-	</notification>
-	<notification name="PassPurchased">
-		Вы приобрели пропуск.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		В регионе не разрешены рекламные объявления.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Ваш пропуск на эту землю скоро закончится.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Нет подходящей поверхности, чтобы сесть. Попробуйте в другом месте.
-	</notification>
-	<notification name="CantSitNoRoom">
-		Здесь нет места, чтобы сесть. Попробуйте в другом месте.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		Невозможно претендовать на объект: у вас нет разрешения
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		Невозможно претендовать на объект: у вас не хватает L$.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		Нельзя передать землю, принадлежащую группе.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		Не удалось купить объект: у вас не хватает L$.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		Не удалось купить инвентарь: у вас не хватает L$.
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		У вас недостаточно L$, чтобы заплатить за проход на эту землю.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		Сейчас нельзя купить пропуск.  Повторите попытку позже.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		Невозможно создать объект:\nучасток заполнен.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Не удалось поместить объект в указанное место.  Повторите попытку.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		Невозможно создать закладку для события.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		Сила творца одолевает заморозку!
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Не удалось выполнить запрос на особые способности. Запрос зарегистрирован.
-	</notification>
-	<notification name="ExpireExplanation">
-		Система сейчас не может обработать ваш запрос. Истекло время запроса.
-	</notification>
-	<notification name="DieExplanation">
-		Система не может обработать ваш запрос.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		Недостаточно денег для создания примитива.
-	</notification>
-	<notification name="RezObjectFailure">
-		Недостаточно денег для создания объекта.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Недопустимое домашнее местоположение; восстановлено стандартное местоположение.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		Сейчас вы не можете никого пригласить к себе: регион уже заполнен. Повторите попытку позже.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Вам не разрешено устанавливать свое домашнее местоположение в этом регионе.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		Задать домашнее местоположение можно только на вашей земле или в Инфохабе материка.
-	</notification>
-	<notification name="SetHomePosition">
-		Домашнее местоположение задано.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		Невозможно забрать объект: сбой инвентаря.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		Невозможно создать требуемый инвентарь.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		Невозможно создать требуемую папку инвентаря.
-	</notification>
-	<notification name="CantCreateInventory">
-		Невозможно создать этот инвентарь.
-	</notification>
-	<notification name="CantCreateLandmark">
-		Невозможно создать закладку.
-	</notification>
-	<notification name="CantCreateOutfit">
-		Сейчас нельзя создать костюм. Попробуйте через минуту.
-	</notification>
-	<notification name="InventoryNotForSale">
-		Инвентарь не для продажи.
-	</notification>
-	<notification name="CantFindInvItem">
-		Не удалось найти предмет из инвентаря.
-	</notification>
-	<notification name="CantFindObject">
-		Не удалось найти объект.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		Сейчас в этом регионе запрещен перевод денег на объекты.
-	</notification>
-	<notification name="CantPayNoAgent">
-		Непонятно, кому платить.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		Нельзя отдавать L$ за общедоступные объекты.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Не удалось создать инвентарь в объекте игрового мира.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Не удалось обновить клиент из-за внутренней ошибки.  Отображаемый в клиенте баланс L$ или владение участками могут не соответствовать действительному балансу на серверах.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		Нельзя создавать большие примитивы, которые пересекаются с другими игроками.  Повторите попытку, когда другие игроки уйдут.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Будут удалены журналы предыдущих разговоров и все резервные копии этих файлов.
-		<usetemplate ignoretext="Подтверждать удаление журнала предыдущих разговоров." name="okcancelignore" notext="Отмена" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Будут удалены записи всех предыдущих разговоров. Список прошедших разговоров не изменится. Все файлы с расширениями .txt и txt.backup в папке [FOLDER] будут удалены.
-		<usetemplate ignoretext="Подтверждать удаление записей." name="okcancelignore" notext="Отмена" yestext="OK"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		Невозможно переместить файлы. Восстановлен прежний путь.
-		<usetemplate ignoretext="Невозможно переместить файлы. Восстановлен прежний путь." name="okignore" yestext="OK"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
index 4866bb7ed6..75e396222f 100644
--- a/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_avatar_list_item.xml
@@ -27,6 +27,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Этот друг может изменять, удалять или брать ваши объекты"/>
 	<icon name="permission_map_icon" tool_tip="Этот друг может видеть вас на карте"/>
 	<icon name="permission_online_icon" tool_tip="Этот друг может видеть ваш статус в сети"/>
-	<button name="info_btn" tool_tip="Дополнительно"/>
 	<button name="profile_btn" tool_tip="Смотреть профиль"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
index 70a1b25996..214ca8bf3a 100644
--- a/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/ru/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Фильтр" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Действия с выбранным жителем или объектом"/>
-		<menu_button name="view_btn" tool_tip="Параметры сортировки"/>
-		<menu_button name="plus_btn" tool_tip="Выберите жителя или объект для блокировки"/>
-		<button name="unblock_btn" tool_tip="Удалить объект или жителя из списка заблокированных"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Список заблокированных жителей"/>
+	<text name="title_text">
+		Черный список
+	</text>
+	<scroll_list name="blocked" tool_tip="Список заблокированных жителей"/>
+	<button label="Заблокировать жителя" name="Block resident..." tool_tip="Выберите жителя для блокировки"/>
+	<button label="Блокировать объект по имени" name="Block object by name..." tool_tip="Выберите объект для блокировки по имени"/>
+	<button label="Разблокировать" name="Unblock" tool_tip="Удалить объект или жителя из списка заблокированных"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
deleted file mode 100644
index 4fdb4f9122..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(загрузка)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
deleted file mode 100644
index 98fe7b99be..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="Включая голосовой чат"/>
-	<icon name="unread_ims_icon" tool_tip="За время вашего отсутствия пришли сообщения"/>
-	<button name="delete_btn" tool_tip="Удалить эту запись"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
index b043ffbbe2..7f000fb5a0 100644
--- a/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Неизвестно"/>
-	<button name="info_btn" tool_tip="Дополнительно"/>
 	<button name="profile_btn" tool_tip="Смотреть профиль"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
index 7da7fb3191..607921f2d6 100644
--- a/indra/newview/skins/default/xui/ru/panel_people.xml
+++ b/indra/newview/skins/default/xui/ru/panel_people.xml
@@ -14,53 +14,81 @@
 	<string name="no_filtered_friends_msg">
 		Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/people/[SEARCH_TERM] поиском].
 	</string>
+	<string name="people_filter_label" value="Фильтр для людей"/>
+	<string name="groups_filter_label" value="Фильтр для групп"/>
 	<string name="no_filtered_groups_msg" value="Не нашли того, что вам нужно? Воспользуйтесь [secondlife:///app/search/groups/[SEARCH_TERM] поиском]."/>
 	<string name="no_groups_msg" value="Ищете группу, чтобы присоединиться к ней? Воспользуйтесь [secondlife:///app/search/groups поиском]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Двойной щелчок открывает карту, shift+перетягивание – обзор)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Двойной щелчок – телепортация, shift+перетягивание – обзор)"/>
+	<filter_editor label="Фильтр" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="РЯДОМ" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Фильтр для людей" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
-				<menu_button name="nearby_view_btn" tool_tip="Параметры просмотра/сортировки"/>
-				<button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Опции"/>
+				<button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/>
 			</panel>
 		</panel>
-		<panel label="ДРУЗЬЯ" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Фильтр для людей" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
-				<menu_button name="friends_view_btn" tool_tip="Параметры просмотра/сортировки"/>
-				<button name="friends_add_btn" tool_tip="Предложить жителю дружбу"/>
-				<dnd_button name="friends_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
-			</panel>
+		<panel label="МОИ ДРУЗЬЯ" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Онлайн"/>
 				<accordion_tab name="tab_all" title="Все"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="Показать дополнительные параметры"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Предложить жителю дружбу"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Удалить выбранного жителя из списка друзей"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="ГРУППЫ" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Фильтр для групп" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Действия с выбранной группой"/>
-				<menu_button name="groups_view_btn" tool_tip="Параметры просмотра/сортировки"/>
-				<menu_button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/>
-				<dnd_button name="minus_btn" tool_tip="Покинуть выбранную группу"/>
+		<panel label="МОИ ГРУППЫ" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Опции"/>
+				<button name="plus_btn" tool_tip="Присоединиться к группе/создать новую группу"/>
+				<button name="activate_btn" tool_tip="Активировать выбранную группу"/>
 			</panel>
 		</panel>
 		<panel label="НЕДАВНИЕ" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Фильтр для людей" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Действия с выбранным жителем"/>
-				<menu_button name="recent_view_btn" tool_tip="Параметры просмотра/сортировки"/>
-				<button name="add_friend_btn" tool_tip="Предложить жителю дружбу"/>
-				<dnd_button name="recent_del_btn" tool_tip="Удалить выбранного пользователя из друзей"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Опции"/>
+				<button name="add_friend_btn" tool_tip="Добавить выбранного жителя в список друзей"/>
 			</panel>
 		</panel>
-		<panel label="БЛОКИРОВАН" name="blocked_panel">
-			<panel label="Черный список жителей и объектов" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Профиль" name="view_profile_btn" tool_tip="Показать изображение, группы и прочую информацию о жителе"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="Начать сеанс IM"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Звонок" name="call_btn" tool_tip="Позвонить этому жителю"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Поделиться" name="share_btn" tool_tip="Поделиться объектом из инвентаря"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Телепортация" name="teleport_btn" tool_tip="Предложить телепортацию"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Профиль группы" name="group_info_btn" tool_tip="Показать информацию о группе"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Групповой чат" name="chat_btn" tool_tip="Открыть сеанс чата"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Звонок группе" name="group_call_btn" tool_tip="Позвонить этой группе"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
index 6383fc8c2c..9283fc9e6e 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Текстовый чат" name="chat">
-	<panel>
-		<check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
-		<check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/>
-		<check_box label="Только друзья и группы могут звонить мне и отправлять IM" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Размер шрифта:
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Мелкий" name="Small" value="0"/>
-			<item label="Средний" name="Medium" value="1"/>
-			<item label="Крупный" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Уведомления
-		</text>
-		<text name="friend_ims">
-			IM друзей:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
-			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			IM чужих:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
-			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
-		</combo_box>
-		<text name="conference_ims">
-			IM конференции:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
-			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
-		</combo_box>
-		<text name="group_chat">
-			Групповой чат:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
-			<item label="Мигание кнопки на панели инструментов" name="FlashToolbarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Локальный чат:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Открыть окно разговоров" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Сообщение во всплывающем окне" name="PopUpMessage" value="всплывание"/>
-			<item label="Мигание кнопки на панели инструментов" name="FlashToolBarButton" value="мигание"/>
-			<item label="Нет" name="None" value="нет"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Для временного отключения всех уведомлений вызовите меню «Общение &gt; Не беспокоить».
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Звук:
-		</text>
-		<check_box label="Новый разговор" name="new_conversation"/>
-		<check_box label="Входящий голосовой вызов" name="incoming_voice_call"/>
-		<check_box label="Предложение телепортации" name="teleport_offer"/>
-		<check_box label="Предложение инвентаря" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Очистить журнал..." name="clear_log"/>
-		<button label="Удалить записи..." name="delete_transcripts"/>
-		<button label="Обзор..." label_selected="Обзор" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Размер шрифта:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Мелкий" name="radio" value="0"/>
+		<radio_item label="Средний" name="radio2" value="1"/>
+		<radio_item label="Крупный" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="истина" label="Воспроизводить анимацию ввода текста при общении" name="play_typing_animation"/>
+	<check_box label="Отправлять мне сообщения по почте, когда меня нет в сети" name="send_im_to_email"/>
+	<check_box label="Вести журнал текстового IM и чата" name="plain_text_chat_history"/>
+	<check_box label="Чат в пузырьках" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		Показывать сообщения:
+	</text>
+	<text name="requires_restart_label">
+		(требуется перезапуск)
+	</text>
+	<radio_group name="chat_window" tool_tip="Показывать IM-сообщения в отдельных окнах или же в одном окне с несколькими вкладками (требуется перезапуск)">
+		<radio_item label="В отдельных окнах" name="radio" value="0"/>
+		<radio_item label="На вкладках" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Включить всплывающие сообщения с новыми репликами в чате:
+	</text>
+	<check_box label="Групповой чат" name="EnableGroupChatPopups" tool_tip="Отображать всплывающие уведомления при появлении сообщений в групповом чате"/>
+	<check_box label="Текстовые чаты" name="EnableIMChatPopups" tool_tip="Отображать всплывающие уведомления при получении IM-сообщений"/>
+	<spinner label="Время отображения всплывающих реплик:" name="nearby_toasts_lifetime"/>
+	<spinner label="Время затухания всплывающих реплик:" name="nearby_toasts_fadingtime"/>
 	<button label="Перевод..." name="ok_btn"/>
 	<button label="Автозамена..." name="autoreplace_showgui"/>
 	<button label="Проверка правописания..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
index c7a850f78a..d1bfedf2d8 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="никогда" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Ответ в режиме «Не беспокоить»:
+		Ответ в режиме «Занят»:
 	</text>
-	<text_editor name="do_not_disturb_response">
+	<text_editor name="busy_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
index 5502530ca4..e9dd3760b5 100644
--- a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Купить объект" name="Buyobject"/>
 			<combo_box.item label="Заплатить за объект" name="Payobject"/>
 			<combo_box.item label="Открыть" name="Open"/>
-			<combo_box.item label="Приблизить" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index d7d4df4a37..f9ded799bf 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -137,7 +137,7 @@
 		Выйти
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=ru-RU&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		У клиента, которым вы пользуетесь, больше нет доступа к игре Second Life. Загрузить новую версию клиента можно по адресу
@@ -619,7 +619,7 @@ support@secondlife.com.
 	<string name="AvatarAway">
 		Нет на месте
 	</string>
-	<string name="AvatarDoNotDisturb">
+	<string name="AvatarBusy">
 		Не беспокоить
 	</string>
 	<string name="AvatarMuted">
@@ -856,12 +856,6 @@ support@secondlife.com.
 	<string name="ST_NO_JOINT">
 		Не удается найти объект ROOT или JOINT.
 	</string>
-	<string name="NearbyChatTitle">
-		Локальный чат
-	</string>
-	<string name="NearbyChatLabel">
-		(Локальный чат)
-	</string>
 	<string name="whisper">
 		шепчет:
 	</string>
@@ -925,15 +919,12 @@ support@secondlife.com.
 	<string name="ControlYourCamera">
 		Управлять камерой
 	</string>
-	<string name="NotConnected">
-		Нет подключения
-	</string>
-	<string name="AgentNameSubst">
-		(Вы)
-	</string>
 	<string name="TeleportYourAgent">
 		Телепортировать вас
 	</string>
+	<string name="NotConnected">
+		Нет подключения
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Общий
 	</string>
@@ -1015,6 +1006,18 @@ support@secondlife.com.
 	<string name="dictionary_files">
 		Словари
 	</string>
+	<string name="AvatarSetNotAway">
+		На месте
+	</string>
+	<string name="AvatarSetAway">
+		Нет на месте
+	</string>
+	<string name="AvatarSetNotBusy">
+		Не занят(а)
+	</string>
+	<string name="AvatarSetBusy">
+		Не беспокоить
+	</string>
 	<string name="shape">
 		Фигура
 	</string>
@@ -1983,8 +1986,8 @@ support@secondlife.com.
 	<string name="PanelContentsNewScript">
 		Новый скрипт
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Этот житель включил режим «Не беспокоить» и увидит ваше сообщение позже.
+	<string name="BusyModeResponseDefault">
+		У адресата вашего сообщения задан статус «Не беспокоить».  Ваше сообщение все равно будет отображено на панели IM для просмотра позже.
 	</string>
 	<string name="MuteByName">
 		(по имени)
@@ -2097,6 +2100,9 @@ support@secondlife.com.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc], [day,datetime,utc] [mth,datetime,utc] [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		Контент
+	</string>
 	<string name="AcquiredItems">
 		Купленные вещи
 	</string>
@@ -3865,7 +3871,7 @@ support@secondlife.com.
 		Область общей дозволенности
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Аватары на этом участке невидимы и неслышимы для аватаров с других участков
+		Все жители с других участков могут видеть аватары и общаться в чате
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Возможны неполадки подвижных объектов в этом регионе, пока регион не будет восстановлен.
@@ -3942,12 +3948,6 @@ support@secondlife.com.
 	<string name="IM_unblock_only_groups_friends">
 		Для просмотра этого сообщения снимите флажок «Только друзья и группы могут звонить мне и отправлять IM» в окне «Настройки/Приватность».
 	</string>
-	<string name="OnlineStatus">
-		Онлайн
-	</string>
-	<string name="OfflineStatus">
-		Оффлайн
-	</string>
 	<string name="answered_call">
 		На ваш звонок ответили
 	</string>
@@ -3957,9 +3957,6 @@ support@secondlife.com.
 	<string name="you_joined_call">
 		Вы присоединились к голосовой беседе
 	</string>
-	<string name="you_auto_rejected_call-im">
-		Голосовой вызов автоматически отклонен, так как включен режим «Не беспокоить».
-	</string>
 	<string name="name_started_call">
 		Житель [NAME] начал голосовую беседу
 	</string>
@@ -3976,7 +3973,7 @@ support@secondlife.com.
 		Соединяется...
 	</string>
 	<string name="conference-title">
-		Чат с несколькими участниками
+		Спонтанная конференция
 	</string>
 	<string name="conference-title-incoming">
 		Конференция с жителем [AGENT_NAME]
@@ -4868,9 +4865,6 @@ support@secondlife.com.
 	<string name="Command_Chat_Label">
 		Чат
 	</string>
-	<string name="Command_Conversations_Label">
-		Разговоры
-	</string>
 	<string name="Command_Compass_Label">
 		Компас
 	</string>
@@ -4946,9 +4940,6 @@ support@secondlife.com.
 	<string name="Command_Chat_Tooltip">
 		Обменивайтесь текстовыми репликами с людьми вокруг вас
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Поговорить со всеми
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Компас
 	</string>
@@ -5078,13 +5069,4 @@ support@secondlife.com.
 	<string name="UserDictionary">
 		[Пользователь]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Разговоры не записываются. Чтобы начать запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Разговоры больше не будут записываться. Чтобы восстановить запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Нет зарегистрированных разговоров. Если вы обратитесь к кому-то или наоборот, в журнале появится новая запись.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_log.xml b/indra/newview/skins/default/xui/tr/floater_conversation_log.xml
deleted file mode 100644
index 5f8dac506f..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="SOHBET GÜNLÜĞÜ">
-	<panel name="buttons_panel">
-		<filter_editor label="Kişileri Filtrele" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
-		<menu_button name="conversations_gear_btn" tool_tip="Seçilen kişi veya grup üzerindeki eylemler"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml b/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
deleted file mode 100644
index 84403dfd68..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="KONUŞMA:">
-	<floater.string name="Title">
-		KONUŞMA: [NAME]
-	</floater.string>
-	<text name="page_label" value="Sayfa"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_im_container.xml b/indra/newview/skins/default/xui/tr/floater_im_container.xml
index 6504430b3c..4451d1d309 100644
--- a/indra/newview/skins/default/xui/tr/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="SOHBETLER">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
-					<button name="add_btn" tool_tip="Yeni bir sohbet başlat"/>
-					<button name="speak_btn" tool_tip="Mikrofonunuzu kullanarak kişilerle konuşun"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="Bu listeyi Daralt/Genişlet"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="Bu panoyu daralt"/>
-					<text name="stub_textbox">
-						Sohbet ayrı bir pencerede.   [secondlife:/// Bunu geri getir.]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="SOHBETLER"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_im_session.xml b/indra/newview/skins/default/xui/tr/floater_im_session.xml
index 8ce8f0fe13..bed08b36c6 100644
--- a/indra/newview/skins/default/xui/tr/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/tr/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] sohbete davet edildi."/>
-	<floater.string name="multiple_participants_added" value="[NAME] sohbete davet edildi."/>
-	<floater.string name="tooltip_to_separate_window" value="Bu sohbeti ayrı bir pencereye taşı"/>
-	<floater.string name="tooltip_to_main_window" value="Bu sohbeti ana pencereye geri taşı"/>
-	<floater.string name="start_call_button_tooltip" value="Ses bağlantısını aç"/>
-	<floater.string name="end_call_button_tooltip" value="Ses bağlantısını kapat"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="Bu panoyu daralt"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Katılımcı listesini daralt"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Katılımcı listesini genişlet"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
-				<menu_button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
-				<button name="add_btn" tool_tip="Bu sohbete birini ekle"/>
-				<button name="voice_call_btn" tool_tip="Ses bağlantısını aç"/>
-				<button name="close_btn" tool_tip="Bu sohbeti bitir"/>
-				<button name="expand_collapse_btn" tool_tip="Bu panoyu Daralt/Genişlet"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="Kime" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="Mesaj panelini gösterir/gizler"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="Kime" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
index 0f2b27241e..adb03c2dff 100644
--- a/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/tr/floater_incoming_call.xml
@@ -10,7 +10,7 @@
 		anonim
 	</floater.string>
 	<floater.string name="VoiceInviteP2P">
-		sizi arıyor.
+		arıyor.
 	</floater.string>
 	<floater.string name="VoiceInviteAdHoc">
 		bir Sesli Sohbet aramasına bir konferans araması ile katıldı.
@@ -25,9 +25,9 @@
 		[CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz?
 	</floater.string>
 	<text name="question">
-		Yanıtlarsanız, mevcut sesli sohbetinizle bağlantınız kesilecek.
+		[CURRENT_CHAT] sohbetinden ayrılıp, bu sesli sohbete katılmak istiyor musunuz?
 	</text>
-	<button label="Yanıtla" label_selected="Yanıtla" name="Accept"/>
-	<button label="Yok say" label_selected="Yok say" name="Reject"/>
-	<button label="Bunun yerine Aİ aç" name="Start IM"/>
+	<button label="Kabul Et" label_selected="Kabul Et" name="Accept"/>
+	<button label="Reddet" label_selected="Reddet" name="Reject"/>
+	<button label="Aİ Başlat" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
index 35f47e6dfa..6eecc7fb77 100644
--- a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				Göster:
 			</text>
-			<check_box label="Test" name="show_world"/>
+			<check_box label="Dünya" name="show_world"/>
 			<check_box label="Sadece hareket ettirilebilir nesneler" name="show_world_movables_only"/>
 			<check_box label="Navigasyon örgüsü" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
index 42483c09e1..889425f23a 100644
--- a/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="Varsayılan" label_selected="Varsayılan" name="Default"/>
 	<button label="Boş" label_selected="Boş" name="Blank"/>
 	<button label="Hiçbiri" label_selected="Hiçbiri" name="None"/>
-	<check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="Canlı Önizleme" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="Önizleme Devre Dışı"/>
 	<filter_editor label="Dokuları Filtrele" name="inventory search editor"/>
 	<check_box initial_value="false" label="Klasörleri göster" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
deleted file mode 100644
index ec350bee60..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="SOHBET SES DÜZEYİ">
-	<slider label="Sesli Sohbet" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
index 7a157244cd..3534a3fe90 100644
--- a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME ÖNİZLEMESİ">
+<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME">
 	<string name="no_voice_effect">
 		(Ses Şekillendirme Yok)
 	</string>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_volume.xml b/indra/newview/skins/default/xui/tr/floater_voice_volume.xml
deleted file mode 100644
index acf99d6199..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="SES DÜZEYİ">
-	<slider name="volume_slider" tool_tip="Ses düzeyi" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
index 9480d30029..f910e1fe91 100644
--- a/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="Yeni Giysiler" name="COF.Gear.New_Clothes"/>
-	<menu label="Yeni Vücut Bölümleri" name="COF.Gear.New_Body_Parts"/>
+	<menu label="Yeni Vücut Bölümleri" name="COF.Geear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation.xml b/indra/newview/skins/default/xui/tr/menu_conversation.xml
deleted file mode 100644
index 31404f2501..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="Sohbeti kapat" name="close_conversation"/>
-	<menu_item_call label="Ses sohbetini aç" name="open_voice_conversation"/>
-	<menu_item_call label="Ses bağlantısını kes" name="disconnect_from_voice"/>
-	<menu_item_call label="Profili Göster" name="view_profile"/>
-	<menu_item_call label="Aİ" name="im"/>
-	<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
-	<menu_item_call label="Sesli arama" name="voice_call"/>
-	<menu_item_call label="Sohbet geçmişi..." name="chat_history"/>
-	<menu_item_call label="Arkadaş ekle" name="add_friend"/>
-	<menu_item_call label="Arkadaşı çıkar" name="remove_friend"/>
-	<menu_item_call label="Arkadaşları çıkar" name="remove_friends"/>
-	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
-	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
-	<menu_item_call label="Harita" name="map"/>
-	<menu_item_call label="Paylaş" name="share"/>
-	<menu_item_call label="Öde" name="pay"/>
-	<menu_item_check label="Sesi Engelle" name="block_unblock"/>
-	<menu_item_check label="Metni Engelle" name="MuteText"/>
-	<menu_item_call label="Grup Profili" name="group_profile"/>
-	<menu_item_call label="Grubu Etkinleştir" name="activate_group"/>
-	<menu_item_call label="Gruptan Ayrıl" name="leave_group"/>
-	<context_menu label="Moderatör Seçenekleri" name="Moderator Options">
-		<menu_item_check label="Metin sohbetine izin ver" name="AllowTextChat"/>
-		<menu_item_call label="Bu katılımcıyı engelle" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="Bu katılımcının engellemesini kaldır" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="Herkesi engelle" name="ModerateVoiceMute"/>
-		<menu_item_call label="Herkesin engellemesini kaldır" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
deleted file mode 100644
index 9e91780eb8..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="Aİ..." name="IM"/>
-	<menu_item_call label="Sesli arama..." name="Call"/>
-	<menu_item_call label="Sohbet geçmişini aç..." name="Chat history"/>
-	<menu_item_call label="Profili Göster" name="View Profile"/>
-	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
-	<menu_item_call label="Arkadaş Ekle" name="add_friend"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/>
-	<menu_item_call label="Gruba davet et..." name="Invite"/>
-	<menu_item_call label="Harita" name="Map"/>
-	<menu_item_call label="Paylaş" name="Share"/>
-	<menu_item_call label="Öde" name="Pay"/>
-	<menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
deleted file mode 100644
index 9a77eaadd9..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="Ada göre sırala" name="sort_by_name"/>
-	<menu_item_check label="Tarihe göre sırala" name="sort_by_date"/>
-	<menu_item_check label="Arkadaşlar üstte olacak şekilde sırala" name="sort_by_friends"/>
-	<menu_item_call label="Yakındaki sohbet geçmişini göster..." name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_conversation.xml b/indra/newview/skins/default/xui/tr/menu_im_conversation.xml
deleted file mode 100644
index 3b9738edce..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="Profili Göster" name="View Profile"/>
-	<menu_item_call label="Arkadaş Ekle" name="Add Friend"/>
-	<menu_item_call label="Arkadaşı çıkar" name="remove_friend"/>
-	<menu_item_call label="Işınlama teklif et" name="offer_teleport"/>
-	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
-	<menu_item_call label="Sohbet geçmişi..." name="chat_history"/>
-	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
-	<menu_item_call label="Harita" name="map"/>
-	<menu_item_call label="Paylaş" name="Share"/>
-	<menu_item_call label="Öde" name="Pay"/>
-	<menu_item_check label="Sesi Engelle" name="Block/Unblock"/>
-	<menu_item_check label="Metni Engelle" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
deleted file mode 100644
index c4d4357ac9..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="Daraltılmış görünüm" name="compact_view"/>
-	<menu_item_check label="Genişletilmiş görünüm" name="expanded_view"/>
-	<menu_item_check label="Zamanı göster" name="IMShowTime"/>
-	<menu_item_check label="Bire bir sohbetlerde adları göster" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_object_icon.xml b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
index 3d5c68d9d3..34a2661d8a 100644
--- a/indra/newview/skins/default/xui/tr/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/tr/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="Nesne Profili..." name="Object Profile"/>
 	<menu_item_call label="Engelle..." name="Block"/>
-	<menu_item_call label="Haritada Göster" name="show_on_map"/>
-	<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
index 674041e9c9..d2e7e7107a 100644
--- a/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/tr/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="Yeni Saç" name="New Hair"/>
 		<menu_item_call label="Yeni Gözler" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="Tüm klasörleri genişlet" name="expand"/>
-	<menu_item_call label="Tüm klasörleri daralt" name="collapse"/>
 	<menu_item_call label="Dış Görünümü Yeniden Adlandır" name="rename"/>
 	<menu_item_call label="Dış Görünümü Sil" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_participant_view.xml b/indra/newview/skins/default/xui/tr/menu_participant_view.xml
deleted file mode 100644
index e9411ff350..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="Sohbetleri türe göre sırala" name="sort_sessions_by_type"/>
-	<menu_item_check label="Sohbetleri ada göre sırala" name="sort_sessions_by_name"/>
-	<menu_item_check label="Sohbetleri son faaliyetlere göre sırala" name="sort_sessions_by_recent"/>
-	<menu_item_check label="Katılımcıları ada göre sırala" name="sort_participants_by_name"/>
-	<menu_item_check label="Katılımcıları son faaliyetlere göre sırala" name="sort_participants_by_recent"/>
-	<menu_item_call label="Sohbet tercihleri..." name="chat_preferences"/>
-	<menu_item_call label="Gizlilik tercihleri..." name="privacy_preferences"/>
-	<menu_item_check label="Sohbet günlüğü..." name="Conversation"/>
-	<menu_item_check label="Yakındaki sohbeti çevir" name="Translate_chat"/>
-	<menu_item_check label="Çeviri ayarları..." name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
deleted file mode 100644
index 2bf1101b48..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="Engellemeyi Kaldır" name="unblock"/>
-	<menu_item_call label="Profil..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
deleted file mode 100644
index a869e2ae7d..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="Sakini ada göre engelle..." name="block_resident_by_name"/>
-	<menu_item_call label="Nesneyi ada göre engelle" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
deleted file mode 100644
index 14b3de3a9f..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="Ada göre sırala" name="sort_by_name"/>
-	<menu_item_check label="Türe göre sırala" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml b/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
deleted file mode 100644
index 609584d6a6..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
-	<menu_item_check label="Duruma Göre Sırala" name="sort_status"/>
-	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
-	<menu_item_check label="Verilen İzinleri Göster" name="view_permissions"/>
-	<menu_item_check label="Sohbet Günlüğünü Göster..." name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups.xml b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
index 743b01844d..9f2946e310 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="Bilgileri Görüntüle" name="View Info"/>
 	<menu_item_call label="Sohbet" name="Chat"/>
-	<menu_item_call label="Sesli arama" name="Call"/>
+	<menu_item_call label="Ara" name="Call"/>
 	<menu_item_call label="Etkinleştir" name="Activate"/>
 	<menu_item_call label="Ayrıl" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml b/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
deleted file mode 100644
index e550b20add..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Grup Simgelerini Göster" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
index 2d61461c91..ee859a9450 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="Profili Göster" name="view_profile"/>
-	<menu_item_call label="Aİ" name="im"/>
-	<menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/>
-	<menu_item_call label="Sesli arama" name="voice_call"/>
-	<menu_item_call label="Sohbet geçmişini göster..." name="chat_history"/>
-	<menu_item_call label="Arkadaş Ekle" name="add_friend"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="remove_friend"/>
-	<menu_item_call label="Gruba davet et..." name="invite_to_group"/>
-	<menu_item_call label="Yakınlaştır" name="zoom_in"/>
-	<menu_item_call label="Harita" name="map"/>
-	<menu_item_call label="Paylaş" name="share"/>
-	<menu_item_call label="Öde" name="pay"/>
-	<menu_item_check label="Engelle/Engeli Kaldır" name="block_unblock"/>
+	<menu_item_call label="Profili Göster" name="View Profile"/>
+	<menu_item_call label="Arkadaş Ekle" name="Add Friend"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/>
+	<menu_item_call label="Aİ" name="IM"/>
+	<menu_item_call label="Ara" name="Call"/>
+	<menu_item_call label="Harita" name="Map"/>
+	<menu_item_call label="Paylaş" name="Share"/>
+	<menu_item_call label="Öde" name="Pay"/>
+	<menu_item_check label="Engelle/Engeli Kaldır" name="Block/Unblock"/>
+	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
index 20695d98e8..5c89f87906 100644
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/tr/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="Arkadaş Ekle" name="add_friends"/>
-	<menu_item_call label="Arkadaşı Çıkar" name="remove_friends"/>
-	<menu_item_call label="Aİ" name="im"/>
-	<menu_item_call label="Ara" name="call"/>
-	<menu_item_call label="Paylaş" name="share"/>
-	<menu_item_call label="Öde" name="pay"/>
-	<menu_item_call label="Işınlama Teklif Et" name="offer_teleport"/>
+	<menu_item_call label="Arkadaş Ekle" name="Add Friends"/>
+	<menu_item_call label="Arkadaşı Çıkar" name="Remove Friend"/>
+	<menu_item_call label="Aİ" name="IM"/>
+	<menu_item_call label="Ara" name="Call"/>
+	<menu_item_call label="Paylaş" name="Share"/>
+	<menu_item_call label="Öde" name="Pay"/>
+	<menu_item_call label="Işınlama Teklif Et" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
deleted file mode 100644
index 59ea7c145f..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="Son Konuşanlara Göre Sırala" name="sort_by_recent_speakers"/>
-	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
-	<menu_item_check label="Mesafeye Göre Sırala" name="sort_distance"/>
-	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
-	<menu_item_check label="Haritayı Göster" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml b/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
deleted file mode 100644
index 02be715ed2..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="En Sonunculara Göre Sırala" name="sort_most"/>
-	<menu_item_check label="Ada Göre Sırala" name="sort_name"/>
-	<menu_item_check label="Kişi Simgelerini Göster" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_agent.xml b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
index b14a0509bf..d82b52aea8 100644
--- a/indra/newview/skins/default/xui/tr/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Profili Göster" name="show_agent"/>
-	<menu_item_call label="Aİ Gönder..." name="send_im"/>
-	<menu_item_call label="Arkadaş Ekle..." name="add_friend"/>
+	<menu_item_call label="Sakin Profilini Göster" name="show_agent"/>
 	<menu_item_call label="Adı panoya kopyala" name="url_copy_label"/>
 	<menu_item_call label="SLurl&apos;yi Panoya Kopyala" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
index 00fa3c27c2..d55e34c11c 100644
--- a/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/tr/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Nesne Profili..." name="show_object"/>
+	<menu_item_call label="Nesne Bilgilerini Göster" name="show_object"/>
 	<menu_item_call label="Haritada Göster" name="show_on_map"/>
 	<menu_item_call label="Nesne Konumuna Işınla" name="teleport_to_object"/>
 	<menu_item_call label="Nesne Adını panoya kopyala" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index c465966fc7..7a7faf6ac4 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="Beni Anime Etmeyi Durdur" name="Stop Animating My Avatar"/>
 			<menu_item_call label="Yürü / koş / uç..." name="Walk / run / fly"/>
 		</menu>
-		<menu label="Durum" name="Status"/>
+		<menu label="Durum" name="Status">
+			<menu_item_call label="Uzakta" name="Set Away"/>
+			<menu_item_call label="Meşgul" name="Set Busy"/>
+		</menu>
 		<menu_item_call label="L$ Satın Al..." name="Buy and Sell L$"/>
 		<menu_item_call label="Satıcı Giden Kutusu..." name="MerchantOutbox"/>
 		<menu_item_call label="Hesap kontrol paneli..." name="Manage My Account"/>
@@ -27,18 +30,14 @@
 		<menu_item_call label="[APP_NAME]&apos;den Çık" name="Quit"/>
 	</menu>
 	<menu label="İletişim Kur" name="Communicate">
-		<menu_item_check label="Sohbetler..." name="Conversations"/>
-		<menu_item_check label="Yakındaki Sohbet..." name="Nearby Chat"/>
+		<menu_item_check label="Sohbet..." name="Nearby Chat"/>
 		<menu_item_check label="Konuş" name="Speak"/>
-		<menu label="Ses şekillendirme" name="VoiceMorphing">
-			<menu_item_check label="Ses şekillendirme yok" name="NoVoiceMorphing"/>
-			<menu_item_check label="Önizleme..." name="Preview"/>
-			<menu_item_call label="Abone ol..." name="Subscribe"/>
-		</menu>
+		<menu_item_check label="Ses ayarları..." name="Nearby Voice"/>
+		<menu_item_check label="Ses şekillendirme..." name="ShowVoice"/>
 		<menu_item_check label="Mimikler..." name="Gestures"/>
-		<menu_item_check label="Arkadaşlar" name="My Friends"/>
-		<menu_item_check label="Gruplar" name="My Groups"/>
-		<menu_item_check label="Yakındaki kişiler" name="Active Speakers"/>
+		<menu_item_call label="Arkadaşlar" name="My Friends"/>
+		<menu_item_call label="Gruplar" name="My Groups"/>
+		<menu_item_call label="Yakındaki kişiler" name="Active Speakers"/>
 		<menu_item_call label="Engelleme Listesi" name="Block List"/>
 	</menu>
 	<menu label="Dünya" name="World">
@@ -114,6 +113,7 @@
 			<menu_item_call label="Satın Al" name="Menu Object Buy"/>
 			<menu_item_call label="Al" name="Menu Object Take"/>
 			<menu_item_call label="Kopya Al" name="Take Copy"/>
+			<menu_item_call label="Envanterime Geri Kaydet" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="Nesne İçeriklerine Geri Kaydet" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="Nesneyi İade Et" name="Return Object back to Owner"/>
 		</menu>
@@ -128,7 +128,6 @@
 			<menu_item_call label="Bağlantı kümeleri..." name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="Karakterler..." name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="Görüntüleme / test..." name="pathfinding_console_menu_item"/>
-			<menu_item_call label="Bölgeyi tekrar kaydet" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="Seçenklr." name="Options">
 			<menu_item_check label="Gelişmiş İzinleri Göster" name="DebugPermissions"/>
@@ -158,13 +157,6 @@
 	<menu label="Yardım" name="Help">
 		<menu_item_call label="Nasıl yapılır..." name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] Yardımı" name="Second Life Help"/>
-		<menu_item_call label="Kullanıcı kılavuzu" name="User’s guide"/>
-		<menu_item_call label="Bilgi Bankası" name="Knowledge Base"/>
-		<menu_item_call label="Wiki" name="Wiki"/>
-		<menu_item_call label="Topluluk Forumları" name="Community Forums"/>
-		<menu_item_call label="Destek portalı" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] Haberleri" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE] Blogları" name="Second Life Blogs"/>
 		<menu_item_call label="Kötüye Kullanımı Bildir" name="Report Abuse"/>
 		<menu_item_call label="Hata Bildir" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/>
@@ -391,14 +383,9 @@
 				<menu_item_call label="Test Dişisi" name="Test Female"/>
 				<menu_item_check label="Avatar Seçimine İzin Ver" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="Animasyon Hızı" name="Animation Speed">
-				<menu_item_call label="Tüm Animasyonlar %10 Daha Hızlı" name="All Animations 10 Faster"/>
-				<menu_item_call label="Tüm Animasyonlar %10 Daha Yavaş" name="All Animations 10 Slower"/>
-				<menu_item_call label="Tüm Animasyon Hızlarını Sıfırla" name="Reset All Animation Speed"/>
-				<menu_item_check label="Yavaş Hareket Animasyonları" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="Parametreleri Varsayılana Zorla" name="Force Params to Default"/>
 			<menu_item_check label="Animasyon Bilgisi" name="Animation Info"/>
+			<menu_item_check label="Yavaş Hareket Animasyonları" name="Slow Motion Animations"/>
 			<menu_item_check label="Şuraya Bak&apos;ı Göster" name="Show Look At"/>
 			<menu_item_check label="Şuraya İşaret Et&apos;i Göster" name="Show Point At"/>
 			<menu_item_check label="Eklem Güncelleştirmeleri İçin Hata Ayıklama" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index ad92a4b478..488702f9ca 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -516,24 +516,6 @@ Daha fazla bilgi için [_URL] adresini ziyaret etmek ister misiniz?
 		</url>
 		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
-
-    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		Grafik yonganız için muhtemelen daha yeni bir sürücü mevcut.  Grafik sürücüleri güncellemek performansınızı kayda değer şekilde artırabilir.
-
-    Sürücü güncellemeleri için [_URL] adresini ziyaret etmek ister misiniz?
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=en-us
-		</url>
-		<usetemplate ignoretext="Grafik sürücüm güncel değil" name="okcancelignore" notext="Hayır" yestext="Evet"/>
-	</notification>
 	<notification name="UnknownGPU">
 		Sisteminiz [APP_NAME] uygulamasının tanımadığı bir grafik kartı içeriyor.
 Bu durum genellikle [APP_NAME] uygulaması ile henüz denenmemiş yeni donanımlar kullanıldığında ortaya çıkar.  Büyük olasılıkla bir sorun çıkmayacaktır, fakat grafik ayarlarınızı değiştirmeniz gerekebilir.
@@ -1564,13 +1546,10 @@ Gruptan ayrılmak istiyor musunuz?
 		Şu anda arkadaşlık teklif edilemiyor. Lütfen biraz sonra tekrar deneyin.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		Rahatsız Etme açık.  Gelen iletişimlerle ilgili size bilgi verilmeyecek.
-
-- Diğer sakinlere sizin Rahatsız Etmeyin yanıtı iletilecektir (Tercihler &gt; Genel içerisinde ayarlanır).
-- Işınlanma teklifleri reddedilecektir.
-- Sesli aramalar reddedilecektir.
-		<usetemplate ignoretext="Durumumu Rahatsız Etme moduna değiştiriyorum" name="okignore" yestext="Tamam"/>
+	<notification name="BusyModeSet">
+		Durumunuz Meşgul olarak ayarlandı.
+Sohbet ve anlık iletiler gizlenecek. Anlık iletilere Meşgul durumu için belirlediğiniz yanıt gönderilecek. Tüm ışınlanma teklifleri reddedilecek. Tüm envanter teklifleri Çöp Kutunuza gidecek.
+		<usetemplate ignoretext="Durumumu Meşgul olarak değiştiriyorum" name="okignore" yestext="Tamam"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		Maksimum grup sayısına eriştiniz. Lütfen bu gruba katılmadan önce başka bir gruptan ayrılın ya da bu teklifi reddedin.
@@ -2054,10 +2033,6 @@ Envanter öğesi/öğeleri taşınsın mı?
 		Hesap geçmişinizi görüntülemek için [http://secondlife.com/account/ Kontrol Paneli] adresine gitmek istiyor musunuz?
 		<usetemplate ignoretext="Hesap geçmişimi görüntülemek için tarayıcımı başlat" name="okcancelignore" notext="İptal" yestext="Sayfaya git"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		Mevcut bir sohbete bir kişi eklediğinizde yeni bir sohbet oluşturulur.  Tüm katılımcılara yeni sohbet bildirimi gönderilir.
-		<usetemplate ignoretext="Sohbet katılımcılarının eklenmesini doğrula" name="okcancelignore" notext="İptal" yestext="Tamam"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		Çıkmak istediğinize emin misiniz?
 		<usetemplate ignoretext="Çıkmadan önce doğrulama iste" name="okcancelignore" notext="Çıkma" yestext="Çık"/>
@@ -2132,14 +2107,14 @@ Bu nesneyi seçilen nesne ile değiştirmek istiyor musunuz?
 			<button ignore="Hiçbir Zaman Değiştirme" name="No" text="İptal"/>
 		</form>
 	</notification>
-	<notification label="Rahatsız Etme Modu Uyarısı" name="DoNotDisturbModePay">
-		Rahatsız Etme seçeneğini devreye aldınız. Bu ödemenin karşılığında sunulan hiçbir öğeyi almayacaksınız.
+	<notification label="Meşgul Durumu Uyarısı" name="BusyModePay">
+		Durumunuz Meşgul olarak ayarlanmış; bu da, bu ödemenin karşılığında teklif edilen hiçbir öğeyi almayacağınız anlamına gelir.
 
-Bu işlemi tamamlamadan önce Rahatsız Etme&apos;yi kapatmak ister misiniz?
+Bu işlemi tamamlamadan önce Meşgul durumundan çıkmak ister misiniz?
 		<form name="form">
-			<ignore name="ignore" text="Rahatsız Etmeyin modundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim"/>
-			<button ignore="Rahatsız Etme Modundan daima çıkılsın" name="Yes" text="Tamam"/>
-			<button ignore="Rahatsız Etme Modundan asla çıkılmasın" name="No" text="İptal"/>
+			<ignore name="ignore" text="Meşgul durumundayken bir kişiye veya bir nesneye ödeme yapmak üzereyim."/>
+			<button ignore="Her zaman Meşgul durumundan çık" name="Yes" text="Tamam"/>
+			<button ignore="Hiçbir zaman Meşgul durumundan çıkma" name="No" text="İptal"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2274,8 +2249,11 @@ Diğer kişilerin bu konuma kolayca erişmesini sağlamak için bu adrese bir we
 	<notification name="GroupNotice">
 		Konu: [SUBJECT], İleti: [MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; durumu: [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; çevrimiçi
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; çevrimdışı
 	</notification>
 	<notification name="AddSelfFriend">
 		Çok iyi biri olduğunuza eminiz fakat kendinizi arkadaş olarak ekleyemezsiniz.
@@ -2504,6 +2482,13 @@ Burada uçamazsınız.
 	<notification name="DynamicPathfindingDisabled">
 		Bu bölgede dinamik yol bulma etkin değil.  Yol bulma LSL çağrılarını kullanan komut dosyalı nesneler, bu bölgede beklendiiği gibi çalışmayabilir.
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		Bu bölgede belirli diğer nesneleri değiştirmek, hareket eden başka nesnelerin yanlış davranmasına neden olabilir.  Hareket eden başka nesnelerin doğru davranmasını sağlamak için “Bölgeyi yeniden kaydet” düğmesine tıklayın.  Daha fazla bilgi edinmek için “Yardım” seçimini yapın.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="Yardım" ignoretext="Bu bölgede belirli diğer nesneleri değiştirmek, hareket eden başka nesnelerin yanlış davranmasına neden olabilir." name="okhelpignore" yestext="Tamam"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		Bir hata meydana geldi.  Bir ağ veya sunucu sorunu olabilir ya da oluşturma haklarına sahip olmayabilirsiniz.  Bazen oturumu kapatıp, tekrar açmak bu sorunu çözer.
 		<usetemplate name="okbutton" yestext="Tamam"/>
@@ -2766,7 +2751,7 @@ Kabul ediyor musunuz?
 	<notification name="ScriptQuestionCaution">
 		Uyarı: &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; nesnesi, Linden Dolar hesabınıza tam erişim istiyor. Eğer erişime izin verirseniz, süregelen bir şekilde, ilave uyarı olmaksızın, hesabınızdan herhangi bir zamanda fon çekebilir veya hesabınızı tamamen boşaltabilir.
   
-Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin.
+Bu türden bir talebin yerinde olması nadir bir durumdur. Eğer hesabınıza neden erişmek istediğini tam olarak anlamıyorsanız, erişime izin vermeyin.
 		<form name="form">
 			<button name="Grant" text="Tam erişime izin ver"/>
 			<button name="Deny" text="Reddet"/>
@@ -3348,626 +3333,4 @@ Girişim iptal edildi.
 		[NUM_ITEMS] öğeyi siliyorsunuz.  Devam etmek istediğinize emin misiniz?
 		<usetemplate ignoretext="Birden çok öğeyi silmek istediğinize emin misiniz?" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] sizi dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız.
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] sizi [AV_FREEZE_TIME] saniye boyunca dondurdu. Hareket edemez veya dünyayla etkileşim kuramazsınız.
-	</notification>
-	<notification name="YouFrozeAvatar">
-		Avatar donduruldu.
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] sizin dondurulmanızı kaldırdı.
-	</notification>
-	<notification name="AvatarUnFrozen">
-		Avatar artık dondurulmuş değil.
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		Dondurma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz.
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		Dondurmanızın süresi sona erdi, istediğinizi yapabilirsiniz.
-	</notification>
-	<notification name="AvatarCantFreeze">
-		Üzgünüz, bu kullanıcı dondurulamaz.
-	</notification>
-	<notification name="NowOwnObject">
-		Artık [OBJECT_NAME] nesnesinin sahibisiniz
-	</notification>
-	<notification name="CantRezOnLand">
-		[OBJECT_POS] konumunda nesneyi oluşturamazsınız çünkü bu arazinin sahibi buna izin vermiyor.  Arazinin sahibini görmek için arazi aracını kullanın.
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		Çok fazla talep olduğu için nesne oluşturulamadı.
-	</notification>
-	<notification name="SitFailCantMove">
-		Oturamazsınız çünkü şu anda hareket edemezsiniz.
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		Oturamazsınız çünkü bu araziye girme izniniz yok.
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		Daha yakına gelmeyi deneyin.  Nesne sizinle aynı bölgede olmadığı için nesnenin üzerine oturulamaz.
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		Yeni nesne oluşturulamıyor. Bölge dolu.
-	</notification>
-	<notification name="FailedToPlaceObject">
-		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
-	</notification>
-	<notification name="NoOwnNoGardening">
-		Sahibi olmadığınız arazide ağaçlar ve çimen oluşturamazsınız.
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		&apos;[OBJ_NAME]&apos; nesnesini kopyalama izniniz olmadığı için kopyalama başarılamadı.
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		&apos;[OBJ_NAME]&apos; nesnesi size aktarılamadığı için kopyalama başarılamadı.
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		&apos;[OBJ_NAME]&apos; nesnesi navmesh&apos;e katkıda bulunduğu için kopyalama başarılamadı.
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		Kök nesne seçili olmayan kopya.
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		Nesneler çoğaltılamıyor çünkü bölge dolu.
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		Nesneler çoğaltılamadı - Üzerinde oldukları parsel bulunamadı.
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		Nesne oluşturulamıyor çünkü
-parsel dolu.
-	</notification>
-	<notification name="RezAttemptFailed">
-		Bir nesneyi oluşturma girişimi başarısız oldu.
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		Bu bölgede hatalara yol açmış olan öğe oluşturulamıyor.
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		Bu envanter öğesi kara listeye alınmış.
-	</notification>
-	<notification name="NoCanRezObjects">
-		Şu anda nesne oluşturmanıza izin verilmiyor.
-	</notification>
-	<notification name="LandSearchBlocked">
-		Arazi Arama Engellendi.
-Çok fazla sayıda arazi aramasını çok hızlı gerçekleştirdiniz.
-Lütfen bir dakika sonra tekrar deneyin.
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		Hayatınızı kaybettiniz ve ana konumunuza ışınlandınız
-	</notification>
-	<notification name="EjectComingSoon">
-		Daha fazla burada olma izniniz yok ve ayrılmak için [EJECT_TIME] saniyeniz var.
-	</notification>
-	<notification name="NoEnterServerFull">
-		Bu bölgeye giremezsiniz çünkü 
-sunucu dolu.
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		Envantere Geri Kaydet devre dışı bırakıldı.
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		&apos;[OBJ_NAME]&apos; nesne içeriğine kaydedilemedi, çünkü oluşturulurken temel alınan nesne artık mevcut değil.
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		&apos;[DEST_NAME]&apos; nesnesini değiştirme izniniz olmadığı için &apos;[OBJ_NAME]&apos; nesne içeriğine kaydedilemedi.
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		&apos;[OBJ_NAME]&apos; envantere geri kaydedilemez -- bu işlem devre dışı bırakıldı.
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		&apos;[OBJ_NAME]&apos; nesnesini kopyalama izniniz olmadığı için seçiminizi kopyalamayazsınız.
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		&apos;[OBJ_NAME]&apos; nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız.
-	</notification>
-	<notification name="NoTransNoCopy">
-		&apos;[OBJ_NAME]&apos; nesnesi aktarılamaz olduğu için seçiminizi kopyalayamazsınız.
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		Benzeticiden &apos;[OBJ_NAME]&apos; nesnesinin kaldırılmasına izinler sistemi izin vermiyor.
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		&apos;[OBJ_NAME]&apos; nesnesini değiştirme izniniz olmadığı için seçiminizi kaydedemezsiniz.
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		&apos;[OBJ_NAME]&apos; nesnesi kopyalanamaz olduğu için seçiminizi kaydedemezsiniz.
-	</notification>
-	<notification name="NoModNoTaking">
-		&apos;[OBJ_NAME]&apos; nesnesini değiştirme izniniz olmadığı için seçiminizi alamazsınız.
-	</notification>
-	<notification name="RezDestInternalError">
-		Dahili Hata: Bilinmeyen hedef türü.
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		Nesne bulunamadığı için silme başarılamadı
-	</notification>
-	<notification name="SorryCantEjectUser">
-		Üzgünüz, bu kullanıcı çıkartılamaz.
-	</notification>
-	<notification name="RegionSezNotAHome">
-		Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor.
-	</notification>
-	<notification name="HomeLocationLimits">
-		&apos;Ana Konum&apos;unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu&apos;nda ayarlayabilirsiniz.
-	</notification>
-	<notification name="HomePositionSet">
-		Ana konum ayarlandı.
-	</notification>
-	<notification name="AvatarEjected">
-		Avatar çıkartıldı.
-	</notification>
-	<notification name="AvatarEjectFailed">
-		Çıkarma başarılamadı çünkü bu parsel için yönetici iznine sahip değilsiniz.
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü parsel dolu.
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bu parselde nesnelerinize izin verilmiyor.
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor, çünkü bu parselde bu nesne için yeterli kaynak yok.
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü bölgede çalıştırılan eski versiyon, bölge değiştirme üzerinden bu nesnenin alınmasını desteklemiyor.
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		[REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor çünkü navmesh&apos;i bölge sınırları ötesinde değiştiremezsiniz.
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		Bilinmeyen bir nedenden ötürü [REGION_NAME] bölgesinde &apos;[OBJECT_NAME]&apos; nesnesi [OBJ_POSITION] konumuna hareket ettirilemiyor. ([FAILURE_TYPE])
-	</notification>
-	<notification name="NoPermModifyObject">
-		Bu nesneyi değiştirme izniniz yok
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		Navmesh&apos;e katkıda bulunan bir nesne için fizik etkinleştirilemez.
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		Anahtar karelenmiş nesneler için fizik etkinleştirilemez.
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		Nesne için fizik etkinleştirilemedi -- arazi kaynakları yetersiz.
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		Fizik kaynağı maliyeti [MAX_OBJECTS]&apos;dan büyük nesne için fizik etkinleştirilemedi
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		Bu nesne fantom olduğu ve navmesh&apos;e katkıda bulunduğu için konkav bir parçaya sahip olamaz.
-	</notification>
-	<notification name="UnableAddItem">
-		Öğe eklenemedi!
-	</notification>
-	<notification name="UnableEditItem">
-		Bu düzenlenemiyor!
-	</notification>
-	<notification name="NoPermToEdit">
-		Bunu düzenleme izni yok.
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		Bu envanteri kopyalama izni yok.
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		Nesne içeriklerine kaydedilemedi: Öğe artık mevcut değil.
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		Nesne içeriklerine kaydedilemedi: Bu ada sahip öğe envanterde zaten mevcut
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		Nesne içeriklerine kaydedilemedi: Bu, aksesuar izinlerini değiştirmeyi gerektirirdi.
-	</notification>
-	<notification name="TooManyScripts">
-		Çok fazla komut dosyası.
-	</notification>
-	<notification name="UnableAddScript">
-		Komut dosyası eklenemedi!
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		Varlık sunucusu zamanında yanıt vermedi.  Nesne sime iade edildi.
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		Bu bölgede fiziksel şekiller etkin değil.
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		Navmesh&apos;i bölge sınırlarının ötesinde değiştiremezsiniz.
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		Bu nesne türü üzerinde fizik özellikleri ayarlanamaz.
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		Kök prim şekilsiz olacak şekilde ayarlanamaz.
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		Bu bölgede fiziksel malzemeler etkin değil.
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		Sadece kök primlerin fizik malzemeleri ayarlanabilir.
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		Karakterler üzerinde fizik malzemelerin ayarlanması henüz desteklenmiyor.
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		Belirtilen fizik malzemesi özelliklerinden biri veya daha fazlası geçersiz.
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		Bir örgü nesnesinin dikiş türünü değiştiremezsiniz.
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		Bir örgü nesnesinin şeklini değiştiremezsiniz
-	</notification>
-	<notification name="FullRegionCantEnter">
-		Bu bölgeye giremezsiniz çünkü \nbölge dolu.
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		Bağlantı başarısız oldu -- sahipler farklı
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		Bağlntı başarılamadı -- navmesh&apos;i bölge sınırlarının ötesinde değiştiremezsiniz.
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		Düzenleme iznine sahip olmadığınız için bağlantı başarılamadı.
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		Bağlantı başarısız oldu -- çok fazla ilkel öğe var
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		Bağlantı başarısız oldu -- aktarılamayanla kopyalanamayan arasında bağlantı kurulamaz
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		Bağlantı başarısız oldu -- bağlantı verilebilecek bir şey yok.
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		Bağlantı başarısız oldu -- çok fazla yol bulma karakteri var
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		Bağlantı başarısız oldu -- arazi kaynakları yetersiz
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		Nesne çok fazla fizik kaynağı kullanıyor -- dinamikleri devre dışı bırakıldı.
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		&apos;[PARCEL_NAME]&apos; parseli üzerindeki &apos;[OBJECT_NAME]&apos; nesnesi tarafından ana konuma ışınlandınız
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		&apos;[OBJECT_NAME]&apos; nesnesi tarafından ana konuma ışınlandınız
-	</notification>
-	<notification name="TeleportedByAttachment">
-		You have been teleported by an attachment on [ITEM_ID]
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		&apos;[PARCEL_NAME]&apos; parseli üzerindeki &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		Sahibi [OWNER_ID] olan &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		Bilinmeyen bir sahibi olan &apos;[OBJECT_NAME]&apos; nesnesi tarafından ışınlandınız.
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		Talep edilen nesne oluşturulamıyor. Bölge dolu.
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		Tek bir noktaya birden fazla nesne iliştiremezsiniz.
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		Burada birden fazla nesne oluşturamazsınız.
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		Talep edilen nesne oluşturulamıyor. Nesne veri tabanında yok.
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		Talep edilen nesne oluşturulamıyor. Talep zaman aşımına uğradı. Lütfen tekrar deneyin.
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		Talep edilen nesne oluşturulamıyor. Lütfen tekrar deneyin.
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		Oluşturma başarısız oldu, talep edilen nesnenin yüklenmesi çok zaman aldı.
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		Bu arazide bitkiler oluşturamazsınız.
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		Nesne geri yüklenemiyor. Dünya konumu bulunamadı.
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		Örgü verileri geçersiz olduğu için nesne oluşturulamadı.
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		Bölgede zaten fazlasıyla komut dosyası olduğu için nesne oluşturulamadı.
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		Erişim ayrıcalıklarınız orada nesne oluşturmanıza izin vermiyor.
-	</notification>
-	<notification name="CantCreateObject">
-		Şu anda nesne oluşturmanıza izin verilmiyor.
-	</notification>
-	<notification name="InvalidObjectParams">
-		Geçersiz nesne parametreleri
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		Erişim ayrıcalıklarınız burada nesne çoğaltmanıza izin vermiyor.
-	</notification>
-	<notification name="CantChangeShape">
-		Bu şekli değiştirmenize izin verilmiyor.
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		Erişim ayrıcalıklarınız burada nesneler üzerinde hak talebinde bulunmanıza izin vermiyor.
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		Grubunuz adına nesne devretmek için gerekli izne sahip olmadığınız için devretme başarılamadı.
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		Erişim ayrıcalıklarınız burada nesneler satın almanıza izin vermiyor.
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		Üzerinde bir avatar oturduğu için nesne iliştirilemiyor.
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		Ağaçlar ve çimen aksesuar olarak giyilemez.
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		Sahibi grup olan nesneler iliştirilemiyor.
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		Sahip olmadığınız nesneleri iliştiremezsiniz.
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		Navmesh&apos;e katkıda bulunan nesneler iliştirilemez.
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		Nesneyi hareket ettirme izniniz olmadığı için nesneyi iliştiremiyorsanız.
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		Nesneyi iliştirmek için yeterli komut dosyası kaynağı mevcut değil!
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		Buraya nesne düşüremezsiniz; Ücretsiz Deneme alanını deneyin.
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		Örgü aksesuarlarını düşüremezsiniz. Envantere ayırın, sonra dünyada oluşturun.
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		Aksesuar düşürülemedi: Burada düşürme izniniz yok.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		Aksesuar düşürülemedi: Mevcut arazi kaynakları yetersiz.
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		Aksesuarlar düşürülemedi: Mevcut kaynaklar yetersiz.
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		Nesne buraya düşürülemez.  Parsel dolu.
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		Bu arazi parselinde yasaklandığınız için bu nesneye dokunamıyor/tutamıyorsunuz.
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		Lütfen silme parametrelerinizi daraltın.
-	</notification>
-	<notification name="UnableToUploadAsset">
-		Varlık karşıya yüklenemiyor.
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		Ana konuma ışınlanacak kullanıcı bulunamadı
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		tanrısal talep başarısız oldu
-	</notification>
-	<notification name="GenericRequestFailed">
-		genel talep başarısız oldu
-	</notification>
-	<notification name="CantUploadPostcard">
-		Posta kartı karşıya yüklenemiyor.  Daha sonra tekrar deneyin.
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		Grup bildirimi için envanter ayrıntıları alınamadı.
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		Grup bildirimi gönderilemedi -- izin verilmiyor.
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		Grup bildirimi gönderilemedi -- envanter oluşturulamadı.
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		Bildirimde envanter ayrıştırılamadı.
-	</notification>
-	<notification name="TerrainUploadFailed">
-		Yüzeyin karşıya yüklemesi başarılamadı.
-	</notification>
-	<notification name="TerrainFileWritten">
-		Yüzey dosyası yazıldı.
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		Yüzey dosyası yazıldı, karşıdan yükleme başlatılıyor...
-	</notification>
-	<notification name="TerrainBaked">
-		Yüzey kaydedildi.
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		Sadece seçilen ilk 10 nesne devre dışı bırakıldı. Gerekiyorsa yenileyin ve ilave seçimler yapın.
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		Bu parseli satın almak için görüntüleyicinizi güncelleştirmelisiniz.
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		Satın alınamıyor, bu parsel satılık değil.
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		Satın alınamıyor, satış fiyatı veya arazi bölgesi değişmiş.
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		Bu parsel için yetkili alıcı değilsiniz.
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		Bu parseli satın alamazsınız çünkü zaten satın alım yetkilendirmesi bekliyor
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		Burada nesneler inşa edemezsiniz, aksi halde parselin kaynak sınırları aşılır.
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		Farklı sahiplere ait araziler seçtiniz. Lütfen daha küçük bir alan seçin ve tekrar deneyin.
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		Seçimde birleştirilecek yeterli sayıda lease edilmiş parsel yok.
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		Arazi bölünemedi.\nBirden fazla parsel seçili durumda.\nDaha küçük bir arazi parçası seçmeyi deneyin.
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		Arazi bölünemiyor.\nParsel bulunamıyor.\nLütfen Yardım -&gt; Hata Bildir ile bildirin...
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		Arazi bölünemiyor. Tüm parsel seçilidir.\nDaha küçük bir arazi parçası seçmeyi deneyin.
-	</notification>
-	<notification name="LandHasBeenDivided">
-		Arazi bölündü.
-	</notification>
-	<notification name="PassPurchased">
-		Bir geçiş hakkı satın aldınız.
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		Bölgede seri ilanlara izin verilmiyor.
-	</notification>
-	<notification name="LandPassExpireSoon">
-		Bu arazi için geçiş hakkınız sona ermek üzere.
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		Üzerinde oturulabilecek uygun bir yüzey yok, başka bir noktayı deneyin.
-	</notification>
-	<notification name="CantSitNoRoom">
-		Burada oturacak yer yok, başka bir yer deneyin.
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		İzniniz olmadığı için nesne üzerinde hak talep etme başarılamadı
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		Sahip olduğunuz L$ yeterli olmadığı için nesne üzerinde hak talep etme başarılamadı.
-	</notification>
-	<notification name="CantDeedGroupLand">
-		Grubun sahip olduğu araziyi devredemezsiniz.
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		Sahip olduğunuz L$ yeterli olmadığı için nesne satın alma başarılamadı.
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		Sahip olduğunuz L$ yeterli olmadığı için envanter satın alma başarılamadı.
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		Sahibi olduğunuz L$ bu araziye geçiş hakkı almanıza yeterli değil.
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		Şu anda geçiş hakkı satın alınamıyor.  Daha sonra tekrar deneyin.
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		Nesne oluşturulamıyor çünkü \nparsel dolu.
-	</notification>
-	<notification name="FailedPlacingObject">
-		Belirtilen konuma nesne yerleştirilemedi.  Lütfen tekrar deneyin.
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		Etkinlik için yer imi oluşturulamıyor.
-	</notification>
-	<notification name="GodBeatsFreeze">
-		Tanrısal güçleriniz dondurmayı devre dışı bıraktı!
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		Özel yetkiler talebi başarısız oldu. Bu talep günlüğe kaydedildi.
-	</notification>
-	<notification name="ExpireExplanation">
-		Sistem şu anda talebinizi işleyemiyor. Talep zaman aşımına uğradı.
-	</notification>
-	<notification name="DieExplanation">
-		Sistem talebinizi işleyemiyor.
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		İlkel öğeyi oluşturmak için yeterli fon yok.
-	</notification>
-	<notification name="RezObjectFailure">
-		Nesneyi oluşturmak için yeterli fon yok.
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		Ana konum sıfırlandı çünkü Ana konum yasal değildi.
-	</notification>
-	<notification name="CantInviteRegionFull">
-		Şu anda konumunuza kimseyi davet edemezsiniz çünkü bölge dolu. Daha sonra tekrar deneyin.
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		Bu bölge, ana konumunuzu buraya kurmanıza izin vermiyor.
-	</notification>
-	<notification name="ListValidHomeLocations">
-		&apos;Ana Konum&apos;unuzu sadece arazinizde veya anakarada bir Bilgi İstasyonu&apos;nda ayarlayabilirsiniz.
-	</notification>
-	<notification name="SetHomePosition">
-		Ana konum ayarlandı.
-	</notification>
-	<notification name="CantDerezInventoryError">
-		Envanter hatasından ötürü nesne oluşturulması geri alınamıyor.
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		Talep edilen envanter oluşturulamadı.
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		Talep edilen envanter klasörü oluşturulamadı.
-	</notification>
-	<notification name="CantCreateInventory">
-		Bu envanter oluşturulamadı.
-	</notification>
-	<notification name="CantCreateLandmark">
-		Yer imi oluşturulamıyor.
-	</notification>
-	<notification name="CantCreateOutfit">
-		Dış görünüm şu anda oluşturulamıyor. Bir dakika sonra tekrar deneyin.
-	</notification>
-	<notification name="InventoryNotForSale">
-		Envanter satılık değil.
-	</notification>
-	<notification name="CantFindInvItem">
-		Envanter öğesi bulunamıyor.
-	</notification>
-	<notification name="CantFindObject">
-		Nesne bulunamıyor.
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		Nesnelere para transferleri bölgede şu anda devre dışı bırakılmış durumda.
-	</notification>
-	<notification name="CantPayNoAgent">
-		Kime ödeme yapılacağı belirlenemedi.
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		Kamusal nesnelere L$ veremezsiniz.
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		Dünya içerisindeki nesnede envater oluşturma başarısız oldu.
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		Dahili bir hata nedeniyle görüntüleyicinizi gerektiği gibi güncelleyemedik.  Görüntüleyicinizde gösterilen L$ bakiyesi veya parsel tutarı sunucular üzerinde gerçekteki bakiyenizi yansıtmayabilir.
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		Başka oyuncularla kesişen büyük primler oluşturulamaz.  Öbür oyuncular hareket ettiğinde lütfen tekrar deneyin.
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		Bu, geçmiş sohbetlerin günlüklerini ve bu dosyanın tüm yedeklerini silecektir.
-		<usetemplate ignoretext="Ben geçmiş sohbetlerin günlüğünü silmeden önce doğrula." name="okcancelignore" notext="İptal" yestext="Tamam"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		Bu, tüm geçmiş sohbetlerin dökümlerini silecektir. Geçmiş sohbetlerin listesi bundan etkilenmez. [FOLDER] klasöründe .txt ve txt.backup uzantısına sahip tüm dosyalar silinecektir.
-		<usetemplate ignoretext="Ben dökümleri silmeden önce doğrulama iste." name="okcancelignore" notext="İptal" yestext="Tamam"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		Dosyalar taşınamıyor. Önceki yol geri yüklendi.
-		<usetemplate ignoretext="Dosyalar taşınamıyor. Önceki yol geri yüklendi." name="okignore" yestext="Tamam"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
index f330bd85e8..7542778aca 100644
--- a/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_avatar_list_item.xml
@@ -27,6 +27,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="Bu arkadaşınız nesnelerinizi düzenleyebilir, silebilir veya alabilir"/>
 	<icon name="permission_map_icon" tool_tip="Bu arkadaşınız haritada sizi bulabilir"/>
 	<icon name="permission_online_icon" tool_tip="Bu arkadaşınız çevrimiçi olduğunuzda sizi görebilir"/>
-	<button name="info_btn" tool_tip="Ek bilgi"/>
 	<button name="profile_btn" tool_tip="Profili göster"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
index 87b67e249e..0464b7ec07 100644
--- a/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/tr/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="Filtrele" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="Seçilen kişi veya nesne üzerindeki eylemler"/>
-		<menu_button name="view_btn" tool_tip="Sıralama seçenekleri"/>
-		<menu_button name="plus_btn" tool_tip="Engellenecek bir Sakin veya nesne seç"/>
-		<button name="unblock_btn" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/>
-	</panel>
-	<block_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/>
+	<text name="title_text">
+		Listeyi Engelle
+	</text>
+	<scroll_list name="blocked" tool_tip="Şu anda engellenmiş olan Sakinler listesi"/>
+	<button label="Kişiyi engelle" name="Block resident..." tool_tip="Engellenecek bir Sakin seç"/>
+	<button label="Nesneyi ada göre engelle" name="Block object by name..." tool_tip="Ada göre engellenecek bir nesne seç"/>
+	<button label="Engellemeyi Kaldır" name="Unblock" tool_tip="Engelleme listesinden Sakini veya nesneyi kaldır"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
deleted file mode 100644
index c7227f02b6..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="(yükleniyor)"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
deleted file mode 100644
index 79895f9c21..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="Sohbet ses dahil edildi"/>
-	<icon name="unread_ims_icon" tool_tip="Oturumunuz kapalıyken mesajlar geldi"/>
-	<button name="delete_btn" tool_tip="Bu girişi kaldır"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
index f44d2b5e76..2bc597f2fa 100644
--- a/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="Bilinmiyor"/>
-	<button name="info_btn" tool_tip="Ek bilgi"/>
 	<button name="profile_btn" tool_tip="Profili göster"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
index 08efd0aa61..1a1e53bac2 100644
--- a/indra/newview/skins/default/xui/tr/panel_people.xml
+++ b/indra/newview/skins/default/xui/tr/panel_people.xml
@@ -14,53 +14,81 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
 	<string name="no_filtered_friends_msg">
 		Aradığınızı bulamadınız mı? [secondlife:///app/search/people/[SEARCH_TERM] Ara] deneyin.
 	</string>
+	<string name="people_filter_label" value="Kişileri Filtrele"/>
+	<string name="groups_filter_label" value="Grupları Filtrele"/>
 	<string name="no_filtered_groups_msg" value="Aradığınızı bulamadınız mı? [secondlife:///app/search/groups/[SEARCH_TERM] Ara] deneyin."/>
 	<string name="no_groups_msg" value="Katılacak Gruplar mı arıyorsunuz? [secondlife:///app/search/groups Ara] deneyin."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Haritayı açmak için çift tıkla, yatay hareket için shift çek)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Işınlamak için çift tıkla, yatay hareket için shift çek)"/>
+	<filter_editor label="Filtrele" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="YAKIN" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="Kişileri Filtrele" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
-				<menu_button name="nearby_view_btn" tool_tip="Gösterme/sıralama seçenekleri"/>
-				<button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/>
-				<dnd_button name="nearby_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="Seçenklr."/>
+				<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
 			</panel>
 		</panel>
-		<panel label="ARKADAŞLAR" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="Kişileri Filtrele" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
-				<menu_button name="friends_view_btn" tool_tip="Seçenekleri göster/sırala"/>
-				<button name="friends_add_btn" tool_tip="Bir sakine arkadaşlık öner"/>
-				<dnd_button name="friends_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
-			</panel>
+		<panel label="ARKADAŞLARIM" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="Çevrimiçi"/>
 				<accordion_tab name="tab_all" title="Tümü"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="İlave seçenekleri göster"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="Bir Sakine arkadaşlık öner"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="Seçilen kişiyi arkadaş Listenden çıkar"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="GRUPLAR" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="Grupları Filtrele" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="Seçilen grup üzerindeki eylemler"/>
-				<menu_button name="groups_view_btn" tool_tip="Seçenekleri göster/sırala"/>
-				<menu_button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
-				<dnd_button name="minus_btn" tool_tip="Seçilen gruptan ayrıl"/>
+		<panel label="GRUPLARIM" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="Seçenklr."/>
+				<button name="plus_btn" tool_tip="Gruba katıl/yeni grup oluştur"/>
+				<button name="activate_btn" tool_tip="Seçilen grubu etkinleştir"/>
 			</panel>
 		</panel>
 		<panel label="SON" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="Kişileri Filtrele" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="Seçilen kişi üzerindeki eylemler"/>
-				<menu_button name="recent_view_btn" tool_tip="Seçenekleri göster/sırala"/>
-				<button name="add_friend_btn" tool_tip="Bir sakine arkadaşlık öner"/>
-				<dnd_button name="recent_del_btn" tool_tip="Seçilen kişiyi arkadaş olarak kaldır"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="Seçenklr."/>
+				<button name="add_friend_btn" tool_tip="Seçilen Sakini arkadaş listene ekle"/>
 			</panel>
 		</panel>
-		<panel label="ENGELLENMİŞ" name="blocked_panel">
-			<panel label="Engellenmiş Sakinler ve Nesneler" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="Profil" name="view_profile_btn" tool_tip="Resim, grup ve diğer Sakin bilgilerini göster"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="Aİ" name="im_btn" tool_tip="Anlık ileti oturumu aç"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="Ara" name="call_btn" tool_tip="Bu Sakini ara"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="Paylaş" name="share_btn" tool_tip="Bir envanter öğesini paylaş"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="Işınla" name="teleport_btn" tool_tip="Işınlama teklif et"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="Grup Profili" name="group_info_btn" tool_tip="Grup bilgilerini göster"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="Grup Sohbeti" name="chat_btn" tool_tip="Sohbet oturumu aç"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="Grup Araması" name="group_call_btn" tool_tip="Bu grubu ara"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
index aaeebdfe6e..231e8fc5fe 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Metin Sohbeti" name="chat">
-	<panel>
-		<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
-		<check_box label="Çevrimdışı olduğunda Aİ&apos;ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
-		<check_box label="Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			Font büyüklüğü:
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="Küçük" name="Small" value="0"/>
-			<item label="Orta" name="Medium" value="1"/>
-			<item label="Büyük" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			Bildirimler
-		</text>
-		<text name="friend_ims">
-			Arkadaş Aİ&apos;leri:
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
-			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			Arkadaş harici Aİ&apos;ler:
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı açılır pencerede göster" name="PopUpMessage" value="toast"/>
-			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
-		</combo_box>
-		<text name="conference_ims">
-			Konferans Aİ&apos;leri:
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
-			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
-		</combo_box>
-		<text name="group_chat">
-			Grup sohbeti:
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
-			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolbarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
-		</combo_box>
-		<text name="nearby_chat">
-			Yakındaki sohbet:
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="Sohbetler penceresini aç" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="Mesajı aç" name="PopUpMessage" value="toast"/>
-			<item label="Araç çubuğu düğmesi yanıp sönsün" name="FlashToolBarButton" value="flash"/>
-			<item label="Hiçbiri" name="None" value="none"/>
-		</combo_box>
-		<text name="notifications_alert">
-			Tüm bildirimleri geçici olarak durdurmak için İletişim Kur &gt; Rahatsız Etme seçeneğini kullanın.
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			Sesi çal:
-		</text>
-		<check_box label="Yeni sohbet" name="new_conversation"/>
-		<check_box label="Gelen sesli arama" name="incoming_voice_call"/>
-		<check_box label="Işınlama teklifi" name="teleport_offer"/>
-		<check_box label="Envanter teklifi" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="Günlüğü temizle..." name="clear_log"/>
-		<button label="Dökümleri sil..." name="delete_transcripts"/>
-		<button label="Gözat..." label_selected="Gözat" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		Font büyüklüğü:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="Küçük" name="radio" value="0"/>
+		<radio_item label="Orta" name="radio2" value="1"/>
+		<radio_item label="Büyük" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="Sohbet sırasında yazma animasyonunu oynat" name="play_typing_animation"/>
+	<check_box label="Çevrimdışı olduğunda Aİ&apos;ler e-posta ile bana gönderilsin" name="send_im_to_email"/>
+	<check_box label="Düz metin Aİ&apos;ler ve sohbet geçmişini etkinleştir" name="plain_text_chat_history"/>
+	<check_box label="Balon Sohbeti" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		Aİ&apos;leri şurada göster:
+	</text>
+	<text name="requires_restart_label">
+		(tekrar başlatma gerekir)
+	</text>
+	<radio_group name="chat_window" tool_tip="Anlık İletileri ayrı gezdiricilerde veya çoklu sekmelere sahip tek bir gezdiricide gösterin (tekrar başlatma gerekir)">
+		<radio_item label="Ayrı Pencereler" name="radio" value="0"/>
+		<radio_item label="Sekmeler" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		Gelen sohbet için açılır pencereleri etkinleştir:
+	</text>
+	<check_box label="Grup Sohbetleri" name="EnableGroupChatPopups" tool_tip="Bir Grup Sohbet iletisi gönderildiğinde açılır pencereleri görmek için işaretle"/>
+	<check_box label="Aİ Sohbetleri" name="EnableIMChatPopups" tool_tip="Bir anlık ileti geldiğinde açılır pencereleri görmek için işaretle"/>
+	<spinner label="Yakındaki sohbet iletilerinin vurgulanma süresi:" name="nearby_toasts_lifetime"/>
+	<spinner label="Yakındaki sohbet iletilerinin sönme süresi:" name="nearby_toasts_fadingtime"/>
 	<button label="Çeviri..." name="ok_btn"/>
 	<button label="Otomatik Yerine Koy..." name="autoreplace_showgui"/>
 	<button label="Yazım Denetimi Yapılıyor..." name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
index 1a13cf8f71..4a48b1588c 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="asla" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		Rahatsız Etme yanıtı:
+		Meşgul durumu cevabı:
 	</text>
-	<text_editor name="do_not_disturb_response">
+	<text_editor name="busy_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
index 9a4cf54fa7..b0b9ab7716 100644
--- a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="Nesneyi satın al" name="Buyobject"/>
 			<combo_box.item label="Nesneye ödeme yap" name="Payobject"/>
 			<combo_box.item label="Aç" name="Open"/>
-			<combo_box.item label="Yakınlaştır" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 155dc8749a..1be8f5974c 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -137,7 +137,7 @@
 		Çık
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/?sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=tr-TR&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Kullandığınız görüntüleyici ile artık Second Life&apos;a erişemezsiniz. Yeni bir görüntüleyiciyi karşıdan yüklemek için lütfen şu sayfayı ziyaret edin:
@@ -619,8 +619,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="AvatarAway">
 		Uzakta
 	</string>
-	<string name="AvatarDoNotDisturb">
-		Rahatsız Etme
+	<string name="AvatarBusy">
+		Meşgul
 	</string>
 	<string name="AvatarMuted">
 		Engellenmiş
@@ -856,12 +856,6 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ST_NO_JOINT">
 		KÖK veya EKLEM bulunamıyor.
 	</string>
-	<string name="NearbyChatTitle">
-		Yakındaki sohbet
-	</string>
-	<string name="NearbyChatLabel">
-		(Yakındaki sohbet)
-	</string>
 	<string name="whisper">
 		fısıldar:
 	</string>
@@ -925,15 +919,12 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="ControlYourCamera">
 		Kameranızı kontrol etmek
 	</string>
-	<string name="NotConnected">
-		Bağlı Değil
-	</string>
-	<string name="AgentNameSubst">
-		(Siz)
-	</string>
 	<string name="TeleportYourAgent">
 		Sizi ışınlama
 	</string>
+	<string name="NotConnected">
+		Bağlı Değil
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Genel
 	</string>
@@ -1015,6 +1006,18 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="dictionary_files">
 		Sözlükler
 	</string>
+	<string name="AvatarSetNotAway">
+		Uzakta Değil
+	</string>
+	<string name="AvatarSetAway">
+		Uzakta
+	</string>
+	<string name="AvatarSetNotBusy">
+		Meşgul Değil
+	</string>
+	<string name="AvatarSetBusy">
+		Meşgul
+	</string>
 	<string name="shape">
 		Şekil
 	</string>
@@ -1983,8 +1986,8 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="PanelContentsNewScript">
 		Yeni Komut Dosyası
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		Bu sakin &quot;Rahatsız Etme&quot; seçeneğini devreye almış, mesajınızı sonra görecek.
+	<string name="BusyModeResponseDefault">
+		İleti gönderdiğiniz Sakin &apos;meşgul modu&apos;nda, bu da rahatsız edilmek istemediği anlamına geliyor.  İletiniz daha sonra incelenmesi için kendisine ait Aİ panelinde gösterilecektir.
 	</string>
 	<string name="MuteByName">
 		(Adına göre)
@@ -2097,6 +2100,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		İçerik
+	</string>
 	<string name="AcquiredItems">
 		Alınan Öğeler
 	</string>
@@ -3868,7 +3874,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 		Genel Bölge
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		Bu parselin içindeki avatarlar, bu parselin dışındaki avatarlar tarafından görülemez veya işitilemez
+		Bu parselin dışında avatarlar görünür durumda ve sohbete izin veriliyor
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		Bölge yeniden kaydedilinceye kadar hareket eden nesneler bu bölgede doğru davranmayabilir.
@@ -3945,12 +3951,6 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="IM_unblock_only_groups_friends">
 		Bu mesajı görmek için Tercihler/Gizlilik&apos;de &apos;Sadece arkadaşlar ve gruplar beni arasın veya Aİ göndersin&apos; seçeneğinin işaretini kaldırmalısınız.
 	</string>
-	<string name="OnlineStatus">
-		Çevrimiçi
-	</string>
-	<string name="OfflineStatus">
-		Çevrimdışı
-	</string>
 	<string name="answered_call">
 		Aramanız yanıtlandı
 	</string>
@@ -3960,9 +3960,6 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="you_joined_call">
 		Sesli aramaya katıldınız
 	</string>
-	<string name="you_auto_rejected_call-im">
-		&quot;Rahatsız Etme&quot; seçeneğini devredeyken sesli aramayı otomatik olarak reddettiniz.
-	</string>
 	<string name="name_started_call">
 		[NAME] bir sesli arama başlattı
 	</string>
@@ -3979,7 +3976,7 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 		Bağlanıyor...
 	</string>
 	<string name="conference-title">
-		Çok kişili sohbet
+		Özel Konferans
 	</string>
 	<string name="conference-title-incoming">
 		[AGENT_NAME] ile konferans
@@ -4869,9 +4866,6 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Chat_Label">
 		Sohbet
 	</string>
-	<string name="Command_Conversations_Label">
-		Sohbetler
-	</string>
 	<string name="Command_Compass_Label">
 		Pusula
 	</string>
@@ -4947,9 +4941,6 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Command_Chat_Tooltip">
 		Metin kullanarak yakındaki kişilerle sohbet etmek
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		Herkesle sohbet et
-	</string>
 	<string name="Command_Compass_Tooltip">
 		Pusula
 	</string>
@@ -5079,13 +5070,4 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Sohbetlerin günlüğü tutulmuyor. Bir günlük tutmaya başlamak için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Bundan böyle sohbetlerin günlükleri tutulmayacak. Bir günlük tutmaya devam etmek için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Günlüğü tutulmuş sohbet yok. Siz biriyle iletişime geçtikten sonra veya biri sizinle iletişime geçtikten sonra, burada bir günlük girişi gösterilir.
-	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_log.xml b/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
deleted file mode 100644
index 37115a0310..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_conversation_log.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_conversation_log" title="交談記錄">
-	<panel name="buttons_panel">
-		<filter_editor label="人員過濾器" name="people_filter_input"/>
-		<menu_button name="conversation_view_btn" tool_tip="檢視/排序的選項"/>
-		<menu_button name="conversations_gear_btn" tool_tip="對所選的人或群組採取動作"/>
-	</panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml b/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
deleted file mode 100644
index ece263f440..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_conversation_preview.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="preview_conversation" title="交談：">
-	<floater.string name="Title">
-		交談：[NAME]
-	</floater.string>
-	<text name="page_label" value="頁"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_container.xml b/indra/newview/skins/default/xui/zh/floater_im_container.xml
index 84ad869100..2d66c659fe 100644
--- a/indra/newview/skins/default/xui/zh/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_container.xml
@@ -1,29 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<multi_floater name="floater_im_box" title="交談">
-	<string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<string name="expand_icon" value="Conv_toolbar_expand"/>
-	<layout_stack name="conversations_stack">
-		<layout_panel name="conversations_layout_panel">
-			<layout_stack name="conversations_pane_buttons_stack">
-				<layout_panel name="conversations_pane_buttons_expanded">
-					<menu_button name="sort_btn" tool_tip="檢視/排序的選項"/>
-					<button name="add_btn" tool_tip="開始新的交談"/>
-					<button name="speak_btn" tool_tip="用麥克風和大家交談"/>
-				</layout_panel>
-				<layout_panel name="conversations_pane_buttons_collapsed">
-					<button name="expand_collapse_btn" tool_tip="縮疊/展開這個清單"/>
-				</layout_panel>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel name="messages_layout_panel">
-			<panel_container name="im_box_tab_container">
-				<panel name="stub_panel">
-					<button name="stub_collapse_btn" tool_tip="縮疊這一區塊"/>
-					<text name="stub_textbox">
-						這個交談另開了新視窗。   [secondlife:/// 把它收回來]
-					</text>
-				</panel>
-			</panel_container>
-		</layout_panel>
-	</layout_stack>
-</multi_floater>
+<multi_floater name="floater_im_box" title="交談"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_im_session.xml b/indra/newview/skins/default/xui/zh/floater_im_session.xml
index d63c5507db..808a0b6720 100644
--- a/indra/newview/skins/default/xui/zh/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/zh/floater_im_session.xml
@@ -1,59 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="panel_im">
-	<floater.string name="call_btn_start">
-		Conv_toolbar_open_call
-	</floater.string>
-	<floater.string name="call_btn_stop">
-		Conv_toolbar_hang_up
-	</floater.string>
-	<floater.string name="collapseline_icon" value="Conv_collapse_to_one_line"/>
-	<floater.string name="expandline_icon" value="Conv_expand_one_line"/>
-	<floater.string name="collapse_icon" value="Conv_toolbar_collapse"/>
-	<floater.string name="expand_icon" value="Conv_toolbar_expand"/>
-	<floater.string name="tear_off_icon" value="Conv_toolbar_arrow_ne"/>
-	<floater.string name="return_icon" value="Conv_toolbar_arrow_sw"/>
-	<floater.string name="participant_added" value="[NAME] 已受邀加入交談。"/>
-	<floater.string name="multiple_participants_added" value="[NAME] 已受邀加入交談。"/>
-	<floater.string name="tooltip_to_separate_window" value="為這個交談另開新視窗"/>
-	<floater.string name="tooltip_to_main_window" value="將這個交談移回到主視窗"/>
-	<floater.string name="start_call_button_tooltip" value="建立語音通聯"/>
-	<floater.string name="end_call_button_tooltip" value="切斷語音通聯"/>
-	<floater.string name="expcol_button_not_tearoff_tooltip" value="縮疊這一區塊"/>
-	<floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="縮疊參與者清單"/>
-	<floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="展開參與者清單"/>
-	<view name="contents_view">
-		<layout_stack name="main_stack">
-			<layout_panel name="toolbar_panel">
-				<menu_button name="view_options_btn" tool_tip="檢視/排序的選項"/>
-				<menu_button name="gear_btn" tool_tip="對選取的人採取動作"/>
-				<button name="add_btn" tool_tip="新增某人到這個交談"/>
-				<button name="voice_call_btn" tool_tip="建立語音通聯"/>
-				<button name="close_btn" tool_tip="結束這個交談"/>
-				<button name="expand_collapse_btn" tool_tip="縮疊/展開這個框"/>
-			</layout_panel>
-			<layout_panel name="body_panel">
-				<layout_stack name="im_panels">
-					<layout_panel name="right_part_holder">
-						<panel name="trnsAndChat_panel">
-							<layout_stack name="translate_and_chat_stack">
-								<layout_panel name="translate_chat_checkbox_lp">
-									<check_box label="翻譯聊天內容" name="translate_chat_checkbox"/>
-								</layout_panel>
-							</layout_stack>
-						</panel>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-			<layout_panel name="chat_layout_panel">
-				<layout_stack name="input_panels">
-					<layout_panel name="input_editor_layout_panel">
-						<chat_editor label="至" name="chat_editor"/>
-					</layout_panel>
-					<layout_panel name="input_button_layout_panel">
-						<button name="minz_btn" tool_tip="顯示/隱藏訊息框"/>
-					</layout_panel>
-				</layout_stack>
-			</layout_panel>
-		</layout_stack>
-	</view>
+	<layout_stack name="im_panels">
+		<layout_panel>
+			<line_editor label="至" name="chat_editor"/>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
index 4526eff21d..45a003d3c8 100644
--- a/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/zh/floater_incoming_call.xml
@@ -25,9 +25,9 @@
 		是否離開 [CURRENT_CHAT] 並加入這個語音聊天？
 	</floater.string>
 	<text name="question">
-		如果接聽，你將切斷目前的語音交談。
+		是否離開 [CURRENT_CHAT] 並加入這個語音聊天？
 	</text>
-	<button label="接聽" label_selected="接聽" name="Accept"/>
-	<button label="忽視" label_selected="忽視" name="Reject"/>
-	<button label="不接聽但開啟 IM" name="Start IM"/>
+	<button label="接受" label_selected="接受" name="Accept"/>
+	<button label="拒絕" label_selected="拒絕" name="Reject"/>
+	<button label="開始 IM" name="Start IM"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
index d0978b8b01..be009b54d8 100644
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
@@ -71,7 +71,7 @@
 			<text name="show_label">
 				顯示：
 			</text>
-			<check_box label="測試" name="show_world"/>
+			<check_box label="世界" name="show_world"/>
 			<check_box label="僅限可移動的" name="show_world_movables_only"/>
 			<check_box label="導航網面" name="show_navmesh"/>
 			<text name="show_walkability_label">
diff --git a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
index 02d06323d4..e909a67e2c 100644
--- a/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
@@ -19,7 +19,7 @@
 	<button label="預設" label_selected="預設" name="Default"/>
 	<button label="空白" label_selected="空白" name="Blank"/>
 	<button label="無" label_selected="無" name="None"/>
-	<check_box initial_value="true" label="立即套用" name="apply_immediate_check"/>
+	<check_box initial_value="true" label="實時預覽" name="apply_immediate_check"/>
 	<text name="preview_disabled" value="已停用預覽"/>
 	<filter_editor label="材質過濾器" name="inventory search editor"/>
 	<check_box initial_value="false" label="顯示資料夾" name="show_folders_check"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
deleted file mode 100644
index 96caa7d333..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_voice_chat_volume.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_voice_volume" title="語音聊天音量">
-	<slider label="語音聊天" name="chat_voice_volume"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
index aab5fa6028..81e0204262 100644
--- a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="地點" name="voice_effects" title="語音變聲試聽">
+<floater label="地點" name="voice_effects" title="語音變聲">
 	<string name="no_voice_effect">
 		（無變聲效果）
 	</string>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_volume.xml b/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
deleted file mode 100644
index 4260a8d331..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_voice_volume.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater name="floater_voice_volume" title="音量">
-	<slider name="volume_slider" tool_tip="音量" value="0.5"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
index eb7093a23c..cd069f9601 100644
--- a/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_cof_gear.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="Gear COF">
 	<menu label="新衣服" name="COF.Gear.New_Clothes"/>
-	<menu label="新身體部位" name="COF.Gear.New_Body_Parts"/>
+	<menu label="新身體部位" name="COF.Geear.New_Body_Parts"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation.xml b/indra/newview/skins/default/xui/zh/menu_conversation.xml
deleted file mode 100644
index 507255d0c0..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_conversation.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_participant">
-	<menu_item_call label="關閉交談" name="close_conversation"/>
-	<menu_item_call label="開啟語音交談" name="open_voice_conversation"/>
-	<menu_item_call label="切斷語音交談" name="disconnect_from_voice"/>
-	<menu_item_call label="察看檔案" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
-	<menu_item_call label="語音通話" name="voice_call"/>
-	<menu_item_call label="聊天歷史……" name="chat_history"/>
-	<menu_item_call label="新增朋友" name="add_friend"/>
-	<menu_item_call label="移除朋友" name="remove_friend"/>
-	<menu_item_call label="移除朋友" name="remove_friends"/>
-	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
-	<menu_item_call label="放大" name="zoom_in"/>
-	<menu_item_call label="地圖" name="map"/>
-	<menu_item_call label="分享" name="share"/>
-	<menu_item_call label="支付" name="pay"/>
-	<menu_item_check label="禁止語音" name="block_unblock"/>
-	<menu_item_check label="禁止文字" name="MuteText"/>
-	<menu_item_call label="群組檔案" name="group_profile"/>
-	<menu_item_call label="啟用群組" name="activate_group"/>
-	<menu_item_call label="離開群組" name="leave_group"/>
-	<context_menu label="主持人選項" name="Moderator Options">
-		<menu_item_check label="允許文字聊天" name="AllowTextChat"/>
-		<menu_item_call label="將此人消音" name="ModerateVoiceMuteSelected"/>
-		<menu_item_call label="取消對此人的消音" name="ModerateVoiceUnMuteSelected"/>
-		<menu_item_call label="所有人消音" name="ModerateVoiceMute"/>
-		<menu_item_call label="取消所有人的消音" name="ModerateVoiceUnmute"/>
-	</context_menu>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
deleted file mode 100644
index 49e91417e8..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_conversation_log_gear.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Context Menu">
-	<menu_item_call label="IM…" name="IM"/>
-	<menu_item_call label="語音通話…" name="Call"/>
-	<menu_item_call label="開啟聊天歷史…" name="Chat history"/>
-	<menu_item_call label="察看檔案" name="View Profile"/>
-	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
-	<menu_item_call label="加為朋友" name="add_friend"/>
-	<menu_item_call label="移除朋友" name="remove_friend"/>
-	<menu_item_call label="邀請加入群組……" name="Invite"/>
-	<menu_item_call label="地圖" name="Map"/>
-	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
deleted file mode 100644
index 3fa99a5cd7..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_conversation_log_view.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_conversation_view">
-	<menu_item_check label="依名稱排序" name="sort_by_name"/>
-	<menu_item_check label="依日期排序" name="sort_by_date"/>
-	<menu_item_check label="將朋友列在頂端" name="sort_by_friends"/>
-	<menu_item_call label="檢視附近聊天歷史……" name="view_nearby_chat_history"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_conversation.xml b/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
deleted file mode 100644
index 815b0b594c..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_im_conversation.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Conversation Gear Menu">
-	<menu_item_call label="察看檔案" name="View Profile"/>
-	<menu_item_call label="加為朋友" name="Add Friend"/>
-	<menu_item_call label="移除朋友" name="remove_friend"/>
-	<menu_item_call label="發出瞬間傳送邀請" name="offer_teleport"/>
-	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
-	<menu_item_call label="聊天歷史……" name="chat_history"/>
-	<menu_item_call label="放大" name="zoom_in"/>
-	<menu_item_call label="地圖" name="map"/>
-	<menu_item_call label="分享" name="Share"/>
-	<menu_item_call label="支付" name="Pay"/>
-	<menu_item_check label="禁止語音" name="Block/Unblock"/>
-	<menu_item_check label="禁止文字" name="MuteText"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml b/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
deleted file mode 100644
index a7006e524a..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_im_session_showmodes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_modes">
-	<menu_item_check label="精簡視野" name="compact_view"/>
-	<menu_item_check label="全展視野" name="expanded_view"/>
-	<menu_item_check label="顯示時間" name="IMShowTime"/>
-	<menu_item_check label="一對一交談時顯示名字" name="IMShowNamesForP2PConv"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_object_icon.xml b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
index 9655732f2e..f4f93b0bdc 100644
--- a/indra/newview/skins/default/xui/zh/menu_object_icon.xml
+++ b/indra/newview/skins/default/xui/zh/menu_object_icon.xml
@@ -2,6 +2,4 @@
 <menu name="Object Icon Menu">
 	<menu_item_call label="物件檔案..." name="Object Profile"/>
 	<menu_item_call label="封鎖…" name="Block"/>
-	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
-	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
index 258d0d6b20..e85b4b7182 100644
--- a/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
+++ b/indra/newview/skins/default/xui/zh/menu_outfit_gear.xml
@@ -23,8 +23,6 @@
 		<menu_item_call label="新頭髮" name="New Hair"/>
 		<menu_item_call label="新眼睛" name="New Eyes"/>
 	</menu>
-	<menu_item_call label="展開全部資料夾" name="expand"/>
-	<menu_item_call label="摺疊全部資料夾" name="collapse"/>
 	<menu_item_call label="裝扮更名" name="rename"/>
 	<menu_item_call label="刪除裝扮" name="delete_outfit"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_participant_view.xml b/indra/newview/skins/default/xui/zh/menu_participant_view.xml
deleted file mode 100644
index 8b35860eb6..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_participant_view.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="participant_manu_view">
-	<menu_item_check label="將交談依類型排序" name="sort_sessions_by_type"/>
-	<menu_item_check label="將交談依名字排序" name="sort_sessions_by_name"/>
-	<menu_item_check label="將交談依最近活動排序" name="sort_sessions_by_recent"/>
-	<menu_item_check label="將參與者依名字排序" name="sort_participants_by_name"/>
-	<menu_item_check label="將參與者依最近活動排序" name="sort_participants_by_recent"/>
-	<menu_item_call label="聊天偏好設定……" name="chat_preferences"/>
-	<menu_item_call label="隱私偏好設定……" name="privacy_preferences"/>
-	<menu_item_check label="交談記錄……" name="Conversation"/>
-	<menu_item_check label="翻譯附近的聊天" name="Translate_chat"/>
-	<menu_item_check label="翻譯設定……" name="Translation_settings"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
deleted file mode 100644
index 9a2a3c403d..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_blocked_gear.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_gear">
-	<menu_item_call label="解除封鎖" name="unblock"/>
-	<menu_item_call label="檔案..." name="profile"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
deleted file mode 100644
index a8cecb4e14..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_blocked_plus.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_plus">
-	<menu_item_call label="按名字封鎖居民……" name="block_resident_by_name"/>
-	<menu_item_call label="依名稱封鎖物件" name="block_object_by_name"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml b/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
deleted file mode 100644
index 5b70cd35bf..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_blocked_view.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_blocked_view">
-	<menu_item_check label="依名稱排序" name="sort_by_name"/>
-	<menu_item_check label="依類型排序" name="sort_by_type"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml b/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
deleted file mode 100644
index 4251238fd9..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_friends_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="依名稱排序" name="sort_name"/>
-	<menu_item_check label="依狀態排序" name="sort_status"/>
-	<menu_item_check label="察看人群圖示" name="view_icons"/>
-	<menu_item_check label="察看許可權限" name="view_permissions"/>
-	<menu_item_check label="檢視交談記錄……" name="view_conversation"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups.xml b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
index b4b566f5ca..5768c554c9 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_groups.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_groups.xml
@@ -2,7 +2,7 @@
 <menu name="menu_group_plus">
 	<menu_item_call label="察看資訊" name="View Info"/>
 	<menu_item_call label="聊天" name="Chat"/>
-	<menu_item_call label="語音通話" name="Call"/>
+	<menu_item_call label="通話" name="Call"/>
 	<menu_item_call label="啟動" name="Activate"/>
 	<menu_item_call label="退出" name="Leave"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml b/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
deleted file mode 100644
index 05a30d938f..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_groups_view.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="顯示群組圖示" name="Display Group Icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
index d25adaf8fb..38d5f3d324 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Avatar Context Menu">
-	<menu_item_call label="察看檔案" name="view_profile"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
-	<menu_item_call label="語音通話" name="voice_call"/>
-	<menu_item_call label="檢視聊天歷史……" name="chat_history"/>
-	<menu_item_call label="加為朋友" name="add_friend"/>
-	<menu_item_call label="移除朋友" name="remove_friend"/>
-	<menu_item_call label="邀請加入群組……" name="invite_to_group"/>
-	<menu_item_call label="放大" name="zoom_in"/>
-	<menu_item_call label="地圖" name="map"/>
-	<menu_item_call label="分享" name="share"/>
-	<menu_item_call label="支付" name="pay"/>
-	<menu_item_check label="封鎖/不再封鎖" name="block_unblock"/>
+	<menu_item_call label="察看檔案" name="View Profile"/>
+	<menu_item_call label="加為朋友" name="Add Friend"/>
+	<menu_item_call label="移除朋友" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="通話" name="Call"/>
+	<menu_item_call label="地圖" name="Map"/>
+	<menu_item_call label="分享" name="Share"/>
+	<menu_item_call label="支付" name="Pay"/>
+	<menu_item_check label="封鎖/不再封鎖" name="Block/Unblock"/>
+	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
index 69f0eab7dc..1380e0b307 100644
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/zh/menu_people_nearby_multiselect.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Multi-Selected People Context Menu">
-	<menu_item_call label="加為朋友" name="add_friends"/>
-	<menu_item_call label="移除朋友" name="remove_friends"/>
-	<menu_item_call label="IM" name="im"/>
-	<menu_item_call label="通話" name="call"/>
-	<menu_item_call label="分享" name="share"/>
-	<menu_item_call label="支付" name="pay"/>
-	<menu_item_call label="發給瞬間傳送請求" name="offer_teleport"/>
+	<menu_item_call label="加為朋友" name="Add Friends"/>
+	<menu_item_call label="移除朋友" name="Remove Friend"/>
+	<menu_item_call label="IM" name="IM"/>
+	<menu_item_call label="通話" name="Call"/>
+	<menu_item_call label="分享" name="Share"/>
+	<menu_item_call label="支付" name="Pay"/>
+	<menu_item_call label="發給瞬間傳送請求" name="teleport"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml b/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
deleted file mode 100644
index 9bc5638472..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_nearby_view.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="依最近說話者排序" name="sort_by_recent_speakers"/>
-	<menu_item_check label="依名稱排序" name="sort_name"/>
-	<menu_item_check label="依距離排序" name="sort_distance"/>
-	<menu_item_check label="察看人群圖示" name="view_icons"/>
-	<menu_item_check label="察看地圖" name="view_map"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml b/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
deleted file mode 100644
index 382234c3ec..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_people_recent_view.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="menu_group_plus">
-	<menu_item_check label="依最近排序" name="sort_most"/>
-	<menu_item_check label="依名稱排序" name="sort_name"/>
-	<menu_item_check label="察看人群圖示" name="view_icons"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_agent.xml b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
index 72629822d4..592bb6561e 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_agent.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_agent.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="察看檔案" name="show_agent"/>
-	<menu_item_call label="送出 IM..." name="send_im"/>
-	<menu_item_call label="加為朋友..." name="add_friend"/>
+	<menu_item_call label="顯示居民檔案" name="show_agent"/>
 	<menu_item_call label="覆製名稱到剪貼簿" name="url_copy_label"/>
 	<menu_item_call label="覆製 SLurl 到剪貼簿" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
index 9f3a9d58ff..b344b21c62 100644
--- a/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
+++ b/indra/newview/skins/default/xui/zh/menu_url_objectim.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="物件檔案..." name="show_object"/>
+	<menu_item_call label="顯示物件資訊" name="show_object"/>
 	<menu_item_call label="顯示在地圖上" name="show_on_map"/>
 	<menu_item_call label="瞬間傳送到物件位置" name="teleport_to_object"/>
 	<menu_item_call label="覆製物件名稱到剪貼簿" name="url_copy_label"/>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 09bdc57819..ac0e9e7e35 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -16,7 +16,10 @@
 			<menu_item_call label="停止我身上的動作" name="Stop Animating My Avatar"/>
 			<menu_item_call label="行走 / 跑步 / 飛行…" name="Walk / run / fly"/>
 		</menu>
-		<menu label="狀態" name="Status"/>
+		<menu label="狀態" name="Status">
+			<menu_item_call label="離開" name="Set Away"/>
+			<menu_item_call label="忙碌" name="Set Busy"/>
+		</menu>
 		<menu_item_call label="購買 L$…" name="Buy and Sell L$"/>
 		<menu_item_call label="商家發件匣…" name="MerchantOutbox"/>
 		<menu_item_call label="帳戶主控臺…" name="Manage My Account"/>
@@ -27,18 +30,14 @@
 		<menu_item_call label="退出 [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="溝通" name="Communicate">
-		<menu_item_check label="交談……" name="Conversations"/>
-		<menu_item_check label="附近的聊天……" name="Nearby Chat"/>
+		<menu_item_check label="聊天…" name="Nearby Chat"/>
 		<menu_item_check label="說話" name="Speak"/>
-		<menu label="語音變聲" name="VoiceMorphing">
-			<menu_item_check label="沒有變聲效果" name="NoVoiceMorphing"/>
-			<menu_item_check label="預覽……" name="Preview"/>
-			<menu_item_call label="訂閱……" name="Subscribe"/>
-		</menu>
+		<menu_item_check label="語音設定…" name="Nearby Voice"/>
+		<menu_item_check label="語音變聲…" name="ShowVoice"/>
 		<menu_item_check label="姿勢…" name="Gestures"/>
-		<menu_item_check label="朋友" name="My Friends"/>
-		<menu_item_check label="群組" name="My Groups"/>
-		<menu_item_check label="附近的人群" name="Active Speakers"/>
+		<menu_item_call label="朋友" name="My Friends"/>
+		<menu_item_call label="群組" name="My Groups"/>
+		<menu_item_call label="附近的人群" name="Active Speakers"/>
 		<menu_item_call label="封鎖清單" name="Block List"/>
 	</menu>
 	<menu label="世界" name="World">
@@ -114,6 +113,7 @@
 			<menu_item_call label="購買" name="Menu Object Buy"/>
 			<menu_item_call label="取得" name="Menu Object Take"/>
 			<menu_item_call label="取得副本" name="Take Copy"/>
+			<menu_item_call label="回存到我的收納區" name="Save Object Back to My Inventory"/>
 			<menu_item_call label="回存到物件內容" name="Save Object Back to Object Contents"/>
 			<menu_item_call label="退回物件" name="Return Object back to Owner"/>
 		</menu>
@@ -128,7 +128,6 @@
 			<menu_item_call label="聯結集…" name="pathfinding_linksets_menu_item"/>
 			<menu_item_call label="角色…" name="pathfinding_characters_menu_item"/>
 			<menu_item_call label="察看 / 測試…" name="pathfinding_console_menu_item"/>
-			<menu_item_call label="重新產出地區" name="pathfinding_rebake_navmesh_item"/>
 		</menu>
 		<menu label="選項" name="Options">
 			<menu_item_check label="顯示進階權限" name="DebugPermissions"/>
@@ -158,13 +157,6 @@
 	<menu label="幫助" name="Help">
 		<menu_item_call label="簡易教學…" name="How To"/>
 		<menu_item_call label="[SECOND_LIFE] 幫助" name="Second Life Help"/>
-		<menu_item_call label="使用者指南" name="User’s guide"/>
-		<menu_item_call label="知識庫" name="Knowledge Base"/>
-		<menu_item_call label="維基" name="Wiki"/>
-		<menu_item_call label="社群論壇" name="Community Forums"/>
-		<menu_item_call label="支援入口" name="Support portal"/>
-		<menu_item_call label="[SECOND_LIFE] 最新消息" name="Second Life News"/>
-		<menu_item_call label="[SECOND_LIFE] 部落格" name="Second Life Blogs"/>
 		<menu_item_call label="違規舉報" name="Report Abuse"/>
 		<menu_item_call label="回報臭蟲" name="Report Bug"/>
 		<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
@@ -391,14 +383,9 @@
 				<menu_item_call label="女性測試" name="Test Female"/>
 				<menu_item_check label="允許選擇化身" name="Allow Select Avatar"/>
 			</menu>
-			<menu label="動作速度" name="Animation Speed">
-				<menu_item_call label="所有動作加快 10%" name="All Animations 10 Faster"/>
-				<menu_item_call label="所有動作放慢 10%" name="All Animations 10 Slower"/>
-				<menu_item_call label="將所有動作恢復原速" name="Reset All Animation Speed"/>
-				<menu_item_check label="慢動作" name="Slow Motion Animations"/>
-			</menu>
 			<menu_item_call label="強制參數為預設值" name="Force Params to Default"/>
 			<menu_item_check label="動作資訊" name="Animation Info"/>
+			<menu_item_check label="慢動作" name="Slow Motion Animations"/>
 			<menu_item_check label="顯示注視在" name="Show Look At"/>
 			<menu_item_check label="顯示指向在" name="Show Point At"/>
 			<menu_item_check label="除錯旋軸的更新" name="Debug Joint Updates"/>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 59be26d43b..9fecf2c104 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -516,24 +516,6 @@
 		</url>
 		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
-	<notification name="AMDOldDriver">
-		你的顯示卡很可能有新版的驅動程式。  更新顯示驅動程式會大幅改善性能。
-
-    前往 [_URL] 察看是否有新版驅動程式？
-		<url name="url">
-			http://support.amd.com/us/Pages/AMDSupportHub.aspx
-		</url>
-		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
-	</notification>
-	<notification name="NVIDIAOldDriver">
-		你的顯示卡很可能有新版的驅動程式。  更新顯示驅動程式會大幅改善性能。
-
-    前往 [_URL] 察看是否有新版驅動程式？
-		<url name="url">
-			http://www.nvidia.com/Download/index.aspx?lang=tw
-		</url>
-		<usetemplate ignoretext="我的顯示驅動程式太老舊" name="okcancelignore" notext="否" yestext="是"/>
-	</notification>
 	<notification name="UnknownGPU">
 		你的系統含有一個 [APP_NAME] 無法辨認的顯像卡。
 原因很可能是 [APP_NAME] 尚未針對新硬體完成測試。  這大概不會出問題，但你可能需要調整顯像設定。
@@ -1554,13 +1536,10 @@ SHA1 指紋：[MD5_DIGEST]
 		此時無法發出交友邀請。 請稍候再試。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
-	<notification name="DoNotDisturbModeSet">
-		「請勿打擾」模式目前是開啟狀態。  你將不會收到任何發給你的訊息通知。
-
-- 其他居民將收到你的「請勿打擾」回應（回應內容設於「偏好設定 &gt; 一般設定」）。
-- 所有瞬間傳送的邀請都將被婉拒。
-- 所有語音來電都將拒絕接聽。
-		<usetemplate ignoretext="我變更我的狀態為「請勿打擾」模式" name="okignore" yestext="確定"/>
+	<notification name="BusyModeSet">
+		已設為忙碌模式。
+聊天和即時訊息內容將被隱藏。 即時訊息發送者將收到你的「忙碌模式」回應。 所有的瞬間傳送邀請都將被婉拒。 此時起送給你的收納區物項都將丟入垃圾桶。
+		<usetemplate ignoretext="我變更我的狀態為忙碌模式" name="okignore" yestext="確定"/>
 	</notification>
 	<notification name="JoinedTooManyGroupsMember">
 		你已達可同時加入的群組數上限。 請先離開另一個群組再加入這一個，或婉拒加入邀請。
@@ -2045,10 +2024,6 @@ SHA1 指紋：[MD5_DIGEST]
 		前往你的[http://secondlife.com/account/ 塗鴉牆]以察看你的帳戶歷史紀錄？
 		<usetemplate ignoretext="啟動我的瀏覽器以察看我的帳戶歷史紀錄" name="okcancelignore" notext="取消" yestext="前往頁面"/>
 	</notification>
-	<notification name="ConfirmAddingChatParticipants">
-		新增一個人到現有的交談，等於建立新的交談。  所有交談者將會收到新交談通知。
-		<usetemplate ignoretext="確認新增聊天者" name="okcancelignore" notext="取消" yestext="確定"/>
-	</notification>
 	<notification name="ConfirmQuit">
 		你確定你要結束退出？
 		<usetemplate ignoretext="當我結束退出時進行確認" name="okcancelignore" notext="不要結束退出" yestext="結束退出"/>
@@ -2123,14 +2098,14 @@ SHA1 指紋：[MD5_DIGEST]
 			<button ignore="絕不取代" name="No" text="取消"/>
 		</form>
 	</notification>
-	<notification label="「請勿打擾」模式警告" name="DoNotDisturbModePay">
-		你已開啟「請勿打擾」。 你將不會收到任何付款購買的物項。
+	<notification label="忙碌模式警告" name="BusyModePay">
+		你現在處於忙碌模式，這意味著你付費後仍將不會收到任何物項。
 
-是否要在完成交易之前，先關閉「請勿打擾」模式？
+你是否要先離開忙碌模式，再完成交易？
 		<form name="form">
-			<ignore name="ignore" text="我即將在「請勿打擾」模式下，試圖付錢給他人或給一個物件"/>
-			<button ignore="固定選擇離開「請勿打擾」模式" name="Yes" text="確定"/>
-			<button ignore="永不離開「請勿打擾」模式" name="No" text="取消"/>
+			<ignore name="ignore" text="當我在忙碌模式時，將要支付金錢或給他人物件"/>
+			<button ignore="總是離開忙碌模式" name="Yes" text="確定"/>
+			<button ignore="絕不離開忙碌模式" name="No" text="取消"/>
 		</form>
 	</notification>
 	<notification name="ConfirmDeleteProtectedCategory">
@@ -2265,8 +2240,11 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="GroupNotice">
 		主旨：[SUBJECT]，訊息：[MESSAGE]
 	</notification>
-	<notification name="FriendOnlineOffline">
-		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前狀態為 [STATUS]
+	<notification name="FriendOnline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前在線上
+	</notification>
+	<notification name="FriendOffline">
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 目前離線
 	</notification>
 	<notification name="AddSelfFriend">
 		雖然你人很好，你還是不能把自己加為朋友。
@@ -2494,6 +2472,13 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="DynamicPathfindingDisabled">
 		這地區並未啟用動態尋徑。  使用尋徑 LSL 呼叫的帶腳本物件，在此地區可能無法正常運作。
 	</notification>
+	<notification name="PathfindingRebakeNavmesh">
+		更改本地區的某些物件將導致其他移動物件的運作發生問題。  要使移動物件正常運作，請點按「重新產出地區」按鈕。  欲獲知詳情請選擇「幫助」。
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+		</url>
+		<usetemplate helptext="幫助" ignoretext="更改本地區的某些物件將導致其他移動物件的運作發生問題。" name="okhelpignore" yestext="確定"/>
+	</notification>
 	<notification name="PathfindingCannotRebakeNavmesh">
 		發生錯誤。  問題可能出在網路或伺服器，也可能因為你無權建製物件。  有時，只要登出再登入即能解決這類問題。
 		<usetemplate name="okbutton" yestext="確定"/>
@@ -2756,7 +2741,7 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="ScriptQuestionCaution">
 		警告：物件 &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; 要求全權存取你的林登幣帳戶。 你如果允許存取帳戶，它將可在任何時候從你帳戶取走資金，或完全加以清空，或定期取走部分資金，且不會發出警告。
   
-如果你不完全瞭解它為何要求存取你的帳戶，請勿允准。
+這很可能是種不當的要求。 如果你不完全瞭解它為何要求存取你的帳戶，請勿允准。
 		<form name="form">
 			<button name="Grant" text="允許全權存取"/>
 			<button name="Deny" text="拒絕"/>
@@ -3338,633 +3323,4 @@ SHA1 指紋：[MD5_DIGEST]
 		你正在刪除 [NUM_ITEMS] 個物項。  你確定你要繼續？
 		<usetemplate ignoretext="確定要刪除多個物項？" name="okcancelignore" notext="否" yestext="是"/>
 	</notification>
-	<notification name="AvatarFrozen">
-		[AV_FREEZER] 凍結了你。 你此時無法移動或與周遭互動。
-	</notification>
-	<notification name="AvatarFrozenDuration">
-		[AV_FREEZER] 凍結了你 [AV_FREEZE_TIME] 秒鐘。 你此時無法移動或與周遭互動。
-	</notification>
-	<notification name="YouFrozeAvatar">
-		化身已凍結。
-	</notification>
-	<notification name="AvatarHasUnFrozenYou">
-		[AV_FREEZER] 解除了對你的凍結。
-	</notification>
-	<notification name="AvatarUnFrozen">
-		化身已解除凍結。
-	</notification>
-	<notification name="AvatarFreezeFailure">
-		凍結失敗，因為你在該地段沒有管理員權限。
-	</notification>
-	<notification name="AvatarFreezeThaw">
-		你遭凍結的時間已過，請恢復正常活動。
-	</notification>
-	<notification name="AvatarCantFreeze">
-		抱歉，無法凍結該用戶。
-	</notification>
-	<notification name="NowOwnObject">
-		你現在是物件 [OBJECT_NAME] 的所有人
-	</notification>
-	<notification name="CantRezOnLand">
-		無法在 [OBJECT_POS] 產生物件，因為這土地的所有人不允許。  請用土地工具察看所有人。
-	</notification>
-	<notification name="RezFailTooManyRequests">
-		無法產生物件，此刻要求數目過多。
-	</notification>
-	<notification name="SitFailCantMove">
-		你無法坐下，因為此刻你不能移動。
-	</notification>
-	<notification name="SitFailNotAllowedOnLand">
-		你不能坐下，因為該土地不允許。
-	</notification>
-	<notification name="SitFailNotSameRegion">
-		請挨近一點。  無法坐在物件上，因為
-它和你不在同一個地區。
-	</notification>
-	<notification name="NoNewObjectRegionFull">
-		無法建立新物件。 地區已滿載。
-	</notification>
-	<notification name="FailedToPlaceObject">
-		無法將物件置於指定地點。  請再試一次。
-	</notification>
-	<notification name="NoOwnNoGardening">
-		你無法在別人的土地上建立樹和草。
-	</notification>
-	<notification name="NoCopyPermsNoObject">
-		複製失敗，你無權複製物件 &apos;[OBJ_NAME]&apos;。
-	</notification>
-	<notification name="NoTransPermsNoObject">
-		複製失敗，因為物件 &apos;[OBJ_NAME]&apos; 無法轉移給你。
-	</notification>
-	<notification name="AddToNavMeshNoCopy">
-		複製失敗，因為物件 &apos;[OBJ_NAME]&apos; 對導航網面有貢獻。
-	</notification>
-	<notification name="DupeWithNoRootsSelected">
-		選取了沒有根的重覆物件。
-	</notification>
-	<notification name="CantDupeCuzRegionIsFull">
-		無法複製物件，因為地區滿載。
-	</notification>
-	<notification name="CantDupeCuzParcelNotFound">
-		無法複製物件，找不到它們所在的地段。
-	</notification>
-	<notification name="CantCreateCuzParcelFull">
-		無法建立物件，因為 
-地段滿載。
-	</notification>
-	<notification name="RezAttemptFailed">
-		試圖產生物件失敗。
-	</notification>
-	<notification name="ToxicInvRezAttemptFailed">
-		無法建立已在此地區造成問題的物件。
-	</notification>
-	<notification name="InvItemIsBlacklisted">
-		該收納區物項已被列入黑名單。
-	</notification>
-	<notification name="NoCanRezObjects">
-		你此時無權建立物件。
-	</notification>
-	<notification name="LandSearchBlocked">
-		土地搜尋遭禁。
-你在短時間內進行了太多次土地搜尋。
-請稍候再試。
-	</notification>
-	<notification name="NotEnoughResourcesToAttach">
-		腳本資源不足，無法附著物件！
-	</notification>
-	<notification name="YouDiedAndGotTPHome">
-		你已經死亡並且被瞬間傳送回你的家的位置
-	</notification>
-	<notification name="EjectComingSoon">
-		你不再允許待在這裡，必須在 [EJECT_TIME] 秒內離開。
-	</notification>
-	<notification name="NoEnterServerFull">
-		你無法進入這地區，因為 
-伺服器滿載。
-	</notification>
-	<notification name="SaveBackToInvDisabled">
-		「儲存回收納區」功能已被停用。
-	</notification>
-	<notification name="NoExistNoSaveToContents">
-		無法將 &apos;[OBJ_NAME]&apos; 儲存到物件內容，因為產生它的來源物件已不存在。
-	</notification>
-	<notification name="NoModNoSaveToContents">
-		無法儲存 [OBJ_NAME] 到物件內容，你無權修改 &apos;[DEST_NAME]&apos; 物件。
-	</notification>
-	<notification name="NoSaveBackToInvDisabled">
-		無法將 &apos;[OBJ_NAME]&apos; 儲存回收納區，此動作已被停用。
-	</notification>
-	<notification name="NoCopyNoSelCopy">
-		無法複製你所選的，因為你無權複製物件 &apos;[OBJ_NAME]&apos;。
-	</notification>
-	<notification name="NoTransNoSelCopy">
-		無法選取複製，因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
-	</notification>
-	<notification name="NoTransNoCopy">
-		無法選取複製，因為物件 &apos;[OBJ_NAME]&apos; 不可轉移。
-	</notification>
-	<notification name="NoPermsNoRemoval">
-		權限系統不允許從模擬器移除物件 &apos;[OBJ_NAME]&apos;。
-	</notification>
-	<notification name="NoModNoSaveSelection">
-		無法儲存你所選的，因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
-	</notification>
-	<notification name="NoCopyNoSaveSelection">
-		無法儲存你所選的，因為物件 &apos;[OBJ_NAME]&apos; 不可複製。
-	</notification>
-	<notification name="NoModNoTaking">
-		無法拿取你所選的，因為你無權修改 &apos;[OBJ_NAME]&apos; 物件。
-	</notification>
-	<notification name="RezDestInternalError">
-		內部錯誤：未知的目的地類型。
-	</notification>
-	<notification name="DeleteFailObjNotFound">
-		刪除失敗，因為找不到物件
-	</notification>
-	<notification name="SorryCantEjectUser">
-		抱歉，無法踢出該用戶。
-	</notification>
-	<notification name="RegionSezNotAHome">
-		此地區不許你在此設定「我的家」。
-	</notification>
-	<notification name="HomeLocationLimits">
-		你只能在自己的土地或大陸資訊中心上設定「我的家」。
-	</notification>
-	<notification name="HomePositionSet">
-		我的家位置已定。
-	</notification>
-	<notification name="AvatarEjected">
-		化身已被踢出。
-	</notification>
-	<notification name="AvatarEjectFailed">
-		踢出失敗，因為你在該地段沒有管理員權限。
-	</notification>
-	<notification name="CantMoveObjectParcelFull">
-		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
-地區 [REGION_NAME] 的 [OBJ_POSITION]，因為該目標地段已滿載。
-	</notification>
-	<notification name="CantMoveObjectParcelPerms">
-		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
-地區 [REGION_NAME] 的 [OBJ_POSITION]，因為此地段不允許你的物件。
-	</notification>
-	<notification name="CantMoveObjectParcelResources">
-		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
- [REGION_NAME] 地區的 [OBJ_POSITION]，因為此地段資源不足容納此物件。
-	</notification>
-	<notification name="CantMoveObjectRegionVersion">
-		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
- [REGION_NAME] 地區的 [OBJ_POSITION]，因為該地區所執行的軟體版本過舊，不支援跨地區接受這個物件。
-	</notification>
-	<notification name="CantMoveObjectNavMesh">
-		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
-地區 [REGION_NAME] 的 [OBJ_POSITION]，因為你不得修改跨越地區界限的導航網面。
-	</notification>
-	<notification name="CantMoveObjectWTF">
-		無法移動 &apos;[OBJECT_NAME]&apos; 物件到
-地區 [REGION_NAME] 的 [OBJ_POSITION]，原因不明。 （[FAILURE_TYPE]）
-	</notification>
-	<notification name="NoPermModifyObject">
-		你無權變更該物件
-	</notification>
-	<notification name="CantEnablePhysObjContributesToNav">
-		對導航網面有貢獻的物件，無法啟用物理。
-	</notification>
-	<notification name="CantEnablePhysKeyframedObj">
-		鍵格動畫物件無法啟用物理。
-	</notification>
-	<notification name="CantEnablePhysNotEnoughLandResources">
-		無法啟用物件的物理——土地資源不足。
-	</notification>
-	<notification name="CantEnablePhysCostTooGreat">
-		物件的物理資源成本超過 [MAX_OBJECTS]，無法啟用物理
-	</notification>
-	<notification name="PhantomWithConcavePiece">
-		此物件不得有凹面部件，因為物件是幻影物件，對導航網面有貢獻。
-	</notification>
-	<notification name="UnableAddItem">
-		無法新增項目！
-	</notification>
-	<notification name="UnableEditItem">
-		無法編輯這項目！
-	</notification>
-	<notification name="NoPermToEdit">
-		無權編輯這項目。
-	</notification>
-	<notification name="NoPermToCopyInventory">
-		無權複製該收納區。
-	</notification>
-	<notification name="CantSaveItemDoesntExist">
-		無法儲存到物件內容：該項目已不存在。
-	</notification>
-	<notification name="CantSaveItemAlreadyExists">
-		無法儲存到物件內容：收納區已存在同名稱的項目
-	</notification>
-	<notification name="CantSaveModifyAttachment">
-		無法儲存到物件內容：這麼做將修改附件的權限。
-	</notification>
-	<notification name="TooManyScripts">
-		腳本太多。
-	</notification>
-	<notification name="UnableAddScript">
-		無法新增腳本！
-	</notification>
-	<notification name="AssetServerTimeoutObjReturn">
-		資產伺服器未在正常時間內反應。  物件已返交模擬器。
-	</notification>
-	<notification name="RegionDisablePhysicsShapes">
-		本地區未啟用物理形狀。
-	</notification>
-	<notification name="NoModNavmeshAcrossRegions">
-		你無法變更跨越地區界限的導航網面。
-	</notification>
-	<notification name="NoSetPhysicsPropertiesOnObjectType">
-		該物件類型不得設定物理性質。
-	</notification>
-	<notification name="NoSetRootPrimWithNoShape">
-		根幾何元件無法設成無形狀。
-	</notification>
-	<notification name="NoRegionSupportPhysMats">
-		本地區未啟用物理材料。
-	</notification>
-	<notification name="OnlyRootPrimPhysMats">
-		只能調整根幾何元件的物理材料。
-	</notification>
-	<notification name="NoSupportCharacterPhysMats">
-		尚不支援角色設定物理材料。
-	</notification>
-	<notification name="InvalidPhysMatProperty">
-		指定的物理材料屬性中，至少有一個無效。
-	</notification>
-	<notification name="NoPermsAlterStitchingMeshObj">
-		網面物件的縫合類型不得變更。
-	</notification>
-	<notification name="NoPermsAlterShapeMeshObj">
-		網面物件的形狀不得變更。
-	</notification>
-	<notification name="FullRegionCantEnter">
-		你無法進入這地區，\n因為地區滿載。
-	</notification>
-	<notification name="LinkFailedOwnersDiffer">
-		聯結失敗——所有人不同
-	</notification>
-	<notification name="LinkFailedNoModNavmeshAcrossRegions">
-		聯結失敗——無法修改跨越地區界限的導航網面。
-	</notification>
-	<notification name="LinkFailedNoPermToEdit">
-		聯結失敗，你無權編輯。
-	</notification>
-	<notification name="LinkFailedTooManyPrims">
-		聯結失敗——幾何元件太多
-	</notification>
-	<notification name="LinkFailedCantLinkNoCopyNoTrans">
-		聯結失敗——無法將「禁止複製」和「禁止轉移」物件聯結起來
-	</notification>
-	<notification name="LinkFailedNothingLinkable">
-		聯結失敗——沒有可聯結的東西。
-	</notification>
-	<notification name="LinkFailedTooManyPathfindingChars">
-		聯結失敗——尋徑角色太多
-	</notification>
-	<notification name="LinkFailedInsufficientLand">
-		聯結失敗——土地資源不足
-	</notification>
-	<notification name="LinkFailedTooMuchPhysics">
-		物件使用了過多物理資源，其動態特性已被停用。
-	</notification>
-	<notification name="TeleportedHomeByObjectOnParcel">
-		你已被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 成功瞬間傳送回家
-	</notification>
-	<notification name="TeleportedHomeByObject">
-		你已成功被物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送回家
-	</notification>
-	<notification name="TeleportedByAttachment">
-		你已成功被 [ITEM_ID] 上的一個附件瞬間傳送
-	</notification>
-	<notification name="TeleportedByObjectOnParcel">
-		你已成功被 &apos;[PARCEL_NAME]&apos; 地段的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
-	</notification>
-	<notification name="TeleportedByObjectOwnedBy">
-		你已成功被 [OWNER_ID] 擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送
-	</notification>
-	<notification name="TeleportedByObjectUnknownUser">
-		你已成功被某未知用戶擁有的物件 &apos;[OBJECT_NAME]&apos; 瞬間傳送。
-	</notification>
-	<notification name="CantCreateObjectRegionFull">
-		無法建立要求的物件。 地區已滿載。
-	</notification>
-	<notification name="CantAttackMultipleObjOneSpot">
-		你不能將多個物件附著到同一個點。
-	</notification>
-	<notification name="CantCreateMultipleObjAtLoc">
-		你不能在此建立多個物件。
-	</notification>
-	<notification name="UnableToCreateObjTimeOut">
-		無法建立要求的物件。 物件在資料庫中找不到。
-	</notification>
-	<notification name="UnableToCreateObjUnknown">
-		無法建立要求的物件。 要求逾時，無法完成。 請再試一次。
-	</notification>
-	<notification name="UnableToCreateObjMissingFromDB">
-		無法建立要求的物件。 請再試一次。
-	</notification>
-	<notification name="RezFailureTookTooLong">
-		物件產生失敗，要求的物件載入時間太久。
-	</notification>
-	<notification name="FailedToPlaceObjAtLoc">
-		無法將物件置於指定地點。  請再試一次。
-	</notification>
-	<notification name="CantCreatePlantsOnLand">
-		你不得在這土地上建立植物。
-	</notification>
-	<notification name="CantRestoreObjectNoWorldPos">
-		無法恢復物件。 找不到虛擬世界的位置。
-	</notification>
-	<notification name="CantRezObjectInvalidMeshData">
-		無法產生物件，它的網面資料無效。
-	</notification>
-	<notification name="CantRezObjectTooManyScripts">
-		無法產生物件，因為這地區已有太多的腳本。
-	</notification>
-	<notification name="CantCreateObjectNoAccess">
-		你無權在此建立物件。
-	</notification>
-	<notification name="CantCreateObject">
-		你此時無權建立物件。
-	</notification>
-	<notification name="InvalidObjectParams">
-		無效的物件參數
-	</notification>
-	<notification name="CantDuplicateObjectNoAcess">
-		你權限不夠，無法在此複製物件。
-	</notification>
-	<notification name="CantChangeShape">
-		你無權變更這個形狀。
-	</notification>
-	<notification name="NoAccessToClaimObjects">
-		你權限不夠，無法在此收取物件。
-	</notification>
-	<notification name="DeedFailedNoPermToDeedForGroup">
-		讓渡失敗，你無權為你的群組讓渡物件。
-	</notification>
-	<notification name="NoPrivsToBuyObject">
-		你權限不夠，無法在此購買物件。
-	</notification>
-	<notification name="CantAttachObjectAvatarSittingOnIt">
-		無法附著物件，有個化身正坐在物件上。
-	</notification>
-	<notification name="WhyAreYouTryingToWearShrubbery">
-		樹和草不能當附件穿戴。
-	</notification>
-	<notification name="CantAttachGroupOwnedObjs">
-		無法附著群組所擁有的物件。
-	</notification>
-	<notification name="CantAttachObjectsNotOwned">
-		無法附著不是你擁有的物件。
-	</notification>
-	<notification name="CantAttachNavmeshObjects">
-		無法附著對導航網面有貢獻的物件。
-	</notification>
-	<notification name="CantAttachObjectNoMovePermissions">
-		無法附著物件，你無權移動該物件。
-	</notification>
-	<notification name="CantAttachNotEnoughScriptResources">
-		腳本資源不足，無法附著物件！
-	</notification>
-	<notification name="CantDropItemTrialUser">
-		你無法在此卸除物件，請到「自由嘗試」區域再試。
-	</notification>
-	<notification name="CantDropMeshAttachment">
-		你無法在此卸除附件。 請選擇把卸除附件送回收納區，再重新成形。
-	</notification>
-	<notification name="CantDropAttachmentNoPermission">
-		卸除附件失敗：你無權在此處卸除。
-	</notification>
-	<notification name="CantDropAttachmentInsufficientLandResources">
-		卸除附件失敗：可用土地資源不足。
-	</notification>
-	<notification name="CantDropAttachmentInsufficientResources">
-		卸除附件失敗：可用資源不足。
-	</notification>
-	<notification name="CantDropObjectFullParcel">
-		無法在此卸除物件。  地段滿載。
-	</notification>
-	<notification name="CantTouchObjectBannedFromParcel">
-		無法觸摸/抓取此物件，因為你在該土地地段遭禁。
-	</notification>
-	<notification name="PlzNarrowDeleteParams">
-		請將刪除參數範圍調小一點。
-	</notification>
-	<notification name="UnableToUploadAsset">
-		無法上傳資產。
-	</notification>
-	<notification name="CantTeleportCouldNotFindUser">
-		找不到要瞬間傳送到家的用戶
-	</notification>
-	<notification name="GodlikeRequestFailed">
-		要求神的權力失敗
-	</notification>
-	<notification name="GenericRequestFailed">
-		普通請求失敗
-	</notification>
-	<notification name="CantUploadPostcard">
-		無法上傳明信片。  請稍候再試一次。
-	</notification>
-	<notification name="CantFetchInventoryForGroupNotice">
-		無法取得群組通知的收納區細節。
-	</notification>
-	<notification name="CantSendGroupNoticeNotPermitted">
-		無法送出群組通知——未准許。
-	</notification>
-	<notification name="CantSendGroupNoticeCantConstructInventory">
-		無法送出群組通知——收納區建立失敗。
-	</notification>
-	<notification name="CantParceInventoryInNotice">
-		無法剖析通知裡的收納品項。
-	</notification>
-	<notification name="TerrainUploadFailed">
-		地形上傳失敗。
-	</notification>
-	<notification name="TerrainFileWritten">
-		地形檔案已寫入。
-	</notification>
-	<notification name="TerrainFileWrittenStartingDownload">
-		地形檔案已寫入，開始下載……
-	</notification>
-	<notification name="TerrainBaked">
-		地形已定貌。
-	</notification>
-	<notification name="TenObjectsDisabledPlzRefresh">
-		只成功停用前 10 個所選物件。 若有需要，請刷新之後再選取更多的項目。
-	</notification>
-	<notification name="UpdateViewerBuyParcel">
-		你必須先更新瀏覽器後，才可購買這個地段。
-	</notification>
-	<notification name="CantBuyParcelNotForSale">
-		無法購買，此地段不供出售。
-	</notification>
-	<notification name="CantBuySalePriceOrLandAreaChanged">
-		無法購買，售價或土地面積已變。
-	</notification>
-	<notification name="CantBuyParcelNotAuthorized">
-		你不是此地段的獲授權的買主。
-	</notification>
-	<notification name="CantBuyParcelAwaitingPurchaseAuth">
-		你無法購買此地段，該地段已在等候批准購買
-	</notification>
-	<notification name="CantBuildOverflowParcel">
-		你不得在此建立物件，這麼做將導致地段超載。
-	</notification>
-	<notification name="SelectedMultipleOwnedLand">
-		你選擇的土地範圍，為不同人所擁有。 請縮小選擇範圍，再試一次。
-	</notification>
-	<notification name="CantJoinTooFewLeasedParcels">
-		未選取足夠租用地段，無法合併。
-	</notification>
-	<notification name="CantDivideLandMultipleParcelsSelected">
-		無法分割土地，\n因為你選取了多個地段，\n請縮小所選土地。
-	</notification>
-	<notification name="CantDivideLandCantFindParcel">
-		無法分割土地。\n找不到地段。\n請到「幫助 &gt; 回報錯誤……」回報問題
-	</notification>
-	<notification name="CantDivideLandWholeParcelSelected">
-		無法分割土地。 選取了整個地段。\n請試著縮小所選的土地。
-	</notification>
-	<notification name="LandHasBeenDivided">
-		土地分割成功。
-	</notification>
-	<notification name="PassPurchased">
-		你購買了通行權。
-	</notification>
-	<notification name="RegionDisallowsClassifieds">
-		地區不允許分類廣告。
-	</notification>
-	<notification name="LandPassExpireSoon">
-		你在此土地的通行權即將到期失效。
-	</notification>
-	<notification name="CantSitNoSuitableSurface">
-		沒有合適的表面讓你坐下，請試一試別處。
-	</notification>
-	<notification name="CantSitNoRoom">
-		這裡沒有空間讓你坐下，請試試另一處。
-	</notification>
-	<notification name="ClaimObjectFailedNoPermission">
-		收取物件失敗，因為你權限不足。
-	</notification>
-	<notification name="ClaimObjectFailedNoMoney">
-		收取物件失敗，因為你 L$ 金額不足。
-	</notification>
-	<notification name="CantDeedGroupLand">
-		無法讓渡群組所擁有的土地。
-	</notification>
-	<notification name="BuyObjectFailedNoMoney">
-		購買物件失敗，你 L$ 金額不足。
-	</notification>
-	<notification name="BuyInventoryFailedNoMoney">
-		購買收納區失敗，你 L$ 金額不足。
-	</notification>
-	<notification name="BuyPassFailedNoMoney">
-		你的 L$ 不足，無法購買此土地的通行權。
-	</notification>
-	<notification name="CantBuyPassTryAgain">
-		此時無法購買通行權。  請稍候再試一次。
-	</notification>
-	<notification name="CantCreateObjectParcelFull">
-		無法建立物件，\n地段滿載。
-	</notification>
-	<notification name="FailedPlacingObject">
-		無法將物件置於指定地點。  請再試一次。
-	</notification>
-	<notification name="CantCreateLandmarkForEvent">
-		無法為活動建立地標。
-	</notification>
-	<notification name="GodBeatsFreeze">
-		你擁有的神力解除了凍結！
-	</notification>
-	<notification name="SpecialPowersRequestFailedLogged">
-		要求特殊能力失敗。 該要求已載入記錄。
-	</notification>
-	<notification name="ExpireExplanation">
-		系統此時無法處理你的要求。 要求逾時，無法完成。
-	</notification>
-	<notification name="DieExplanation">
-		系統無法處理你的要求。
-	</notification>
-	<notification name="AddPrimitiveFailure">
-		金額不足，無法建立幾何元件。
-	</notification>
-	<notification name="RezObjectFailure">
-		金額不足，無法建立物件。
-	</notification>
-	<notification name="ResetHomePositionNotLegal">
-		已重設「我的家」位置，因為前一個位置不合法。
-	</notification>
-	<notification name="CantInviteRegionFull">
-		此刻你無法邀請任何人到你的位置，因為地區滿載。 請稍候再試一次。
-	</notification>
-	<notification name="CantSetHomeAtRegion">
-		此地區不許你在此設定「我的家」。
-	</notification>
-	<notification name="ListValidHomeLocations">
-		你只能在自己的土地或大陸資訊中心上設定「我的家」。
-	</notification>
-	<notification name="SetHomePosition">
-		我的家位置已定。
-	</notification>
-	<notification name="CantDerezInventoryError">
-		收納區出錯，無法收納物件。
-	</notification>
-	<notification name="CantCreateRequestedInv">
-		無法建立要求的收納區。
-	</notification>
-	<notification name="CantCreateRequestedInvFolder">
-		無法建立要求的收納區資料夾。
-	</notification>
-	<notification name="CantCreateInventory">
-		無法建立該收納區。
-	</notification>
-	<notification name="CantCreateLandmark">
-		無法建立地標。
-	</notification>
-	<notification name="CantCreateOutfit">
-		此時無法建立裝扮。 請過一分鐘後再試。
-	</notification>
-	<notification name="InventoryNotForSale">
-		收納區沒有待售。
-	</notification>
-	<notification name="CantFindInvItem">
-		找不到收納區物項。
-	</notification>
-	<notification name="CantFindObject">
-		找不到物件。
-	</notification>
-	<notification name="CantTransfterMoneyRegionDisabled">
-		此地區目前未啟用轉移金錢給物件的功能。
-	</notification>
-	<notification name="CantPayNoAgent">
-		無法決定付款給誰。
-	</notification>
-	<notification name="CantDonateToPublicObjects">
-		你無法將 L$ 送給公共物件。
-	</notification>
-	<notification name="InventoryCreationInWorldObjectFailed">
-		針對虛擬世界物件建立收納區失敗。
-	</notification>
-	<notification name="UserBalanceOrLandUsageError">
-		發生內部錯誤，我們無法如常更新你的瀏覽器。  你瀏覽器顯示的 L$ 餘額或擁有地段，可能和伺服器上的正確數額不一致。
-	</notification>
-	<notification name="LargePrimAgentIntersect">
-		無法建立和其他參與者發生交截的大型幾何元件。  請等其他參與者移開後再試。
-	</notification>
-	<notification name="PreferenceChatClearLog">
-		這動作將刪除先前交談的記錄，和所有記錄備份。
-		<usetemplate ignoretext="刪除先前交談記錄前，先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
-	</notification>
-	<notification name="PreferenceChatDeleteTranscripts">
-		這將刪除所有先前交談的內容記錄。 過去交談歷史清單不受影響。 資料夾 [FOLDER] 所有副檔名 .txt 和 txt.backup 的檔案都將刪除。
-		<usetemplate ignoretext="刪除交談內容記錄前先向我確認。" name="okcancelignore" notext="取消" yestext="確定"/>
-	</notification>
-	<notification name="PreferenceChatPathChanged">
-		無法移動檔案。 已恢復前一個路徑。
-		<usetemplate ignoretext="無法移動檔案。 已恢復前一個路徑。" name="okignore" yestext="確定"/>
-	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
index e0a49a0add..1c8b56b3d6 100644
--- a/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_avatar_list_item.xml
@@ -27,6 +27,5 @@
 	<icon name="permission_edit_mine_icon" tool_tip="這位朋友能編輯、刪除或取得你的物件"/>
 	<icon name="permission_map_icon" tool_tip="這位朋友能在地圖上找到你的位置"/>
 	<icon name="permission_online_icon" tool_tip="這位朋友當你上線能看到訊息"/>
-	<button name="info_btn" tool_tip="詳情"/>
 	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
index 9f59bb32f8..1dfa024138 100644
--- a/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
+++ b/indra/newview/skins/default/xui/zh/panel_block_list_sidetray.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="block_list_panel">
-	<panel label="bottom_panel" name="blocked_buttons_panel">
-		<filter_editor label="過濾器" name="blocked_filter_input"/>
-		<menu_button name="blocked_gear_btn" tool_tip="對所選的人或物件採取動作"/>
-		<menu_button name="view_btn" tool_tip="排序選項"/>
-		<menu_button name="plus_btn" tool_tip="挑選一位居民或物件，加以封鎖"/>
-		<button name="unblock_btn" tool_tip="將居民或物件由封鎖清單中移除"/>
-	</panel>
-	<block_list name="blocked" tool_tip="目前封鎖的居民清單"/>
+	<text name="title_text">
+		封鎖清單
+	</text>
+	<scroll_list name="blocked" tool_tip="目前封鎖的居民清單"/>
+	<button label="封鎖他人" name="Block resident..." tool_tip="挑選一位居民以進行封鎖"/>
+	<button label="依名稱封鎖物件" name="Block object by name..." tool_tip="依名稱挑選一個物件進行封鎖"/>
+	<button label="解除封鎖" name="Unblock" tool_tip="將居民或物件由封鎖清單中移除"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
deleted file mode 100644
index 6524d41645..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_conversation_list_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_list_item">
-	<layout_stack name="conversation_item_stack">
-		<layout_panel name="conversation_title_panel">
-			<text name="conversation_title" value="（載入中）"/>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml b/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
deleted file mode 100644
index 8446ce2130..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_conversation_log_list_item.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="conversation_log_list_item">
-	<icon name="voice_session_icon" tool_tip="包含語音交談"/>
-	<icon name="unread_ims_icon" tool_tip="訊息在你登出期間傳來"/>
-	<button name="delete_btn" tool_tip="移除此項目"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
index fec4bb572a..175293cdf7 100644
--- a/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
+++ b/indra/newview/skins/default/xui/zh/panel_group_list_item.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="group_list_item">
 	<text name="group_name" value="未知"/>
-	<button name="info_btn" tool_tip="詳情"/>
 	<button name="profile_btn" tool_tip="察看檔案"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index 5f7aca387a..59ea7b70e2 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -14,53 +14,81 @@
 	<string name="no_filtered_friends_msg">
 		找不到你要找的嗎？ 請試試[secondlife:///app/search/people/[SEARCH_TERM] 搜尋]。
 	</string>
+	<string name="people_filter_label" value="人員過濾器"/>
+	<string name="groups_filter_label" value="群組過濾器"/>
 	<string name="no_filtered_groups_msg" value="找不到你要找的嗎？ 請試試[secondlife:///app/search/groups/[SEARCH_TERM] 搜尋]。"/>
 	<string name="no_groups_msg" value="要尋找群組考慮加入嗎？ 請試試[secondlife:///app/search/groups 搜尋]。"/>
 	<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/>
+	<filter_editor label="過濾器" name="filter_input"/>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
-			<panel label="bottom_panel" name="nearby_buttons_panel">
-				<filter_editor label="人員過濾器" name="nearby_filter_input"/>
-				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
-				<menu_button name="nearby_view_btn" tool_tip="檢視/排序的選項"/>
-				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
-				<dnd_button name="nearby_del_btn" tool_tip="將選取的人從朋友名單移除"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="nearby_view_sort_btn" tool_tip="選項"/>
+				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
 			</panel>
 		</panel>
-		<panel label="朋友" name="friends_panel">
-			<panel label="bottom_panel" name="friends_buttons_panel">
-				<filter_editor label="人員過濾器" name="friends_filter_input"/>
-				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
-				<menu_button name="friends_view_btn" tool_tip="檢視/排序的選項"/>
-				<button name="friends_add_btn" tool_tip="向某位居民發出交友邀請"/>
-				<dnd_button name="friends_del_btn" tool_tip="將選取的人從朋友名單移除"/>
-			</panel>
+		<panel label="我的朋友" name="friends_panel">
 			<accordion name="friends_accordion">
 				<accordion_tab name="tab_online" title="上線"/>
 				<accordion_tab name="tab_all" title="全部"/>
 			</accordion>
+			<panel label="bottom_panel" name="bottom_panel">
+				<layout_stack name="bottom_panel">
+					<layout_panel name="options_gear_btn_panel">
+						<menu_button name="friends_viewsort_btn" tool_tip="顯示額外選項"/>
+					</layout_panel>
+					<layout_panel name="add_btn_panel">
+						<button name="add_btn" tool_tip="向居民發出交友邀請"/>
+					</layout_panel>
+					<layout_panel name="trash_btn_panel">
+						<dnd_button name="del_btn" tool_tip="由你的朋友清單移除所選擇的人"/>
+					</layout_panel>
+				</layout_stack>
+			</panel>
 		</panel>
-		<panel label="群組" name="groups_panel">
-			<panel label="bottom_panel" name="groups_buttons_panel">
-				<filter_editor label="群組過濾器" name="groups_filter_input"/>
-				<menu_button name="groups_gear_btn" tool_tip="對所選群組採取動作"/>
-				<menu_button name="groups_view_btn" tool_tip="檢視/排序的選項"/>
-				<menu_button name="plus_btn" tool_tip="加入群組/創立新群組"/>
-				<dnd_button name="minus_btn" tool_tip="離開所選群組"/>
+		<panel label="我的群組" name="groups_panel">
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="groups_viewsort_btn" tool_tip="選項"/>
+				<button name="plus_btn" tool_tip="加入群組/創立新群組"/>
+				<button name="activate_btn" tool_tip="啟用所選擇的群組"/>
 			</panel>
 		</panel>
 		<panel label="最近" name="recent_panel">
-			<panel label="bottom_panel" name="recent_buttons_panel">
-				<filter_editor label="人員過濾器" name="recent_filter_input"/>
-				<button name="gear_btn" tool_tip="對選取的人採取動作"/>
-				<menu_button name="recent_view_btn" tool_tip="檢視/排序的選項"/>
-				<button name="add_friend_btn" tool_tip="向某位居民發出交友邀請"/>
-				<dnd_button name="recent_del_btn" tool_tip="將選取的人從朋友名單移除"/>
+			<panel label="bottom_panel" name="bottom_panel">
+				<menu_button name="recent_viewsort_btn" tool_tip="選項"/>
+				<button name="add_friend_btn" tool_tip="添加所選的居民到你的朋友清單"/>
 			</panel>
 		</panel>
-		<panel label="已封鎖的" name="blocked_panel">
-			<panel label="被封鎖的居民與物件" name="panel_block_list_sidetray"/>
-		</panel>
 	</tab_container>
+	<panel name="button_bar">
+		<layout_stack name="bottom_bar_ls">
+			<layout_panel name="view_profile_btn_lp">
+				<button label="檔案" name="view_profile_btn" tool_tip="顯示圖片、群組與其他居民資訊"/>
+			</layout_panel>
+			<layout_panel name="im_btn_lp">
+				<button label="IM" name="im_btn" tool_tip="開啟即時訊息會話"/>
+			</layout_panel>
+			<layout_panel name="call_btn_lp">
+				<button label="通話" name="call_btn" tool_tip="和這位居民通話"/>
+			</layout_panel>
+			<layout_panel name="share_btn_lp">
+				<button label="分享" name="share_btn" tool_tip="分享一個收納區物品"/>
+			</layout_panel>
+			<layout_panel name="teleport_btn_lp">
+				<button label="瞬間傳送" name="teleport_btn" tool_tip="發出瞬間傳送邀請"/>
+			</layout_panel>
+		</layout_stack>
+		<layout_stack name="bottom_bar_ls1">
+			<layout_panel name="group_info_btn_lp">
+				<button label="群組檔案" name="group_info_btn" tool_tip="顯示群組資訊"/>
+			</layout_panel>
+			<layout_panel name="chat_btn_lp">
+				<button label="群組聊天" name="chat_btn" tool_tip="開啟聊天會話"/>
+			</layout_panel>
+			<layout_panel name="group_call_btn_lp">
+				<button label="群組通話" name="group_call_btn" tool_tip="與此群組進行通話"/>
+			</layout_panel>
+		</layout_stack>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index e700e35516..cf2f81d313 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -1,86 +1,34 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="文字聊天" name="chat">
-	<panel>
-		<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
-		<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
-		<check_box label="只有我的朋友和群組可以 IM 或與我通話。" name="voice_call_friends_only_check"/>
-		<text name="font_size">
-			字型尺寸：
-		</text>
-		<combo_box name="chat_font_size">
-			<item label="小" name="Small" value="0"/>
-			<item label="中" name="Medium" value="1"/>
-			<item label="大" name="Large" value="2"/>
-		</combo_box>
-		<check_box label="聊天泡泡" name="bubble_text_chat"/>
-	</panel>
-	<panel>
-		<text name="notifications">
-			通知
-		</text>
-		<text name="friend_ims">
-			朋友 IM：
-		</text>
-		<combo_box name="FriendIMOptions">
-			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
-			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
-		</combo_box>
-		<text name="non_friend_ims">
-			非朋友 IM：
-		</text>
-		<combo_box name="NonFriendIMOptions">
-			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
-			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
-		</combo_box>
-		<text name="conference_ims">
-			多方交談 IM：
-		</text>
-		<combo_box name="ConferenceIMOptions">
-			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
-			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
-		</combo_box>
-		<text name="group_chat">
-			群組聊天：
-		</text>
-		<combo_box name="GroupChatOptions">
-			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
-			<item label="Flash 工具列按鈕" name="FlashToolbarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
-		</combo_box>
-		<text name="nearby_chat">
-			附近的聊天：
-		</text>
-		<combo_box name="NearbyChatOptions">
-			<item label="開啟交談視窗" name="OpenConversationsWindow" value="openconversations"/>
-			<item label="以突顯式視窗顯示訊息" name="PopUpMessage" value="toast"/>
-			<item label="Flash 工具列按鈕" name="FlashToolBarButton" value="flash"/>
-			<item label="無" name="None" value="無"/>
-		</combo_box>
-		<text name="notifications_alert">
-			若要暫時停止所有通知，請設定「溝通 &gt; 請勿打擾」。
-		</text>
-	</panel>
-	<panel>
-		<text name="play_sound">
-			播放聲音：
-		</text>
-		<check_box label="新交談" name="new_conversation"/>
-		<check_box label="語音通話來電" name="incoming_voice_call"/>
-		<check_box label="瞬間傳送邀請" name="teleport_offer"/>
-		<check_box label="收納物品贈送" name="inventory_offer"/>
-	</panel>
-	<panel>
-		<button label="清空記錄……" name="clear_log"/>
-		<button label="刪除交談內容記錄……" name="delete_transcripts"/>
-		<button label="瀏覽…" label_selected="瀏覽" name="log_path_button"/>
-	</panel>
+	<text name="font_size">
+		字型尺寸：
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item label="小" name="radio" value="0"/>
+		<radio_item label="中" name="radio2" value="1"/>
+		<radio_item label="大" name="radio3" value="2"/>
+	</radio_group>
+	<check_box initial_value="true" label="聊天時播放打字動作" name="play_typing_animation"/>
+	<check_box label="當我離線時將收到的 IM 訊息郵寄給我" name="send_im_to_email"/>
+	<check_box label="啟用純本文 IM 與聊天歷史紀錄" name="plain_text_chat_history"/>
+	<check_box label="聊天泡泡" name="bubble_text_chat"/>
+	<text name="show_ims_in_label">
+		顯示 IMs 於：
+	</text>
+	<text name="requires_restart_label">
+		（須重新啟動）
+	</text>
+	<radio_group name="chat_window" tool_tip="顯示你的即時訊息在分開的浮動視窗，或是使用很多頁籤的單一浮動視窗（須重新啟動）">
+		<radio_item label="分開視窗" name="radio" value="0"/>
+		<radio_item label="頁籤" name="radio2" value="1"/>
+	</radio_group>
+	<text name="disable_toast_label">
+		啟用傳入聊天的突顯示視窗：
+	</text>
+	<check_box label="群組聊天" name="EnableGroupChatPopups" tool_tip="當群組聊天訊息抵達時查看突顯式視窗"/>
+	<check_box label="IM 聊天" name="EnableIMChatPopups" tool_tip="當即時訊息抵達時查看突顯式視窗"/>
+	<spinner label="附近聊天內容提示框停駐時間：" name="nearby_toasts_lifetime"/>
+	<spinner label="附近聊天內容提示框消退時間：" name="nearby_toasts_fadingtime"/>
 	<button label="翻譯…" name="ok_btn"/>
 	<button label="自動取代…" name="autoreplace_showgui"/>
 	<button label="拼字檢查…" name="spellcheck_showgui"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
index 044edbed70..7e67a0d02d 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_general.xml
@@ -68,9 +68,9 @@
 		<combo_box.item label="絕不" name="item4"/>
 	</combo_box>
 	<text name="text_box3">
-		「請勿打擾」預設回應：
+		忙碌模式回應：
 	</text>
-	<text_editor name="do_not_disturb_response">
+	<text_editor name="busy_response">
 		log_in_to_change
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
index 60f44a3d88..982dde4010 100644
--- a/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/zh/sidepanel_task_info.xml
@@ -72,7 +72,6 @@
 			<combo_box.item label="購買物件" name="Buyobject"/>
 			<combo_box.item label="支付物件" name="Payobject"/>
 			<combo_box.item label="打開" name="Open"/>
-			<combo_box.item label="縮放" name="Zoom"/>
 		</combo_box>
 		<panel name="perms_inv">
 			<text name="perm_modify">
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 31713ac281..7e17ed6864 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -614,8 +614,8 @@ http://secondlife.com/viewer-access-faq
 	<string name="AvatarAway">
 		離開
 	</string>
-	<string name="AvatarDoNotDisturb">
-		請勿打擾
+	<string name="AvatarBusy">
+		忙碌
 	</string>
 	<string name="AvatarMuted">
 		封鎖的
@@ -851,12 +851,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="ST_NO_JOINT">
 		找不到 ROOT 或旋軸。
 	</string>
-	<string name="NearbyChatTitle">
-		附近的聊天中
-	</string>
-	<string name="NearbyChatLabel">
-		（附近的聊天）
-	</string>
 	<string name="whisper">
 		低語：
 	</string>
@@ -920,15 +914,12 @@ http://secondlife.com/viewer-access-faq
 	<string name="ControlYourCamera">
 		控制你的攝影機
 	</string>
-	<string name="NotConnected">
-		未聯接
-	</string>
-	<string name="AgentNameSubst">
-		（你）
-	</string>
 	<string name="TeleportYourAgent">
 		瞬間傳送你本人
 	</string>
+	<string name="NotConnected">
+		未聯接
+	</string>
 	<string name="SIM_ACCESS_PG">
 		一般普級
 	</string>
@@ -1010,6 +1001,18 @@ http://secondlife.com/viewer-access-faq
 	<string name="dictionary_files">
 		字典
 	</string>
+	<string name="AvatarSetNotAway">
+		非離開
+	</string>
+	<string name="AvatarSetAway">
+		離開
+	</string>
+	<string name="AvatarSetNotBusy">
+		非忙碌
+	</string>
+	<string name="AvatarSetBusy">
+		忙碌
+	</string>
 	<string name="shape">
 		體形
 	</string>
@@ -1978,8 +1981,8 @@ http://secondlife.com/viewer-access-faq
 	<string name="PanelContentsNewScript">
 		新腳本
 	</string>
-	<string name="DoNotDisturbModeResponseDefault">
-		這居民處於「請勿打擾」狀態，不會立即看到你的訊息。
+	<string name="BusyModeResponseDefault">
+		你傳訊過去的居民目前處於忙碌狀態，這意味著他要求不被打擾。  你的訊息仍將留存並顯示於對方的 IM 面板上供稍後查閱。
 	</string>
 	<string name="MuteByName">
 		（按名稱）
@@ -2092,6 +2095,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="GroupMoneyDate">
 		[weekday,datetime,utc] [mth,datetime,utc] [day,datetime,utc], [year,datetime,utc]
 	</string>
+	<string name="ViewerObjectContents">
+		內容
+	</string>
 	<string name="AcquiredItems">
 		取得物品
 	</string>
@@ -3863,7 +3869,7 @@ http://secondlife.com/viewer-access-faq
 		一般普級地區
 	</string>
 	<string name="LocationCtrlSeeAVsTooltip">
-		這地段外的其他化身，看不見也聽不到位於地段裡的化身
+		可看到本地段外的化身，並與之交談
 	</string>
 	<string name="LocationCtrlPathfindingDirtyTooltip">
 		地區重新產出之前，可移動物件可能無法正常運作。
@@ -3940,12 +3946,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="IM_unblock_only_groups_friends">
 		要察看這訊息，你必須到「偏好設定 / 隱私」，取消勾選「只有我的朋友和群組可以 IM 或與我通話」。
 	</string>
-	<string name="OnlineStatus">
-		上線
-	</string>
-	<string name="OfflineStatus">
-		離線
-	</string>
 	<string name="answered_call">
 		你的通話已經接通
 	</string>
@@ -3955,9 +3955,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="you_joined_call">
 		你發起了語音通話
 	</string>
-	<string name="you_auto_rejected_call-im">
-		因為處於「請勿打擾」模式，你已自動拒聽這通語音來電。
-	</string>
 	<string name="name_started_call">
 		[NAME] 發起了語音通話
 	</string>
@@ -3974,7 +3971,7 @@ http://secondlife.com/viewer-access-faq
 		聯接中...
 	</string>
 	<string name="conference-title">
-		多人聊天
+		臨時多方通話
 	</string>
 	<string name="conference-title-incoming">
 		和 [AGENT_NAME] 多方通話
@@ -4866,9 +4863,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="Command_Chat_Label">
 		聊天
 	</string>
-	<string name="Command_Conversations_Label">
-		交談
-	</string>
 	<string name="Command_Compass_Label">
 		羅盤
 	</string>
@@ -4944,9 +4938,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="Command_Chat_Tooltip">
 		透過文字和附近人們聊天
 	</string>
-	<string name="Command_Conversations_Tooltip">
-		和所有人交談
-	</string>
 	<string name="Command_Compass_Tooltip">
 		指南針
 	</string>
@@ -5076,13 +5067,4 @@ http://secondlife.com/viewer-access-faq
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		交談未留記錄。 若想開始留記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		將不再為交談留記錄。 若想恢復留存記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		目前沒有交談記錄。 在你聯絡某人或某人聯絡你之後，這裡將留存記錄。
-	</string>
 </strings>