Merge viewer-development -> VirLinden/sunshine

319 files changed, 6645 insertions, 5064 deletions

diff --git a/.hgtags b/.hgtags
index f65942e3cf..c5b40e9b9a 100755
--- a/.hgtags
+++ b/.hgtags
@@ -305,5 +305,9 @@ b1dbb1a83f48f93f6f878cff9e52d2cb635e145c 3.4.0-beta2
 7649a3dff5ec22d3727377e5f02efd0f421e4cb5 DRTVWR-201
 84fb70dfe3444e75a44fb4bee43e2fc8221cebdd 3.4.0-beta4
 de3be913f68813a9bac7d1c671fef96d1159bcd6 DRTVWR-202
+573e863be2f26d3687161def4b9fea9b7038dda8 3.4.0-beta5
 34dbbe2b00afe90352d3acf8290eb10ab90d1c8b oz-build-test-tag
 6ee71714935ffcd159db3d4f5800c1929aac54e1 DRTVWR-205
+7b22c612fc756e0ea63b10b163e81d107f85dbf8 DRTVWR-206
+8c9085066c78ed5f6c9379dc054c82a6fcdb1851 DRTVWR-207
+351eea5f9dc192fc5ddea3b02958de97677a0a12 3.3.4-release3
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 0bf039224c..58f8932cc4 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4097,7 +4097,7 @@ S32 LLViewerObject::setTETextureCore(const U8 te, const LLUUID& uuid, LLHost hos
 	return retval;
 }
 
-
+//virtual
 void LLViewerObject::changeTEImage(S32 index, LLViewerTexture* new_image) 
 {
 	if(index < 0 || index >= getNumTEs())
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index dd02dce716..1f70f7ac3c 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -323,7 +323,7 @@ public:
 	/*virtual*/ S32     setTEGlow(const U8 te, const F32 glow);
 	/*virtual*/	BOOL	setMaterial(const U8 material);
 	virtual		void	setTEImage(const U8 te, LLViewerTexture *imagep); // Not derived from LLPrimitive
-	void                changeTEImage(S32 index, LLViewerTexture* new_image)  ;
+	virtual     void    changeTEImage(S32 index, LLViewerTexture* new_image)  ;
 	LLViewerTexture		*getTEImage(const U8 te) const;
 	
 	void fitFaceTexture(const U8 face);
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index b43bdb69f8..2ad3ff50b8 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1803,6 +1803,18 @@ void LLVOVolume::setNumTEs(const U8 num_tes)
 	return ;
 }
 
+//virtual     
+void LLVOVolume::changeTEImage(S32 index, LLViewerTexture* imagep)
+{
+	BOOL changed = (mTEImages[index] != imagep);
+	LLViewerObject::changeTEImage(index, imagep);
+	if (changed)
+	{
+		gPipeline.markTextured(mDrawable);
+		mFaceMappingChanged = TRUE;
+	}
+}
+
 void LLVOVolume::setTEImage(const U8 te, LLViewerTexture *imagep)
 {
 	BOOL changed = (mTEImages[te] != imagep);
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 0082f2e991..5482c80f2b 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -173,6 +173,7 @@ public:
 
 	/*virtual*/ void	setScale(const LLVector3 &scale, BOOL damped);
 
+	/*virtual*/ void    changeTEImage(S32 index, LLViewerTexture* new_image)  ;
 	/*virtual*/ void	setNumTEs(const U8 num_tes);
 	/*virtual*/ void	setTEImage(const U8 te, LLViewerTexture *imagep);
 	/*virtual*/ S32		setTETexture(const U8 te, const LLUUID &uuid);
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index b4c28daac9..4387a61963 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -66,27 +66,26 @@ Voice-Serverversion: [VOICE_VERSION]
 		</panel>
 		<panel label="Lizenzen" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion.
-        APR Copyright (C) 2000-2004 The Apache Software Foundation.
-        Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
-        cURL Copyright (C) 1996-2002, Daniel Stenberg (daniel@haxx.se).
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion.
+        APR Copyright (C) 2011 The Apache Software Foundation
+        Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+        cURL Copyright (C) 1996-2010, Daniel Stenberg (daniel@haxx.se).
         DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm und Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
         GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University sowie David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW).
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Copyright (C) 2001, Xiphophorus.
-        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-        PCRE Copyright (c) 1997-2008 University of Cambridge.
+        ogg/vorbis Copyright (C) 2002, Xiphophorus.
+        OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+        PCRE Copyright (c) 1997-2012 University of Cambridge.
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga.
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com).
         xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-        zlib Copyright (C) 1995-2002 Jean-loup Gailly und Mark Adler.
-        google-perftools Copyright (c) 2005, Google Inc.
+        zlib Copyright (C) 1995-2012 Jean-loup Gailly und Mark Adler.
 
         Second Life Viewer verwendet Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (und Lizenzgeber). Alle Rechte vorbehalten. Details siehe www.havok.com.
 
diff --git a/indra/newview/skins/default/xui/de/floater_about_land.xml b/indra/newview/skins/default/xui/de/floater_about_land.xml
index 9e330f9766..44922fbe78 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -463,7 +463,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 				Zugang nur Einwohnern gestatten, die:
 			</text>
 			<check_box label="Zahlungsinformationen hinterlegt haben [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Um diese Parzelle besuchen zu können, müssen Einwohner Zahlungsinformationen hinterlegt haben. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
-			<check_box label="ihr Alter bestätigt haben [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Um diese Parzelle besuchen zu können, müssen Einwohner ihr Alter bestätigt haben. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
+			<check_box label="Sind mindestens 18 Jahre alt [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Nur Einwohner, die mindestens 18 Jahre alt sind, können diese Parzelle betreten. Weitere Informationen finden Sie unter [SUPPORT_SITE]."/>
 			<check_box label="Gruppenzugang erlauben: [GROUP]" name="GroupCheck" tool_tip="Gruppe im Register „Allgemein“ festlegen."/>
 			<check_box label="Pässe verkaufen an:" name="PassCheck" tool_tip="Ermöglicht befristeten Zugang zu dieser Parzelle"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/de/floater_animation_preview.xml b/indra/newview/skins/default/xui/de/floater_animation_preview.xml
deleted file mode 100644
index 82a4a51d07..0000000000
--- a/indra/newview/skins/default/xui/de/floater_animation_preview.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<floater.string name="failed_to_initialize">
-		Bewegung konnte nicht initialisiert werden
-	</floater.string>
-	<floater.string name="anim_too_long">
-		Animationsdatei ist [LENGTH] Sekunden lang.
-
-Maximal erlaubt sind [MAX_LENGTH] Sekunden.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		Animationsdatei konnte nicht gelesen werden.
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		OK
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Unvollständige Datei
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Constraint-Definition kann nicht gelesen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		BVH-Datei kann nicht geöffnet werden
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		Ungültiger HIERARCHY-Titel.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		ROOT oder JOINT nicht gefunden.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		JOINT-Name nicht erfasst.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		VERSATZ nicht gefunden.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		CHANNELS nicht gefunden.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Kann Rotations-Reihenfolge nicht erfassen.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Kann Rotations-Achse nicht erfassen.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		MOTION nicht gefunden.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		Anzahl der Bilder kann nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Bildzeit kann nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Positions-Werte können nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Kann Rotations-Werte nicht erfassen.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Datei kann nicht geöffnet werden
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Übersetzungstitel kann nicht gelesen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Übersetzungsnamen können nicht geladen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Ignorier-Wert kann nicht gelesen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Übersetzungs-Wert kann nicht gelesen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Outname-Wert kann nicht gelesen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Übersetzungsmatrix kann nicht geladen werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Mergechild-Name nicht erfasst.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Mergeparent-Name nicht erfasst.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Prioritätswert kann nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Loop-Wert kann nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Easeln-Wert kann nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		easeOut-Wert kann nicht erfasst werden.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Hand-Morph-Wert nicht erfasst.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Emote-Name kann nicht gelesen werden.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Falscher Root-Joint-Name, &quot;hip&quot; verwenden.
-	</floater.string>
-	<text name="name_label">
-		Name:
-	</text>
-	<line_editor name="name_form"/>
-	<text name="description_label">
-		Beschreibung:
-	</text>
-	<spinner label="Priorität" name="priority" tool_tip="Steuert, welche Animationen von dieser Animation überschrieben werden können"/>
-	<check_box bottom_delta="-18" label="Schleife" name="loop_check" tool_tip="Erzeugt eine Animationsschleife"/>
-	<spinner label="In (%)" name="loop_in_point" tool_tip="Anfang einer Animationsschleife festlegen"/>
-	<spinner label="Aus (%)" name="loop_out_point" tool_tip="Ende einer Animationsschleife festlegen"/>
-	<text name="hand_label">
-		Handhaltung
-	</text>
-	<combo_box label="" name="hand_pose_combo" tool_tip="Steuert während der Animation die Bewegung der Hände">
-		<combo_box.item label="Dehnen" name="Spread"/>
-		<combo_box.item label="Entspannt" name="Relaxed"/>
-		<combo_box.item label="Beide zeigen" name="PointBoth"/>
-		<combo_box.item label="Faust" name="Fist"/>
-		<combo_box.item label="Links entspannt" name="RelaxedLeft"/>
-		<combo_box.item label="Nach links zeigen" name="PointLeft"/>
-		<combo_box.item label="Linke Faust" name="FistLeft"/>
-		<combo_box.item label="Rechts entspannt" name="RelaxedRight"/>
-		<combo_box.item label="Nach rechts zeigen" name="PointRight"/>
-		<combo_box.item label="Rechte Faust" name="FistRight"/>
-		<combo_box.item label="Rechts salutieren" name="SaluteRight"/>
-		<combo_box.item label="Tippt" name="Typing"/>
-		<combo_box.item label="Friedensrecht" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Ausdruck
-	</text>
-	<combo_box label="" name="emote_combo" tool_tip="Steuert Gesichtsregungen während der Animation">
-		<item label="(Keiner)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Ängstlich" name="Afraid" value="Ängstlich"/>
-		<item label="Verärgert" name="Angry" value="Verärgert"/>
-		<item label="Grinst" name="BigSmile" value="Grinsend"/>
-		<item label="Gelangweilt" name="Bored" value="Gelangweilt"/>
-		<item label="Weinen" name="Cry" value="Weinen"/>
-		<item label="Verachten" name="Disdain" value="Verachten"/>
-		<item label="Verlegen" name="Embarrassed" value="Verlegen"/>
-		<item label="Stirnrunzeln" name="Frown" value="Stirnrunzeln"/>
-		<item label="Küssen" name="Kiss" value="Küssen"/>
-		<item label="Lachen" name="Laugh" value="Lachen"/>
-		<item label="Bäääh" name="Plllppt" value="Bäääh"/>
-		<item label="Angewidert" name="Repulsed" value="Angewidert"/>
-		<item label="Traurig" name="Sad" value="Traurig"/>
-		<item label="Schulterzucken" name="Shrug" value="Schulterzucken"/>
-		<item label="Lächeln" name="Smile" value="Lächeln"/>
-		<item label="Überraschung" name="Surprise" value="Überraschung"/>
-		<item label="Zwinkern" name="Wink" value="Zwinkern"/>
-		<item label="Sorgenvoll" name="Worry" value="Sorgenvoll"/>
-	</combo_box>
-	<text name="preview_label" width="97">
-		Vorschau während:
-	</text>
-	<combo_box label="" left_delta="107" name="preview_base_anim" tool_tip="Hiermit können Sie das Verhalten Ihres Avatars testen, während Ihr Avatar normale Bewegungen ausführt.">
-		<item label="Stehend" name="Standing" value="Stehend"/>
-		<item label="Geht" name="Walking" value="Gehend"/>
-		<item label="Sitzt" name="Sitting" value="Sitzend"/>
-		<item label="Fliegen" name="Flying" value="Fliegen"/>
-	</combo_box>
-	<spinner label="Eingang glätten (s)" label_width="105" name="ease_in_time" tool_tip="Einblendungsgeschwindigkeit von Animationen (in Sekunden)" width="175"/>
-	<spinner bottom_delta="-20" label="Ausgang glätten (s)" label_width="105" left="10" name="ease_out_time" tool_tip="Ausblendegeschwindigkeit von Animationen (in Sekunden)" width="175"/>
-	<button bottom_delta="-32" label="" name="play_btn" tool_tip="Ihre Animation abspielen"/>
-	<button name="pause_btn" tool_tip="Ihre Animation pausieren"/>
-	<button label="" name="stop_btn" tool_tip="Animation anhalten"/>
-	<slider label="" name="playback_slider"/>
-	<text name="bad_animation_text">
-		Animationsdatei konnte nicht gelesen werden.
-
-Wir empfehlen exportierte BVH-Dateien aus Poser 4.
-	</text>
-	<button label="Hochladen ([AMOUNT] L$)" name="ok_btn" width="160"/>
-	<button label="Abbrechen" left="180" name="cancel_btn" width="88"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_autoreplace.xml b/indra/newview/skins/default/xui/de/floater_autoreplace.xml
new file mode 100644
index 0000000000..0c774990ef
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Einstellungen für automatische Ersetzung...">
+	<check_box label="Automatische Ersetzung aktivieren..." name="autoreplace_enable" tool_tip="Eines oder mehrere Schlüsselwörter bei der Eingabe von Chat-Text durch die entsprechende Ersetzung substituieren"/>
+	<button label="Liste importieren..." name="autoreplace_import_list" tool_tip="Exportierte Liste aus einer Datei laden."/>
+	<button label="Liste exportieren..." name="autoreplace_export_list" tool_tip="Ausgewählte Liste zur Weitergabe in einer Datei speichern."/>
+	<button label="Neue Liste..." name="autoreplace_new_list" tool_tip="Neue Liste erstellen."/>
+	<button label="Liste löschen" name="autoreplace_delete_list" tool_tip="Ausgewählte Liste löschen."/>
+	<button name="autoreplace_list_up" tool_tip="Dieser Liste eine höhere Priorität einräumen."/>
+	<button name="autoreplace_list_down" tool_tip="Dieser Liste eine niedrigere Priorität einräumen."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Schlüsselwort" name="keyword"/>
+		<scroll_list.columns label="Ersetzung" name="replacement"/>
+	</scroll_list>
+	<button label="Hinzufügen..." name="autoreplace_add_entry"/>
+	<button label="Entfernen" name="autoreplace_delete_entry"/>
+	<button label="Eintrag speichern" name="autoreplace_save_entry" tool_tip="Diesen Eintrag speichern."/>
+	<button label="Änderungen speichern" name="autoreplace_save_changes" tool_tip="Alle Änderungen speichern."/>
+	<button label="Abbrechen" name="autoreplace_cancel" tool_tip="Alle Änderungen löschen."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/de/floater_inventory.xml b/indra/newview/skins/default/xui/de/floater_inventory.xml
deleted file mode 100644
index d9b7c30fd2..0000000000
--- a/indra/newview/skins/default/xui/de/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="MEIN INVENTAR">
-	<floater.string name="Title">
-		MEIN INVENTAR
-	</floater.string>
-	<floater.string name="TitleFetching">
-		MEIN INVENTAR ([ITEM_COUNT] Objekte werden abgerufen...) [FILTER]
-	</floater.string>
-	<floater.string name="TitleCompleted">
-		MEIN INVENTAR ([ITEM_COUNT] Objekte) [FILTER]
-	</floater.string>
-	<floater.string name="Fetched">
-		Abgerufen
-	</floater.string>
-	<panel label="Inventar" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_model_preview.xml b/indra/newview/skins/default/xui/de/floater_model_preview.xml
index 4af8d67686..4285462bc8 100644
--- a/indra/newview/skins/default/xui/de/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Dreiecke" name="triangles" value="Dreiecke"/>
 				<text initial_value="Scheitelpunkte" name="vertices" value="Scheitelpunkte"/>
 				<text initial_value="Hoch" name="high_label" value="Hoch"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Aus Datei laden"/>
+					<item name="Generate" value="Generieren"/>
+				</combo_box>
 				<button label="Durchsuchen..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Dreiecklimit"/>
+					<item name="Error Threshold" value="Fehlerschwelle"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Mittel" name="medium_label" value="Mittel"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Aus Datei laden"/>
+					<item name="Generate" value="Generieren"/>
+					<item name="Use LoD above" value="Detailstufe oben verwenden"/>
+				</combo_box>
 				<button label="Durchsuchen..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Dreiecklimit"/>
+					<item name="Error Threshold" value="Fehlerschwelle"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Niedrig" name="low_label" value="Niedrig"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Aus Datei laden"/>
+					<item name="Generate" value="Generieren"/>
+					<item name="Use LoD above" value="Detailstufe oben verwenden"/>
+				</combo_box>
 				<button label="Durchsuchen..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Dreiecklimit"/>
+					<item name="Error Threshold" value="Fehlerschwelle"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="Niedrigste" name="lowest_label" value="Niedrigste"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Aus Datei laden"/>
+					<item name="Generate" value="Generieren"/>
+					<item name="Use LoD above" value="Detailstufe oben verwenden"/>
+				</combo_box>
 				<button label="Durchsuchen..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Dreiecklimit"/>
+					<item name="Error Threshold" value="Fehlerschwelle"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Normalen generieren" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/de/floater_nearby_chat.xml b/indra/newview/skins/default/xui/de/floater_nearby_chat.xml
deleted file mode 100644
index 2aabbb18f2..0000000000
--- a/indra/newview/skins/default/xui/de/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT IN DER NÄHE">
-	<check_box label="Chat übersetzen" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml
new file mode 100644
index 0000000000..7096dbc156
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Pathfinding-Figuren">
+	<floater.string name="messaging_get_inprogress">
+		Pathfinding-Figuren werden abgerufen...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Fehler beim Abrufen von Pathfinding-Figuren.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Keine Pathfinding-Figuren.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] Figuren von [NUM_TOTAL] ausgewählt.
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		Pathfinding ist in dieser Region nicht aktiviert.
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Laden]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Unbekannt]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[Gruppe]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Name" name="name"/>
+			<scroll_list.columns label="Beschreibung" name="description"/>
+			<scroll_list.columns label="Eigentümer" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="Höhe" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Figuren:
+		</text>
+		<button label="Liste aktualisieren" name="refresh_objects_list"/>
+		<button label="Alle auswählen" name="select_all_objects"/>
+		<button label="Keine auswählen" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Aktionen für ausgewählte Figuren:
+		</text>
+		<check_box label="Beacon anzeigen" name="show_beacon"/>
+		<check_box label="Physikkapsel anzeigen" name="show_physics_capsule"/>
+		<button label="Nehmen" name="take_objects"/>
+		<button label="Kopie nehmen" name="take_copy_objects"/>
+		<button label="Dorthin teleportieren" name="teleport_me_to_object" tool_tip="Nur aktiviert, wenn eine Figur ausgewählt ist."/>
+		<button label="Zurückgeben" name="return_objects"/>
+		<button label="Löschen" name="delete_objects"/>
+	</panel>
+</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
new file mode 100644
index 0000000000..ebf8f01632
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Pathfinding-Ansicht/-Test">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		Pathfinding-Bibliotheksimplementierung nicht gefunden.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		Pathfinding ist in dieser Region nicht aktiviert.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		Warten, bis Region geladen ist.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Navmesh-Status wird geprüft.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Navmesh wird heruntergeladen.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		Navmesh hat sich auf dem Server geändert. Neuestes Navmesh wird heruntergeladen.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		Neuestes Navmesh wurde heruntergeladen.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		Navmesh kann nicht heruntergeladen werden.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		Navmesh weist ausstehende Änderungen auf.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		Navmesh wird erstellt.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		Einige Navmesh-Regionen weisen ausstehende Änderungen auf.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		Einige Navmesh-Regionen werden erstellt.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		Einige Navmesh-Regionen weisen ausstehende Änderungen auf und andere werden erstellt.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		Navmesh ist aktuell.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		Pathfinding-Bibliotheksimplementierung nicht gefunden.
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		Pathfinding ist in dieser Region nicht aktiviert.
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Bitte wählen Sie Anfangs- und Endpunkte aus.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Bitte wählen Sie einen Anfangspunkt aus.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Bitte wählen Sie einen Endpunkt aus.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		Pfad wird orange dargestellt.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		Zwischen den gewählten Punkten wurde kein Pfad gefunden.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Fehler bei der Pfaderstellung aufgetreten.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Anzeigen" name="view_panel">
+			<text name="show_label">
+				Anzeigen:
+			</text>
+			<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">
+				Begehbarkeitskarte anzeigen:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="Nicht anzeigen" name="show_heatmap_mode_none"/>
+				<combo_box.item label="Figurentyp A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="Figurentyp B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="Figurentyp C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="Figurentyp D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Begehbare Objekte" name="show_walkables"/>
+			<check_box label="Materialvolumen" name="show_material_volumes"/>
+			<check_box label="Statische Hinternisse" name="show_static_obstacles"/>
+			<check_box label="Ausschlussvolumen" name="show_exclusion_volumes"/>
+			<check_box label="Wasserebene" name="show_water_plane"/>
+			<check_box label="Mit Röntgenblick" name="show_xray"/>
+		</panel>
+		<panel label="Pfad testen" name="test_panel">
+			<text name="ctrl_click_label">
+				Bei gedrückter Strg-Taste klicken, um Anfangspunkt auszuwählen.
+			</text>
+			<text name="shift_click_label">
+				Bei gedrückter Umschalttaste klicken, um Endpunkt auszuwählen.
+			</text>
+			<text name="character_width_label">
+				Figurenbreite
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				Figurentyp
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Keine" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Pfad löschen" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml
new file mode 100644
index 0000000000..f1d561e51b
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Pathfinding-Linksets">
+	<floater.string name="messaging_get_inprogress">
+		Pathfinding-Linksets werden abgerufen...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Fehler beim Abrufen von Pathfinding-Linksets.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Ausgewählte Pathfinding-Linksets werden geändert...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Fehler beim Ändern der ausgewählten Pathfinding-Linksets.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Keine Pathfinding-Linksets.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] Linksets von [NUM_TOTAL] ausgewählt.
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		Pathfinding ist in dieser Region nicht aktiviert.
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terrain]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Laden]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Unbekannt]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[Gruppe]
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Begehbar
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Statisches Hinternis
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Bewegliches Hinternis
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Materialvolumen
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Ausschlussvolumen
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Bewegliches Phantom
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[nicht änderbar]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[beschränkt]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[konkav]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[beschränkt,konkav]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Linkset-Nutzung auswählen...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Nach Linkset-Nutzung filtern..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Begehbar" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Statisches Hinternis" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Bewegliches Hinternis" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Materialvolumen" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Ausschlussvolumen" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Bewegliches Phantom" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Anwenden" name="apply_filters"/>
+		<button label="Entfernen" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Name (Hauptprim)" name="name"/>
+			<scroll_list.columns label="Beschreibung (Hauptprim)" name="description"/>
+			<scroll_list.columns label="Eigentümer" name="owner"/>
+			<scroll_list.columns label="Belastung" name="land_impact"/>
+			<scroll_list.columns label="Abstand" name="dist_from_you"/>
+			<scroll_list.columns label="Linkset-Nutzung" name="linkset_use"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Linksets:
+		</text>
+		<button label="Liste aktualisieren" name="refresh_objects_list"/>
+		<button label="Alle auswählen" name="select_all_objects"/>
+		<button label="Keine auswählen" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="Beacon anzeigen" name="show_beacon"/>
+		<button label="Nehmen" name="take_objects"/>
+		<button label="Kopie nehmen" name="take_copy_objects"/>
+		<button label="Dorthin teleportieren" name="teleport_me_to_object"/>
+		<button label="Zurückgeben" name="return_objects"/>
+		<button label="Löschen" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Begehbarkeit:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="Begehbarkeit für Figuren vom Typ A. Ein Beispiel für diesen Typ wäre „Humanoid“."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="Begehbarkeit für Figuren vom Typ B. Ein Beispiel für diesen Typ wäre „Kreatur“."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="Begehbarkeit für Figuren vom Typ C. Ein Beispiel für diesen Typ wäre „Mechanisch“."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="Begehbarkeit für Figuren vom Typ D. Ein Beispiel für diesen Typ wäre „Anderer“."/>
+		<button label="Änderungen übernehmen" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Humanoid)
+		</text>
+		<text name="suggested_use_b_label">
+			(Kreatur)
+		</text>
+		<text name="suggested_use_c_label">
+			(Mechanisch)
+		</text>
+		<text name="suggested_use_d_label">
+			(Anderer)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_postcard.xml b/indra/newview/skins/default/xui/de/floater_postcard.xml
deleted file mode 100644
index 28af0183cb..0000000000
--- a/indra/newview/skins/default/xui/de/floater_postcard.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="FOTO EMAILEN">
-	<text name="to_label">
-		E-Mail des Empfängers:
-	</text>
-	<text name="from_label">
-		Ihre E-Mail:
-	</text>	
-	<text name="name_label">
-		Ihr Name:
-	</text>	
-	<text name="subject_label">
-		Betreff:
-	</text>
-	<line_editor label="Betreff hier eingeben." name="subject_form"/>
-	<text name="msg_label">
-		Nachricht:
-	</text>
-	<text_editor name="msg_form">
-		Nachricht hier eingeben.
-	</text_editor>	
-	<text name="fine_print">
-		Wenn sich der Empfänger bei SL anmeldet, erhalten Sie einen Empfehlungsbonus.
-	</text>
-	<button label="Abbrechen" name="cancel_btn"/>
-	<button label="Senden" name="send_btn"/>
-	<text name="default_subject">
-		Postkarte aus [SECOND_LIFE].
-	</text>
-	<text name="default_message">
-		Sehen Sie hier!
-	</text>
-	<string name="upload_message">
-		Wird gesendet...
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_spellcheck.xml b/indra/newview/skins/default/xui/de/floater_spellcheck.xml
new file mode 100644
index 0000000000..213db277b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Einstellungen für Rechtschreibprüfung">
+	<check_box label="Rechtschreibprüfung aktivieren" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Hauptwörterbuch:
+	</text>
+	<text label="Protokolle:" name="spellcheck_additional">
+		Zusätzliche Wörterbücher:
+	</text>
+	<text name="spellcheck_available">
+		Verfügbar
+	</text>
+	<text name="spellcheck_active">
+		Aktiv
+	</text>
+	<button label="Entfernen" name="spellcheck_remove_btn"/>
+	<button label="Importieren..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml
new file mode 100644
index 0000000000..374c0fc0d2
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Wörterbuch importieren">
+	<button label="Durchsuchen" label_selected="Durchsuchen" name="dictionary_path_browse"/>
+	<button label="Importieren" name="ok_btn"/>
+	<button label="Abbrechen" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_stats.xml b/indra/newview/skins/default/xui/de/floater_stats.xml
index 92d057a4fe..f3239f73c7 100644
--- a/indra/newview/skins/default/xui/de/floater_stats.xml
+++ b/indra/newview/skins/default/xui/de/floater_stats.xml
@@ -53,7 +53,13 @@
 				<stat_bar label="Objekte" name="simobjects"/>
 				<stat_bar label="Aktive Objekte" name="simactiveobjects"/>
 				<stat_bar label="Aktive Skripts" name="simactivescripts"/>
+				<stat_bar label="Skripts ausgeführt" name="simpctscriptsrun"/>
 				<stat_bar label="Skript-Events" name="simscripteps"/>
+				<stat_view label="Pathfinding" name="simpathfinding">
+					<stat_bar label="AI-Schrittzeit" name="simsimaistepmsec"/>
+					<stat_bar label="Übersprungene Silhouettenschritte" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Figuren aktualisiert" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_bar label="Paketeingang" name="siminpps"/>
 				<stat_bar label="Paketausgang" name="simoutpps"/>
 				<stat_bar label="Ausstehende Downloads" name="simpendingdownloads"/>
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 5bb96bebc4..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,6 +20,8 @@
 	<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="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"/>
 	<button label="Hinzufügen" label_selected="Hinzufügen" name="l_add_btn"/>
@@ -31,5 +33,4 @@
 	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
 	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
-	<check_box initial_value="true" label="Jetzt übernehmen" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_tools.xml b/indra/newview/skins/default/xui/de/floater_tools.xml
index dee89b28e5..5f5c34a5cf 100644
--- a/indra/newview/skins/default/xui/de/floater_tools.xml
+++ b/indra/newview/skins/default/xui/de/floater_tools.xml
@@ -148,6 +148,12 @@
 			<panel.string name="text modify info 4">
 				Sie können diese Objekte nicht bearbeiten.
 			</panel.string>
+			<panel.string name="text modify info 5">
+				Dieses Objekt kann nicht über eine Regionsgrenze hinweg geändert werden
+			</panel.string>
+			<panel.string name="text modify info 6">
+				Diese Objekte können nicht über eine Regionsgrenze hinweg geändert werden
+			</panel.string>
 			<panel.string name="text modify warning">
 				Gesamtes Objekt wählen, um Berechtigungen festzulegen.
 			</panel.string>
@@ -197,12 +203,12 @@
 				<combo_box.item label="Zoom" name="Zoom"/>
 			</combo_box>
 			<check_box label="Zum Verkauf:" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Kopie" name="Copy"/>
 				<combo_box.item label="Inhalt" name="Contents"/>
 				<combo_box.item label="Original" name="Original"/>
 			</combo_box>
-			<spinner label="Preis: L$" name="Edit Cost"/>
 			<check_box label="In Suche anzeigen" name="search_check" tool_tip="Dieses Objekt in Suchergebnissen anzeigen"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -238,6 +244,11 @@
 					F:
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Pathfinding-Attribute:
+				</text>
+			</panel>
 		</panel>
 		<panel label="Objekt" name="Object">
 			<check_box label="Gesperrt" name="checkbox locked" tool_tip="Verhindert, dass das Objekt verschoben oder gelöscht wird. Oft beim Bauen nützlich, um unbeabsichtigte Bearbeitungen zu vermeiden."/>
diff --git a/indra/newview/skins/default/xui/de/floater_top_objects.xml b/indra/newview/skins/default/xui/de/floater_top_objects.xml
index d2055a53db..f8130c6379 100644
--- a/indra/newview/skins/default/xui/de/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/de/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		Zeit
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Mono-Uhrzeit:
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		Top-Kollisionsobjekte
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Name" name="name" width="135"/>
 		<scroll_list.columns label="Eigentümer" name="owner"/>
 		<scroll_list.columns label="Position" name="location" width="125"/>
+		<scroll_list.columns label="Parzelle" name="parcel"/>
 		<scroll_list.columns label="Uhrzeit" name="time"/>
-		<scroll_list.columns label="Mono-Uhrzeit:" name="mono_time"/>
 		<scroll_list.columns label="URLs" name="URLs"/>
+		<scroll_list.columns label="Speicher (KB)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		Objekt-ID:
@@ -42,12 +40,16 @@
 	<button label="Beacon anzeigen" name="show_beacon_btn"/>
 	<text name="obj_name_text">
 		Objektname:
-	</text>	
+	</text>
 	<button label="Filter" name="filter_object_btn"/>
 	<text name="owner_name_text">
 		Eigentümer:
-	</text>	
+	</text>
 	<button label="Filter" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		Parzelle:
+	</text>
+	<button label="Filtern" name="filter_parcel_btn"/>
 	<button label="Aktualisieren" name="refresh_btn"/>
 	<button label="Auswahl zurückgeben" name="return_selected_btn" width="134"/>
 	<button label="Alle zurückgeben" left="150" name="return_all_btn" width="134"/>
diff --git a/indra/newview/skins/default/xui/de/menu_bottomtray.xml b/indra/newview/skins/default/xui/de/menu_bottomtray.xml
deleted file mode 100644
index cb0082f944..0000000000
--- a/indra/newview/skins/default/xui/de/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Schaltfläche „Sprechen“" name="EnableVoiceChat"/>
-	<menu_item_check label="Schaltfläche Gesten" name="ShowGestureButton"/>
-	<menu_item_check label="Schaltfläche Bewegungssteuerung" name="ShowMoveButton"/>
-	<menu_item_check label="Schaltfläche Ansicht" name="ShowCameraButton"/>
-	<menu_item_check label="Schaltfläche Foto" name="ShowSnapshotButton"/>
-	<menu_item_check label="Schaltfläche „Bauen“" name="ShowBuildButton"/>
-	<menu_item_check label="Schaltfläche „Suchen“" name="ShowSearchButton"/>
-	<menu_item_check label="Schaltfläche „Karte“" name="ShowWorldMapButton"/>
-	<menu_item_check label="Minikarten-Schaltfläche" name="ShowMiniMapButton"/>
-	<menu_item_call label="Ausschneiden" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Kopieren" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Einfügen" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Löschen" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Alle auswählen" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/de/menu_mode_change.xml b/indra/newview/skins/default/xui/de/menu_mode_change.xml
deleted file mode 100644
index b8090018b7..0000000000
--- a/indra/newview/skins/default/xui/de/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Basis" name="BasicMode"/>
-	<menu_item_check label="Erweitert" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_object.xml b/indra/newview/skins/default/xui/de/menu_object.xml
index 412bd3ac04..9f44ced928 100644
--- a/indra/newview/skins/default/xui/de/menu_object.xml
+++ b/indra/newview/skins/default/xui/de/menu_object.xml
@@ -5,6 +5,8 @@
 	</menu_item_call>
 	<menu_item_call label="Bearbeiten" name="Edit..."/>
 	<menu_item_call label="Bauen" name="Build"/>
+	<menu_item_call label="In Linksets anzeigen" name="show_in_linksets"/>
+	<menu_item_call label="In Figuren anzeigen" name="show_in_characters"/>
 	<menu_item_call label="Öffnen" name="Open"/>
 	<menu_item_call label="Hier sitzen" name="Object Sit"/>
 	<menu_item_call label="Aufstehen" name="Object Stand Up"/>
diff --git a/indra/newview/skins/default/xui/de/menu_text_editor.xml b/indra/newview/skins/default/xui/de/menu_text_editor.xml
index c00186c13e..2e33ed3416 100644
--- a/indra/newview/skins/default/xui/de/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/de/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(unbekannt)" name="Suggestion 1"/>
+	<menu_item_call label="(unbekannt)" name="Suggestion 2"/>
+	<menu_item_call label="(unbekannt)" name="Suggestion 3"/>
+	<menu_item_call label="(unbekannt)" name="Suggestion 4"/>
+	<menu_item_call label="(unbekannt)" name="Suggestion 5"/>
+	<menu_item_call label="Zum Wörterbuch hinzufügen" name="Add to Dictionary"/>
+	<menu_item_call label="Zur Ignorieren-Liste hinzufügen" name="Add to Ignore"/>
 	<menu_item_call label="Ausschneiden" name="Cut"/>
 	<menu_item_call label="Kopieren" name="Copy"/>
 	<menu_item_call label="Einfügen" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index c4c4defab9..6ee708ed62 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -27,6 +27,7 @@
 		<menu_item_call label="Einstellungen..." name="Preferences"/>
 		<menu_item_call label="Symbolleistenschaltflächen..." name="Toolbars"/>
 		<menu_item_call label="Alle Steuerelemente ausblenden" name="Hide UI"/>
+		<menu_item_check label="HUD-Anhänge anzeigen" name="Show HUD Attachments"/>
 		<menu_item_call label="[APP_NAME] schließen" name="Quit"/>
 	</menu>
 	<menu label="Unterhalten" name="Communicate">
@@ -38,6 +39,7 @@
 		<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">
 		<menu_item_call label="Landmarke für diesen Ort setzen" name="Create Landmark Here"/>
@@ -123,6 +125,11 @@
 			<menu_item_call label="Skripts auf ausführen einstellen" name="Set Scripts to Running"/>
 			<menu_item_call label="Skripts auf nicht ausführen einstellen" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Pathfinding" name="Pathfinding">
+			<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>
 		<menu label="Optionen" name="Options">
 			<menu_item_check label="Erweiterte Berechtigungen anzeigen" name="DebugPermissions"/>
 			<menu_item_check label="Nur meine Objekte auswählen" name="Select Only My Objects"/>
@@ -173,7 +180,6 @@
 			<menu_item_check label="Partikel ausblenden" name="Hide Particles"/>
 			<menu_item_check label="Auswahl ausblenden" name="Hide Selected"/>
 			<menu_item_check label="Durchsichtig hervorheben" name="Highlight Transparent"/>
-			<menu_item_check label="HUD-Anhänge anzeigen" name="Show HUD Attachments"/>
 			<menu_item_check label="Fadenkreuz für Mouselook anzeigen" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Darstellungstypen" name="Rendering Types">
@@ -376,7 +382,6 @@
 				<menu_item_call label="Avatargeometry ein-/ausschalten" name="Toggle Character Geometry"/>
 				<menu_item_call label="Männlich testen" name="Test Male"/>
 				<menu_item_call label="Weiblich testen" name="Test Female"/>
-				<menu_item_call label="PG ein-/ausschalten" name="Toggle PG"/>
 				<menu_item_check label="Avatarauswahl zulassen" name="Allow Select Avatar"/>
 			</menu>
 			<menu_item_call label="Param auf Standard erzwingen" name="Force Params to Default"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index a5923526e5..33dfcdcc84 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -374,6 +380,12 @@ Sie benötigen ein Konto, um [SECOND_LIFE] betreten zu können. Möchten Sie jet
 	<notification name="InvalidCredentialFormat">
 		Sie müssen entweder den Benutzernamen oder den Vor- und Nachnamen Ihres Avatars in das Feld „Benutzername“ eingeben und die Anmeldung dann erneut versuchen.
 	</notification>
+	<notification name="InvalidGrid">
+		„[GRID]“ ist keine gültige Grid-ID.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		Ihre Startposition gibt kein gültiges Grid an.
+	</notification>
 	<notification name="DeleteClassified">
 		Anzeige „[NAME]“ löschen?
 Gebühren werden nicht rückerstattet.
@@ -479,8 +491,8 @@ Das Objekt ist möglicherweise außer Reichweite oder wurde gelöscht.
 		Ein kompiliertes Skript konnte aus folgendem Grund nicht gespeichert werden: [REASON].  Speichern Sie das Skript bitte später.
 	</notification>
 	<notification name="StartRegionEmpty">
-		Sie haben keine Start-Region festgelegt.
-Bitte geben Sie den Namen der Region im Feld „Startposition“ ein oder wählen Sie „Mein letzter Standort“ oder „Mein Zuhause“ als Startposition aus.
+		Ihre Startregion ist nicht definiert.
+Geben Sie den Namen der Region im Feld „Startposition“ ein oder wählen Sie „Mein letzter Standort“ oder „Mein Zuhause“ als Startposition aus.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -607,6 +619,9 @@ Sie können maximal [MAX] Objekte verknüpfen.
 
 Stellen Sie sicher, dass kein Objekt gesperrt ist und alle Objekte Ihnen gehören.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		Objekte können nicht über Regionsgrenzen hinweg verknüpft werden.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Verknüpfung nicht möglich, da nicht alle Objekte denselben Eigentümer haben.
 
@@ -991,6 +1006,41 @@ Sie sind nicht berechtigt, Land für die aktive Gruppe zu kaufen.
 			<button name="Cancel" text="Abbrechen"/>
 		</form>
 	</notification>
+	<notification label="Automatische Ersetzungsliste hinzufügen" name="AddAutoReplaceList">
+		Name für neue Liste:
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="Automatische Ersetzungsliste umbenennen" name="RenameAutoReplaceList">
+		Der Name „[DUPNAME]“ wird bereits verwendet.
+ Geben Sie einen neuen eindeutigen Namen ein:
+		<form name="form">
+			<button name="ReplaceList" text="Aktuelle Liste ersetzen"/>
+			<button name="SetName" text="Neuen Namen verwenden"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		Das Schlüsselwort muss ein einziges Wort sein; die Ersetzungszeichenfolge darf nicht leer sein.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		Diese Ersetzungsliste ist nicht gültig.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Sie müssen eine Datei, einen Namen und eine Sprache angeben.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		Das Wörterbuch [DIC_NAME] scheint keine „aff“-Datei zu haben und ist deshalb ein sekundäres Wörterbuch.
+Es kann als zusätzliches Wörterbuch verwendet werden, aber nicht als Hauptwörterbuch.
+
+Weitere Informationen finden Sie unter https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries.
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		Kopieren nicht möglich:
+    [FROM_NAME]
+    in
+    [TO_NAME]
+	</notification>
 	<notification label="Outfit speichern" name="SaveOutfitAs">
 		Mein aktuelles Outfit als neues Outfit speichern:
 		<form name="form">
@@ -1707,83 +1757,128 @@ Tausende Regionen werden verändert und der Spaceserver wird dadurch stark belas
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		Sie dürfen diese Region aufgrund Ihrer Alterseinstufung nicht betreten. Der Grund hierfür ist möglicherweise, dass Sie nicht altersüberprüft sind.
-
-Bitte vergewissern Sie sich, dass Sie den aktuellsten Viewer installiert haben und besuchen Sie unsere Knowledgebase, um mehr über Regionen mit dieser Altereinstufung zu erfahren.
+		Die Region, die Sie besuchen möchten, enthält Inhalte, die Ihre aktuellen Einstellungen überschreiten. Sie können Ihre Einstellungen unter „Ich“ &gt; „Einstellungen“ &gt; „Allgemein“ ändern.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		Sie dürfen diese Region aufgrund Ihrer Alterseinstufung nicht betreten.
-
-Möchten Sie unsere Knowledgebase besuchen, um mehr Informationen über Altereinstufung zu erhalten?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, die nur für Erwachsene zugänglich sind.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/de
 		</url>
-		<usetemplate ignoretext="Ich kann diese Region aufgrund der Alterseinstufung nicht betreten" name="okcancelignore" notext="Schließen" yestext="Zur Knowledgbase"/>
+		<usetemplate ignoretext="Regionswechsel: Die Region, die Sie besuchen möchten, enthält Inhalte, die nur für Erwachsene zugänglich sind." name="okcancelignore" notext="Schließen" yestext="Zur Knowledge Base gehen"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		Aufgrund Ihrer Alterseinstufung dürfen Sie diese Region nicht betreten.
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt.
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, die nur für Erwachsene zugänglich sind.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Sie dürfen diese Region aufgrund der Einstellung Ihrer Inhaltseinstufung nicht betreten.
-
-Bitte ändern Sie Ihre Einstellungen bezüglich der Inhaltseinstufung, um die gewünschte Region zu betreten. Danach können Sie nach [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Um die Veränderungen rückgängig zu machen, gehen Sie zu Ich &gt; Einstellungen &gt; Allgemein.
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt. Sie können Ihre Einstellungen ändern oder diesen Vorgang abbrechen. Nachdem Sie Ihre Einstellungen geändert haben, können Sie erneut versuchen, die Region zu betreten.
+		<form name="form">
+			<button name="OK" text="Einstellungen ändern"/>
+			<button name="Cancel" text="Abbrechen"/>
+			<ignore name="ignore" text="Regionswechsel: Die Region, die Sie besuchen möchten, enthält Inhalte, die aufgrund Ihrer Einstellungen nicht dargestellt werden können."/>
+		</form>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		Wir haben technische Probleme mit Ihrem Teleport, da Ihre Einstellungen nicht mit dem Server synchronisiert sind.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		Die Region, die Sie besuchen möchten, enthält Inhalte, die Ihre aktuellen Einstellungen überschreiten. Sie können Ihre Einstellungen unter „Ich“ &gt; „Einstellungen“ &gt; „Allgemein“ ändern.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, die nur für Erwachsene zugänglich sind.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/de
+		</url>
+		<usetemplate ignoretext="Teleport: Die Region, die Sie besuchen möchten, enthält Inhalte, die nur für Erwachsene zugänglich sind." name="okcancelignore" notext="Schließen" yestext="Zur Knowledge Base gehen"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, die nur für Erwachsene zugänglich sind.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt. Sie können Ihre Einstellungen ändern und den Teleport fortsetzen oder Sie können den Teleport abbrechen.
+		<form name="form">
+			<button name="OK" text="Ändern und fortfahren"/>
+			<button name="Cancel" text="Abbrechen"/>
+			<ignore name="ignore" text="Teleport (kann neu gestartet werden): Die Region, die Sie besuchen möchten, enthält Inhalte, die aufgrund Ihrer Einstellungen nicht dargestellt werden können."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		Die Region, die Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt. Sie können Ihre Einstellungen ändern oder den Teleport abbrechen. Nachdem Sie Ihre Einstellungen geändert haben, können Sie den Teleport erneut versuchen.
 		<form name="form">
-			<button name="OK" text="Einstellung ändern"/>
-			<button name="Cancel" text="Schließen"/>
-			<ignore name="ignore" text="Meine Alterseinstufung lässt nicht zu, dass ich eine Region betrete."/>
+			<button name="OK" text="Einstellungen ändern"/>
+			<button name="Cancel" text="Abbrechen"/>
+			<ignore name="ignore" text="Teleport (kann nicht neu gestartet werden): Die Region, die Sie besuchen möchten, enthält Inhalte, die aufgrund Ihrer Einstellungen nicht dargestellt werden können."/>
 		</form>
 	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		Wir haben technische Probleme mit Ihrem Teleport, da Ihre Einstellungen nicht mit dem Server synchronisiert sind.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		Ihre Inhaltseinstufung ist jetzt [RATING].
+		Sie erhalten keine Benachrichtigungen mehr, wenn Sie eine Region der Inhaltseinstufung „[RATING]“ besuchen. Sie können Ihre Inhaltseinstellungen von der Menüleiste aus ändern („Ich“ &gt; „Einstellungen“ &gt; „Allgemein“).
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		Wir konnten Ihre Einstellungen zur Anzeige von [PREFERRED_MATURITY]-Inhalten leider nicht ändern. Ihre Einstellungen wurden auf [ACTUAL_MATURITY]-Inhalte zurückgesetzt. Sie können erneut versuchen, Ihre Inhaltseinstellungen von der Menüleiste aus zu ändern („Ich“ &gt; „Einstellungen“ &gt; „Allgemein“).
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		Sie haben aufgrund Ihrer Alterseinstufung keinen Anspruch auf dieses Land. Der Grund hierfür ist möglicherweise, dass Sie nicht altersüberprüft sind.
-
-Bitte vergewissern Sie sich, dass Sie den aktuellsten Viewer installiert haben und besuchen Sie unsere Knowledgebase, um mehr über Regionen mit dieser Altereinstufung zu erfahren.
+		Die Inhaltseinstufung des Landes, das Sie in Besitz nehmen möchten, überschreitet Ihre aktuellen Einstellungen. Sie können Ihre Einstellungen unter „Ich“ &gt; „Einstellungen“ &gt; „Allgemein“ ändern.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		Sie haben aufgrund Ihrer Alterseinstufung keinen Anspruch auf dieses Land.
-
-Möchten Sie unsere Knowledgebase besuchen, um mehr Informationen über Altereinstufung zu erhalten?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		Nur Erwachsene können dieses Land in Besitz nehmen.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/de
 		</url>
-		<usetemplate ignoretext="Ich habe aufgrund der Alterseinstufung keinen Anspruch auf dieses Land" name="okcancelignore" notext="Schließen" yestext="Zur Knowledgbase"/>
+		<usetemplate ignoretext="Nur Erwachsene können dieses Land in Besitz nehmen." name="okcancelignore" notext="Schließen" yestext="Zur Knowledge Base gehen"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		Sie haben aufgrund Ihrer Alterseinstufung keinen Anspruch auf dieses Land.
+		Das Land, das Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt.
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		Das Land, das Sie in Besitz nehmen möchten, enthält [REGIONMATURITY]-Inhalte, die nur für Erwachsene zugänglich sind.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		Sie haben aufgrund der Einstellung Ihrer Alterseinstufung keinen Anspruch auf dieses Land.
-
-Klicken Sie auf „Einstellung ändern“, um Ihre Einstellung für Altereinstufung sofort zu ändern und Zugang zu erhalten. Sie können ab sofort [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Falls Sie diese Einstellung später rückgängig machen möchten, gehen Sie zu Bearbeiten &gt; Einstellungen &gt; Allgemein.
-		<usetemplate ignoretext="Meine Alterseinstufung lässt nicht zu, dass ich auf Land Anspruch erhebe" name="okcancelignore" notext="Schließen" yestext="Einstellung ändern"/>
+		Das Land, das Sie besuchen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt. Sie können Ihre Einstellungen ändern und anschließend erneut versuchen, das Land in Besitz zu nehmen.
+		<form name="form">
+			<button name="OK" text="Einstellungen ändern"/>
+			<button name="Cancel" text="Abbrechen"/>
+			<ignore name="ignore" text="Das Land, das Sie in Besitz nehmen möchten, enthält Inhalte, die aufgrund Ihrer Einstellungen nicht dargestellt werden können."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		Sie können aufgrund Ihrer Alterseinstufung dieses Land nicht kaufen. Der Grund hierfür ist möglicherweise, dass Sie nicht altersüberprüft sind.
-
-Bitte vergewissern Sie sich, dass Sie den aktuellsten Viewer installiert haben und besuchen Sie unsere Knowledgebase, um mehr über Regionen mit dieser Altereinstufung zu erfahren.
+		Die Inhaltseinstufung des Landes, das Sie kaufen möchten, überschreitet Ihre aktuellen Einstellungen.  Sie können Ihre Einstellungen unter „Ich“ &gt; „Einstellungen“ &gt; „Allgemein“ ändern.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		Sie können aufgrund Ihrer Alterseinstufung dieses Land nicht kaufen.
-
-Möchten Sie unsere Knowledgebase besuchen, um mehr Informationen über Altereinstufung zu erhalten?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Nur Erwachsene können dieses Land kaufen.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/de
 		</url>
-		<usetemplate ignoretext="Ich kann aufgrund der Alterseinstufung dieses Land nicht kaufen" name="okcancelignore" notext="Schließen" yestext="Zur Knowledgbase"/>
+		<usetemplate ignoretext="Nur Erwachsene können dieses Land kaufen." name="okcancelignore" notext="Schließen" yestext="Zur Knowledge Base gehen"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		Sie können aufgrund Ihrer Alterseinstufung dieses Land nicht kaufen.
+		Das Land, das Sie kaufen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt.
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		Das Land, das Sie kaufen möchten, enthält Inhalte der Einstufung „[REGIONMATURITY]“, die nur für Erwachsene zugänglich sind.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		Sie können aufgrund Ihrer Einstellung für Alterseinstufung dieses Land nicht kaufen.
-
-Klicken Sie auf „Einstellung ändern“, um Ihre Einstellung für Altereinstufung sofort zu ändern und Zugang zu erhalten. Sie können ab sofort [REGIONMATURITY]-Inhalt suchen und auf diesen zugreifen. Falls Sie diese Einstellung später rückgängig machen möchten, gehen Sie zu Bearbeiten &gt; Einstellungen &gt; Allgemein.
-		<usetemplate ignoretext="Meine Alterseinstufung lässt nicht zu, dass ich Land kaufe" name="okcancelignore" notext="Schließen" yestext="Einstellung ändern"/>
+		Das Land, das Sie kaufen möchten, enthält [REGIONMATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGIONMATURITY]-Inhalte nicht dargestellt. Sie können Ihre Einstellungen ändern und anschließend erneut versuchen, das Land zu kaufen.
+		<form name="form">
+			<button name="OK" text="Einstellungen ändern"/>
+			<button name="Cancel" text="Abbrechen"/>
+			<ignore name="ignore" text="Das Land, das Sie kaufen möchten, enthält Inhalte, die aufgrund Ihrer Einstellungen nicht dargestellt werden können."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Zu viele Prims wurden ausgewählt.  Bitte wählen Sie höchstens [MAX_PRIM_COUNT] Prims aus und versuchen Sie es erneut.
@@ -1838,10 +1933,9 @@ Anzeige für [AMOUNT] L$ veröffentlichen?
 		</form>
 	</notification>
 	<notification label="Alterseinstufung der Region ändern" name="RegionMaturityChange">
-		Die Alterseinstufung dieser Region wurde aktualisiert.
+		Die Inhaltseinstufung dieser Region wurde geändert.
 Es kann eine Weile dauern, bis diese Änderung auf der Karte angezeigt wird.
-
-Um Regionen der Alterseinstufung „Adult&quot; zu betreten, müssen Einwohner altersüberprüft sein. Dies kann entweder über die Alterverifizierung oder Zahlungsverifizierung geschehen.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="Falsche Voice-Version" name="VoiceVersionMismatch">
 		Diese Version von [APP_NAME] ist mit der Voice-Chat-Funktion in dieser Region nicht kompatibel. Damit Voice-Chat funktioniert, müssen Sie [APP_NAME] aktualisieren.
@@ -2131,14 +2225,11 @@ Von einer Webseite zu diesem Formular linken, um anderen leichten Zugang zu dies
 		<usetemplate ignoretext="Die Kleidung, die während dem Bearbeiten meines Aussehens erstellt wird, sofort anziehen" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Um auf Adult-Inhalte und –Bereiche in Second Life zuzugreifen, müssen Sie mindestens 18 Jahre alt sein. Bitte besuchen Sie die Altersüberprüfungsseite, um zu bestätigen, dass Sie mindestens 18 Jahre alt sind. 
-Hierzu wird Ihr Webbrowser geöffnet.
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="Ich habe mein Alter nicht verifizieren lassen" name="okcancelignore" notext="Abbrechen" yestext="Zur Altersüberprüfung"/>
+		Der Ort, den Sie besuchen möchten, ist nur für Bewohner zugänglich, die mindestens 18 Jahre alt sind.
+		<usetemplate ignoretext="Ich bin nicht alt genug, um beschränkte Bereiche zu besuchen." name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		Ort auf Einwohner beschränkt, die mindestens 18 Jahre alt sind.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Um diesen Bereich besuchen zu können, müssen Ihre Zahlungsinformationen gespeichert sein.  Möchten Sie diese Einstellung auf der [SECOND_LIFE]-Webseite einrichten?
@@ -2199,7 +2290,7 @@ Hierzu wird Ihr Webbrowser geöffnet.
 		Terrain.raw heruntergeladen
 	</notification>
 	<notification name="GestureMissing">
-		Hmm. Geste [NAME] fehlt in Datenbank.
+		Geste [NAME] fehlt in Datenbank.
 	</notification>
 	<notification name="UnableToLoadGesture">
 		Geste [NAME] konnte nicht geladen werden.
@@ -2399,6 +2490,23 @@ Fliegen ist hier nicht möglich.
 	<notification name="NoBuild">
 		In diesem Bereich ist das Bauen deaktiviert. Sie können keine Objekte bauen oder rezzen.
 	</notification>
+	<notification name="PathfindingDirty">
+		Diese Region weist ausstehende Pathfinding-Änderungen auf. Wenn Sie Baurechte besitzen, können Sie die Region durch Klicken auf die Schaltfläche „Region neu formen“ neu formen.
+	</notification>
+	<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"/>
+	</notification>
 	<notification name="SeeAvatars">
 		Diese Parzelle verbirgt Avatare und Text-Chat vor einer anderen Parzelle.   Sie können Einwohner außerhalb dieser Parzelle weder sehen noch von ihnen gesehen werden.  Regulärer Text-Chat auf Kanal 0 ist ebenfalls blockiert.
 	</notification>
@@ -2417,9 +2525,7 @@ Hier funktionieren nur Skripts, die dem Landeigentümer gehören.
 		Öffentliches Land kann nur in der Region in Besitz genommen werden, in der Sie sich befinden.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		Sie dürfen diese Region aufgrund Ihrer Alterseinstufung nicht betreten. Sie müssen eventuell eine Altersüberprüfung vornehmen und/oder den aktuellsten Viewer installieren.
-
-Bitte besuchen Sie unsere Knowledgebase, um mehr Details über Zugang zu Regionen mit dieser Alterseinstufung zu erhalten.
+		Die Region, die Sie besuchen möchten, enthält Inhalte, die Ihre aktuellen Einstellungen überschreiten. Sie können Ihre Einstellungen unter „Ich“ &gt; „Einstellungen“ &gt; „Allgemein“ ändern.
 	</notification>
 	<notification name="URBannedFromRegion">
 		Sie dürfen diese Region nicht betreten.
@@ -2430,11 +2536,11 @@ Bitte besuchen Sie unsere Knowledgebase, um mehr Details über Zugang zu Regione
 	<notification name="ImproperPaymentStatus">
 		Die für den Zutritt zu dieser Region erforderlichen Zahlungsinformationen liegen nicht vor.
 	</notification>
-	<notification name="MustGetAgeRgion">
-		Sie müssen altersüberprüft sein, um diese Region betreten zu können.
+	<notification name="MustGetAgeRegion">
+		Sie müssen mindestens 18 Jahre alt sein, um diese Region betreten zu können.
 	</notification>
 	<notification name="MustGetAgeParcel">
-		Sie müssen altersüberprüft sein, um diese Parzelle betreten zu können.
+		Sie müssen mindestens 18 Jahre alt sein, um diese Parzelle betreten zu können.
 	</notification>
 	<notification name="NoDestRegion">
 		Keine Zielregion gefunden.
@@ -2534,14 +2640,35 @@ Versuchen Sie es in einigen Minuten erneut.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME_SLURL] hat Ihnen einen Teleport an seine/ihre Position angeboten:
+		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort angeboten:
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+„[MESSAGE]“
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; – [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Teleportieren"/>
 			<button name="Cancel" text="Abbrechen"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort angeboten:
+
+„[MESSAGE]“
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; – [MATURITY_STR]
+
+Diese Region enthält [REGION_CONTENT_MATURITY]-Inhalte, doch aufgrund Ihrer aktuellen Einstellungen werden [REGION_CONTENT_MATURITY]-Inhalte nicht dargestellt. Sie können Ihre Einstellungen ändern und den Teleport fortsetzen oder Sie können den Teleport abbrechen.
+		<form name="form">
+			<button name="Teleport" text="Ändern und fortfahren"/>
+			<button name="Cancel" text="Abbrechen"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] hat Ihnen den Teleport an seinen/ihren Standort angeboten:
+
+„[MESSAGE]“
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; – [MATURITY_STR]
+
+Diese Region enthält jedoch Inhalte, die nur für Erwachsene zugänglich sind.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Ein Teleportangebot wurde an [TO_NAME] geschickt
 	</notification>
@@ -2946,6 +3073,10 @@ Sie haben eine [RESOLUTION]-gebackene Textur für „[BODYREGION]“ nach [TIME]
 		( [EXISTENCE] Sekunden am Leben)
 Sie haben lokal eine [RESOLUTION]-gebackene Textur für „[BODYREGION]“ nach [TIME] Sekunden aktualisiert.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		Wir können keine Vorschau dieser Textur anzeigen, da sie nicht kopier- und/oder übertragungsfähig ist.
+		<usetemplate ignoretext="Hinweis anzeigen, wenn bei nicht kopier- und/oder übertragungsfähigen Texturen keine Live-Vorschau möglich ist" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Möchten Sie dieses Gespräch wirklich verlassen ?
 		<usetemplate ignoretext="Bestätigen, bevor ich den Anruf verlasse." name="okcancelignore" notext="Nein" yestext="Ja"/>
@@ -3115,6 +3246,23 @@ Durch Ausblenden der Schaltfläche „Sprechen“ wird die Sprechfunktion deakti
 		Durch diese Aktion werden alle Menüelemente und Schaltflächen ausgeblendet. Um sie wieder anzuzeigen, klicken Sie erneut auf [SHORTCUT].
 		<usetemplate ignoretext="Vor Ausblenden der UI bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestricted">
+		Einige der ausgewählten Linksets können aufgrund von Berechtigungseinschränkungen nicht auf „[REQUESTED_TYPE]“ gesetzt werden. Diese Linksets werden stattdessen auf „[RESTRICTED_TYPE]“ gesetzt.
+		<usetemplate ignoretext="Einige der ausgewählten Linksets können aufgrund von Berechtigungseinschränkungen nicht gesetzt werden." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnVolume">
+		Einige der ausgewählten Linksets können nicht auf „[REQUESTED_TYPE]“ gesetzt werden, da die Form nicht konvex ist.
+		<usetemplate ignoretext="Einige der ausgewählten Linksets können nicht gesetzt werden, da die Form nicht konvex ist." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestrictedAndVolume">
+		Einige der ausgewählten Linksets können aufgrund von Berechtigungseinschränkungen nicht auf „[REQUESTED_TYPE]“ gesetzt werden. Diese Linksets werden stattdessen auf „[RESTRICTED_TYPE]“ gesetzt.
+ Einige der ausgewählten Linksets können nicht auf „[REQUESTED_TYPE]“ gesetzt werden, da die Form nicht konvex ist. Die Nutzungsarten dieser Linksets bleiben unverändert.
+		<usetemplate ignoretext="Einige der ausgewählten Linksets können nicht gesetzt werden, da die Berechtigungen eingeschränkt sind und die Form nicht konvex ist." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		Das ausgewählte Objekt wirkt sich auf das Navmesh aus. Wenn Sie es in einen flexiblen Pfad ändern, wird es aus dem Navmesh entfernt.
+		<usetemplate ignoretext="Das ausgewählte Objekt wirkt sich auf das Navmesh aus. Wenn Sie es in einen flexiblen Pfad ändern, wird es aus dem Navmesh entfernt." name="okcancelignore" notext="Abbrechen" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Ihr Computer entspricht nicht den Hardwareanforderungen von [APP_NAME]. [APP_NAME] setzt eine OpenGL-Grafikkarte mit Multitextur-Unterstützung voraus. Falls Ihre Grafikkarte diese Funktion unterstützt, installieren Sie die neuesten Treiber sowie die aktuellen Service Packs und Patches für Ihr Betriebssystem.
 
@@ -3151,4 +3299,12 @@ Zukünftige Aktualisierungen dieser Datei werden deaktiviert.
 		Versuch, eine ungültige oder nicht lesbare Bilddatei ([FNAME]) hinzuzufügen, die nicht geöffnet oder decodiert werden konnte.
 Versuch abgebrochen.
 	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		Sie sind dabei, [NUM_ITEMS] Objekte zurückzugeben. Möchten Sie diesen Vorgang wirklich fortsetzen?
+		<usetemplate ignoretext="Möchten Sie wirklich mehrere Objekte zurückgeben?" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		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>
 </notifications>
diff --git a/indra/newview/skins/default/xui/de/panel_bottomtray.xml b/indra/newview/skins/default/xui/de/panel_bottomtray.xml
deleted file mode 100644
index afe9836401..0000000000
--- a/indra/newview/skins/default/xui/de/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Schaltet Mikrofon ein/aus"/>
-	<string name="VoiceControlBtnToolTip" value="Voice-Chat-Steuerung anzeigen/ausblenden"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Sprechen" label_selected="Sprechen" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Gesten" name="Gesture" tool_tip="Gesten anzeigen/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Bewegen" name="movement_btn" tool_tip="Bewegungssteuerung anzeigen/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Ansicht" name="camera_btn" tool_tip="Kamerasteuerung anzeigen/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="Foto machen"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Bauen" name="build_btn" tool_tip="Bauwerkzeuge ein-/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Suche" name="search_btn" tool_tip="Suche anzeigen/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Karte" name="world_map_btn" tool_tip="Karte ein-/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Minikarte" name="mini_map_btn" tool_tip="Minikarte ein-/ausblenden"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="IMs"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Benachrichtigungen"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_group_invite.xml b/indra/newview/skins/default/xui/de/panel_group_invite.xml
index 5f323d80dd..c32d2fe4bf 100644
--- a/indra/newview/skins/default/xui/de/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/de/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Einige der ausgewählten Einwohner sind bereits Gruppenmitglieder und haben aus diesem Grund keine Einladung erhalten.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Gruppeneinladungen nicht gesendet: zu viele Einwohner ausgewählt. Gruppeneinladungen sind auf 100 Einwohner pro Anfrage beschränkt.
+	</panel.string>
 	<text name="help_text">
 		Sie können mehrere Einwohner in Ihre Gruppe einladen. Klicken Sie hierzu auf „Einwohnerliste öffnen“.
 	</text>
diff --git a/indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml
new file mode 100644
index 0000000000..44be6d67b1
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_navmesh_rebake">
+	<button label="Region neu formen" name="navmesh_btn" tool_tip="Klicken, um das Navmesh der Region neu zu formen."/>
+	<button label="Neuformen wird angefordert" name="navmesh_btn_sending" tool_tip="Anforderung zum Neuformen wird an den Server gesendet."/>
+	<button label="Region wird neu geformt" name="navmesh_btn_baking" tool_tip="Region wird neu geformt. Nach Abschluss des Vorgangs verschwindet diese Schaltfläche."/>
+</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 746a561e6c..c9ae350147 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -29,5 +29,7 @@
 	<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="Übersetzungseinstellungen für Chats" name="ok_btn"/>
+	<button label="Übersetzen..." name="ok_btn"/>
+	<button label="Automatisch ersetzen..." name="autoreplace_showgui"/>
+	<button label="Rechtschreibprüfung..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_debug.xml b/indra/newview/skins/default/xui/de/panel_region_debug.xml
index d1b8f0d78a..4a85bd85fd 100644
--- a/indra/newview/skins/default/xui/de/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_debug.xml
@@ -36,5 +36,5 @@
 	<button label="?" name="top_scripts_help"/>
 	<button label="Region neu starten" name="restart_btn" tool_tip="2-Minuten-Countdown und Region neu starten"/>
 	<button label="?" name="restart_help"/>
-	<button label="Neustart verzögern" name="cancel_restart_btn" tool_tip="Regionsneustart um eine Stunde verschieben"/>
+	<button label="Neustart abbrechen" name="cancel_restart_btn" tool_tip="Regionsneustart um eine Stunde verschieben"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_region_estate.xml b/indra/newview/skins/default/xui/de/panel_region_estate.xml
index aecf6f62fc..b087451391 100644
--- a/indra/newview/skins/default/xui/de/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_estate.xml
@@ -19,7 +19,7 @@
 		Zugang nur Einwohnern gestatten, die:
 	</text>
 	<check_box label="Zahlungsinformationen hinterlegt haben" name="limit_payment" tool_tip="Um diesen Grundbesitz besuchen zu können, müssen Einwohner Zahlungsinformationen hinterlegt haben. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
-	<check_box label="ihr Alter bestätigt haben" name="limit_age_verified" tool_tip="Um diesen Grundbesitz besuchen zu können, müssen Einwohner ihr Alter bestätigt haben. Weitere Informationen finden Sie auf [SUPPORT_SITE]."/>
+	<check_box label="Sind mindestens 18 Jahre alt" name="limit_age_verified" tool_tip="Nur Einwohner, die mindestens 18 Jahre alt sind, können diesen Grundbesitz betreten. Weitere Informationen finden Sie unter [SUPPORT_SITE]."/>
 	<check_box label="Voice-Chat erlauben" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<text name="abuse_email_text" width="222">
diff --git a/indra/newview/skins/default/xui/de/panel_region_texture.xml b/indra/newview/skins/default/xui/de/panel_region_texture.xml
deleted file mode 100644
index 2f4904730b..0000000000
--- a/indra/newview/skins/default/xui/de/panel_region_texture.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Bodentexturen" name="Textures">
-	<text name="region_text_lbl">
-		Region:
-	</text>
-	<text name="region_text">
-		unbekannt
-	</text>
-	<text name="detail_texture_text">
-		Terraintexturen (erfordert 512x512, 24-Bit-.tga-Dateien)
-	</text>
-	<text name="height_text_lbl">
-		1 (niedrig)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (Hoch)
-	</text>
-	<text name="height_text_lbl5">
-		Texturhöhenbereich
-	</text>
-	<text name="height_text_lbl6">
-		Nordwest
-	</text>
-	<text name="height_text_lbl7">
-		Nordost
-	</text>
-	<text name="height_text_lbl8">
-		Südwest
-	</text>
-	<text name="height_text_lbl9">
-		Südost
-	</text>
-	<spinner label="Niedrig" label_width="40" name="height_start_spin_0"/>
-	<spinner label="Niedrig" label_width="40" name="height_start_spin_1"/>
-	<spinner label="Niedrig" label_width="40" name="height_start_spin_2"/>
-	<spinner label="Niedrig" label_width="40" name="height_start_spin_3"/>
-	<spinner label="Hoch" label_width="40" name="height_range_spin_0"/>
-	<spinner label="Hoch" label_width="40" name="height_range_spin_1"/>
-	<spinner label="Hoch" label_width="40" name="height_range_spin_2"/>
-	<spinner label="Hoch" label_width="40" name="height_range_spin_3"/>
-	<text name="height_text_lbl10">
-		Diese Werte geben den Mischungsgrad für die obigen Texturen an.
-	</text>
-	<text name="height_text_lbl11">
-		In Metern gemessen. Der NIEDRIG-Wert ist die MAXIMALE Höhe der Textur #1, der HÖCHST-Wert ist die MINDEST-Höhe von Textur #4.
-	</text>
-	<text name="height_text_lbl12">
-		und der OBERE WERT die MINIMALE Höhe von Textur 4.
-	</text>
-	<button label="Übernehmen" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_side_tray.xml b/indra/newview/skins/default/xui/de/panel_side_tray.xml
deleted file mode 100644
index 3c81636fa0..0000000000
--- a/indra/newview/skins/default/xui/de/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Seitenleiste auf-/zuklappen." name="sidebar_openclose" tab_title="Seitenleiste auf-/zuklappen"/>
-	<sidetray_tab description="Startseite." name="sidebar_home" tab_title="Startseite">
-		<panel label="Startseite" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Ihr öffentliches Profil und Auswahl bearbeiten." name="sidebar_me" tab_title="Mein Profil">
-		<panel_container name="panel_container">
-			<panel label="Ich" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Freunde, Kontakte und Leute in Ihrer Nähe finden." name="sidebar_people" tab_title="Leute">
-		<panel_container name="panel_container">
-			<panel label="Gruppenprofil" name="panel_group_info_sidetray"/>
-			<panel label="Ignorierte Einwohner &amp; Objekte" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Hier finden Sie neue Orte und Orte, die Sie bereits besucht haben." label="Orte" name="sidebar_places" tab_title="Orte">
-		<panel label="Orte" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Inventar durchsuchen." name="sidebar_inventory" tab_title="Mein Inventar">
-		<panel label="Inventar bearbeiten" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Ändern Sie Ihr Aussehen und Ihren aktuellen Look." name="sidebar_appearance" tab_title="Mein Aussehen">
-		<panel label="Aussehen bearbeiten" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
index 18241dea32..1b67eaf03b 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(unbekannt)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(unbekannt/mehrere)
+	</panel.string>
 	<panel.string name="public">
 		(öffentlich)
 	</panel.string>
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 7b46ee7c9b..4c8d77d336 100644
--- a/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/de/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		Sie können diese Objekte nicht bearbeiten.
 	</panel.string>
+	<panel.string name="text modify info 5">
+		Dieses Objekt kann nicht über eine Regionsgrenze hinweg geändert werden
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Diese Objekte können nicht über eine Regionsgrenze hinweg geändert werden
+	</panel.string>
 	<panel.string name="text modify warning">
 		Diese Objekt verfügt über verknüpfte Teile
 	</panel.string>
@@ -95,6 +101,9 @@
 		</combo_box>
 		<spinner label="Preis: L$" name="Edit Cost"/>
 		<check_box label="In Suche anzeigen" name="search_check" tool_tip="Dieses Objekt in Suchergebnissen anzeigen"/>
+		<text name="pathfinding_attributes_label">
+			Pathfinding-Attribute:
+		</text>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 668a7b35bf..206b631874 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -1006,6 +1006,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="script_files">
 		Skripts
 	</string>
+	<string name="dictionary_files">
+		Wörterbücher
+	</string>
 	<string name="AvatarSetNotAway">
 		Nicht abwesend
 	</string>
@@ -3864,6 +3867,12 @@ Falls diese Meldung weiterhin angezeigt wird, wenden Sie sich bitte an [SUPPORT_
 	<string name="LocationCtrlSeeAVsTooltip">
 		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.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		Dynamisches Pathfinding ist in dieser Region nicht aktiviert.
+	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] Aktualisierung
 	</string>
@@ -5006,6 +5015,21 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Normal">
 		Normal
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Keine
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Wirkt sich auf Navmesh aus
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Figur
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(mehrere)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Sehr niedrig
 	</string>
@@ -5021,4 +5045,10 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="snapshot_quality_very_high">
 		Sehr hoch
 	</string>
+	<string name="TeleportMaturityExceeded">
+		Der Einwohner kann diese Region nicht besuchen.
+	</string>
+	<string name="UserDictionary">
+		[Benutzer]
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/de/teleport_strings.xml b/indra/newview/skins/default/xui/de/teleport_strings.xml
index 9cf381bacc..8062633df6 100644
--- a/indra/newview/skins/default/xui/de/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/de/teleport_strings.xml
@@ -46,6 +46,9 @@ Ihre Teleport-Anfrage kann nicht sofort bearbeitet werden. Versuchen Sie es in e
 		<message name="no_inventory_host">
 			Das Inventarsystem ist zurzeit nicht verfügbar.
 		</message>
+		<message name="MustGetAgeRegion">
+			Sie müssen mindestens 18 Jahre alt sein, um diese Region betreten zu können.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -81,5 +84,8 @@ Ihre Teleport-Anfrage kann nicht sofort bearbeitet werden. Versuchen Sie es in e
 		<message name="requesting">
 			Teleport wird initialisiert...
 		</message>
+		<message name="pending">
+			Anstehender Teleport...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 307b61133f..3696c7e12c 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -66,27 +66,26 @@ Versión del servidor de voz: [VOICE_VERSION]
 		</panel>
 		<panel label="Licencias" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-        APR Copyright (C) 2000-2004 The Apache Software Foundation
-        Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
-        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+        APR Copyright (C) 2011 The Apache Software Foundation
+        Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+        cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
         DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
         GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Copyright (C) 2001, Xiphophorus
-        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-        PCRE Copyright (c) 1997-2008 University of Cambridge
+        ogg/vorbis Copyright (C) 2002, Xiphophorus
+        OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+        PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-        zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-        google-perftools Copyright (c) 2005, Google Inc.
+        zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
         El visor de Second Life usa Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (y sus licenciadores). Reservados todos los derechos. Vea los detalles en www.havok.com.
 
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index fd54d74af2..f8c40d798a 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -465,7 +465,7 @@ los media:
 				Permitir únicamente el acceso a los Residentes que:
 			</text>
 			<check_box label="Han aportado información de pago [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Para poder acceder a esta parcela los Residentes deben haber aportado información de pago en su cuenta. Para más información, ver [SUPPORT_SITE]."/>
-			<check_box label="Han verificado su edad [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Para poder acceder a esta parcela los Residentes deben haber verificado su edad. Para más información, ver [SUPPORT_SITE]."/>
+			<check_box label="Son mayores de 18 años [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Para poder acceder a esta parcela los Residentes deben ser mayores de 18 años. Para más información, consulta [SUPPORT_SITE]."/>
 			<check_box label="Acceso permitido al grupo: [GROUP]" name="GroupCheck" tool_tip="Elija el grupo en la pestaña General."/>
 			<check_box label="Vender pases a:" name="PassCheck" tool_tip="Permitir acceso temporal a esta parcela"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/es/floater_animation_preview.xml b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
deleted file mode 100644
index d57405f7e5..0000000000
--- a/indra/newview/skins/default/xui/es/floater_animation_preview.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<floater.string name="failed_to_initialize">
-		Fallo al iniciar el movimiento
-	</floater.string>
-	<floater.string name="anim_too_long">
-		El archivo de la animación dura [LENGTH] segundos.
-
-La duración máxima de una animación es de [MAX_LENGTH] segundos.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		No se ha podido leer el archivo de la animación.
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		OK
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Fin prematuro del archivo.
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		No se puede leer la definición de la restricción.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		No se puede abrir el archivo BVH.
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		&apos;HIERARCHY header&apos; inválido.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		No se pueden encontrar &apos;ROOT&apos; o &apos;JOINT&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		No se puede obtener el nombre &apos;JOINT&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		No se puede encontrar &apos;OFFSET&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		No se puede encontrar &apos;CHANNELS&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		No se puede conseguir el orden de la rotación.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		No se puede encontrar el eje de rotación.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		No se puede encontrar &apos;MOTION&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		No se puede conseguir el número de frames.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		No se puede conseguir el tiempo del frame.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		No se pueden conseguir los valores de la posición.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		No se pueden conseguir los valores de la rotación.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		No se puede abrir el archivo de traducción.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		No se puede leer el encabezamiento de la traducción.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		No se puede leer la traducción de los nombres.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		No se puede leer la traducción de los valores ignorados.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		No se puede leer el valor relativo de la traducción.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		No se puede leer la traducción del valor &apos;outname&apos;
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		No se puede leer la matriz de traducciones.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		No se puede conseguir el nombre &apos;mergechild&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		No se puede conseguir el nombre &apos;mergeparent&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		No se puede obtener el valor prioritario.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		No se puede conseguir el valor del bucle.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		No se pueden conseguir los valores &apos;easeIn&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		No se pueden conseguir los valores &apos;easeOut&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		No se puede conseguir el valor de &apos;hand morph&apos;.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		No se puede leer el nombre del gesto.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Nombre incorrecto de &apos;root joint&apos;, usa &quot;hip&quot;.
-	</floater.string>
-	<text name="name_label">
-		Nombre:
-	</text>
-	<text name="description_label">
-		Descripción:
-	</text>
-	<spinner label="Prioridad:" name="priority" tool_tip="Controla qué otras animaciones pueden ser anuladas por ésta"/>
-	<check_box label="Bucle:" name="loop_check" tool_tip="Hace esta animación en bucle"/>
-	<spinner label="Empieza(%)" name="loop_in_point" tool_tip="Indica el punto en el que la animación vuelve a empezar"/>
-	<spinner label="Acaba(%)" name="loop_out_point" tool_tip="Indica el punto en el que la animación acaba el bucle"/>
-	<text name="hand_label">
-		Posición de las manos
-	</text>
-	<combo_box name="hand_pose_combo" tool_tip="Controla qué hacen las manos durante la animación">
-		<combo_box.item label="Extendidas" name="Spread"/>
-		<combo_box.item label="Relajadas" name="Relaxed"/>
-		<combo_box.item label="Ambas señalan" name="PointBoth"/>
-		<combo_box.item label="Puño" name="Fist"/>
-		<combo_box.item label="La izq. relajada" name="RelaxedLeft"/>
-		<combo_box.item label="La izq. señala" name="PointLeft"/>
-		<combo_box.item label="Puño izq." name="FistLeft"/>
-		<combo_box.item label="La der. relajada" name="RelaxedRight"/>
-		<combo_box.item label="La der. señala" name="PointRight"/>
-		<combo_box.item label="Puño der." name="FistRight"/>
-		<combo_box.item label="La derecha saluda" name="SaluteRight"/>
-		<combo_box.item label="Escribiendo" name="Typing"/>
-		<combo_box.item label="&apos;Paz&apos; en la der." name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Expresión
-	</text>
-	<combo_box name="emote_combo" tool_tip="Controla qué hace la cara durante la animación">
-		<item label="(ninguno)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Con miedo" name="Afraid" value="Miedo"/>
-		<item label="Enfado" name="Angry" value="Enfado"/>
-		<item label="Gran sonrisa" name="BigSmile" value="Gran sonrisa"/>
-		<item label="Aburrimiento" name="Bored" value="Aburrimiento"/>
-		<item label="Llorar" name="Cry" value="Lloro"/>
-		<item label="Desdén" name="Disdain" value="Desdén"/>
-		<item label="Avergonzarse" name="Embarrassed" value="Vergüenza"/>
-		<item label="Fruncir el ceño" name="Frown" value="Fruncir el ceño"/>
-		<item label="Beso" name="Kiss" value="Beso"/>
-		<item label="Reír" name="Laugh" value="Risa"/>
-		<item label="Sacar la lengua" name="Plllppt" value="Sacar la lengua"/>
-		<item label="Rechazo" name="Repulsed" value="Rechazo"/>
-		<item label="Triste" name="Sad" value="Tristeza"/>
-		<item label="Encogerse de hombros" name="Shrug" value="Encogerse de hombros"/>
-		<item label="Sonrisa" name="Smile" value="Sonrisa"/>
-		<item label="Sorpresa" name="Surprise" value="Sorpresa"/>
-		<item label="Guiño" name="Wink" value="Guiño"/>
-		<item label="Preocupación" name="Worry" value="Preocupación"/>
-	</combo_box>
-	<text name="preview_label">
-		Vista previa mientras
-	</text>
-	<combo_box name="preview_base_anim" tool_tip="Compruebe cómo se comporta su animación a la vez que el avatar realiza acciones comunes.">
-		<item label="De pie" name="Standing" value="De pie"/>
-		<item label="Caminando" name="Walking" value="Caminando"/>
-		<item label="Sentado/a" name="Sitting" value="Sentado"/>
-		<item label="Volando" name="Flying" value="Volando"/>
-	</combo_box>
-	<spinner label="Combinar (sec)" name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones"/>
-	<spinner label="Dejar de combinar (sec)" name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones"/>
-	<button bottom_delta="-32" name="play_btn" tool_tip="Ejecutar tu animación"/>
-	<button name="pause_btn" tool_tip="Pausar tu animación"/>
-	<button label="" name="stop_btn" tool_tip="Parar la repetición de la animación"/>
-	<slider label="" name="playback_slider"/>
-	<text name="bad_animation_text">
-		No se ha podido leer el archivo de la animación.
-
-Recomendamos usar archivos BVH exportados de Poser 4.
-	</text>
-	<button label="Subir ([AMOUNT] L$)" name="ok_btn"/>
-	<button label="Cancelar" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_autoreplace.xml b/indra/newview/skins/default/xui/es/floater_autoreplace.xml
new file mode 100644
index 0000000000..15abccc376
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Configuración de reemplazo automático">
+	<check_box label="Habilitar el reemplazo automático" name="autoreplace_enable" tool_tip="Al escribir el texto del chat, reemplaza las palabras clave especificadas con la sustitución correspondiente"/>
+	<button label="Importar lista..." name="autoreplace_import_list" tool_tip="Carga una lista previamente exportada desde un archivo."/>
+	<button label="Exportar lista..." name="autoreplace_export_list" tool_tip="Guarda la lista seleccionada en un archivo para poder compartirla."/>
+	<button label="Lista nueva..." name="autoreplace_new_list" tool_tip="Crea una lista nueva."/>
+	<button label="Eliminar lista" name="autoreplace_delete_list" tool_tip="Elimina la lista seleccionada."/>
+	<button name="autoreplace_list_up" tool_tip="Aumenta la prioridad de esta lista."/>
+	<button name="autoreplace_list_down" tool_tip="Baja la prioridad de esta lista."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Palabra clave" name="keyword"/>
+		<scroll_list.columns label="Reemplazo" name="replacement"/>
+	</scroll_list>
+	<button label="Añadir..." name="autoreplace_add_entry"/>
+	<button label="Eliminar" name="autoreplace_delete_entry"/>
+	<button label="Guardar entrada" name="autoreplace_save_entry" tool_tip="Guarda esta entrada."/>
+	<button label="Guardar cambios" name="autoreplace_save_changes" tool_tip="Guarda todos los cambios."/>
+	<button label="Cancelar" name="autoreplace_cancel" tool_tip="Descarta todos los cambios."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/es/floater_inventory.xml b/indra/newview/skins/default/xui/es/floater_inventory.xml
deleted file mode 100644
index 0f0ba2fce6..0000000000
--- a/indra/newview/skins/default/xui/es/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="MI INVENTARIO">
-	<floater.string name="Title">
-		MI INVENTARIO
-	</floater.string>
-	<floater.string name="TitleFetching">
-		MI INVENTARIO (obteniendo [ITEM_COUNT] ítems...) [FILTER]
-	</floater.string>
-	<floater.string name="TitleCompleted">
-		MI INVENTARIO ([ITEM_COUNT] ítems) [FILTER]
-	</floater.string>
-	<floater.string name="Fetched">
-		Obtenido
-	</floater.string>
-	<panel label="Panel del inventario" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_model_preview.xml b/indra/newview/skins/default/xui/es/floater_model_preview.xml
index ab3ba5aed7..e2313bce99 100644
--- a/indra/newview/skins/default/xui/es/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Triángulos" name="triangles" value="Triángulos"/>
 				<text initial_value="Vértices" name="vertices" value="Vértices"/>
 				<text initial_value="Alto" name="high_label" value="Alto"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Cargar desde archivo"/>
+					<item name="Generate" value="Generar"/>
+				</combo_box>
 				<button label="Buscar..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Límite de triángulo"/>
+					<item name="Error Threshold" value="Margen de error"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Medio" name="medium_label" value="Medio"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Cargar desde archivo"/>
+					<item name="Generate" value="Generar"/>
+					<item name="Use LoD above" value="Usar nivel de detalle superior"/>
+				</combo_box>
 				<button label="Buscar..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Límite de triángulo"/>
+					<item name="Error Threshold" value="Margen de error"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Bajo" name="low_label" value="Bajo"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Cargar desde archivo"/>
+					<item name="Generate" value="Generar"/>
+					<item name="Use LoD above" value="Usar nivel de detalle superior"/>
+				</combo_box>
 				<button label="Buscar..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Límite de triángulo"/>
+					<item name="Error Threshold" value="Margen de error"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="Mínimo" name="lowest_label" value="Mínimo"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Cargar desde archivo"/>
+					<item name="Generate" value="Generar"/>
+					<item name="Use LoD above" value="Usar nivel de detalle superior"/>
+				</combo_box>
 				<button label="Buscar..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Límite de triángulo"/>
+					<item name="Error Threshold" value="Margen de error"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Generar normales" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/es/floater_nearby_chat.xml b/indra/newview/skins/default/xui/es/floater_nearby_chat.xml
deleted file mode 100644
index b3b8cdcfff..0000000000
--- a/indra/newview/skins/default/xui/es/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT">
-	<check_box label="Traducir chat" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml
new file mode 100644
index 0000000000..e3ee0563d2
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Personajes de pathfinding">
+	<floater.string name="messaging_get_inprogress">
+		Consultando los personajes de pathfinding...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Se ha detectado un error al consultar los personajes de pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		No hay personajes de pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] personajes seleccionados de [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		En esta región no está permitido el pathfinding.
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Cargando]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Desconocido]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[grupo]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nombre" name="name"/>
+			<scroll_list.columns label="Descripción" name="description"/>
+			<scroll_list.columns label="Propietario" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="Altitud" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Personajes:
+		</text>
+		<button label="Actualizar la lista" name="refresh_objects_list"/>
+		<button label="Seleccionar todo" name="select_all_objects"/>
+		<button label="No seleccionar ninguno" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Acciones en los personajes seleccionados:
+		</text>
+		<check_box label="Mostrar baliza" name="show_beacon"/>
+		<check_box label="Mostrar la cápsula de física" name="show_physics_capsule"/>
+		<button label="Tomar" name="take_objects"/>
+		<button label="Tomar una copia" name="take_copy_objects"/>
+		<button label="Teleportarme a él" name="teleport_me_to_object" tool_tip="Se habilita solo cuando está seleccionado un personaje."/>
+		<button label="Devolver" name="return_objects"/>
+		<button label="Eliminar" name="delete_objects"/>
+	</panel>
+</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
new file mode 100644
index 0000000000..e93ecc9e10
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Vista/prueba de pathfinding">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		No se encuentra la implementación de la biblioteca de localización de rutas.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		En esta región no está permitido el pathfinding.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		Esperando a que termine la carga de la región.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Comprobando el estado del navmesh.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Descargando el navmesh.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		El navmesh se ha modificado en el servidor. Descargando el último navmesh.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		Se ha descargado el último navmesh.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		No se puede descargar el navmesh correctamente.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		El navmesh tiene cambios pendientes.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		El navmesh se está construyendo.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		Algunas regiones del navmesh tienen cambios pendientes.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		Algunas regiones del navmesh se están construyendo.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		Algunas regiones del navmesh tienen cambios pendientes y otras se están construyendo.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		El navmesh está actualizado.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		No se encuentra la implementación de la biblioteca de localización de rutas.
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		En esta región no está permitido el pathfinding.
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Elige los puntos inicial y final.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Elige el punto inicial.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Elige el punto final.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		La ruta se muestra de color naranja.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		No se encuentra una ruta entre los puntos seleccionados.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Error durante la generación de la ruta.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Vista" name="view_panel">
+			<text name="show_label">
+				Mostrar:
+			</text>
+			<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">
+				Mostrar el mapa de transitabilidad:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="No mostrar" name="show_heatmap_mode_none"/>
+				<combo_box.item label="Personaje de tipo A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="Personaje de tipo B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="Personaje de tipo C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="Personaje de tipo D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Objetos transitables" name="show_walkables"/>
+			<check_box label="Volúmenes materiales" name="show_material_volumes"/>
+			<check_box label="Obstáculos estáticos" name="show_static_obstacles"/>
+			<check_box label="Volúmenes de exclusión" name="show_exclusion_volumes"/>
+			<check_box label="Plano de agua" name="show_water_plane"/>
+			<check_box label="Con visión de rayos X" name="show_xray"/>
+		</panel>
+		<panel label="Probar ruta" name="test_panel">
+			<text name="ctrl_click_label">
+				Ctrl-clic para seleccionar el punto inicial.
+			</text>
+			<text name="shift_click_label">
+				Mayús-clic para seleccionar el punto final.
+			</text>
+			<text name="character_width_label">
+				Ancho del personaje
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				Tipo de personaje
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Ninguno" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Borrar ruta" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml
new file mode 100644
index 0000000000..266e8138c9
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Linksets de pathfinding">
+	<floater.string name="messaging_get_inprogress">
+		Consultando los linksets de pathfinding...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Se ha detectado un error al consultar los linksets de pathfinding.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Modificando los linksets de pathfinding seleccionados...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Se ha detectado un error al modificar los linksets de pathfinding seleccionados.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		No hay linksets de pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] linksets seleccionados de [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		En esta región no está permitido el pathfinding.
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terreno]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Cargando]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Desconocido]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[grupo]
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Objeto transitable
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Obstáculo estático
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Obstáculo móvil
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Volumen material
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Volumen de exclusión
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Inmaterial móvil
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[no modificable]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[restringido]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[cóncavo]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[restringido,cóncavo]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Elegir la utilización del linkset...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Filtrar por utilización de linkset..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Objeto transitable" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Obstáculo estático" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Obstáculo móvil" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Volumen material" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Volumen de exclusión" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Inmaterial móvil" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Aplicar" name="apply_filters"/>
+		<button label="Limpiar" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nombre (prim raíz)" name="name"/>
+			<scroll_list.columns label="Descripción (prim raíz)" name="description"/>
+			<scroll_list.columns label="Propietario" name="owner"/>
+			<scroll_list.columns label="Impacto" name="land_impact"/>
+			<scroll_list.columns label="Distancia" name="dist_from_you"/>
+			<scroll_list.columns label="Utilización de linkset" name="linkset_use"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Linksets:
+		</text>
+		<button label="Actualizar la lista" name="refresh_objects_list"/>
+		<button label="Seleccionar todo" name="select_all_objects"/>
+		<button label="No seleccionar ninguno" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="Mostrar baliza" name="show_beacon"/>
+		<button label="Tomar" name="take_objects"/>
+		<button label="Tomar una copia" name="take_copy_objects"/>
+		<button label="Teleportarme a él" name="teleport_me_to_object"/>
+		<button label="Devolver" name="return_objects"/>
+		<button label="Eliminar" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Transitabilidad:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="Transitabilidad de los personajes de tipo A. El tipo del personaje del ejemplo es humanoide."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="Transitabilidad de los personajes de tipo B. El tipo del personaje del ejemplo es criatura."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="Transitabilidad de los personajes de tipo C. El tipo del personaje del ejemplo es mecánico."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="Transitabilidad de los personajes de tipo D. El tipo del personaje del ejemplo es otro."/>
+		<button label="Aplicar cambios" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Humanoide)
+		</text>
+		<text name="suggested_use_b_label">
+			(Criatura)
+		</text>
+		<text name="suggested_use_c_label">
+			(Mecánico)
+		</text>
+		<text name="suggested_use_d_label">
+			(Otro)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_postcard.xml b/indra/newview/skins/default/xui/es/floater_postcard.xml
deleted file mode 100644
index b5b9805fe2..0000000000
--- a/indra/newview/skins/default/xui/es/floater_postcard.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="FOTO POR CORREO">
-	<text name="to_label">
-		Correo del destinatario:
-	</text>	
-	<text name="from_label">
-		Su correo:
-	</text>	
-	<text name="name_label">
-		Su nombre:
-	</text>	
-	<text name="subject_label">
-		Asunto:
-	</text>
-	<line_editor label="Escriba aquí el asunto." name="subject_form"/>
-	<text name="msg_label">
-		Mensaje:
-	</text>
-	<text_editor name="msg_form">
-		Escriba aquí el mensaje.
-	</text_editor>
-	<text name="fine_print">
-		Si su destinatario se registra en [SECOND_LIFE],
-usted conseguirá un bono de referido.
-	</text>
-	<button label="Cancelar" name="cancel_btn"/>
-	<button label="Enviar" name="send_btn"/>
-	<string name="default_subject">
-		Postal desde [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		¡Mira esto!
-	</string>
-	<string name="upload_message">
-		Enviando...
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_spellcheck.xml b/indra/newview/skins/default/xui/es/floater_spellcheck.xml
new file mode 100644
index 0000000000..b664b96928
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Configuración del corrector ortográfico">
+	<check_box label="Habilitar la revisión ortográfica" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Diccionario principal:
+	</text>
+	<text label="Registros:" name="spellcheck_additional">
+		Diccionarios adicionales:
+	</text>
+	<text name="spellcheck_available">
+		Disponibles
+	</text>
+	<text name="spellcheck_active">
+		Activos
+	</text>
+	<button label="Eliminar" name="spellcheck_remove_btn"/>
+	<button label="Importar..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml
new file mode 100644
index 0000000000..bd86ed00da
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Importar diccionario">
+	<button label="Examinar" label_selected="Examinar" name="dictionary_path_browse"/>
+	<button label="Importar" name="ok_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_stats.xml b/indra/newview/skins/default/xui/es/floater_stats.xml
index d53ae88126..00601920f2 100644
--- a/indra/newview/skins/default/xui/es/floater_stats.xml
+++ b/indra/newview/skins/default/xui/es/floater_stats.xml
@@ -47,6 +47,12 @@
 					<stat_bar label="Objetos con bajo nivel de detalle" name="physicslodtasks"/>
 					<stat_bar label="Memoria asignada" name="physicsmemoryallocated"/>
 				</stat_view>
+				<stat_bar label="Scripts ejecutados" name="simpctscriptsrun"/>
+				<stat_view label="Pathfinding" name="simpathfinding">
+					<stat_bar label="Tiempo de paso de IA" name="simsimaistepmsec"/>
+					<stat_bar label="Pasos de silueta omitidos" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Personajes actualizados" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_view label="Tiempo (ms)" name="simperf">
 					<stat_bar label="Tiempo total de los frames" name="simframemsec"/>
 					<stat_bar label="Tiempo de red" name="simnetmsec"/>
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 1e566e3e31..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,6 +20,8 @@
 	<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="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"/>
 	<button label="Añadir" label_selected="Añadir" name="l_add_btn"/>
@@ -31,5 +33,4 @@
 	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
-	<check_box initial_value="true" label="Aplicarlo ahora" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 650b4b457d..15462c3726 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -128,6 +128,12 @@
 			<panel.string name="text modify info 4">
 				No puedes modificar estos objetos
 			</panel.string>
+			<panel.string name="text modify info 5">
+				No se puede modificar este objeto a través del límite de una región
+			</panel.string>
+			<panel.string name="text modify info 6">
+				No se pueden modificar estos objetos a través del límite de una región
+			</panel.string>
 			<panel.string name="text modify warning">
 				Para configurar los permisos, debes seleccionar el objeto completo
 			</panel.string>
@@ -177,12 +183,12 @@
 				<combo_box.item label="Zoom" name="Zoom"/>
 			</combo_box>
 			<check_box label="En venta:" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Copia" name="Copy"/>
 				<combo_box.item label="Contenidos" name="Contents"/>
 				<combo_box.item label="Original" name="Original"/>
 			</combo_box>
-			<spinner label="Precio: L$" name="Edit Cost"/>
 			<check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Dejar que la gente vea este objeto en los resultados de la búsqueda"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -218,6 +224,11 @@
 					F:
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Atributos de pathfinding:
+				</text>
+			</panel>
 		</panel>
 		<panel label="Objeto" name="Object">
 			<check_box label="Bloqueado" name="checkbox locked" tool_tip="Previene que el objeto sea movido o borrado. Suele ser útil mientras se construye, para prevenir que se modifique sin querer."/>
diff --git a/indra/newview/skins/default/xui/es/floater_top_objects.xml b/indra/newview/skins/default/xui/es/floater_top_objects.xml
index 033633bd22..bb53f116c2 100644
--- a/indra/newview/skins/default/xui/es/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/es/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		Tiempo
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Tiempo en Mono
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		Objetos que colisionan
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Nombre" name="name"/>
 		<scroll_list.columns label="Propietario" name="owner"/>
 		<scroll_list.columns label="Posición" name="location"/>
+		<scroll_list.columns label="Parcela" name="parcel"/>
 		<scroll_list.columns label="Tiempo" name="time"/>
-		<scroll_list.columns label="Tiempo en Mono" name="mono_time"/>
 		<scroll_list.columns label="URLs" name="URLs"/>
+		<scroll_list.columns label="Memoria (KB)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		ID del objeto:
@@ -48,6 +46,10 @@
 		Propietario:
 	</text>
 	<button label="Filtro" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		Parcela:
+	</text>
+	<button label="Filtro" name="filter_parcel_btn"/>
 	<button label="Actualizar" name="refresh_btn"/>
 	<button label="Devolver lo seleccionado" name="return_selected_btn" width="170"/>
 	<button label="Devolver todo" left="190" name="return_all_btn"/>
diff --git a/indra/newview/skins/default/xui/es/menu_bottomtray.xml b/indra/newview/skins/default/xui/es/menu_bottomtray.xml
deleted file mode 100644
index 40058a1749..0000000000
--- a/indra/newview/skins/default/xui/es/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Botón Hablar" name="EnableVoiceChat"/>
-	<menu_item_check label="Botón Gestos" name="ShowGestureButton"/>
-	<menu_item_check label="Botón Moverse" name="ShowMoveButton"/>
-	<menu_item_check label="Botón Vista" name="ShowCameraButton"/>
-	<menu_item_check label="Botón Foto" name="ShowSnapshotButton"/>
-	<menu_item_check label="Botón Construir" name="ShowBuildButton"/>
-	<menu_item_check label="Botón Buscar" name="ShowSearchButton"/>
-	<menu_item_check label="Botón Mapa" name="ShowWorldMapButton"/>
-	<menu_item_check label="Botón Minimapa" name="ShowMiniMapButton"/>
-	<menu_item_call label="Cortar" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Copiar" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Pegar" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Borrar" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Seleccionar todo" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_mode_change.xml b/indra/newview/skins/default/xui/es/menu_mode_change.xml
deleted file mode 100644
index 608505d192..0000000000
--- a/indra/newview/skins/default/xui/es/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Básico" name="BasicMode"/>
-	<menu_item_check label="Avanzado" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_object.xml b/indra/newview/skins/default/xui/es/menu_object.xml
index d8c75eaf47..33ea8c88d8 100644
--- a/indra/newview/skins/default/xui/es/menu_object.xml
+++ b/indra/newview/skins/default/xui/es/menu_object.xml
@@ -5,6 +5,8 @@
 	</menu_item_call>
 	<menu_item_call label="Editar" name="Edit..."/>
 	<menu_item_call label="Construir" name="Build"/>
+	<menu_item_call label="Mostrar en linksets" name="show_in_linksets"/>
+	<menu_item_call label="Mostrar en personajes" name="show_in_characters"/>
 	<menu_item_call label="Abrir" name="Open"/>
 	<menu_item_call label="Sentarme aquí" name="Object Sit"/>
 	<menu_item_call label="Levantarme" name="Object Stand Up"/>
diff --git a/indra/newview/skins/default/xui/es/menu_text_editor.xml b/indra/newview/skins/default/xui/es/menu_text_editor.xml
index 095e461734..6253463725 100644
--- a/indra/newview/skins/default/xui/es/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/es/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(desconocido)" name="Suggestion 1"/>
+	<menu_item_call label="(desconocido)" name="Suggestion 2"/>
+	<menu_item_call label="(desconocido)" name="Suggestion 3"/>
+	<menu_item_call label="(desconocido)" name="Suggestion 4"/>
+	<menu_item_call label="(desconocido)" name="Suggestion 5"/>
+	<menu_item_call label="Añadir al diccionario" name="Add to Dictionary"/>
+	<menu_item_call label="Añadir a ignorados" name="Add to Ignore"/>
 	<menu_item_call label="Cortar" name="Cut"/>
 	<menu_item_call label="Copiar" name="Copy"/>
 	<menu_item_call label="Pegar" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 740bd35cbb..d80150ef6d 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -27,6 +27,7 @@
 		<menu_item_call label="Preferencias..." name="Preferences"/>
 		<menu_item_call label="Botones de la barra de herramientas..." name="Toolbars"/>
 		<menu_item_call label="Ocultar todos los controles" name="Hide UI"/>
+		<menu_item_check label="Mostrar los HUD anexados" name="Show HUD Attachments"/>
 		<menu_item_call label="Salir de [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicarme" name="Communicate">
@@ -38,6 +39,7 @@
 		<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">
 		<menu_item_call label="Crear un hito de este sitio" name="Create Landmark Here"/>
@@ -123,6 +125,11 @@
 			<menu_item_call label="Definir los scripts a ejecutar" name="Set Scripts to Running"/>
 			<menu_item_call label="Configurar scripts como no ejecutándose" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Pathfinding" name="Pathfinding">
+			<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>
 		<menu label="Opciones" name="Options">
 			<menu_item_check label="Mostrar los permisos avanzados" name="DebugPermissions"/>
 			<menu_item_check label="Seleccionar sólo mis objetos" name="Select Only My Objects"/>
@@ -173,7 +180,6 @@
 			<menu_item_check label="Ocultar las partículas" name="Hide Particles"/>
 			<menu_item_check label="Ocultar lo seleccionado" name="Hide Selected"/>
 			<menu_item_check label="Realzar las transparencias" name="Highlight Transparent"/>
-			<menu_item_check label="Mostrar los HUD anexados" name="Show HUD Attachments"/>
 			<menu_item_check label="Mostrar el Punto de Mira en la vista subjetiva" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Objetos representados" name="Rendering Types">
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index b298f6d050..991a079be5 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -364,6 +370,12 @@ Necesitas una cuenta para acceder a [SECOND_LIFE]. ¿Te gustaría crear una ahor
 	<notification name="InvalidCredentialFormat">
 		Escribe el nombre de usuario o el nombre y el apellido de tu avatar en el campo Nombre de usuario e inicia sesión otra vez.
 	</notification>
+	<notification name="InvalidGrid">
+		&apos;[GRID]&apos; no es un identificador de cuadrícula válido.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		Tu localización inicial no especifica una cuadrícula válida.
+	</notification>
 	<notification name="DeleteClassified">
 		¿Borrar el clasificado &apos;[NAME]&apos;?
 No se reembolsan las cuotas pagadas.
@@ -467,8 +479,8 @@ El objeto debe de haber sido borrado o estar fuera de rango (&apos;out of range&
 		Al guardar un script compilado, hubo un problema por: [REASON]. Por favor, vuelve a intentar guardarlo más tarde..
 	</notification>
 	<notification name="StartRegionEmpty">
-		Perdón, no está definida tu Posición inicial.
-Por favor, escribe el nombre de la región en el cajetín de Posición inicial, o elige para esa posición Mi Base o Mi última posición.
+		No está definida tu región inicial.
+Por favor, escribe el nombre de la región en el cuadro de Posición inicial o elige para esa posición Mi Base o Mi última posición.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -599,6 +611,9 @@ todos los objetos.
 
 Por favor, asegúrate de que no hay ninguno bloqueado, y de que eres el propietario de todos.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		No se pueden vincular objetos a través de límites de región.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Imposible enlazarlos, porque hay objetos de distintos propietarios.
 
@@ -980,6 +995,41 @@ no tienes el permiso de comprar terreno para el grupo que tienes activado actual
 			<button name="Cancel" text="Cancelar"/>
 		</form>
 	</notification>
+	<notification label="Añadir lista de reemplazo automático" name="AddAutoReplaceList">
+		Nombre de la nueva lista:
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="Cambiar nombre de la lista de reemplazo automático" name="RenameAutoReplaceList">
+		El nombre &apos;[DUPNAME]&apos; ya se está utilizando.
+    Escribe un nombre nuevo que sea único:
+		<form name="form">
+			<button name="ReplaceList" text="Reemplazar la lista actual"/>
+			<button name="SetName" text="Usar un nombre nuevo"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		La palabra clave debe ser una palabra única y el reemplazo no puede estar vacío.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		La lista de reemplazo no es válida.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Debes especificar un archivo, un nombre y un idioma.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		El diccionario [DIC_NAME] aparentemente no contiene un archivo &quot;aff&quot;, lo cual significa que es un diccionario &quot;secundario&quot;.
+Puedes utilizarlo como un diccionario adicional, pero no como el diccionario principal.
+
+Consulta https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		No se puede copiar
+    [FROM_NAME]
+    a
+    [TO_NAME]
+	</notification>
 	<notification label="Guardar el vestuario" name="SaveOutfitAs">
 		Guardar como un nuevo vestuario lo que estoy llevando:
 		<form name="form">
@@ -1702,83 +1752,128 @@ Se cambiarán miles de regiones, y se provocará un colapso en el espacio del se
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		No estás autorizado en esa región por su nivel de calificación. Puede deberse a que no hay información validada de tu edad.
-
-Por favor, comprueba que tienes instalado el último visor, y dirígete a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación.
+		Tus preferencias de contenido actuales te impiden visitar la región que has seleccionado.  Puedes cambiar las preferencias en Yo &gt; Preferencias &gt; General.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		No estás autorizado en esa región por su nivel de calificación. 
-
-¿Quieres ir a la Base de Conocimientos para aprender más sobre el nivel de calificación?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], que solo es accesible para los adultos.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/es
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="No puedo entrar a esta región dado el nivel de calificación" name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
+		<usetemplate ignoretext="Paso a otra región: la región que intentas visitar tiene un contenido solo accesible para los adultos." name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		No estás autorizado en esa región por su nivel de calificación.
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos.
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], que solo es accesible para los adultos.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		No estás autorizado en esta región por tus preferencias sobre el nivel de calificación.
-
-Para entrar en la región que deseas, cambia tu preferencia de nivel de calificación. Esto te permitirá buscar contenidos [REGIONMATURITY] y tener acceso a ellos. Para deshacer los cambios, elige Yo &gt; Preferencias &gt; General.
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos. Podemos cambiar tus preferencias o tú puedes cancelar la visita. Después de cambiar tus preferencias, intenta otra vez acceder a la región.
 		<form name="form">
-			<button name="OK" text="Cambiar las preferencias"/>
-			<button default="true" name="Cancel" text="Cerrar"/>
-			<ignore name="ignore" text="Mis preferencias sobre nivel de calificación me impiden entrar a esta región"/>
+			<button name="OK" text="Cambiar preferencias"/>
+			<button default="true" name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Paso a otra región: tus preferencias de contenido no te permiten visitar la región que has seleccionado."/>
 		</form>
 	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		Estamos experimentando dificultades técnicas con el teleporte porque tus preferencias no están sincronizadas con el servidor.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		Tus preferencias de contenido actuales te impiden visitar la región que has seleccionado. Puedes cambiar las preferencias en Yo &gt; Preferencias &gt; General.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], que solo es accesible para los adultos.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+		</url>
+		<usetemplate ignoretext="Teleportarme: la región que intentas visitar tiene un contenido solo accesible para los adultos." name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], que solo es accesible para los adultos.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos. Podemos cambiar tus preferencias y proceder a teleportarte o bien tú puedes cancelar el teleporte.
+		<form name="form">
+			<button name="OK" text="Cambiar y continuar"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Teleportar (reiniciable): tus preferencias de contenido no te permiten visitar la región que has seleccionado."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		La región que intentas visitar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos. Puedes cambiar tus preferencias o bien cancelar el teleporte. Después de cambiar tus preferencias, intenta teleportarte otra vez.
+		<form name="form">
+			<button name="OK" text="Cambiar preferencias"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Teleportar (no reiniciable): tus preferencias de contenido no te permiten visitar la región que has seleccionado."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		Estamos experimentando dificultades técnicas con el teleporte porque tus preferencias no están sincronizadas con el servidor.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		Tu preferencia de nivel de calificación actual es [RATING].
+		No recibirás más notificaciones cuando vayas a visitar una región con un contenido [RATING]. En el futuro, puedes cambiar tus preferencias de contenido en Yo &gt; Preferencias &gt; General en la barra de menús.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		En este momento no se pueden cambiar tus preferencias para ver el contenido [PREFERRED_MATURITY].  Tus preferencias se han restablecido para que puedas ver el contenido [ACTUAL_MATURITY]. Si deseas cambiar las preferencias otra vez, en la barra de menús, selecciona Yo &gt; Preferencias &gt; General.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		No puedes reclamar este terreno por su nivel de calificación. Puede deberse a que no hay información validada de tu edad.
-
-Por favor, comprueba que tienes instalado el último visor, y dirígete a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación.
+		Tus preferencias actuales de calificación de contenido te impiden reclamar el terreno que has seleccionado. Puedes cambiar las preferencias en Yo &gt; Preferencias &gt; General.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		No puedes reclamar este terreno por su nivel de calificación. 
-
-¿Quieres ir a la Base de Conocimientos para más información sobre el nivel de calificación?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		Solo los adultos pueden reclamar este terreno.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/es
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="No puedo reclamar este terreno dado el nivel de calificación" name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
+		<usetemplate ignoretext="Solo los adultos pueden reclamar este terreno." name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		No puedes reclamar este terreno debido a su nivel de calificación.
+		El terreno que intentas reclamar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos.
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		El terreno que intentas reclamar tiene un contenido [REGIONMATURITY], que solo es accesible para los adultos.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		No puedes reclamar este terreno por tus preferencias sobre el nivel de calificación.
-
-Puedes pulsar &apos;Cambiar las Preferencias&apos; para incrementar las preferencias del nivel de calificación y, así, poder entrar. En adelante, podrás buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quieres deshacer este cambio, ve a Yo &gt; Preferencias &gt; General.
-		<usetemplate ignoretext="Mis preferencias sobre el nivel de calificación me impiden reclamar este terreno" name="okcancelignore" notext="Cerrar" yestext="Cambiar preferencia"/>
+		El terreno que intentas reclamar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos. Podemos cambiar tus preferencias y después puedes volver a intentar reclamar el terreno.
+		<form name="form">
+			<button name="OK" text="Cambiar preferencias"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Tus preferencias de contenido no te permiten reclamar el terreno que has seleccionado."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		No puedes comprar este terreno por su nivel de calificación. Puede deberse a que no hay información validada de tu edad.
-
-Por favor, comprueba que tienes instalado el último visor, y dirígete a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación.
+		Tus preferencias actuales de calificación de contenido te impiden comprar el terreno que has seleccionado. Puedes cambiar las preferencias en Yo &gt; Preferencias &gt; General.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		No puedes comprar este terreno por tus preferencias de nivel de calificación. 
-
-¿Quieres ir a la Base de Conocimientos para más información sobre el nivel de calificación?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Solo los adultos pueden comprar este terreno.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/es
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="No puedo comprar este terreno dado el nivel de calificación" name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
+		<usetemplate ignoretext="Solo los adultos pueden comprar este terreno." name="okcancelignore" notext="Cerrar" yestext="Ir a la Base de Conocimientos"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		No puedes comprar este terreno por su nivel de calificación.
+		El terreno que intentas comprar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos.
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		El terreno que intentas comprar tiene un contenido [REGIONMATURITY], que solo es accesible para los adultos.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		No puedes comprar este terreno por tus preferencias sobre el nivel de calificación.
-
-Puedes pulsar &apos;Cambiar las Preferencias&apos; para incrementar las preferencias del nivel de calificación y, así, poder entrar. En adelante, podrás buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quieres deshacer este cambio, ve a Yo &gt; Preferencias &gt; General.
-		<usetemplate ignoretext="Mis preferencias sobre el nivel de calificación me impiden comprar el terreno" name="okcancelignore" notext="Cerrar" yestext="Cambiar preferencia"/>
+		El terreno que intentas comprar tiene un contenido [REGIONMATURITY], pero tus preferencias actuales no te autorizan a ver este tipo de contenidos. Podemos cambiar tus preferencias y después puedes volver a intentar comprar el terreno.
+		<form name="form">
+			<button name="OK" text="Cambiar preferencias"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Tus preferencias de contenido no te permiten comprar el terreno que has seleccionado."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Hay demasiados prims seleccionados.  Por favor, selecciona [MAX_PRIM_COUNT] o menos y vuelve a intentarlo
@@ -1833,10 +1928,9 @@ Puedes pulsar &apos;Cambiar las Preferencias&apos; para incrementar las preferen
 		</form>
 	</notification>
 	<notification label="Cambiada la calificación de la región" name="RegionMaturityChange">
-		Se ha actualizado el nivel de calificación de esta región.
+		Se ha cambiando el nivel de calificación de esta región.
 Puede que lleve algún tiempo hasta que el cambio se vea reflejado en el mapa.
-
-Para entrar a regiones Adultas, los Residentes deben haber verificado su cuenta, bien verificando la edad o bien verificando una forma de pago.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="Desajuste en la versión de voz" name="VoiceVersionMismatch">
 		Esta versión de [APP_NAME] no es compatible con la prestación de voz de esta región. Para que el chat de voz funcione correctamente debes actualizar [APP_NAME].
@@ -2125,14 +2219,11 @@ Publícala en una página web para que otros puedan acceder fácilmente a esta p
 		<usetemplate ignoretext="Ponerme la ropa que estoy creando mientras modifico mi apariencia" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Para acceder al contenido Adulto y los lugares de Second Life con dicho carácter, debes tener por lo menos 18 años. Visita la página de verificación de edad para confirmar que tienes más de 18 años. 
-Al hacerlo se iniciará el navegador web.
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="No he verificado mi edad" name="okcancelignore" notext="Cancelar" yestext="Ir a Verificación de la edad"/>
+		El lugar que intentas visitar tiene el acceso restringido a los Residentes mayores de 18 años.
+		<usetemplate ignoretext="No tengo la edad suficiente para visitar áreas restringidas por edad." name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		Localización restringida para mayores de 18 años.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Para visitar este sitio debes haber aportado información de pago en tu cuenta.  ¿Quieres ir al sitio web de [SECOND_LIFE] y configurar esto?
@@ -2393,6 +2484,23 @@ Aquí no puedes volar.
 	<notification name="NoBuild">
 		Este terreno tiene desactivado el poder construir. Aquí no puedes ni construir ni crear objetos.
 	</notification>
+	<notification name="PathfindingDirty">
+		La región contiene cambios de pathfinding pendientes.  Si tienes derechos de construcción, puedes recargarla pulsando el botón “Recargar región”.
+	</notification>
+	<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"/>
+	</notification>
 	<notification name="SeeAvatars">
 		Esta parcela oculta los avatares y el chat de texto de otras parcelas. No podrás ver a los residentes que estén fuera la parcela ni ellos podrán verte a ti. El chat de texto regular del canal 0 también está bloqueado.
 	</notification>
@@ -2411,9 +2519,7 @@ Los scripts no funcionan aquí, excepto los pertenecientes al propietario del te
 		Sólo puedes reclamar terreno público de la región en que estás.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		No estás autorizado en esa región por su nivel de calificación. Debes validar tu edad y/o instalar el último visor.
-
-Por favor, dirígete a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación.
+		Tus preferencias de contenido actuales te impiden visitar la región que has seleccionado. Puedes cambiar las preferencias en Yo &gt; Preferencias &gt; General.
 	</notification>
 	<notification name="URBannedFromRegion">
 		Se te ha prohibido el acceso a la región.
@@ -2424,11 +2530,11 @@ Por favor, dirígete a la Base de Conocimientos para más detalles sobre el acce
 	<notification name="ImproperPaymentStatus">
 		No tienes el estado de pago adecuado para entrar a esta región.
 	</notification>
-	<notification name="MustGetAgeRgion">
-		Debes tener verificada la edad para entrar a esta región
+	<notification name="MustGetAgeRegion">
+		Solo pueden acceder a esta región los mayores de 18 años.
 	</notification>
 	<notification name="MustGetAgeParcel">
-		Debes haber verificado tu edad para entrar a esta parcela.
+		Para acceder a esta parcela debes ser mayor de 18 años.
 	</notification>
 	<notification name="NoDestRegion">
 		No se ha encontrada la región de destino.
@@ -2528,14 +2634,35 @@ Por favor, vuelve a intentarlo en unos momentos.
 		</form>
 	</notification>
 	<notification name="TeleportOffered">
-		[NAME_SLURL] te ha ofrecido teleportarte a su posición:
+		[NAME_SLURL] te ofrece teleportarte a su localización:
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Teleportar"/>
 			<button name="Cancel" text="Cancelar"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] te ofrece teleportarte a su localización:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Esta región tiene un contenido [REGION_CONTENT_MATURITY, pero tus preferencias actuales no te autorizan a ver los contenidos [REGION_CONTENT_MATURITY].  Podemos cambiar tus preferencias y proceder a teleportarte o bien tú puedes cancelar el teleporte.
+		<form name="form">
+			<button name="Teleport" text="Cambiar y continuar"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] te ofrece teleportarte a su localización:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+No obstante, el contenido de esta región solo es accesible para los adultos.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Teleporte ofrecido a [TO_NAME]
 	</notification>
@@ -2932,6 +3059,10 @@ Has actualizado una textura obtenida mediante bake de [RESOLUTION] para &apos;[B
 		( [EXISTENCE] segundos con vida )
 Has actualizado de manera local una textura obtenida mediante bake de [RESOLUTION] para &apos;[BODYREGION]&apos; después de [TIME] segundos.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		No se puede mostrar una vista previa de esta textura porque es de tipo &apos;no copiable&apos; y/o &apos;no transferible&apos;.
+		<usetemplate ignoretext="Advertirme si el modo Vista previa inmediata no está disponible para las texturas &apos;no copiable&apos; y/o &apos;no transferible&apos;" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		¿Estás seguro de que deseas salir de esta multiconferencia?
 		<usetemplate ignoretext="Confirma antes de salir de la llamada" name="okcancelignore" notext="No" yestext="Sí"/>
@@ -3100,6 +3231,23 @@ Al ocultar el botón Hablar se desactiva la función de voz.
 		Esta acción ocultará todos los botones y elementos de menú. Para restaurarlos, pulsa otra vez en [SHORTCUT].
 		<usetemplate ignoretext="Confirmar antes de ocultar la IU" name="okcancelignore" notext="Cancelar" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestricted">
+		Algunos de los linksets seleccionados no pueden configurarse como &apos;[REQUESTED_TYPE]&apos; debido a restricciones de los permisos del linkset. Estos linksets se configurarán como &apos;[RESTRICTED_TYPE]&apos;.
+		<usetemplate ignoretext="Algunos de los linksets seleccionados no pueden configurarse debido a restricciones de los permisos del linkset." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnVolume">
+		Algunos de los linksets seleccionados no pueden configurarse como &apos;[REQUESTED_TYPE]&apos; porque su forma no es convexa.
+		<usetemplate ignoretext="Algunos de los linksets seleccionados no pueden configurarse porque su forma no es convexa." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestrictedAndVolume">
+		Algunos de los linksets seleccionados no pueden configurarse como &apos;[REQUESTED_TYPE]&apos; debido a restricciones de los permisos del linkset. Estos linksets se configurarán como &apos;[RESTRICTED_TYPE]&apos;.
+ Algunos de los linksets seleccionados no pueden configurarse como &apos;[REQUESTED_TYPE]&apos; porque su forma no es convexa. Los tipos de utilización de estos linksets no cambiarán.
+		<usetemplate ignoretext="Algunos de los linksets seleccionados no pueden configurarse debido a restricciones de los permisos del linkset y porque su forma no es convexa." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		El objeto que has seleccionado afecta al navmesh. Al cambiarlo a una Ruta flexible se eliminará del navmesh.
+		<usetemplate ignoretext="El objeto que has seleccionado afecta al navmesh. Al cambiarlo a una Ruta flexible se eliminará del navmesh." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Parece que no tienes el hardware apropiado para [APP_NAME]. [APP_NAME] requiere una tarjeta gráfica OpenGL que admita texturas múltiples (&apos;multitexture support&apos;). Si la tienes, comprueba que tienes los últimos &apos;drivers&apos; para tu tarjeta gráfica, así como los últimos parches y &apos;service packs&apos; para tu sistema operativo.
 
@@ -3136,4 +3284,12 @@ Desactivando futuras actualizaciones de este archivo.
 		Se ha intentado añadir un archivo de imagen [FNAME] no válido o ilegible, que no se puede abrir ni descodificar.
 Intento cancelado.
 	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		Vas a devolver [NUM_ITEMS] objetos. ¿Estás seguro de que deseas continuar?
+		<usetemplate ignoretext="¿Estás seguro de que quieres devolver varios objetos?" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		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>
 </notifications>
diff --git a/indra/newview/skins/default/xui/es/panel_bottomtray.xml b/indra/newview/skins/default/xui/es/panel_bottomtray.xml
deleted file mode 100644
index 2b1d017a2d..0000000000
--- a/indra/newview/skins/default/xui/es/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Activa/Desactiva el micrófono"/>
-	<string name="VoiceControlBtnToolTip" value="Muestra/Oculta el panel del control de voz"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Hablar" label_selected="Hablar" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Gestos" name="Gesture" tool_tip="Muestra/Oculta los gestos"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Moverme" name="movement_btn" tool_tip="Muestra/Oculta los controles del movimiento"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Visión" name="camera_btn" tool_tip="Muestra/Oculta los controles de la cámara"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="Hacer una foto"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Construir" name="build_btn" tool_tip="Muestra/Oculta las herramientas de construcción"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Buscar" name="search_btn" tool_tip="Muestra/Oculta la búsqueda"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Mapa" name="world_map_btn" tool_tip="Muestra/Oculta el mapa del mundo"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Minimapa" name="mini_map_btn" tool_tip="Muestra/Oculta el minimapa"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Conversaciones"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Notificaciones"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
index 0d877f78f2..319e9d0f1b 100644
--- a/indra/newview/skins/default/xui/es/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Alguno de los Residentes que has elegido ya están en el grupo: no se les enviará la invitación.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Las invitaciones al grupo no se han enviado: has seleccionado demasiados Residentes. Solo se permiten 100 invitaciones al grupo por solicitud.
+	</panel.string>
 	<text bottom_delta="-96" height="72" name="help_text" width="214">
 		Puedes elegir a varios Residentes para invitarles a tu grupo. Para empezar, pulsa &apos;Abrir el selector de residentes&apos;.
 	</text>
diff --git a/indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml
new file mode 100644
index 0000000000..96df844512
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_navmesh_rebake">
+	<button label="Recargar la región" name="navmesh_btn" tool_tip="Pulsa para recargar el navmesh de la región."/>
+	<button label="Solicitando recarga" name="navmesh_btn_sending" tool_tip="Enviando la solicitud de recarga al servidor."/>
+	<button label="La región se está recargando" name="navmesh_btn_baking" tool_tip="La región se está recargando.  Este botón desaparecerá cuando finalice la recarga."/>
+</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 aea9b9ce4a..b0b6114e88 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -29,5 +29,7 @@
 	<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="Configuración de la traducción del chat" name="ok_btn"/>
+	<button label="Traducción…" name="ok_btn"/>
+	<button label="Reemplazo automático..." name="autoreplace_showgui"/>
+	<button label="Revisión ortográfica..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml
index 64162220a6..f07f3d3951 100644
--- a/indra/newview/skins/default/xui/es/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_debug.xml
@@ -36,5 +36,5 @@
 	<button label="?" left="297" name="top_scripts_help"/>
 	<button label="Reiniciar la región" name="restart_btn" tool_tip="Cuenta atrás de 2 minutos y reiniciar la región"/>
 	<button label="?" name="restart_help"/>
-	<button label="Retrasar el reinicio" name="cancel_restart_btn" tool_tip="Retrasar una hora el reinicio de la región"/>
+	<button label="Cancelar reinicio" name="cancel_restart_btn" tool_tip="Retrasar una hora el reinicio de la región"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml
index 84c1ed7686..6089dfb8db 100644
--- a/indra/newview/skins/default/xui/es/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml
@@ -26,7 +26,7 @@
 		Permitir únicamente el acceso a los Residentes que:
 	</text>
 	<check_box label="Han aportado la información de pago." name="limit_payment" tool_tip="Para poder acceder a este estado los Residentes deben haber aportado información de pago en su cuenta. Para más información, ver [SUPPORT_SITE]."/>
-	<check_box label="Han verificado su edad" name="limit_age_verified" tool_tip="Para poder acceder a este estado los Residentes deben haber verificado su edad. Para más información, ver [SUPPORT_SITE]."/>
+	<check_box label="Son mayores de 18 años" name="limit_age_verified" tool_tip="Para poder acceder a este estado, los Residentes deben ser mayores de 18 años. Para más información, consulta [SUPPORT_SITE]."/>
 	<check_box label="Permitir el chat de voz" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Permitir el teleporte a cualquier punto" name="allow_direct_teleport"/>
diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml
deleted file mode 100644
index 047e8f2f30..0000000000
--- a/indra/newview/skins/default/xui/es/panel_region_texture.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Texturas del terreno" name="Textures">
-	<text name="region_text_lbl">
-		Región:
-	</text>
-	<text name="region_text">
-		desconocida
-	</text>
-	<text name="detail_texture_text" width="380">
-		Texturas del terreno (se requieren archivos .tga de 512x512 y 24 bites)
-	</text>
-	<text name="height_text_lbl">
-		1 (Baja)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (Alta)
-	</text>
-	<text name="height_text_lbl5">
-		Rangos de la elevación de la textura
-	</text>
-	<text name="height_text_lbl6">
-		Noroeste
-	</text>
-	<text name="height_text_lbl7">
-		Noreste
-	</text>
-	<text name="height_text_lbl8">
-		Suroeste
-	</text>
-	<text name="height_text_lbl9">
-		Sureste
-	</text>
-	<spinner label="Baja" name="height_start_spin_0"/>
-	<spinner label="Baja" name="height_start_spin_1"/>
-	<spinner label="Baja" name="height_start_spin_2"/>
-	<spinner label="Baja" name="height_start_spin_3"/>
-	<spinner label="Alta" name="height_range_spin_0"/>
-	<spinner label="Alta" name="height_range_spin_1"/>
-	<spinner label="Alta" name="height_range_spin_2"/>
-	<spinner label="Alta" name="height_range_spin_3"/>
-	<text name="height_text_lbl10">
-		Estos valores representan la gama de mezclas para las texturas superiores.
-	</text>
-	<text name="height_text_lbl11">
-		Midiendo en metros, el valor BAJA es la altura MÁXIMA de la textura #1, y el valor ALTA es la altura MÍNIMA de la textura #4.
-	</text>
-	<text name="height_text_lbl12">
-		y el valor ALTA es la altura MÍNIMA de la textura #4.
-	</text>
-	<button label="Aplicar" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_side_tray.xml b/indra/newview/skins/default/xui/es/panel_side_tray.xml
deleted file mode 100644
index cf5afb3cd1..0000000000
--- a/indra/newview/skins/default/xui/es/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Manejar la barra lateral." name="sidebar_openclose" tab_title="Barra lateral"/>
-	<sidetray_tab description="Inicio." name="sidebar_home" tab_title="Inicio">
-		<panel label="Inicio" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Edita tu perfil público y tus destacados." name="sidebar_me" tab_title="Mi perfil">
-		<panel_container name="panel_container">
-			<panel label="Yo" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Encuentra a tus amigos, contactos y gente que esté cerca." name="sidebar_people" tab_title="Gente">
-		<panel_container name="panel_container">
-			<panel label="Perfil del grupo" name="panel_group_info_sidetray"/>
-			<panel label="Residentes y objetos ignorados" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Encontrar lugares donde ir o que ya visitaste." label="Lugares" name="sidebar_places" tab_title="Lugares">
-		<panel label="Lugares" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Mira tu inventario." name="sidebar_inventory" tab_title="Mi inventario">
-		<panel label="Modificar el inventario" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Cambia tu apariencia y tu &apos;look&apos; actual." name="sidebar_appearance" tab_title="Mi apariencia">
-		<panel label="Modificar la apariencia" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
index ef7c6781be..176247f90e 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(desconocidas)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(desconocido/múltiple)
+	</panel.string>
 	<panel.string name="public">
 		(público)
 	</panel.string>
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 bd814ecc66..9da2958953 100644
--- a/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/es/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		No puedes modificar estos objetos
 	</panel.string>
+	<panel.string name="text modify info 5">
+		No se puede modificar este objeto a través del límite de una región
+	</panel.string>
+	<panel.string name="text modify info 6">
+		No se pueden modificar estos objetos a través del límite de una región
+	</panel.string>
 	<panel.string name="text modify warning">
 		Este objeto tiene partes enlazadas
 	</panel.string>
@@ -95,6 +101,9 @@
 		</combo_box>
 		<spinner label="Precio: L$" name="Edit Cost"/>
 		<check_box label="Mostrar en la búsqueda" name="search_check" tool_tip="Permitir que la gente vea este objeto en los resultados de la búsqueda"/>
+		<text name="pathfinding_attributes_label">
+			Atributos de pathfinding:
+		</text>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index adc32ba168..d4698b8cb3 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -988,6 +988,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="script_files">
 		Scripts
 	</string>
+	<string name="dictionary_files">
+		Diccionarios
+	</string>
 	<string name="AvatarSetNotAway">
 		Salir del estado ausente
 	</string>
@@ -3780,6 +3783,12 @@ Si sigues recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	<string name="LocationCtrlSeeAVsTooltip">
 		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.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		Esta región no tiene activado el pathfinding dinámico.
+	</string>
 	<string name="UpdaterWindowTitle">
 		Actualizar [APP_NAME]
 	</string>
@@ -4913,6 +4922,21 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="Normal">
 		Normal
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Ninguno
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Afecta al navmesh
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Personaje
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(Múltiple)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Muy bajo
 	</string>
@@ -4928,4 +4952,10 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="snapshot_quality_very_high">
 		Muy alto
 	</string>
+	<string name="TeleportMaturityExceeded">
+		El Residente no puede visitar esta región.
+	</string>
+	<string name="UserDictionary">
+		[Usuario]
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml
index a23d9c43d0..94975a83f8 100644
--- a/indra/newview/skins/default/xui/es/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/es/teleport_strings.xml
@@ -44,6 +44,9 @@ Para repetir el tutorial, visita la isla de bienvenida pública.
 		<message name="no_inventory_host">
 			En estos momentos no está disponible el sistema del inventario.
 		</message>
+		<message name="MustGetAgeRegion">
+			Solo pueden acceder a esta región los mayores de 18 años.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -79,5 +82,8 @@ Para repetir el tutorial, visita la isla de bienvenida pública.
 		<message name="requesting">
 			Solicitando teleporte...
 		</message>
+		<message name="pending">
+			Teleporte pendiente...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index 4409949584..a659cb4245 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -66,27 +66,26 @@ Version serveur vocal : [VOICE_VERSION]
 		</panel>
 		<panel label="Licences" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-        APR Copyright (C) 2000-2004 The Apache Software Foundation
-        Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
-        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+        APR Copyright (C) 2011 The Apache Software Foundation
+        Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+        cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
         DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm et Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
-        GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University et David Luebke, Brenden Schubert, University of Virginia.
+        GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University, et David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Copyright (C) 2001, Xiphophorus
-        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-        PCRE Copyright (c) 1997-2008 University of Cambridge
+        ogg/vorbis Copyright (C) 2002, Xiphophorus
+        OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+        PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-        zlib Copyright (C) 1995-2002 Jean-loup Gailly et Mark Adler.
-        google-perftools Copyright (c) 2005, Google Inc.
+        zlib Copyright (C) 1995-2012 Jean-Loup Gailly et Mark Adler.
 
         Le client Second Life utilise Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (et ses concédants de licence). Tous droits réservés. Pour plus de détails, consultez le site Web www.havok.com.
 
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index c86f31b429..26844d9849 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -470,7 +470,7 @@ musique :
 				Conditions d&apos;accès des résidents :
 			</text>
 			<check_box label="Informations de paiement enregistrées [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Pour pouvoir accéder à cette parcelle, les résidents doivent avoir enregistré des informations de paiement. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
-			<check_box label="Âge vérifié [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Pour que les résidents puissent accéder à cette parcelle, leur âge doit avoir fait l&apos;objet d&apos;une vérification. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
+			<check_box label="Avoir plus de 18 ans [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Pour accéder à cette parcelle, les résidents doivent avoir au moins 18 ans. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
 			<check_box label="Autoriser l&apos;accès au groupe : [GROUP]" name="GroupCheck" tool_tip="Définir le groupe à l&apos;onglet Général."/>
 			<check_box label="Vendre des pass à :" name="PassCheck" tool_tip="Autoriser un accès temporaire à cette parcelle"/>
 			<combo_box name="pass_combo" width="110">
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
deleted file mode 100644
index aa42fe6150..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<floater.string name="failed_to_initialize">
-		Echec de l&apos;initialisation du mouvement
-	</floater.string>
-	<floater.string name="anim_too_long">
-		Le fichier d&apos;animation fait [LENGTH] secondes.
-
-La longueur maximale est de [MAX_LENGTH] secondes.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		Impossible de lire le fichier d&apos;animation.
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		Ok
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Fichier incomplet.
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Impossible de lire la définition des contraintes.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		Impossible d&apos;ouvrir le fichier BVH.
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		En-tête HIERARCHY non valide.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		Impossible de trouver ROOT ou JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		Impossible de trouver le nom JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		Impossible de trouver OFFSET.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		Impossible de trouver les CHANNELS.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Impossible d&apos;obtenir l&apos;ordre de rotation.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Impossible d&apos;obtenir l&apos;axe de rotation.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		Impossible de trouver MOTION.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		Impossible d&apos;obtenir le nombre de cadres.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Impossible d&apos;obtenir le temps du cadre.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Impossible de trouver les valeurs de la position.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Impossible de trouver les valeurs de rotation.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Impossible d&apos;ouvrir le fichier de traduction.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Impossible de lire l&apos;en-tête de traduction.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Impossible de lire la traduction.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Impossible de lire la traduction.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Impossible de lire la valeur de traduction relative.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Impossible de lire la traduction.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Impossible de lire la matrice de traduction.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Impossible de trouver le nom mergechild.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Impossible de trouver le nom mergeparent.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Impossible de définir la valeur de la priorité.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Impossible de définir la valeur de la boucle
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Impossible de trouver les valeurs easeIn.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		Impossible de trouver les valeurs easeOut.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Impossible d&apos;obtenir la valeur hand morph.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Impossible de lire le nom emote.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Nom de racine incorrect.
-	</floater.string>
-	<text name="name_label">
-		Nom :
-	</text>
-	<text name="description_label">
-		Description :
-	</text>
-	<spinner label="Priorité" name="priority" tool_tip="Contrôle quelles autres animations peuvent être remplacées par cette animation"/>
-	<check_box label="Boucle" left="6" name="loop_check" tool_tip="Lit cette animation en boucle"/>
-	<spinner label="Début (%)" label_width="65" name="loop_in_point" tool_tip="Définit un point de l&apos;animation auquel retourne la boucle" width="105"/>
-	<spinner label="Fin (%)" name="loop_out_point" tool_tip="Définit un point de l&apos;animation qui met fin à la boucle"/>
-	<text name="hand_label">
-		Mouvement de
-main
-	</text>
-	<combo_box label="" name="hand_pose_combo" tool_tip="Contrôle ce que font les mains pendant l&apos;animation">
-		<combo_box.item label="Espacement" name="Spread"/>
-		<combo_box.item label="Détendues" name="Relaxed"/>
-		<combo_box.item label="Pointer (les deux)" name="PointBoth"/>
-		<combo_box.item label="Poing" name="Fist"/>
-		<combo_box.item label="Détendue (gauche)" name="RelaxedLeft"/>
-		<combo_box.item label="Pointer (gauche)" name="PointLeft"/>
-		<combo_box.item label="Poing (gauche)" name="FistLeft"/>
-		<combo_box.item label="Détendue (droite)" name="RelaxedRight"/>
-		<combo_box.item label="Pointer (droite)" name="PointRight"/>
-		<combo_box.item label="Poing (droite)" name="FistRight"/>
-		<combo_box.item label="Saluer (droite)" name="SaluteRight"/>
-		<combo_box.item label="Taper" name="Typing"/>
-		<combo_box.item label="Paix (main droite)" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Expression
-	</text>
-	<combo_box label="" name="emote_combo" tool_tip="Contrôle ce que fait le visage pendant l&apos;animation">
-		<item label="(aucun)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Effrayé" name="Afraid" value="Effrayé"/>
-		<item label="En colère" name="Angry" value="En colère"/>
-		<item label="Grand sourire" name="BigSmile" value="Grand sourire"/>
-		<item label="Ennui" name="Bored" value="Ennui"/>
-		<item label="Pleurer" name="Cry" value="Pleurer"/>
-		<item label="Mépris" name="Disdain" value="Mépris"/>
-		<item label="Gêne" name="Embarrassed" value="Gêne"/>
-		<item label="Froncer les sourcils" name="Frown" value="Froncer les sourcils"/>
-		<item label="Embrasser" name="Kiss" value="Embrasser"/>
-		<item label="Rire" name="Laugh" value="Rire"/>
-		<item label="Plllppt" name="Plllppt" value="Tirer la langue"/>
-		<item label="Dégoût" name="Repulsed" value="Dégoût"/>
-		<item label="Triste" name="Sad" value="Triste"/>
-		<item label="Hausser les épaules" name="Shrug" value="Hausser les épaules"/>
-		<item label="Sourire" name="Smile" value="Sourire"/>
-		<item label="Surprise" name="Surprise" value="Surprise"/>
-		<item label="Clin d&apos;œil" name="Wink" value="Clin d&apos;œil"/>
-		<item label="Soucis" name="Worry" value="Inquiétude"/>
-	</combo_box>
-	<text name="preview_label">
-		Prévisualiser
-pendant
-	</text>
-	<combo_box label="" name="preview_base_anim" tool_tip="Utilisez cette option pour tester votre animation pendant que votre avatar fait des choses banales.">
-		<item label="Debout" name="Standing" value="Debout"/>
-		<item label="Marche" name="Walking" value="Marche"/>
-		<item label="Assis" name="Sitting" value="Assis"/>
-		<item label="Vol" name="Flying" value="Vol"/>
-	</combo_box>
-	<spinner label="Transition début (s)" name="ease_in_time" tool_tip="Durée (en secondes) de l&apos;entrée en fondu de l&apos;animation"/>
-	<spinner label="Transition fin (s)" name="ease_out_time" tool_tip="Durée (en secondes) de la sortie en fondu de l&apos;animation"/>
-	<button label="" name="play_btn" tool_tip="Lire votre animation"/>
-	<button name="pause_btn" tool_tip="Pauser votre animation"/>
-	<button label="" name="stop_btn" tool_tip="Arrêter le playback"/>
-	<slider label="" name="playback_slider"/>
-	<text name="bad_animation_text">
-		Impossible de lire le fichier d&apos;animation.
-
-Nous recommandons les fichiers BVH extraits de Poser 4.
-	</text>
-	<button label="Charger ([AMOUNT] L$)" name="ok_btn"/>
-	<button label="Annuler" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_autoreplace.xml b/indra/newview/skins/default/xui/fr/floater_autoreplace.xml
new file mode 100644
index 0000000000..1d19181692
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Paramètres Rechercher/Remplacer">
+	<check_box label="Activer la fonction Rechercher/Remplacer" name="autoreplace_enable" tool_tip="Lors de la saisie du texte d&apos;un chat, remplace chaque mot-clé spécifié par la valeur correspondante."/>
+	<button label="Importer une liste..." name="autoreplace_import_list" tool_tip="Charger une liste précédemment exportée à partir d&apos;un fichier."/>
+	<button label="Exporter la liste..." name="autoreplace_export_list" tool_tip="Enregistrer la liste sélectionnée dans un fichier afin de pouvoir la partager."/>
+	<button label="Nouvelle liste..." name="autoreplace_new_list" tool_tip="Créer une nouvelle liste."/>
+	<button label="Supprimer la liste" name="autoreplace_delete_list" tool_tip="Supprimer la liste sélectionnée."/>
+	<button name="autoreplace_list_up" tool_tip="Augmenter la priorité de cette liste."/>
+	<button name="autoreplace_list_down" tool_tip="Diminuer la priorité de cette liste."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Mot-clé" name="keyword"/>
+		<scroll_list.columns label="Remplacement" name="replacement"/>
+	</scroll_list>
+	<button label="Ajouter..." name="autoreplace_add_entry"/>
+	<button label="Supprimer" name="autoreplace_delete_entry"/>
+	<button label="Enregistrer" name="autoreplace_save_entry" tool_tip="Enregistrer cette entrée."/>
+	<button label="Enregistrer les modifications" name="autoreplace_save_changes" tool_tip="Enregistrer toutes les modifications."/>
+	<button label="Annuler" name="autoreplace_cancel" tool_tip="Ignorer toutes les modifications."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory.xml b/indra/newview/skins/default/xui/fr/floater_inventory.xml
deleted file mode 100644
index 200c07e522..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="MON INVENTAIRE">
-	<floater.string name="Title">
-		MON INVENTAIRE
-	</floater.string>
-	<floater.string name="TitleFetching">
-		MON INVENTAIRE (récupération de [ITEM_COUNT] articles en cours) [FILTER]
-	</floater.string>
-	<floater.string name="TitleCompleted">
-		MON INVENTAIRE ([ITEM_COUNT] articles) [FILTER]
-	</floater.string>
-	<floater.string name="Fetched">
-		Récupéré
-	</floater.string>
-	<panel label="Panneau Inventaire" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_model_preview.xml b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
index 0f272891c7..0f717cb2cd 100644
--- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Triangles" name="triangles" value="Triangles"/>
 				<text initial_value="Sommets" name="vertices" value="Sommets"/>
 				<text initial_value="Élevé" name="high_label" value="Élevé"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Depuis un fichier"/>
+					<item name="Generate" value="Génération"/>
+				</combo_box>
 				<button label="Parcourir..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Triangles max"/>
+					<item name="Error Threshold" value="Seuil d&apos;erreur"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Moyen" name="medium_label" value="Moyen"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Depuis un fichier"/>
+					<item name="Generate" value="Génération"/>
+					<item name="Use LoD above" value="Niveau de détail du dessus"/>
+				</combo_box>
 				<button label="Parcourir..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Triangles max"/>
+					<item name="Error Threshold" value="Seuil d&apos;erreur"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Faible" name="low_label" value="Faible"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Depuis un fichier"/>
+					<item name="Generate" value="Génération"/>
+					<item name="Use LoD above" value="Niveau de détail du dessus"/>
+				</combo_box>
 				<button label="Parcourir..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Triangles max"/>
+					<item name="Error Threshold" value="Seuil d&apos;erreur"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="Le plus faible" name="lowest_label" value="Le plus faible"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Depuis un fichier"/>
+					<item name="Generate" value="Génération"/>
+					<item name="Use LoD above" value="Niveau de détail du dessus"/>
+				</combo_box>
 				<button label="Parcourir..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Triangles max"/>
+					<item name="Error Threshold" value="Seuil d&apos;erreur"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Génération de normales" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml b/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml
deleted file mode 100644
index 8bbd34baae..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT PRÈS DE MOI">
-	<check_box label="Traduction du chat" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml
new file mode 100644
index 0000000000..7c9109c011
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Personnages de recherche de chemin">
+	<floater.string name="messaging_get_inprogress">
+		Requête relative aux personnages de recherche de chemin en cours...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Erreur lors de la requête relative aux personnages de recherche de chemin.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Aucun personnage de recherche de chemin.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] personnages sélectionnés sur [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		La recherche de chemin n&apos;a pas été activée pour cette région.
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Chargement]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Inconnu]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[Groupe]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nom" name="name"/>
+			<scroll_list.columns label="Description" name="description"/>
+			<scroll_list.columns label="Propriétaire" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="Altitude" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Personnages :
+		</text>
+		<button label="Actualiser" name="refresh_objects_list"/>
+		<button label="Tout sélectionner" name="select_all_objects"/>
+		<button label="Ne rien sélectionner" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Actions sur les personnages sélectionnés :
+		</text>
+		<check_box label="Afficher la balise" name="show_beacon"/>
+		<check_box label="Afficher la capsule physique" name="show_physics_capsule"/>
+		<button label="Prendre" name="take_objects"/>
+		<button label="Prendre une copie" name="take_copy_objects"/>
+		<button label="M&apos;y téléporter" name="teleport_me_to_object" tool_tip="Activé uniquement lorsqu&apos;un personnage est sélectionné."/>
+		<button label="Renvoyer" name="return_objects"/>
+		<button label="Supprimer" name="delete_objects"/>
+	</panel>
+</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
new file mode 100644
index 0000000000..6d85f8035d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Vue / test de recherche de chemin">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		Implémentation de la bibliothèque de recherche de chemin introuvable
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		La recherche de chemin n&apos;a pas été activée pour cette région.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		En attente de fin de chargement de la région.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Vérification de l&apos;état du maillage de navigation.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Téléchargement du maillage de navigation.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		Maillage de navigation modifié sur le serveur. Téléchargement du plus récent.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		Le maillage de navigation le plus récent a été téléchargé.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		Impossible de télécharger le maillage de navigation.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		Des modifications sont en attente concernant le maillage de navigation.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		Maillage de navigation en cours de création.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		Des modifications sont en attente pour certaines régions de maillage de navigation.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		Certaines régions de maillage de navigation sont en cours de création.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		Des modifications sont en attente pour certaines régions de maillage de navigation et d&apos;autres sont en cours de création.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		Maillage de navigation à jour.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		Implémentation de la bibliothèque de recherche de chemin introuvable
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		La recherche de chemin n&apos;a pas été activée pour cette région.
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Choisissez un point de départ et un point d&apos;arrivée.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Choisissez un point de départ.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Choisissez un point d&apos;arrivée.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		Le chemin s&apos;affiche en orange.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		Impossible de trouver un chemin entre les points choisis.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Erreur lors de la génération du chemin.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Vue" name="view_panel">
+			<text name="show_label">
+				Afficher :
+			</text>
+			<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">
+				Où marcher est possible :
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="Ne pas afficher" name="show_heatmap_mode_none"/>
+				<combo_box.item label="Type de personnage A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="Type de personnage B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="Type de personnage C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="Type de personnage D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Marche possible" name="show_walkables"/>
+			<check_box label="Volumes de matériau" name="show_material_volumes"/>
+			<check_box label="Obstacles statiques" name="show_static_obstacles"/>
+			<check_box label="Volumes d&apos;exclusion" name="show_exclusion_volumes"/>
+			<check_box label="Plan de l&apos;eau" name="show_water_plane"/>
+			<check_box label="Mode rayons X" name="show_xray"/>
+		</panel>
+		<panel label="Chemin test" name="test_panel">
+			<text name="ctrl_click_label">
+				Ctrl-clic : sélection du point de départ
+			</text>
+			<text name="shift_click_label">
+				Maj-clic : sélection du point d&apos;arrivée
+			</text>
+			<text name="character_width_label">
+				Largeur du personnage
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				Type de personnage
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Aucun" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Effacer le chemin" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml
new file mode 100644
index 0000000000..3abddd54ce
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Groupes de liens de recherche de chemin">
+	<floater.string name="messaging_get_inprogress">
+		Requête relative aux groupes de liens de recherche de chemin en cours...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Erreur lors de la requête relative aux groupes de liens de recherche de chemin.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Modification des groupes de liens de recherche de chemin sélectionnés...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Erreur lors de la modification des groupes de liens de recherche de chemin sélectionnés.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Aucun groupe de liens de recherche de chemin.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] groupes de liens sélectionnés sur [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		La recherche de chemin n&apos;a pas été activée pour cette région.
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terrain]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Chargement]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Inconnu]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[Groupe]
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Marche possible
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Obstacle statique
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Obstacle mobile
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Volume de matériau
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Volume d&apos;exclusion
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Fantôme mobile
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[Non modifiable]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[Restriction]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[Concave]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[Restriction,Concave]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Choisir un usage de groupe de liens...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Filtrer par usage..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Marche possible" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Obstacle statique" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Obstacle mobile" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Volume de matériau" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Volume d&apos;exclusion" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Fantôme mobile" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Appliquer" name="apply_filters"/>
+		<button label="Effacer" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nom (prim racine)" name="name"/>
+			<scroll_list.columns label="Description (prim racine)" name="description"/>
+			<scroll_list.columns label="Propriétaire" name="owner"/>
+			<scroll_list.columns label="Impact" name="land_impact"/>
+			<scroll_list.columns label="Distance" name="dist_from_you"/>
+			<scroll_list.columns label="Usage du groupe de liens" name="linkset_use"/>
+			<scroll_list.columns label="% A" name="a_percent"/>
+			<scroll_list.columns label="% B" name="b_percent"/>
+			<scroll_list.columns label="% C" name="c_percent"/>
+			<scroll_list.columns label="% D" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Groupes de liens :
+		</text>
+		<button label="Actualiser" name="refresh_objects_list"/>
+		<button label="Tout sélectionner" name="select_all_objects"/>
+		<button label="Ne rien sélectionner" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="Afficher la balise" name="show_beacon"/>
+		<button label="Prendre" name="take_objects"/>
+		<button label="Prendre une copie" name="take_copy_objects"/>
+		<button label="M&apos;y téléporter" name="teleport_me_to_object"/>
+		<button label="Renvoyer" name="return_objects"/>
+		<button label="Supprimer" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Marche possible :
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="Marche possible pour les personnages de type A. Exemple de type de personnage : humanoïde."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="Marche possible pour les personnages de type B. Exemple de type de personnage : créature."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="Marche possible pour les personnages de type C. Exemple de type de personnage : mécanique."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="Marche possible pour les personnages de type D. Exemple de type de personnage : autre."/>
+		<button label="Appliquer les changements" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Humanoïde)
+		</text>
+		<text name="suggested_use_b_label">
+			(Créature)
+		</text>
+		<text name="suggested_use_c_label">
+			(Mécanique)
+		</text>
+		<text name="suggested_use_d_label">
+			(Autre)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_postcard.xml b/indra/newview/skins/default/xui/fr/floater_postcard.xml
deleted file mode 100644
index e65dfb09b4..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_postcard.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="ENVOYER LA PHOTO PAR E-MAIL">
-	<text name="to_label">
-		E-mail du destinataire :
-	</text>
-	<text name="from_label">
-		Votre e-mail :
-	</text>
-	<text name="name_label">
-		Votre nom :
-	</text>
-	<text name="subject_label">
-		Objet :
-	</text>
-	<line_editor label="Saisir ici votre objet" name="subject_form"/>
-	<text name="msg_label">
-		Message :
-	</text>
-	<text_editor name="msg_form">
-		Saisir ici votre message
-	</text_editor>
-	<text name="fine_print">
-		Si le destinataire s&apos;inscrit sur [SECOND_LIFE], vous recevrez un bonus.
-	</text>
-	<button label="Annuler" name="cancel_btn"/>
-	<button label="Envoyer" name="send_btn"/>
-	<string name="default_subject">
-		Carte postale de [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		Ouvrez-moi !
-	</string>
-	<string name="upload_message">
-		Envoi en cours...
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_spellcheck.xml b/indra/newview/skins/default/xui/fr/floater_spellcheck.xml
new file mode 100644
index 0000000000..077ce25828
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Paramètres du vérificateur orthographique">
+	<check_box label="Activer le vérificateur orthographique" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Dictionnaire principal :
+	</text>
+	<text label="Journaux :" name="spellcheck_additional">
+		Dictionnaires supplémentaires :
+	</text>
+	<text name="spellcheck_available">
+		Disponibles
+	</text>
+	<text name="spellcheck_active">
+		Actifs
+	</text>
+	<button label="Supprimer" name="spellcheck_remove_btn"/>
+	<button label="Importer..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml
new file mode 100644
index 0000000000..c8c76c672d
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Importation d&apos;un dictionnaire">
+	<button label="Parcourir" label_selected="Parcourir" name="dictionary_path_browse"/>
+	<button label="Importer" name="ok_btn"/>
+	<button label="Annuler" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_stats.xml b/indra/newview/skins/default/xui/fr/floater_stats.xml
index 56fa062d46..d6bd187956 100644
--- a/indra/newview/skins/default/xui/fr/floater_stats.xml
+++ b/indra/newview/skins/default/xui/fr/floater_stats.xml
@@ -53,7 +53,13 @@
 				<stat_bar label="Objets" name="simobjects"/>
 				<stat_bar label="Objets actifs" name="simactiveobjects"/>
 				<stat_bar label="Scripts actifs" name="simactivescripts"/>
+				<stat_bar label="Scripts exécutés" name="simpctscriptsrun"/>
 				<stat_bar label="Événements de scripts" name="simscripteps"/>
+				<stat_view label="Recherche de chemin" name="simpathfinding">
+					<stat_bar label="Durée de l&apos;étape IA" name="simsimaistepmsec"/>
+					<stat_bar label="Étapes de silhouette ignorées" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Personnages mis à jour" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_bar label="Paquets en entrée" name="siminpps"/>
 				<stat_bar label="Paquets en sortie" name="simoutpps"/>
 				<stat_bar label="Téléchargements en attente" name="simpendingdownloads"/>
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 ca0fbd3589..43397c2acd 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -20,6 +20,8 @@
 	<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="Aperçu en 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"/>
 	<button label="Ajouter" label_selected="Ajouter" name="l_add_btn"/>
@@ -31,5 +33,4 @@
 	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
 	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
-	<check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index 9643c51fb3..bcc3423862 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -148,6 +148,12 @@
 			<panel.string name="text modify info 4">
 				Vous ne pouvez pas modifier ces objets
 			</panel.string>
+			<panel.string name="text modify info 5">
+				Impossible de modifier cet objet au-delà de la frontière d&apos;une région
+			</panel.string>
+			<panel.string name="text modify info 6">
+				Impossible de modifier ces objets au-delà de la frontière d&apos;une région
+			</panel.string>
 			<panel.string name="text modify warning">
 				Sélectionnez l&apos;objet en entier
 			</panel.string>
@@ -197,12 +203,12 @@
 				<combo_box.item label="Zoomer" name="Zoom"/>
 			</combo_box>
 			<check_box label="À vendre :" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Copie" name="Copy"/>
 				<combo_box.item label="Contenus" name="Contents"/>
 				<combo_box.item label="Original" name="Original"/>
 			</combo_box>
-			<spinner label="Prix : L$" name="Edit Cost"/>
 			<check_box label="Afficher dans la recherche" name="search_check" tool_tip="Afficher l&apos;objet dans les résultats de recherche"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -238,6 +244,11 @@
 					F :
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Attributs de recherche de chemin :
+				</text>
+			</panel>
 		</panel>
 		<panel label="Objet" name="Object">
 			<check_box label="Verrouillé" name="checkbox locked" tool_tip="Empêche l&apos;objet d&apos;être déplacé ou supprimé. Utile pendant la construction pour éviter les modifications involontaires."/>
diff --git a/indra/newview/skins/default/xui/fr/floater_top_objects.xml b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
index b40d585310..aeeb462ac6 100644
--- a/indra/newview/skins/default/xui/fr/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		Temps
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Temps Mono
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		Collisions les plus consommatrices
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Nom" name="name"/>
 		<scroll_list.columns label="Propriétaire" name="owner"/>
 		<scroll_list.columns label="Lieu" name="location"/>
+		<scroll_list.columns label="Parcelle" name="parcel"/>
 		<scroll_list.columns label="Temps" name="time"/>
-		<scroll_list.columns label="Temps Mono" name="mono_time"/>
 		<scroll_list.columns label="URL" name="URLs"/>
+		<scroll_list.columns label="Mémoire (Ko)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		ID de l&apos;objet :
@@ -48,6 +46,10 @@
 		Propriétaire :
 	</text>
 	<button label="Filtre" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		Parcelle :
+	</text>
+	<button label="Filtrer" name="filter_parcel_btn"/>
 	<button label="Rafraîchir" name="refresh_btn"/>
 	<button label="Renvoyer" name="return_selected_btn"/>
 	<button label="Tout renvoyer" name="return_all_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_bottomtray.xml b/indra/newview/skins/default/xui/fr/menu_bottomtray.xml
deleted file mode 100644
index d0d245b286..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Bouton Parler" name="EnableVoiceChat"/>
-	<menu_item_check label="Bouton Geste" name="ShowGestureButton"/>
-	<menu_item_check label="Bouton Bouger" name="ShowMoveButton"/>
-	<menu_item_check label="Bouton Affichage" name="ShowCameraButton"/>
-	<menu_item_check label="Bouton Photo" name="ShowSnapshotButton"/>
-	<menu_item_check label="Bouton Construire" name="ShowBuildButton"/>
-	<menu_item_check label="Bouton Rechercher" name="ShowSearchButton"/>
-	<menu_item_check label="Bouton Carte" name="ShowWorldMapButton"/>
-	<menu_item_check label="Bouton Mini-carte" name="ShowMiniMapButton"/>
-	<menu_item_call label="Couper" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Copier" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Coller" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Supprimer" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Tout sélectionner" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_mode_change.xml b/indra/newview/skins/default/xui/fr/menu_mode_change.xml
deleted file mode 100644
index 982a331c5b..0000000000
--- a/indra/newview/skins/default/xui/fr/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Basique" name="BasicMode"/>
-	<menu_item_check label="Avancé" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_object.xml b/indra/newview/skins/default/xui/fr/menu_object.xml
index c6db48a31c..573b6da582 100644
--- a/indra/newview/skins/default/xui/fr/menu_object.xml
+++ b/indra/newview/skins/default/xui/fr/menu_object.xml
@@ -5,6 +5,8 @@
 	</menu_item_call>
 	<menu_item_call label="Modifier" name="Edit..."/>
 	<menu_item_call label="Construire" name="Build"/>
+	<menu_item_call label="Voir parmi les groupes de liens" name="show_in_linksets"/>
+	<menu_item_call label="Voir parmi les personnages" name="show_in_characters"/>
 	<menu_item_call label="Ouvrir" name="Open"/>
 	<menu_item_call label="M&apos;asseoir ici" name="Object Sit"/>
 	<menu_item_call label="Me lever" name="Object Stand Up"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_text_editor.xml b/indra/newview/skins/default/xui/fr/menu_text_editor.xml
index b6f429aec9..c31b0c8556 100644
--- a/indra/newview/skins/default/xui/fr/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/fr/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(inconnu)" name="Suggestion 1"/>
+	<menu_item_call label="(inconnu)" name="Suggestion 2"/>
+	<menu_item_call label="(inconnu)" name="Suggestion 3"/>
+	<menu_item_call label="(inconnu)" name="Suggestion 4"/>
+	<menu_item_call label="(inconnu)" name="Suggestion 5"/>
+	<menu_item_call label="Ajouter au dictionnaire" name="Add to Dictionary"/>
+	<menu_item_call label="Ajouter aux éléments à ignorer" name="Add to Ignore"/>
 	<menu_item_call label="Couper" name="Cut"/>
 	<menu_item_call label="Copier" name="Copy"/>
 	<menu_item_call label="Coller" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 346b6ec2c7..3982a6159f 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -28,6 +28,7 @@
 		<menu_item_call label="Préférences..." name="Preferences"/>
 		<menu_item_call label="Boutons des barres d&apos;outils..." name="Toolbars"/>
 		<menu_item_call label="Masquer tous les contrôles" name="Hide UI"/>
+		<menu_item_check label="Afficher les éléments HUD" name="Show HUD Attachments"/>
 		<menu_item_call label="Quitter [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Communiquer" name="Communicate">
@@ -39,6 +40,7 @@
 		<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">
 		<menu_item_call label="Créer un repère pour ce lieu" name="Create Landmark Here"/>
@@ -124,6 +126,11 @@
 			<menu_item_call label="Définir les scripts sur Exécution" name="Set Scripts to Running"/>
 			<menu_item_call label="Définir les scripts sur Pas d&apos;exécution" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Recherche de chemin" name="Pathfinding">
+			<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>
 		<menu label="Options" name="Options">
 			<menu_item_check label="Afficher les droits avancés" name="DebugPermissions"/>
 			<menu_item_check label="Sélectionner mes objets uniquement" name="Select Only My Objects"/>
@@ -174,7 +181,6 @@
 			<menu_item_check label="Masquer les particules" name="Hide Particles"/>
 			<menu_item_check label="Masquer la sélection" name="Hide Selected"/>
 			<menu_item_check label="Mettre la transparence en surbrillance" name="Highlight Transparent"/>
-			<menu_item_check label="Afficher les éléments HUD" name="Show HUD Attachments"/>
 			<menu_item_check label="Afficher le réticule de la vue subjective" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Types de rendu" name="Rendering Types">
@@ -377,7 +383,6 @@
 				<menu_item_call label="Basculer la géométrie des personnages" name="Toggle Character Geometry"/>
 				<menu_item_call label="Test homme" name="Test Male"/>
 				<menu_item_call label="Test femme" name="Test Female"/>
-				<menu_item_call label="Activer/désactiver PG" name="Toggle PG"/>
 				<menu_item_check label="Autoriser la sélection de l&apos;avatar" name="Allow Select Avatar"/>
 			</menu>
 			<menu_item_call label="Forcer les paramètres par défaut" name="Force Params to Default"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index abd22e4c7b..bb23a1063d 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -366,6 +372,12 @@ Pour entrer dans [SECOND_LIFE], vous devez disposer d&apos;un compte. Voulez-vou
 	<notification name="InvalidCredentialFormat">
 		Saisissez soit le nom d&apos;utilisateur soit à la fois le prénom et le nom de votre avatar dans le champ Nom d&apos;utilisateur, puis connectez-vous.
 	</notification>
+	<notification name="InvalidGrid">
+		[GRID] n&apos;est pas un identifiant de grille valide.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		Grille non valide spécifiée au niveau du lieu de départ.
+	</notification>
 	<notification name="DeleteClassified">
 		Supprimer l&apos;annonce [NAME] ?
 Une fois payés, les frais ne sont pas remboursables.
@@ -472,7 +484,7 @@ L&apos;objet est peut-être inaccessible ou a peut-être été supprimé.
 	</notification>
 	<notification name="StartRegionEmpty">
 		Vous n&apos;avez pas défini de région de départ.
-Veuillez saisir le nom de la région dans la case Lieu de départ, ou choisissez Dernier emplacement ou Domicile comme Lieu de départ.
+Saisissez le nom de la région voulue dans la case Lieu de départ ou choisissez Dernier emplacement ou Domicile comme lieu de départ.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -599,6 +611,9 @@ Vous pouvez lier un maximum de [MAX] objets.
 
 Assurez-vous que vous êtes le propriétaire de tous les objets et qu&apos;aucun d&apos;eux n&apos;est verrouillé.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		Impossible de lier des objets d&apos;une région à une autre.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Impossible de lier car les objets n&apos;ont pas tous le même propriétaire.
 
@@ -979,6 +994,41 @@ Proposer à [NAME] de devenir votre ami(e) ?
 			<button name="Cancel" text="Annuler"/>
 		</form>
 	</notification>
+	<notification label="Ajouter une liste Rechercher/Remplacer" name="AddAutoReplaceList">
+		Nom de la nouvelle liste :
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="Renommer la liste Rechercher/Remplacer" name="RenameAutoReplaceList">
+		Le nom [DUPNAME] est déjà utilisé.
+    Saisissez un nouveau nom unique :
+		<form name="form">
+			<button name="ReplaceList" text="Remplacer la liste actuelle"/>
+			<button name="SetName" text="Utiliser le nouveau nom"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		Le mot-clé doit être constitué d&apos;un seul mot et sa valeur de remplacement doit être renseignée.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		Liste de remplacement non valide.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Spécifiez un fichier, un nom et une langue.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		Le dictionnaire [DIC_NAME] ne semble pas contenir de fichier &quot;aff&quot; ; il s&apos;agit donc d&apos;un dictionnaire « secondaire ».
+Vous pouvez l&apos;utiliser comme dictionnaire supplémentaire mais pas comme dictionnaire principal.
+
+Voir https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		Impossible de copier
+    [FROM_NAME]
+    vers
+    [TO_NAME]
+	</notification>
 	<notification label="Enregistrer la tenue" name="SaveOutfitAs">
 		Enregistrer ce que je porte comme nouvelle tenue :
 		<form name="form">
@@ -1692,83 +1742,128 @@ Cette action modifiera des milliers de régions et sera difficile à digérer po
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		Votre catégorie d&apos;accès ne vous autorise pas à pénétrer dans cette région. Cela vient peut-être du fait qu&apos;il manquait des informations pour valider votre âge.
-
-Vérifiez que vous avez la toute dernière version du client et consultez les pages d&apos;aide pour savoir comment accéder aux zones ayant ce niveau d&apos;accès.
+		La région que vous essayez de visiter comporte du contenu dont le niveau dépasse celui de vos préférences actuelles. Vous pouvez modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		Votre catégorie d&apos;accès ne vous permet pas de pénétrer dans cette région.
-
-Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] uniquement accessible aux adultes.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/fr
+			http://community.secondlife.com/t5/Base-de-connaissances/Cat%C3%A9gories-niveaux-de-contenu/ta-p/700311
 		</url>
-		<usetemplate ignoretext="Je ne peux pas pénétrer dans cette région car je n&apos;ai pas accès à cette catégorie de contenu" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
+		<usetemplate ignoretext="Passage à une autre région : la région que vous essayez de visiter comporte du contenu uniquement accessible aux adultes." name="okcancelignore" notext="Fermer" yestext="Accéder à la Base de connaissances"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		Votre catégorie d&apos;accès ne vous permet pas de pénétrer dans cette région.
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY].
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] uniquement accessible aux adultes.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		La catégorie de contenu définie dans vos préférences ne vous permet pas de pénétrer dans cette région.
-
-Pour cela, vous devez modifier votre paramètre de catégorie de contenu. Vous pourrez alors rechercher du contenu [REGIONMATURITY] et y accéder. Pour annuler vos modifications, accédez à Moi &gt; Préférences &gt; Général.
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY]. Il est possible de modifier vos préférences ou d&apos;annuler l&apos;action. Une fois vos préférences modifiées, vous pouvez réessayer d&apos;accéder à la région.
 		<form name="form">
 			<button name="OK" text="Modifier les préférences"/>
-			<button default="true" name="Cancel" text="Fermer"/>
-			<ignore name="ignore" text="La catégorie de contenu que j&apos;ai choisie m&apos;empêche de pénétrer dans une région"/>
+			<button default="true" name="Cancel" text="Annuler"/>
+			<ignore name="ignore" text="Passage à une autre région : la région que vous essayez de visiter comporte du contenu dont le niveau est exclu de vos préférences actuelles."/>
 		</form>
 	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		Nous rencontrons des difficultés techniques au niveau de votre téléportation car vos préférences ne sont pas synchronisées avec le serveur.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		La région que vous essayez de visiter comporte du contenu dont le niveau dépasse celui de vos préférences actuelles. Vous pouvez modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] uniquement accessible aux adultes.
+		<url name="url">
+			http://community.secondlife.com/t5/Base-de-connaissances/Cat%C3%A9gories-niveaux-de-contenu/ta-p/700311
+		</url>
+		<usetemplate ignoretext="Téléportation : la région que vous essayez de visiter comporte du contenu uniquement accessible aux adultes." name="okcancelignore" notext="Fermer" yestext="Accéder à la Base de connaissances"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY].
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] uniquement accessible aux adultes.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY]. Il est possible de modifier vos préférences afin de poursuivre la téléportation ou d&apos;annuler la téléportation.
+		<form name="form">
+			<button name="OK" text="Modifier et continuer"/>
+			<button name="Cancel" text="Annuler"/>
+			<ignore name="ignore" text="Téléportation (redémarrage possible) : la région que vous essayez de visiter comporte du contenu dont le niveau est exclu de vos préférences."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		La région que vous essayez de visiter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY]. Il est possible de modifier vos préférences ou d&apos;annuler la téléportation. Une fois vos préférences modifiées, vous devrez réessayer de vous téléporter.
+		<form name="form">
+			<button name="OK" text="Modifier les préférences"/>
+			<button name="Cancel" text="Annuler"/>
+			<ignore name="ignore" text="Téléportation (redémarrage impossible) : la région que vous essayez de visiter comporte du contenu dont le niveau est exclu de vos préférences."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		Nous rencontrons des difficultés techniques au niveau de votre téléportation car vos préférences ne sont pas synchronisées avec le serveur.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		Votre préférence de catégorie de contenu est désormais [RATING].
+		Aucune autre notification vous informant que vous allez visiter une région au contenu [RATING] ne vous sera envoyée. Vous pouvez modifier vos préférences de contenu à l&apos;avenir en accédant à Moi &gt; Préférences &gt; Général, à partir de la barre de menus.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		Impossible de modifier vos préférences afin d&apos;afficher le contenu [PREFERRED_MATURITY] à l&apos;heure actuelle. Le paramètre [ACTUAL_MATURITY] a été rétabli. Vous pouvez réessayer de modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général, à partir de la barre de menus.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		Votre catégorie d&apos;accès ne vous permet pas de réclamer cette région. Cela vient peut-être du fait qu&apos;il manquait des informations pour valider votre âge.
-
-Vérifiez que vous avez la toute dernière version du client et consultez les pages d&apos;aide pour savoir comment accéder aux zones ayant ce niveau d&apos;accès.
+		Le niveau de contenu du terrain que vous essayez de revendiquer dépasse celui défini dans vos préférences actuelles. Vous pouvez modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		Votre catégorie d&apos;accès ne vous permet pas de réclamer cette région.
-
-Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		Seuls les adultes sont autorisés à revendiquer ce terrain.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/fr
+			http://community.secondlife.com/t5/Base-de-connaissances/Cat%C3%A9gories-niveaux-de-contenu/ta-p/700311
 		</url>
-		<usetemplate ignoretext="Je ne peux pas réclamer cette région car je n&apos;ai pas accès à cette catégorie de contenu" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
+		<usetemplate ignoretext="Seuls les adultes sont autorisés à revendiquer ce terrain." name="okcancelignore" notext="Fermer" yestext="Accéder à la Base de connaissances"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		Votre catégorie d&apos;accès ne vous autorise pas à réclamer cette région.
+		Le terrain que vous essayez de revendiquer comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY].
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		Le terrain que vous essayez de revendiquer comporte du contenu [REGIONMATURITY] uniquement accessible aux adultes.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		Votre catégorie d&apos;accès ne vous permet pas de réclamer cette région.
-
-En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Moi &gt; Préférences &gt; Général.
-		<usetemplate ignoretext="La catégorie de contenu que j&apos;ai choisie m&apos;empêche de réclamer un terrain" name="okcancelignore" notext="Fermer" yestext="Modifier les Préférences"/>
+		Le terrain que vous essayez de revendiquer comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY]. Il est possible de modifier vos préférences, puis d&apos;essayer de revendiquer ce terrain à nouveau.
+		<form name="form">
+			<button name="OK" text="Modifier les préférences"/>
+			<button name="Cancel" text="Annuler"/>
+			<ignore name="ignore" text="Le terrain que vous essayez de revendiquer comporte du contenu dont le niveau est exclu de vos préférences."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		Votre catégorie d&apos;accès ne vous permet pas d&apos;acheter cette région. Cela vient peut-être du fait qu&apos;il manquait des informations pour valider votre âge.
-
-Vérifiez que vous avez la toute dernière version du client et consultez les pages d&apos;aide pour savoir comment accéder aux zones ayant ce niveau d&apos;accès.
+		Le niveau de contenu du terrain que vous essayez d&apos;acheter dépasse celui défini dans vos préférences actuelles. Vous pouvez modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		Votre catégorie d&apos;accès ne vous permet pas d&apos;acheter cette région.
-
-Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Seuls les adultes sont autorisés à acheter ce terrain.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/fr
+			http://community.secondlife.com/t5/Base-de-connaissances/Cat%C3%A9gories-niveaux-de-contenu/ta-p/700311
 		</url>
-		<usetemplate ignoretext="Je ne peux pas acheter ce terrain car je n&apos;ai pas accès à cette catégorie de contenu" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
+		<usetemplate ignoretext="Seuls les adultes sont autorisés à acheter ce terrain." name="okcancelignore" notext="Fermer" yestext="Accéder à la Base de connaissances"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		Votre catégorie d&apos;accès ne vous permet pas d&apos;acheter cette région.
+		Le terrain que vous essayez d&apos;acheter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY].
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		Le terrain que vous essayez d&apos;acheter comporte du contenu [REGIONMATURITY] uniquement accessible aux adultes.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		Votre catégorie d&apos;accès ne vous autorise pas à acheter cette région.
-
-En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Moi &gt; Préférences &gt; Général.
-		<usetemplate ignoretext="La catégorie de contenu que j&apos;ai choisie m&apos;empêche d&apos;acheter un terrain" name="okcancelignore" notext="Fermer" yestext="Modifier les Préférences"/>
+		Le terrain que vous essayez d&apos;acheter comporte du contenu [REGIONMATURITY] alors que les préférences que vous avez définies excluent tout contenu [REGIONMATURITY]. Il est possible de modifier vos préférences, puis d&apos;essayer d&apos;acheter ce terrain à nouveau.
+		<form name="form">
+			<button name="OK" text="Modifier les préférences"/>
+			<button name="Cancel" text="Annuler"/>
+			<ignore name="ignore" text="Le terrain que vous essayez d&apos;acheter comporte du contenu dont le niveau est exclu de vos préférences."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Vous avez sélectionné trop de prims.  Veuillez sélectionner au maximum [MAX_PRIM_COUNT] prims et réessayer.
@@ -1823,10 +1918,9 @@ Publier cette petite annonce maintenant pour [AMOUNT] L$ ?
 		</form>
 	</notification>
 	<notification label="Catégorie de la région modifiée" name="RegionMaturityChange">
-		Le niveau de maturité de cette région a été mis à jour.
-Ce changement n&apos;apparaîtra pas immédiatement sur la carte.
-
-Pour entrer dans les régions Adultes, le résident doit avoir vérifié son compte, que ce soit par vérification de l&apos;âge ou du mode de paiement.
+		Le niveau de contenu de cette région a changé.
+Il se peut que l&apos;affichage de cette modification sur la carte prenne quelque temps.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="Versions de voix non compatibles" name="VoiceVersionMismatch">
 		Cette version de [APP_NAME] n&apos;est pas compatible avec la fonctionnalité de chat vocal dans cette région. Vous devez mettre à jour [APP_NAME] pour que le chat vocal fonctionne correctement.
@@ -2116,14 +2210,11 @@ Liez-la à partir d&apos;une page web pour permettre aux autres résidents d&apo
 		<usetemplate ignoretext="Porter automatiquement tout en modifiant mon apparence" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Vous devez avoir au moins 18 ans pour accéder au contenu et aux zones Adulte dans Second Life. Visitez la page de vérification de l&apos;âge afin de confirmer que vous avez plus de 18 ans. 
-Cette opération lancera votre navigateur Web.
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="Je n&apos;ai pas procédé à la vérification de mon âge" name="okcancelignore" notext="Annuler" yestext="Accéder à la page de vérification de l&apos;âge"/>
+		L&apos;accès à l&apos;endroit que vous essayez de visiter est limité aux résidents de plus de 18 ans.
+		<usetemplate ignoretext="Je n&apos;ai pas l&apos;âge requis pour visiter les zones d&apos;accès limité en fonction de l&apos;âge." name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		L&apos;accès à cet endroit est limité aux plus de 18 ans.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Pour pouvoir pénétrer dans cette zone, vous devez avoir enregistré vos informations de paiement.  Souhaitez-vous aller sur [SECOND_LIFE] et enregistrer vos informations de paiement ?
@@ -2385,6 +2476,23 @@ Vous ne pouvez pas voler ici.
 	<notification name="NoBuild">
 		La construction est interdite dans cette zone. Vous ne pouvez pas construite ou rezzer d&apos;objets ici.
 	</notification>
+	<notification name="PathfindingDirty">
+		Des modifications de recherche de chemin sont en attente concernant cette région. Si vous disposez de droits de construction, vous pouvez la figer de nouveau en cliquant sur le bouton Refiger la région.
+	</notification>
+	<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"/>
+	</notification>
 	<notification name="SeeAvatars">
 		Cette parcelle masque les avatars et le chat écrit des autres parcelles. Vous ne pouvez pas voir les résidents qui se trouvent en dehors, et ceux qui se trouvent en dehors ne peuvent pas vous voir. Le chat écrit habituel sur le canal 0 est également bloqué.
 	</notification>
@@ -2403,9 +2511,7 @@ Aucun script ne marche ici à part ceux du propriétaire du terrain.
 		Vous ne pouvez réclamer qu&apos;un terrain public dans la région où vous vous trouvez actuellement.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		Votre catégorie d&apos;accès ne vous autorise pas à pénétrer dans cette région. Vous devez sans doute procéder à la vérification de votre âge ou installer une version plus récente du client.
-
-Pour savoir comment accéder aux zones ayant un tel niveau d&apos;accès, veuillez consulter les pages d&apos;aide.
+		La région que vous essayez de visiter comporte du contenu dont le niveau dépasse celui de vos préférences actuelles. Vous pouvez modifier vos préférences en accédant à Moi &gt; Préférences &gt; Général.
 	</notification>
 	<notification name="URBannedFromRegion">
 		Vous avez été banni de cette région.
@@ -2416,11 +2522,11 @@ Pour savoir comment accéder aux zones ayant un tel niveau d&apos;accès, veuill
 	<notification name="ImproperPaymentStatus">
 		Vous n&apos;avez pas le statut de paiement approprié pour pénétrer dans cette région.
 	</notification>
-	<notification name="MustGetAgeRgion">
-		Pour pouvoir pénétrer dans cette région, vous devez avoir procédé à la vérification de votre âge.
+	<notification name="MustGetAgeRegion">
+		Pour accéder à cette région, vous devez avoir au moins 18 ans.
 	</notification>
 	<notification name="MustGetAgeParcel">
-		Pour pouvoir pénétrer sur cette parcelle, vous devez avoir procédé à la vérification de votre âge.
+		Pour accéder à cette parcelle, vous devez avoir au moins 18 ans.
 	</notification>
 	<notification name="NoDestRegion">
 		Région de destination introuvable.
@@ -2522,12 +2628,33 @@ Veuillez réessayer dans quelques minutes.
 	<notification name="TeleportOffered">
 		[NAME_SLURL] propose de vous téléporter à son emplacement :
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+« [MESSAGE] »
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Téléporter"/>
 			<button name="Cancel" text="Annuler"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] propose de vous téléporter à son emplacement :
+
+« [MESSAGE] »
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Cette région comporte du contenu [REGION_CONTENT_MATURITY] alors que vos préférences actuelles excluent tout contenu [REGION_CONTENT_MATURITY]. Il est possible de modifier vos préférences afin de poursuivre la téléportation ou d&apos;annuler la téléportation.
+		<form name="form">
+			<button name="Teleport" text="Modifier et continuer"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] propose de vous téléporter à son emplacement :
+
+« [MESSAGE] »
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Toutefois, cette région comporte du contenu uniquement accessible aux adultes.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Offre de téléportation envoyée à [TO_NAME]
 	</notification>
@@ -2931,6 +3058,10 @@ Texture figée de [RESOLUTION] chargée pour [BODYREGION] au bout de [TIME] seco
 		([EXISTENCE] secondes d&apos;existence)
 Texture figée de [RESOLUTION] mise à jour localement pour [BODYREGION] au bout de [TIME] secondes.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		Impossible d&apos;afficher un aperçu de cette texture car il s&apos;agit d&apos;une texture sans copie et/ou transfert.
+		<usetemplate ignoretext="M&apos;avertir que le mode Aperçu en direct n&apos;est pas disponible pour les textures sans copie et/ou transfert" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Voulez-vous vraiment quitter cet appel ?
 		<usetemplate ignoretext="Confirmer avant de quitter l&apos;appel" name="okcancelignore" notext="Non" yestext="Oui"/>
@@ -3102,6 +3233,23 @@ Cliquez sur un point dans le monde et faites glisser votre souris pour faire tou
 		Cette action masquera tous les boutons et articles de menu. Pour les récupérer, cliquez de nouveau sur [SHORTCUT].
 		<usetemplate ignoretext="Confirmer avant de masquer l&apos;interface" name="okcancelignore" notext="Annuler" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestricted">
+		Certains groupes de liens sélectionnés ne peuvent pas être définis sur [REQUESTED_TYPE] en raison des restrictions d&apos;autorisation définies les concernant. Ces groupes de liens seront définis sur [RESTRICTED_TYPE].
+		<usetemplate ignoretext="Certains groupes de liens sélectionnés ne peuvent pas être définis en raison des restrictions d&apos;autorisation les concernant." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnVolume">
+		Certains groupes de liens sélectionnés ne peuvent pas être définis sur [REQUESTED_TYPE] en raison d&apos;une forme non convexe.
+		<usetemplate ignoretext="Certains groupes de liens sélectionnés ne peuvent pas être définis en raison d&apos;une forme non convexe." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestrictedAndVolume">
+		Certains groupes de liens sélectionnés ne peuvent pas être définis sur [REQUESTED_TYPE] en raison des restrictions d&apos;autorisation les concernant. Ces groupes de liens seront définis sur [RESTRICTED_TYPE].
+ Certains groupes de liens sélectionnés ne peuvent pas être définis sur [REQUESTED_TYPE] en raison d&apos;une forme non convexe. Les types d&apos;usage de ces groupes de liens ne seront pas modifiés.
+		<usetemplate ignoretext="Certains groupes de liens sélectionnés ne peuvent pas être définis en raison des restrictions d&apos;autorisation les concernant et d&apos;une forme non convexe." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		L&apos;objet sélectionné affecte le maillage de navigation. Si vous le modifiez en Flexibilité, il sera supprimé de ce maillage.
+		<usetemplate ignoretext="L&apos;objet sélectionné affecte le maillage de navigation. Si vous le modifiez en Flexibilité, il sera supprimé de ce maillage." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Vous semblez ne pas avoir le matériel requis pour utiliser [APP_NAME]. [APP_NAME] requiert une carte graphique OpenGL avec une prise en charge du multitexturing. Si vous avez une telle carte, assurez-vous que vous avez aussi les pilotes les plus récents pour la carte, ainsi que les service packs et les patchs pour votre système d&apos;exploitation.
 
@@ -3137,4 +3285,12 @@ Désactivation des mises à jour futures de ce fichier...
 	<notification name="LocalBitmapsVerifyFail">
 		Tentative d&apos;ajout d&apos;un fichier image [FNAME] non valide ou illisible n&apos;ayant pas pu être ouvert ou décodé. Tentative annulée.
 	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		Vous allez renvoyer [NUM_ITEMS] articles. Voulez-vous vraiment continuer ?
+		<usetemplate ignoretext="Voulez-vous vraiment renvoyer plusieurs articles ?" name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		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>
 </notifications>
diff --git a/indra/newview/skins/default/xui/fr/panel_bottomtray.xml b/indra/newview/skins/default/xui/fr/panel_bottomtray.xml
deleted file mode 100644
index c4537861e3..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Active/Désactive le micro"/>
-	<string name="VoiceControlBtnToolTip" value="Affiche/Masque le panneau de contrôle de la voix"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Parler" label_selected="Parler" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Geste" name="Gesture" tool_tip="Affiche/Masque les gestes"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Bouger" name="movement_btn" tool_tip="Affiche/Masque le contrôle des déplacements"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Affichage" name="camera_btn" tool_tip="Affiche/Masque le contrôle de la caméra"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="Prendre une photo"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Construire" name="build_btn" tool_tip="Affiche/Masque les outils pour la construction"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Rechercher" name="search_btn" tool_tip="Affiche/Masque la recherche"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Carte" name="world_map_btn" tool_tip="Affiche/Masque la carte du monde"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Mini-carte" name="mini_map_btn" tool_tip="Affiche/Masque la mini-carte"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Conversations"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Notifications"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_invite.xml b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
index 53f7ac33c2..d792439220 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Certains résidents que vous avez choisis font déjà partie du groupe et l&apos;invitation ne leur a donc pas été envoyée.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Invitations de groupe non envoyées : trop de résidents sélectionnés. Les invitations de groupe sont limitées à 100 par demande.
+	</panel.string>
 	<text name="help_text">
 		Vous pouvez inviter plusieurs résidents à la fois. Cliquez d&apos;abord sur Choisir un résident.
 	</text>
diff --git a/indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml
new file mode 100644
index 0000000000..7acf092257
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_navmesh_rebake">
+	<button label="Refiger la région" name="navmesh_btn" tool_tip="Cliquer pour refiger le maillage de navigation de la région."/>
+	<button label="Demande consistant à refiger la région en cours..." name="navmesh_btn_sending" tool_tip="Envoi de la demande consistant à refiger la région au serveur..."/>
+	<button label="La région se refige..." name="navmesh_btn_baking" tool_tip="La région se refige. Ce bouton disparaîtra lorsque le processus sera terminé."/>
+</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 76ed237451..550beb653e 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -29,5 +29,7 @@
 	<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 automatique" name="ok_btn"/>
+	<button label="Traduction..." name="ok_btn"/>
+	<button label="Rechercher/Remplacer..." name="autoreplace_showgui"/>
+	<button label="Orthographe..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
index 6ea4b60072..b15af0d1f2 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
@@ -36,5 +36,5 @@
 	<button label="?" left="337" name="top_scripts_help"/>
 	<button label="Redémarrer la région" name="restart_btn" tool_tip="Redémarrer la région au bout de 2 minutes" width="160"/>
 	<button label="?" left="177" name="restart_help"/>
-	<button label="Retarder le redémarrage" name="cancel_restart_btn" tool_tip="Retarder le redémarrage de la région d&apos;une heure" width="160"/>
+	<button label="Annuler le redémarrage" name="cancel_restart_btn" tool_tip="Retarder le redémarrage de la région d&apos;une heure" width="160"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index 9d97d1bf29..be89020ac7 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
@@ -21,7 +21,7 @@ domaine.
 		Conditions d&apos;accès des résidents :
 	</text>
 	<check_box label="Informations de paiement enregistrées" name="limit_payment" tool_tip="Pour pouvoir accéder à ce domaine, les résidents doivent avoir enregistré des informations de paiement. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
-	<check_box label="Âge vérifié" name="limit_age_verified" tool_tip="Pour que les résidents puissent accéder à ce domaine, leur âge doit avoir fait l&apos;objet d&apos;une vérification. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
+	<check_box label="Avoir plus de 18 ans" name="limit_age_verified" tool_tip="Pour accéder à ce domaine, les résidents doivent avoir au moins 18 ans. Consultez le [SUPPORT_SITE] pour plus d&apos;informations."/>
 	<check_box label="Autoriser les chats vocaux" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<text name="abuse_email_text">
diff --git a/indra/newview/skins/default/xui/fr/panel_region_texture.xml b/indra/newview/skins/default/xui/fr/panel_region_texture.xml
deleted file mode 100644
index c0b667137a..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_region_texture.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Textures du sol" name="Textures">
-	<text name="region_text_lbl">
-		Région :
-	</text>
-	<text name="region_text">
-		(inconnue)
-	</text>
-	<text name="base_texture_text">
-		Textures de base (fichiers 128x128, 24 bit .tga)
-	</text>
-	<text name="height_text_lbl">
-		1 (faible)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (élevé)
-	</text>
-	<text name="detail_texture_text">
-		Textures du terrain (fichiers.tga 512 x 512, 24 bit requis)
-	</text>
-	<text name="height_text_lbl5">
-		Limites d&apos;élévation de texture
-	</text>
-	<text name="height_text_lbl6">
-		Nord-ouest
-	</text>
-	<text name="height_text_lbl7">
-		Nord-est
-	</text>
-	<text name="height_text_lbl8">
-		Sud-ouest
-	</text>
-	<text name="height_text_lbl9">
-		Sud-est
-	</text>
-	<text name="height_text_lbl10" width="460">
-		Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
-	</text>
-	<text name="height_text_lbl11">
-		En mètres, la valeur Bas correspond à la hauteur max. de la texture n°1
-	</text>
-	<text name="height_text_lbl12">
-		et la valeur Haut correspond à la hauteur min. de la texture n°4.
-	</text>
-	<text name="height_text_lbl13">
-		Nord-est
-	</text>
-	<spinner label="Bas" name="height_start_spin_0"/>
-	<spinner label="Bas" name="height_start_spin_1"/>
-	<spinner label="Bas" name="height_start_spin_2"/>
-	<spinner label="Bas" name="height_start_spin_3"/>
-	<spinner label="Haut" name="height_range_spin_0"/>
-	<spinner label="Haut" name="height_range_spin_1"/>
-	<spinner label="Haut" name="height_range_spin_2"/>
-	<spinner label="Haut" name="height_range_spin_3"/>
-	<text name="height_text_lbl14">
-		Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
-	</text>
-	<text name="height_text_lbl15">
-		La valeur Bas correspond à la hauteur max. de la Texture 1,
-	</text>
-	<text name="height_text_lbl16">
-		et la valeur Haut correspond à la hauteur min. de la Texture 4.
-	</text>
-	<button label="Appliquer" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_side_tray.xml b/indra/newview/skins/default/xui/fr/panel_side_tray.xml
deleted file mode 100644
index 178ae4324b..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Activer/désactiver le panneau latéral." name="sidebar_openclose" tab_title="Activer/désactiver le panneau latéral"/>
-	<sidetray_tab description="Domicile." name="sidebar_home" tab_title="Accueil">
-		<panel label="domicile" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Modifiez votre profil public et vos Favoris." name="sidebar_me" tab_title="Mon profil">
-		<panel_container name="panel_container">
-			<panel label="Moi" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Trouvez vos amis, vos contacts et les personnes se trouvant près de vous." name="sidebar_people" tab_title="Personnes">
-		<panel_container name="panel_container">
-			<panel label="Profil du groupe" name="panel_group_info_sidetray"/>
-			<panel label="Résidents et objets ignorés" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Trouvez de nouveaux lieux à découvrir et les lieux que vous connaissez déjà." label="Lieux" name="sidebar_places" tab_title="Endroits">
-		<panel label="Lieux" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Parcourez votre inventaire." name="sidebar_inventory" tab_title="Mon inventaire">
-		<panel label="Modifier l&apos;inventaire" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Modifiez votre apparence actuelle." name="sidebar_appearance" tab_title="Mon apparence">
-		<panel label="Changer d&apos;apparence" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
index 95649d3934..e7fc7859c9 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(inconnu)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(valeur inconnue ou valeurs multiples)
+	</panel.string>
 	<panel.string name="public">
 		(public)
 	</panel.string>
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 bd8a39fe16..60027d41cb 100644
--- a/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/fr/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		Vous ne pouvez pas modifier ces objets
 	</panel.string>
+	<panel.string name="text modify info 5">
+		Impossible de modifier cet objet au-delà de la frontière d&apos;une région
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Impossible de modifier ces objets au-delà de la frontière d&apos;une région
+	</panel.string>
 	<panel.string name="text modify warning">
 		Cet objet comprend des parties liées
 	</panel.string>
@@ -95,6 +101,9 @@
 		</combo_box>
 		<spinner label="Prix : L$" name="Edit Cost"/>
 		<check_box label="Afficher avec la recherche" name="search_check" tool_tip="Permettre aux autres résidents de voir cet objet dans les résultats de recherche"/>
+		<text name="pathfinding_attributes_label">
+			Attributs de recherche de chemin :
+		</text>
 		<text name="B:">
 			B :
 		</text>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 0987952c28..6dc1439593 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1006,6 +1006,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="script_files">
 		Scripts
 	</string>
+	<string name="dictionary_files">
+		Dictionnaires
+	</string>
 	<string name="AvatarSetNotAway">
 		Présent
 	</string>
@@ -3864,6 +3867,12 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
 	<string name="LocationCtrlSeeAVsTooltip">
 		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.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		La recherche de chemin dynamique n&apos;est pas activée dans cette région.
+	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] - Mise à jour
 	</string>
@@ -5006,6 +5015,21 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="Normal">
 		Normal
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Aucun
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Maillage de navigation affecté
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Personnage
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(Multiple)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Très faible
 	</string>
@@ -5021,4 +5045,10 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="snapshot_quality_very_high">
 		Très élevée
 	</string>
+	<string name="TeleportMaturityExceeded">
+		Le résident ne peut pas visiter cette région.
+	</string>
+	<string name="UserDictionary">
+		[User]
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/fr/teleport_strings.xml b/indra/newview/skins/default/xui/fr/teleport_strings.xml
index d0c74ff353..6065fa2966 100644
--- a/indra/newview/skins/default/xui/fr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/fr/teleport_strings.xml
@@ -45,6 +45,9 @@ Pour recommencer le didacticiel, accédez à Welcome Island Public.
 		<message name="no_inventory_host">
 			L&apos;inventaire est temporairement indisponible.
 		</message>
+		<message name="MustGetAgeRegion">
+			Pour accéder à cette région, vous devez avoir au moins 18 ans.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -80,5 +83,8 @@ Pour recommencer le didacticiel, accédez à Welcome Island Public.
 		<message name="requesting">
 			Demande de téléportation en cours...
 		</message>
+		<message name="pending">
+			En attente de téléportation...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index 39114b7bf7..c672511fc5 100644
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -66,27 +66,26 @@ Versione Server voice: [VOICE_VERSION]
 		</panel>
 		<panel label="Licenze" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-        APR Copyright (C) 2000-2004 The Apache Software Foundation
-        Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
-        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+        APR Copyright (C) 2011 The Apache Software Foundation
+        Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+        cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
         DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
         GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Copyright (C) 2001, Xiphophorus
-        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-        PCRE Copyright (c) 1997-2008 University of Cambridge
+        ogg/vorbis Copyright (C) 2002, Xiphophorus
+        OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+        PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-        zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-        google-perftools Copyright (c) 2005, Google Inc.
+        zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
         Il Viewer Second Life utilizza Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (e licenziatari). Tutti i diritti riservati. Per informazioni dettagliate, vedere www.havok.com.
 
diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml
index cfc3ad8fdb..fe3e59b0bd 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -470,7 +470,7 @@ Media:
 				Consenti l&apos;accesso solo ai Residenti che:
 			</text>
 			<check_box label="Hanno informazioni di pagamento in archivio [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Per poter visitare questo lotto i Residenti devono aver fornito informazioni di pagamento a Linden Lab.  Vedi [SUPPORT_SITE] per maggiori informazioni."/>
-			<check_box label="Hanno verificato l&apos;età [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Per poter visitare questo lotto i Residenti devono aver verificato la propria età. Vedi [SUPPORT_SITE] per maggiori informazioni."/>
+			<check_box label="Hanno almeno 18 anni [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Per poter visitare questo lotto i Residenti devono avere almeno 18 anni. Vedi [SUPPORT_SITE] per maggiori informazioni."/>
 			<check_box label="Permetti accesso al gruppo: [GROUP]" name="GroupCheck" tool_tip="Imposta il gruppo nel pannello generale."/>
 			<check_box label="Vendi pass a:" name="PassCheck" tool_tip="Permetti in questo terreno l&apos;accesso temporaneo"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/it/floater_animation_preview.xml b/indra/newview/skins/default/xui/it/floater_animation_preview.xml
deleted file mode 100644
index dc99d287b9..0000000000
--- a/indra/newview/skins/default/xui/it/floater_animation_preview.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<floater.string name="failed_to_initialize">
-		Impossibile inizializzare la sequenza
-	</floater.string>
-	<floater.string name="anim_too_long">
-		Il file dell&apos;animazione è lungo [LENGTH] secondi.
-
-La lunghezza massima è [MAX_LENGTH] secondi.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		Impossibile leggere il file dell&apos;animazione.
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		Ok
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Fine prematura del file.
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Impossibile leggere la definizione del vincolo.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		Impossibile aprire il file BVH.
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		Intestazione HIERARCHY non valida.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		Impossibile trovare la ROOT o JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		Impossibile trovare il nome JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		Impossibile trovare OFFSET.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		Impossibile trovare CHANNELS.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Impossibile ottenere un ordine di rotazione.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Rotazione dell&apos;asse non disponibile.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		Impossibile trovare MOTION.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		Impossibile ottenere il numero dei frame.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Impossibile ottenere il tempo del frame.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Impossibile ottenere i valori della posizione.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Impossibile ottenere i valori di rotazione.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Impossibile aprire il file di traduzione.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Impossibile leggere l&apos;intestazione della traduzione.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Impossibile leggere i nomi della traduzione.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Impossibile leggere la traduzione, ignora il valore.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Impossibile leggere la traduzione del valore relativo.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Valore non trovato.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Impossibile leggere la matrice di traduzione.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Impossibile trovare il nome mergechild.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Impossibile ottenere il nome mergeparent.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Impossibile ottenere il valore di priorità.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Impossibile ottenere il valore di ripetizione.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Impossibile ottenere i valori easeIn.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		Cannot get ease Out values.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Impossibile ottenere il valore morph della mano.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Impossibile leggere il nome emote.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Nome non corretto del root joint, usa &quot;hip&quot;.
-	</floater.string>
-	<text name="name_label">
-		Nome:
-	</text>
-	<text name="description_label">
-		Descrizione:
-	</text>
-	<spinner label="Priorità" name="priority" tool_tip="Definisce quali altre animazioni possono essere sostituite da questa animazione"/>
-	<check_box label="Ciclica" name="loop_check" tool_tip="Riproduce questa animazione in ripetizione"/>
-	<spinner label="In(%)" name="loop_in_point" tool_tip="Imposta il punto sul quale ritorna l&apos;animazione"/>
-	<spinner label="Out(%)" name="loop_out_point" tool_tip="Imposta il punto sul quale termina l&apos;animazione"/>
-	<text name="hand_label">
-		Postura della mano
-	</text>
-	<combo_box name="hand_pose_combo" tool_tip="Definisce ciò che fanno le mani durante l&apos;animazione">
-		<combo_box.item label="Stendi" name="Spread"/>
-		<combo_box.item label="Rilassato" name="Relaxed"/>
-		<combo_box.item label="Indica entrambi" name="PointBoth"/>
-		<combo_box.item label="Pugno" name="Fist"/>
-		<combo_box.item label="Sinistra rilassata" name="RelaxedLeft"/>
-		<combo_box.item label="Indica sinistra" name="PointLeft"/>
-		<combo_box.item label="Pugno con la sinistra" name="FistLeft"/>
-		<combo_box.item label="Destra rilassata" name="RelaxedRight"/>
-		<combo_box.item label="Indica destra" name="PointRight"/>
-		<combo_box.item label="Pugno destro" name="FistRight"/>
-		<combo_box.item label="Saluta a destra" name="SaluteRight"/>
-		<combo_box.item label="Battitura" name="Typing"/>
-		<combo_box.item label="Pace a destra" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Espressione
-	</text>
-	<combo_box name="emote_combo" tool_tip="Definisce ciò che fa il viso durante l&apos;animazione">
-		<item label="(Nessuno)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Spavento" name="Afraid" value="Spavento"/>
-		<item label="Arrabbiato" name="Angry" value="Arrabbiato"/>
-		<item label="Grande sorriso" name="BigSmile" value="Grande sorriso"/>
-		<item label="Annoiato" name="Bored" value="Annoiato"/>
-		<item label="Pianto" name="Cry" value="Pianto"/>
-		<item label="Disdegno" name="Disdain" value="Disdegno"/>
-		<item label="Imbarazzato" name="Embarrassed" value="Imbarazzato"/>
-		<item label="Accigliato" name="Frown" value="Accigliato"/>
-		<item label="Bacio" name="Kiss" value="Bacio"/>
-		<item label="Risata" name="Laugh" value="Risata"/>
-		<item label="Plllppt" name="Plllppt" value="Linguaccia"/>
-		<item label="Repulsione" name="Repulsed" value="Repulsione"/>
-		<item label="Triste" name="Sad" value="Triste"/>
-		<item label="Scrollata di spalle" name="Shrug" value="Scrollata di spalle"/>
-		<item label="Sorriso" name="Smile" value="Sorriso"/>
-		<item label="Stupore" name="Surprise" value="Stupore"/>
-		<item label="Occhiolino" name="Wink" value="Occhiolino"/>
-		<item label="Preoccupato" name="Worry" value="Preoccupato"/>
-	</combo_box>
-	<text name="preview_label">
-		Vedi anteprima mentre
-	</text>
-	<combo_box name="preview_base_anim" tool_tip="Da usarsi per controllare il comportamento dell&apos;animazione mentre l&apos;avatar svolge azioni abituali.">
-		<item label="In piedi" name="Standing" value="In piedi"/>
-		<item label="Camminando" name="Walking" value="Cammina"/>
-		<item label="Seduto" name="Sitting" value="Seduto"/>
-		<item label="Volo" name="Flying" value="Volo"/>
-	</combo_box>
-	<spinner label="Avvio lento (sec)" name="ease_in_time" tool_tip="Durata (in secondi) della fusione in entrata delle animazioni"/>
-	<spinner label="Arresto lento (sec)" name="ease_out_time" tool_tip="Durata (in secondi) della fusione in uscita delle animazioni"/>
-	<button name="play_btn" tool_tip="Riproduci la tua animazione"/>
-	<button name="pause_btn" tool_tip="Metti in pausa la tua animazione"/>
-	<button label="" name="stop_btn" tool_tip="Ferma la riproduzione dell&apos;animazione"/>
-	<text name="bad_animation_text">
-		Impossibile leggere il file dell&apos;animazione.
-
-Raccomandiamo file di tipo BVH esportati da
-Poser 4.
-	</text>
-	<button label="Importa ([AMOUNT]L$)" name="ok_btn"/>
-	<button label="Annulla" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_autoreplace.xml b/indra/newview/skins/default/xui/it/floater_autoreplace.xml
new file mode 100644
index 0000000000..559a42cfae
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Impostazioni sostituzione automatica">
+	<check_box label="Attiva sostituzione automatica" name="autoreplace_enable" tool_tip="Quando inserisci testo nella chat, sostituisci le parole chiave inserite con l&apos;elemento sostitutivo corrispondente."/>
+	<button label="Importa lista..." name="autoreplace_import_list" tool_tip="Carica da file una lista esportata in precedenza."/>
+	<button label="Esporta lista..." name="autoreplace_export_list" tool_tip="Salva la lista selezionata in un file per condividerla."/>
+	<button label="Nuova lista..." name="autoreplace_new_list" tool_tip="Crea una nuova lista"/>
+	<button label="Cancella lista" name="autoreplace_delete_list" tool_tip="Cancella la lista selezionata"/>
+	<button name="autoreplace_list_up" tool_tip="Aumenta la priorità di questa lista."/>
+	<button name="autoreplace_list_down" tool_tip="Diminuisci la priorità di questa lista."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Parola chiave" name="keyword"/>
+		<scroll_list.columns label="Sostituzione" name="replacement"/>
+	</scroll_list>
+	<button label="Aggiungi..." name="autoreplace_add_entry"/>
+	<button label="Rimuovi" name="autoreplace_delete_entry"/>
+	<button label="Salva elemento" name="autoreplace_save_entry" tool_tip="Salva questo elemento."/>
+	<button label="Salva modifiche" name="autoreplace_save_changes" tool_tip="Salva tutte le modifiche."/>
+	<button label="Annulla" name="autoreplace_cancel" tool_tip="Annulla tutte le modifiche."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/it/floater_inventory.xml b/indra/newview/skins/default/xui/it/floater_inventory.xml
deleted file mode 100644
index 2aa6795988..0000000000
--- a/indra/newview/skins/default/xui/it/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="IL MIO INVENTARIO">
-	<floater.string name="Title">
-		IL MIO INVENTARIO
-	</floater.string>
-	<floater.string name="TitleFetching">
-		IL MIO INVENTARIO (recupero di [ITEM_COUNT] articoli...) [FILTER]
-	</floater.string>
-	<floater.string name="TitleCompleted">
-		IL MIO INVENTARIO ([ITEM_COUNT] articoli) [FILTER]
-	</floater.string>
-	<floater.string name="Fetched">
-		Completato
-	</floater.string>
-	<panel label="Pannello dell&apos;Inventario" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_model_preview.xml b/indra/newview/skins/default/xui/it/floater_model_preview.xml
index ca36fd2def..e8df4d2d4b 100644
--- a/indra/newview/skins/default/xui/it/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Triangoli" name="triangles" value="Triangoli"/>
 				<text initial_value="Vertici" name="vertices" value="Vertici"/>
 				<text initial_value="Alto" name="high_label" value="Alto"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Carica da file"/>
+					<item name="Generate" value="Genera"/>
+				</combo_box>
 				<button label="Sfoglia..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Limite triangoli"/>
+					<item name="Error Threshold" value="Limite errori"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Medio" name="medium_label" value="Medio"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Carica da file"/>
+					<item name="Generate" value="Genera"/>
+					<item name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/>
+				</combo_box>
 				<button label="Sfoglia..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Limite triangoli"/>
+					<item name="Error Threshold" value="Limite errori"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Basso" name="low_label" value="Basso"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Carica da file"/>
+					<item name="Generate" value="Genera"/>
+					<item name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/>
+				</combo_box>
 				<button label="Sfoglia..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Limite triangoli"/>
+					<item name="Error Threshold" value="Limite errori"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="Bassissimo" name="lowest_label" value="Bassissimo"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Carica da file"/>
+					<item name="Generate" value="Genera"/>
+					<item name="Use LoD above" value="Usa livello di dettaglio indicato in precedenza"/>
+				</combo_box>
 				<button label="Sfoglia..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Limite triangoli"/>
+					<item name="Error Threshold" value="Limite errori"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Genera normali" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/it/floater_nearby_chat.xml b/indra/newview/skins/default/xui/it/floater_nearby_chat.xml
deleted file mode 100644
index 9e81899880..0000000000
--- a/indra/newview/skins/default/xui/it/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="CHAT NEI DINTORNI">
-	<check_box label="Traduci chat" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml
new file mode 100644
index 0000000000..5122954edb
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Personaggi con pathfinding">
+	<floater.string name="messaging_get_inprogress">
+		Ricerca personaggi con pathfinding in corso...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Errore rilevato durante la ricerca di personaggi con pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Nessun personaggio con pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] personaggi selezionati su [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		In questa regione non è attivata la funzione pathfinding
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Caricamento in corso]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Sconosciuto]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[gruppo]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nome" name="name"/>
+			<scroll_list.columns label="Descrizione" name="description"/>
+			<scroll_list.columns label="Proprietario" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="Altitudine" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Personaggi:
+		</text>
+		<button label="Aggiorna lista" name="refresh_objects_list"/>
+		<button label="Seleziona tutto" name="select_all_objects"/>
+		<button label="Non selezionare nessuno" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Azioni per i personaggi selezionati:
+		</text>
+		<check_box label="Mostra marcatore" name="show_beacon"/>
+		<check_box label="Mostra capsula fisica" name="show_physics_capsule"/>
+		<button label="Prendi" name="take_objects"/>
+		<button label="Prendi copia" name="take_copy_objects"/>
+		<button label="Teletrasportami alla posizione" name="teleport_me_to_object" tool_tip="Attivato solo se viene selezionato un personaggio."/>
+		<button label="Restituisci" name="return_objects"/>
+		<button label="Elimina" name="delete_objects"/>
+	</panel>
+</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
new file mode 100644
index 0000000000..77be220a2a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Visualizzazione / test pathfinding">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		Implementazione libreria percorsi non trovata.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		In questa regione non è attivata la funzione pathfinding
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		Attendere il caricamento della regione.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Controllo stato navmesh
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Scaricamento navmesh in corso
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		Il navmesh è stato cambiato sul server. Scaricamento del navmesh più recente in corso
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		Il navmesh più recente è stato scaricato.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		Navmesh non scaricato correttamente.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		Il navmesh ha modifiche in sospeso.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		Costruzione navmesh in corso.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		Alcune regioni navmesh hanno modifiche in sospeso.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		La costruzione di alcune regioni navmesh è in corso.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		Alcune regioni navmesh hanno modifiche in sospeso e in altre la costruzione è in corso.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		Navmesh è aggiornato.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		Implementazione libreria percorsi non trovata.
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		In questa regione non è attivata la funzione pathfinding
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Seleziona punti iniziale e finale.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Seleziona punto iniziale.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Seleziona punto finale.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		Il percorso viene visualizzato con il colore arancione.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		Nessun percorso trovato tra i punti selezionati.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Si è verificato un errore durante la generazione del percorso.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Visuale" name="view_panel">
+			<text name="show_label">
+				Mostra:
+			</text>
+			<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">
+				Mostra mappa camminabilità:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="Non mostrare" name="show_heatmap_mode_none"/>
+				<combo_box.item label="Personaggio tipo A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="Personaggio tipo B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="Personaggio tipo C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="Personaggio tipo D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Camminabili" name="show_walkables"/>
+			<check_box label="Volumi materiali" name="show_material_volumes"/>
+			<check_box label="Ostacoli statici" name="show_static_obstacles"/>
+			<check_box label="Volumi esclusioni" name="show_exclusion_volumes"/>
+			<check_box label="Piano acqua" name="show_water_plane"/>
+			<check_box label="Con vista a raggi X" name="show_xray"/>
+		</panel>
+		<panel label="Percorso test" name="test_panel">
+			<text name="ctrl_click_label">
+				Seleziona il punto iniziale premendo Ctrl e facendo clic.
+			</text>
+			<text name="shift_click_label">
+				Seleziona il punto finale premendo Maiusc e facendo clic.
+			</text>
+			<text name="character_width_label">
+				Larghezza personaggio
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				Tipo personaggio
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Nessuno" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Cancella percorso" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml
new file mode 100644
index 0000000000..2c6d620b0a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Set collegati pathfinding">
+	<floater.string name="messaging_get_inprogress">
+		Ricerca set collegati pathfinding in corso...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Errore rilevato durante la ricerca di set collegati pathfinding.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Modifica set collegati pathfinding selezionati in corso...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Errore rilevato durante la modifica dei set collegati pathfinding selezionati.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Nessun set collegato con pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] set collegati selezionati su [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		In questa regione non è attivata la funzione pathfinding
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terreno]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Caricamento in corso]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Sconosciuto]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[gruppo]
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Camminabile
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Ostacolo statico
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Ostacolo mobile
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Volume materiale
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Volume esclusione
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Oggetto fantasma mobile
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[non modificabile]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[limitato]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[concavo]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[limitato,concavo]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Seleziona uso set collegati...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Filtra in base all&apos;uso set collegati..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Camminabile" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Ostacolo statico" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Ostacolo mobile" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Volume materiale" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Volume esclusione" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Oggetto fantasma mobile" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Applica" name="apply_filters"/>
+		<button label="Cancella" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nome (prim principale)" name="name"/>
+			<scroll_list.columns label="Descrizione (prim principale)" name="description"/>
+			<scroll_list.columns label="Proprietario" name="owner"/>
+			<scroll_list.columns label="Impatto" name="land_impact"/>
+			<scroll_list.columns label="Distanza" name="dist_from_you"/>
+			<scroll_list.columns label="Uso set collegati" name="linkset_use"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Set collegati:
+		</text>
+		<button label="Aggiorna lista" name="refresh_objects_list"/>
+		<button label="Seleziona tutto" name="select_all_objects"/>
+		<button label="Non selezionare nessuno" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="Mostra marcatore" name="show_beacon"/>
+		<button label="Prendi" name="take_objects"/>
+		<button label="Prendi copia" name="take_copy_objects"/>
+		<button label="Teletrasportami alla posizione" name="teleport_me_to_object"/>
+		<button label="Restituisci" name="return_objects"/>
+		<button label="Elimina" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Camminabilità:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="Camminabilità per personaggi di tipo A. Umanoide è un esempio del tipo di personaggio."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="Camminabilità per personaggi di tipo B. Creatura è un esempio del tipo di personaggio."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="Camminabilità per personaggi di tipo C. Elemento meccanico è un esempio del tipo di personaggio."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="Camminabilità per personaggi di tipo D. Altro è un esempio del tipo di personaggio."/>
+		<button label="Applica modifiche" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Umanoide)
+		</text>
+		<text name="suggested_use_b_label">
+			(Creatura)
+		</text>
+		<text name="suggested_use_c_label">
+			(Elemento meccanico)
+		</text>
+		<text name="suggested_use_d_label">
+			(Altro)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_postcard.xml b/indra/newview/skins/default/xui/it/floater_postcard.xml
deleted file mode 100644
index cb2916268a..0000000000
--- a/indra/newview/skins/default/xui/it/floater_postcard.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="INVIA FOTO VIA E-MAIL">
-	<text name="to_label" width="135">
-		Email del destinatario:
-	</text>
-	<line_editor left="143" name="to_form" width="127"/>
-	<text name="from_label">
-		La tua email:
-	</text>
-	<line_editor left="143" name="from_form" width="127"/>
-	<text name="name_label">
-		Il tuo nome:
-	</text>
-	<line_editor left="143" name="name_form" width="127"/>
-	<text name="subject_label">
-		Soggetto:
-	</text>
-	<line_editor left="143" name="subject_form" width="127"/>
-	<line_editor label="Scrivi il soggetto qui." name="subject_form"/>
-	<text name="msg_label">
-		Messaggio:
-	</text>
-	<text_editor name="msg_form">
-		Scrivi il messaggio qui.
-	</text_editor>
-	<text name="fine_print">
-		Se il tuo destinatario si registrerà in [SECOND_LIFE], riceverai il relativo bonus.
-	</text>
-	<button label="Annulla" name="cancel_btn"/>
-	<button label="Invia" name="send_btn"/>
-	<string name="default_subject">
-		Cartolina da [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		Vieni a vedere!
-	</string>
-	<string name="upload_message">
-		Invio...
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_spellcheck.xml b/indra/newview/skins/default/xui/it/floater_spellcheck.xml
new file mode 100644
index 0000000000..2a8557b0fc
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Impostazioni controllo ortografico">
+	<check_box label="Attiva controllo ortografico" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Dizionario principale:
+	</text>
+	<text label="Registri:" name="spellcheck_additional">
+		Dizionari aggiuntivi:
+	</text>
+	<text name="spellcheck_available">
+		Disponibile
+	</text>
+	<text name="spellcheck_active">
+		Attivato
+	</text>
+	<button label="Rimuovi" name="spellcheck_remove_btn"/>
+	<button label="Importa..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml
new file mode 100644
index 0000000000..c04fc249a7
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Imposta dizionario">
+	<button label="Sfoglia" label_selected="Sfoglia" name="dictionary_path_browse"/>
+	<button label="Importa" name="ok_btn"/>
+	<button label="Annulla" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_stats.xml b/indra/newview/skins/default/xui/it/floater_stats.xml
index 2241cad711..825b2ce57a 100644
--- a/indra/newview/skins/default/xui/it/floater_stats.xml
+++ b/indra/newview/skins/default/xui/it/floater_stats.xml
@@ -47,6 +47,12 @@
 					<stat_bar label="Oggetti a basso LOD" name="physicslodtasks"/>
 					<stat_bar label="Memoria allocata" name="physicsmemoryallocated"/>
 				</stat_view>
+				<stat_bar label="Script eseguiti" name="simpctscriptsrun"/>
+				<stat_view label="Pathfinding" name="simpathfinding">
+					<stat_bar label="Tempo passaggio AI" name="simsimaistepmsec"/>
+					<stat_bar label="Passaggi silhouette saltati" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Personaggi aggiornati" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_view label="Tempo (ms)" name="simperf">
 					<stat_bar label="Tempo totale Frame" name="simframemsec"/>
 					<stat_bar label="Tempo netto" name="simnetmsec"/>
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 e85030087c..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,6 +19,8 @@
 	<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="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"/>
 	<button label="Aggiungi" label_selected="Aggiungi" name="l_add_btn"/>
@@ -30,5 +32,4 @@
 	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
 	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
-	<check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml
index c963ac72e6..dd59035dd4 100644
--- a/indra/newview/skins/default/xui/it/floater_tools.xml
+++ b/indra/newview/skins/default/xui/it/floater_tools.xml
@@ -149,6 +149,12 @@
 			<panel.string name="text modify info 4">
 				Non puoi modificare questi oggetti
 			</panel.string>
+			<panel.string name="text modify info 5">
+				Questo oggetto non può essere modificato attraverso il confine di una regione
+			</panel.string>
+			<panel.string name="text modify info 6">
+				Questi oggetti non possono essere modificati attraverso il confine di una regione
+			</panel.string>
 			<panel.string name="text modify warning">
 				Devi selezionare tutto l&apos;oggetto per impostare i permessi
 			</panel.string>
@@ -204,12 +210,12 @@
 				<combo_box.item label="Ingrandisci" name="Zoom"/>
 			</combo_box>
 			<check_box label="In vendita:" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Copia" name="Copy"/>
 				<combo_box.item label="Contenuto" name="Contents"/>
 				<combo_box.item label="Originale" name="Original"/>
 			</combo_box>
-			<spinner label="Prezzo: L$" name="Edit Cost"/>
 			<check_box label="Mostra nella ricerca" name="search_check" tool_tip="Permetti che l&apos;oggetto sia visibile nella ricerca"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -245,6 +251,11 @@
 					F:
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Attributi pathfinding:
+				</text>
+			</panel>
 		</panel>
 		<panel label="Oggetto" name="Object">
 			<check_box label="Bloccato" name="checkbox locked" tool_tip="Previene lo spostamento o la cancellazione dell&apos;oggetto. Spesso utile mentre si costruisce per evitare involontarie modifiche."/>
diff --git a/indra/newview/skins/default/xui/it/floater_top_objects.xml b/indra/newview/skins/default/xui/it/floater_top_objects.xml
index 7d062db23b..d8ca7f4438 100644
--- a/indra/newview/skins/default/xui/it/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/it/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		Ora
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Ora &apos;Mono&apos;
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		Oggetti con maggiori collisioni
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Nome" name="name" width="84"/>
 		<scroll_list.columns label="Proprietario" name="owner" width="84"/>
 		<scroll_list.columns label="Ubicazione" name="location" width="84"/>
+		<scroll_list.columns label="Lotto" name="parcel"/>
 		<scroll_list.columns label="Ora" name="time" width="84"/>
-		<scroll_list.columns label="Ora (Mono)" name="mono_time" width="84"/>
 		<scroll_list.columns label="URL" name="URLs"/>
+		<scroll_list.columns label="Memoria (KB)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		ID oggetto:
@@ -51,6 +49,10 @@
 	</text>
 	<line_editor font="SansSerifSmall" left="90" name="owner_name_editor" width="280"/>
 	<button label="Filtro" name="filter_owner_btn" width="150"/>
+	<text name="parcel_name_text">
+		Lotto:
+	</text>
+	<button label="Filtra" name="filter_parcel_btn"/>
 	<button label="Aggiorna" name="refresh_btn" width="150"/>
 	<button label="Restituisci selezionato" name="return_selected_btn" width="150"/>
 	<button label="Restituisci tutti" left="170" name="return_all_btn"/>
diff --git a/indra/newview/skins/default/xui/it/menu_bottomtray.xml b/indra/newview/skins/default/xui/it/menu_bottomtray.xml
deleted file mode 100644
index ddd6909136..0000000000
--- a/indra/newview/skins/default/xui/it/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Pulsante Parla" name="EnableVoiceChat"/>
-	<menu_item_check label="Tasto Gesture" name="ShowGestureButton"/>
-	<menu_item_check label="Tasto Movimento" name="ShowMoveButton"/>
-	<menu_item_check label="Tasto Visuale" name="ShowCameraButton"/>
-	<menu_item_check label="Tasto Foto" name="ShowSnapshotButton"/>
-	<menu_item_check label="Pulsante Costruisci" name="ShowBuildButton"/>
-	<menu_item_check label="Pulsante Cerca" name="ShowSearchButton"/>
-	<menu_item_check label="Pulsante Mappa" name="ShowWorldMapButton"/>
-	<menu_item_check label="Pulsante Mini mappa" name="ShowMiniMapButton"/>
-	<menu_item_call label="Taglia" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Copia" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Incolla" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Elimina" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Seleziona tutto" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/it/menu_mode_change.xml b/indra/newview/skins/default/xui/it/menu_mode_change.xml
deleted file mode 100644
index 499dcf1873..0000000000
--- a/indra/newview/skins/default/xui/it/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Di base" name="BasicMode"/>
-	<menu_item_check label="Avanzata" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_object.xml b/indra/newview/skins/default/xui/it/menu_object.xml
index a172cf3b26..7f41e8937f 100644
--- a/indra/newview/skins/default/xui/it/menu_object.xml
+++ b/indra/newview/skins/default/xui/it/menu_object.xml
@@ -5,6 +5,8 @@
 	</menu_item_call>
 	<menu_item_call label="Modifica" name="Edit..."/>
 	<menu_item_call label="Costruisci" name="Build"/>
+	<menu_item_call label="Mostra nei set collegati" name="show_in_linksets"/>
+	<menu_item_call label="Mostra nei personaggi" name="show_in_characters"/>
 	<menu_item_call label="Apri" name="Open"/>
 	<menu_item_call label="Siediti qui" name="Object Sit"/>
 	<menu_item_call label="Alzati" name="Object Stand Up"/>
diff --git a/indra/newview/skins/default/xui/it/menu_text_editor.xml b/indra/newview/skins/default/xui/it/menu_text_editor.xml
index 4636ce9929..5b61da914e 100644
--- a/indra/newview/skins/default/xui/it/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/it/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(sconosciuto)" name="Suggestion 1"/>
+	<menu_item_call label="(sconosciuto)" name="Suggestion 2"/>
+	<menu_item_call label="(sconosciuto)" name="Suggestion 3"/>
+	<menu_item_call label="(sconosciuto)" name="Suggestion 4"/>
+	<menu_item_call label="(sconosciuto)" name="Suggestion 5"/>
+	<menu_item_call label="Aggiungi al dizionario" name="Add to Dictionary"/>
+	<menu_item_call label="Aggiungi per ignorare" name="Add to Ignore"/>
 	<menu_item_call label="Taglia" name="Cut"/>
 	<menu_item_call label="Copia" name="Copy"/>
 	<menu_item_call label="Incolla" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index f94b2f9a9e..547c5a9b73 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -28,6 +28,7 @@
 		<menu_item_call label="Preferenze..." name="Preferences"/>
 		<menu_item_call label="Pulsanti barra strumenti..." name="Toolbars"/>
 		<menu_item_call label="Nascondi tutti i controlli" name="Hide UI"/>
+		<menu_item_check label="Mostra elementi HUD" name="Show HUD Attachments"/>
 		<menu_item_call label="Esci da [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunica" name="Communicate">
@@ -39,6 +40,7 @@
 		<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">
 		<menu_item_call label="Crea punto di riferimento per questo luogo" name="Create Landmark Here"/>
@@ -124,6 +126,11 @@
 			<menu_item_call label="Imposta gli script come in esecuzione" name="Set Scripts to Running"/>
 			<menu_item_call label="Imposta script come non in esecuzione" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Pathfinding" name="Pathfinding">
+			<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>
 		<menu label="Opzioni" name="Options">
 			<menu_item_check label="Mostra autorizzazioni avanzate" name="DebugPermissions"/>
 			<menu_item_check label="Seleziona solo i miei oggetti" name="Select Only My Objects"/>
@@ -174,7 +181,6 @@
 			<menu_item_check label="Nascondi particelle" name="Hide Particles"/>
 			<menu_item_check label="Nascondi selezionati" name="Hide Selected"/>
 			<menu_item_check label="Evidenzia trasparenza" name="Highlight Transparent"/>
-			<menu_item_check label="Mostra elementi HUD" name="Show HUD Attachments"/>
 			<menu_item_check label="Mostra mirino visuale soggettiva" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Modalità di rendering" name="Rendering Types">
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 78034d736f..9bdce2e2f6 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -367,6 +373,12 @@ Devi avere un account per entrare in [SECOND_LIFE]. Vuoi crearne uno adesso?
 	<notification name="InvalidCredentialFormat">
 		Immetti il nome utente oppure sia il nome che il cognome del tuo avatar nel campo del nome utente, quindi effettua nuovamente l&apos;accesso.
 	</notification>
+	<notification name="InvalidGrid">
+		&apos;[GRID]&apos; non è un identificatore di griglia valido.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		La tua posizione iniziale non ha specificato una griglia valida.
+	</notification>
 	<notification name="DeleteClassified">
 		Cancella annuncio &apos;[NAME]&apos;?
 Non ci sono rimborsi per la tariffa pagata.
@@ -598,6 +610,9 @@ Puoi unire al massimo [MAX] oggetti.
 
 Accertati che nessuno sia bloccato e che li possiedi tutti.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		Gli oggetti non possono essere collegati attraverso i confini.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Impossibile unire perche non tutti gli oggetti hanno lo stesso proprietario.
 
@@ -977,6 +992,41 @@ Offri l&apos;amicizia a [NAME]?
 			<button name="Cancel" text="Annulla"/>
 		</form>
 	</notification>
+	<notification label="Aggiungi lista di sostituzione automatica" name="AddAutoReplaceList">
+		Nome per la nuova lista:
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="Rinomina lista di sostituzione automatica" name="RenameAutoReplaceList">
+		Il nome &apos;[DUPNAME]&apos; è già in uso
+    Inserisci un nuovo nome univoco:
+		<form name="form">
+			<button name="ReplaceList" text="Sostituisci lista corrente"/>
+			<button name="SetName" text="Usa nuovo nome"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		La parola chiave deve essere una sola parola e la sostituzione non può essere vuota.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		L&apos;elenco di sostituzione non è valido.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Devi specificare un file, un nome e una lingua.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		Sembra che il dizionario [DIC_NAME] non includa un file &quot;aff&quot;; ciò indica che di tratta di un dizionario &quot;secondario&quot;.
+Può essere usato come dizionario aggiuntivo, ma non come dizionario principale.
+
+Vedi https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		Copia non eseguita da
+    [FROM_NAME]
+    a
+    [TO_NAME]
+	</notification>
 	<notification label="Salva vestiario" name="SaveOutfitAs">
 		Salva gli abiti che indosso come nuovo vestiario:
 		<form name="form">
@@ -1697,83 +1747,128 @@ Cambierà migliaia di regioni e produrrà seri problemi ai vari server.
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		Non sei ammesso in questa regione a causa della tua categoria di accesso. Questo può risultare da una mancanza di informazioni necessarie per convalidare la tua età.
-
-Verifica di avere installato l&apos;ultima versione del programma e vai alla Knowledge Base per ulteriori informazioni su come accedere nelle zone con tale categoria di accesso.
+		La regione che cerchi di visitare include contenuti che non corripondono al livello selezionato nelle preferenze.  Per cambiare le preferenze seleziona Io &gt; Preferenze &gt; Generale.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		Non sei ammesso in questa regione a causa della tua categoria d&apos;accesso. 
-
-Vuoi andare alla Knowledge Base per ulteriori informazioni sulle categorie di accesso?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY] accessibili solo ad adulti.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/it
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Non posso entrare in questa regione a causa delle restrizioni della categoria di accesso" name="okcancelignore" notext="Chiudi" yestext="Vai alla Knowledge Base"/>
+		<usetemplate ignoretext="Attraversamento regione: la regione che cerchi di visitare include contenuti accessibili solo ad adulti." name="okcancelignore" notext="Chiudi" yestext="Passa alla Base conoscenze"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		Non sei ammesso in questa regione a causa della tua categoria d&apos;accesso.
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY].
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY] accessibili solo ad adulti.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Non ti è consentito entrare in quella regione a causa della categoria di accesso impostata nelle preferenze.
-
-Per entrare nella regione, dovrai modificare la tua categoria di accesso. Ciò ti consentirà inoltre di effettuare ricerche di contenuti di categoria [REGIONMATURITY]. Per annullare le modifiche in un secondo momento, vai a Io &gt; Preferenze &gt; Generali.
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY]. Puoi modificare le tue preferenze o annullare. Dopo aver modificato le preferenze, prova nuovamente ad entrare nella regione.
+		<form name="form">
+			<button name="OK" text="Modifica preferenze"/>
+			<button default="true" name="Cancel" text="Annulla"/>
+			<ignore name="ignore" text="Attraversamento regione: La regione che cerchi di visitare include contenuti esclusi nelle preferenze."/>
+		</form>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		Si è verificato un problema con il teleport a causa di un errore di sincronizzazione delle preferenze con il server.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		La regione che cerchi di visitare include contenuti che non corripondono al livello selezionato nelle preferenze.  Per cambiare le preferenze seleziona Io &gt; Preferenze &gt; Generale.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY] accessibili solo ad adulti.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+		</url>
+		<usetemplate ignoretext="Teleport: la regione che cerchi di visitare include contenuti accessibili solo ad adulti." name="okcancelignore" notext="Chiudi" yestext="Passa alla Base conoscenze"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY].
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY] accessibili solo ad adulti.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY]. Puoi modificare le preferenze e continuare con il teleport oppure annullarlo.
 		<form name="form">
-			<button name="OK" text="Cambia preferenza"/>
-			<button default="true" name="Cancel" text="Chiudi"/>
-			<ignore name="ignore" text="La categoria di accesso impostata mi impedisce di entrare in una regione"/>
+			<button name="OK" text="Modifica e continua"/>
+			<button name="Cancel" text="Annulla"/>
+			<ignore name="ignore" text="Teleport (riavviabile): La regione che cerchi di visitare include contenuti esclusi nelle preferenze."/>
 		</form>
 	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		La regione che cerchi di visitare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY]. Puoi modificare le tue preferenze o annullare il teleport. Dopo aver modificato le preferenze, prova nuovamente a teletrasportarti nella regione.
+		<form name="form">
+			<button name="OK" text="Modifica preferenze"/>
+			<button name="Cancel" text="Annulla"/>
+			<ignore name="ignore" text="Teleport (non riavviabile): La regione che cerchi di visitare include contenuti esclusi nelle preferenze."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		Si è verificato un problema con il teleport a causa di un errore di sincronizzazione delle preferenze con il server.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		La tua categoria di accesso attuale è [RATING].
+		Non riceverai più notifiche se stai per visitare una regione con contenuti [RATING].   In futuro potrai modificare le preferenze relative ai contenuti selezionando Io &gt; Preferenze &gt; Generale nella barra del menu.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		Non è stato possibile modificare le preferenze per visualizzare contenuti [PREFERRED_MATURITY].  le preferenze sono state ripristinate per consentire la visualizzazione di contenuti [ACTUAL_MATURITY].  Puoi cercare di modificare nuovamente le preferenze selezionando Io &gt; Preferenze &gt; Generale nella barra del menu.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		Non puoi prendere possesso di questo terreno a causa della tua categoria di accesso. Questo può essere dovuto ad una mancanza di informazioni valide che confermino la tua età.
-
-Verifica di avere installato l&apos;ultima versione del programma e vai alla Knowledge Base per informazioni sull&apos;accesso ad aree con queste categorie di accesso.
+		Il terreno che desideri richiedere ha una categoria di accesso maggiore di quella indicata nelle preferenze.   Per cambiare le preferenze seleziona Io &gt; Preferenze &gt; Generale.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		Non puoi prendere possesso di questa terra a causa delle preferenze sulle categorie di accesso. 
-
-Vuoi andare alla Knowledge Base per maggiori informazioni sulle categorie di accesso?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		Solo gli adulti possono richiedere questo terreno.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/it
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Non posso richiedere questo terreno a causa delle restrizioni della categoria di accesso" name="okcancelignore" notext="Chiudi" yestext="Vai alla Knowledge Base"/>
+		<usetemplate ignoretext="Solo gli adulti possono richiedere questo terreno." name="okcancelignore" notext="Chiudi" yestext="Passa alla Base conoscenze"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		Non puoi prendere possesso di questa terra a causa della tua categoria di accesso.
+		Il terreno che desideri richiedere include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY].
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		Il terreno che cerchi di richiedere include contenuti [REGIONMATURITY], accessibili solo ad adulti.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		Non puoi richiedere questo terreno a causa della tua categoria di accesso.
-
-Puoi cliccare su Cambia preferenze per modificare la categoria di accesso e quindi riuscire ad entrare. Da adesso potrai accedere ai contenuti [REGIONMATURITY] ed effettuare ricerche in questa categoria. Se in seguito tu volessi cambiare di nuovo le tue impostazioni, apri la finestra di dialogo da Io &gt; Preferenze &gt; Generale.
-		<usetemplate ignoretext="Le mie preferenze di categoria di accesso mi impediscono di richiedere terreno" name="okcancelignore" notext="Chiudi" yestext="Cambia le preferenze"/>
+		Il terreno che desideri richiedere include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY]. Puoi modificare le preferenze e quindi cercare di richiedere nuovamente il terreno.
+		<form name="form">
+			<button name="OK" text="Modifica preferenze"/>
+			<button name="Cancel" text="Annulla"/>
+			<ignore name="ignore" text="Il terreno che cerchi di richiedere include contenuti esclusi nelle preferenze."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		Non puoi acquistare questo terreno a causa della tua categoria di accesso. Questo può essere dovuto ad una mancanza di informazioni valide che confermino la tua età.
-
-Verifica di avere installato l&apos;ultima versione del programma e vai alla Knowledge Base per informazioni sull&apos;accesso ad aree con queste categorie di accesso.
+		Il terreno che desideri acquistare ha una categoria di accesso maggiore di quella indicata nelle preferenze.   Per cambiare le preferenze seleziona Io &gt; Preferenze &gt; Generale.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		Non puoi acquistare questo terreno a causa della tua categoria di accesso. 
-
-Vuoi andare alla Knowledge Base per maggiori informazioni sulle categorie di accesso?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Solo gli adulti possono acquistare questo terreno.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/it
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Non posso acquistare questo terreno a causa delle restrizioni della categoria di accesso" name="okcancelignore" notext="Chiudi" yestext="Vai alla Knowledge Base"/>
+		<usetemplate ignoretext="Solo gli adulti possono acquistare questo terreno." name="okcancelignore" notext="Chiudi" yestext="Passa alla Base conoscenze"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		Non puoi acquistare questa land a causa della tua categoria di accesso.
+		Il terreno che cerchi di acquistare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY].
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		Il terreno che cerchi di acquistare include contenuti [REGIONMATURITY], accessibili solo ad adulti.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		Non puoi acquistare questo terreno a causa della tua categoria di accesso.
-
-Puoi cliccare su Cambia preferenze per modificare la categoria di accesso e quindi riuscire ad entrare. Da adesso potrai accedere ai contenuti [REGIONMATURITY] ed effettuare ricerche in questa categoria. Se in seguito tu volessi cambiare di nuovo le tue impostazioni, apri la finestra di dialogo da Io &gt; Preferenze &gt; Generale.
-		<usetemplate ignoretext="Le mie Preferenze di accesso mi impediscono di acquistare terreno" name="okcancelignore" notext="Chiudi" yestext="Cambia le preferenze"/>
+		Il terreno che cerchi di acquistare include contenuti [REGIONMATURITY], ma le tue preferenze attuali escludono i contenuti [REGIONMATURITY]. Puoi modificare le preferenze e quindi cercare di acquistare nuovamente il terreno.
+		<form name="form">
+			<button name="OK" text="Modifica preferenze"/>
+			<button name="Cancel" text="Annulla"/>
+			<ignore name="ignore" text="Il terreno che cerchi di acquistare include contenuti esclusi nelle preferenze."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Hai selezionato troppi prim.  Seleziona non più di [MAX_PRIM_COUNT] prim e riprova
@@ -1828,10 +1923,9 @@ Pubblica questo annuncio adesso per [AMOUNT]L$?
 		</form>
 	</notification>
 	<notification label="Cambiato il contenuto Moderato" name="RegionMaturityChange">
-		La classificazione di questa regione è stata aggiornata.
-Un periodo di tempo è necessario prima che la modifica venga integrata nella mappa.
-
-Per accedere a regioni per adulti, i residenti devono avere un Account verificato, mediante verifica dell&apos;età oppure mediante verifica della modalità di pagamento.
+		La classificazione di questa regione è stata modificata.
+Prima che questa modifica venga integrata nella mappa potrebbe essere necessario un po&apos; di tempo.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="Versione voice non compatibile" name="VoiceVersionMismatch">
 		Questa versione di [APP_NAME] non è compatibile con la funzionalità di chat vocale in questa regione. Affinché la chat vocale funzioni correttamente, dovrai aggiornare [APP_NAME].
@@ -2122,14 +2216,11 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica
 		<usetemplate ignoretext="Indossare gli abiti che creo mentre modifico il mio aspetto" name="okcancelignore" notext="No" yestext="Si"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Per accedere ai contenuti e alle aree per adulti in Second Life devi avere almeno 18 anni. Visita la pagina di verifica dell&apos;età per confermare di avere almeno 18 anni. 
-Verrà avviato il browser Web.
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="Non ho verificato la mia età" name="okcancelignore" notext="Annulla" yestext="Passa alla verifica dell&apos;età"/>
+		Il luogo che desideri visitare è limitato a persone di almeno 18 anni di età.
+		<usetemplate ignoretext="Non ho l&apos;età necessaria per visitare aree limitate." name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		Posizione limitata a persone maggiori di 18 anni di età.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Per poter visitare questa zona devi avere devi aver fornito informazioni di pagamento a Linden Lab.  Vuoi andare sul sito di [SECOND_LIFE] ed impostarle?
@@ -2390,6 +2481,23 @@ Qui non puoi volare.
 	<notification name="NoBuild">
 		In questa zona è proibita la costruzione. Qui non puoi costruire né rezzare oggetti.
 	</notification>
+	<notification name="PathfindingDirty">
+		La regione ha modifiche di pathfinding in sospeso.  Se hai le autorizzazioni necessarie per la costruzione puoi eseguire il rebake facendo clic sul pulsante “Rebake regione”.
+	</notification>
+	<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"/>
+	</notification>
 	<notification name="SeeAvatars">
 		In questo lotto non si possono vedere avatar e chat di testo presenti in altri lotti.   Non puoi vedere altri residenti fuori dal lotto e loro non possono vederti.  Viene bloccata anche la normale chat di testo sul canale 0.
 	</notification>
@@ -2408,9 +2516,7 @@ Qui funzionano soltanto gli script del proprietario del terreno.
 		Puoi solo richiedere terreni pubblici nella regione in cui sei posizionato.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		Non puoi entrare in quella regione a causa della tua categoria di accesso. Può essere necessario validare l&apos;età e/o installare l&apos;ultima versione del programma.
-
-Visita la Knowledge Base per informazioni sull&apos;accesso alle aree con queste categorie di accesso.
+		La regione che cerchi di visitare include contenuti che non corripondono al livello selezionato nelle preferenze.  Per cambiare le preferenze seleziona Io &gt; Preferenze &gt; Generale.
 	</notification>
 	<notification name="URBannedFromRegion">
 		Tu hai l&apos;accesso bloccato a questa regione.
@@ -2421,8 +2527,11 @@ Visita la Knowledge Base per informazioni sull&apos;accesso alle aree con queste
 	<notification name="ImproperPaymentStatus">
 		Non hai una impostazioni di pagamento corrette per entrare in questa regione.
 	</notification>
+	<notification name="MustGetAgeRegion">
+		Per poter entrare in questa regione devi avere almeno 18 anni.
+	</notification>
 	<notification name="MustGetAgeParcel">
-		Devi essere di età verificata per entrare in questa terra.
+		Per poter entrare in questo lotto devi avere almeno 18 anni.
 	</notification>
 	<notification name="NoDestRegion">
 		Non è stata trovata nessuna regione di destinazione.
@@ -2524,12 +2633,33 @@ Riprova tra qualche istante.
 	<notification name="TeleportOffered">
 		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione:
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Teleport"/>
 			<button name="Cancel" text="Cancella"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Questa regione include contenuti [REGION_CONTENT_MATURITY], ma le tue preferenze attuali escludono i contenuti  [REGION_CONTENT_MATURITY].  Puoi modificare le preferenze e continuare con il teleport oppure annullarlo.
+		<form name="form">
+			<button name="Teleport" text="Modifica e continua"/>
+			<button name="Cancel" text="Annulla"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] ti ha offerto il teleport alla sua ubicazione:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Questa regione include però contenuti accessibili solo agli adulti.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Offerta di Teleport inviata a [TO_NAME]
 	</notification>
@@ -2933,6 +3063,10 @@ Hai caricato una texture [RESOLUTION] completata per &apos;[BODYREGION]&apos; do
 		( In esistenza da [EXISTENCE] secondi)
 Hai aggiornato localmente una texture [RESOLUTION] completata per &apos;[BODYREGION]&apos; dopo [TIME] secondi.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		Non possiamo mostrare un&apos;anteprima di questa texture perché non ne è consentita la copia e/o il trasferimento.
+		<usetemplate ignoretext="Avvisami se la modalità Anteprima dal vivo non è disponibile per texture per cui non è consentita la copia e/o il trasferimento." name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Sei sicuro di volere uscire dalla chiamata?
 		<usetemplate ignoretext="Conferma prima di uscire dalla chiamata" name="okcancelignore" notext="No" yestext="Sì"/>
@@ -3104,6 +3238,23 @@ Clicca e trascina dovunque nel mondo per ruotare la visuale
 		Questa azione cancellerà tutte le voci di menu e i pulsanti. Per visualizzarli nuovamente cliccare ancora [SHORTCUT].
 		<usetemplate ignoretext="Conferma prima di nascondere l&apos;interfaccia" name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestricted">
+		Alcuni set collegati selezionati non possono essere impostati su &apos;[REQUESTED_TYPE]&apos; a causa di limitazioni nelle autorizzazioni per i set collegati.  Questi set collegati verranno invece impostati su &apos;[RESTRICTED_TYPE]&apos;.
+		<usetemplate ignoretext="Alcuni set collegati selezionati non possono essere impostati a causa di limitazioni nelle autorizzazioni per i set collegati." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnVolume">
+		Alcuni set collegati selezionati non possono essere impostati a &apos;[REQUESTED_TYPE]&apos; perché la forma è non-convessa.
+		<usetemplate ignoretext="Alcuni set collegati selezionati non possono essere impostati perché la forma è non-convessa." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestrictedAndVolume">
+		Alcuni set collegati selezionati non possono essere impostati su &apos;[REQUESTED_TYPE]&apos; a causa di limitazioni nelle autorizzazioni per i set collegati.  Questi set collegati verranno invece impostati su &apos;[RESTRICTED_TYPE]&apos;.
+ Alcuni set collegati selezionati non possono essere impostati a &apos;[REQUESTED_TYPE]&apos; perché la forma è non-convessa. Il tipo di utilizzo di questi set collegati non cambierà.
+		<usetemplate ignoretext="Alcuni set collegati selezionati non possono essere impostati a causa delle limitazioni nelle autorizzazioni per il set collegato e perché la forma è non-convessa." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		L&apos;oggetto selezionato influenza il navmesh.  Se lo si trasforma in un percorso flessibile verrà rimosso dal navmesh.
+		<usetemplate ignoretext="L&apos;oggetto selezionato influenza il navmesh.  Se lo si trasforma in un percorso flessibile verrà rimosso dal navmesh." name="okcancelignore" notext="Annulla" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Non sembra che tu abbia i requisiti hardware adeguati per [APP_NAME]. [APP_NAME] richiede una scheda grafica OpenGL con supporto multitexture. Se ne hai una in dotazione, accertati di avere i driver, i service pack e i patch più recenti per la scheda grafica e per il sistema operativo.
 
@@ -3140,4 +3291,12 @@ Gli aggiornamenti futuri per questo file sono disattivati.
 		Tentativo di aggiungere un file immagine [FNAME] non valido o non leggibile che non è stato possibile aprire o decodificare.
 Tentativo annullato.
 	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		Stai per restituire [NUM_ITEMS] elementi.  Vuoi continuare?
+		<usetemplate ignoretext="Sei sicuro di volere restituire più oggetti?" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		Stai per cancellare [NUM_ITEMS] elementi.  Vuoi continuare?
+		<usetemplate ignoretext="Sei sicuro di volere eliminare più oggetti?" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/it/panel_bottomtray.xml b/indra/newview/skins/default/xui/it/panel_bottomtray.xml
deleted file mode 100644
index 3d12473c87..0000000000
--- a/indra/newview/skins/default/xui/it/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Accende o spegne il microfono"/>
-	<string name="VoiceControlBtnToolTip" value="Mostra o nasconde il pannello di regolazione voce"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Parla" label_selected="Parla" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Gesture" name="Gesture" tool_tip="Mostra o nasconde le gesture"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Sposta" name="movement_btn" tool_tip="Mostra o nasconde i comandi del movimento"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Visuale" name="camera_btn" tool_tip="Mostra o nasconde le regolazioni della visuale"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="Scatta una foto"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Costruisci" name="build_btn" tool_tip="Mostra o nasconde gli strumenti di costruzione"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Cerca" name="search_btn" tool_tip="Mostra o nasconde la ricerca"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Mappa" name="world_map_btn" tool_tip="Mostra o nasconde la mappa del mondo"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Mini mappa" name="mini_map_btn" tool_tip="Mostra o nasconde la mini mappa"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Conversazioni"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Notifiche"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_group_invite.xml b/indra/newview/skins/default/xui/it/panel_group_invite.xml
index e3cb3c1092..1b57eba3f0 100644
--- a/indra/newview/skins/default/xui/it/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/it/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Alcuni dei residenti selezionati sono già nel gruppo, pertanto l&apos;invito non verrà loro spedito.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Invito di gruppo non inviato: troppi residenti selezionati Gli inviti di gruppo possono essere inviati a un massimo di 100 persone per ciascuna richiesta.
+	</panel.string>
 	<text name="help_text">
 		Puoi selezionare più residenti da invitare nel tuo gruppo. Per iniziare, clicca su Apri il selettore di residenti.
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml
new file mode 100644
index 0000000000..432754076a
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_navmesh_rebake">
+	<button label="Rebake regione" name="navmesh_btn" tool_tip="Fai clic per eseguire rebake sul navmesh della regione"/>
+	<button label="Richiesta rebake" name="navmesh_btn_sending" tool_tip="Invio richiesta rebake al server."/>
+	<button label="Rebake regione in corso" name="navmesh_btn_baking" tool_tip="Rebake della regione in corso.  Al termine, questo pulsante non sarà più visibile."/>
+</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 7f5992b584..0c9c4027e5 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -29,5 +29,7 @@
 	<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="Impostazioni traduzione chat" name="ok_btn"/>
+	<button label="Traduzione..." name="ok_btn"/>
+	<button label="Sostituzione automatica..." name="autoreplace_showgui"/>
+	<button label="Correzione ortografica..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_debug.xml b/indra/newview/skins/default/xui/it/panel_region_debug.xml
index 45b3a016f4..789dade097 100644
--- a/indra/newview/skins/default/xui/it/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_debug.xml
@@ -36,5 +36,5 @@
 	<button label="?" left="297" name="top_scripts_help"/>
 	<button label="Riavvia la regione" name="restart_btn" tool_tip="Dai 2 minuti di tempo massimo e fai riavviare la regione"/>
 	<button label="?" name="restart_help"/>
-	<button label="Ritarda il riavvio" name="cancel_restart_btn" tool_tip="Ritarda il riavvio della regione di un&apos;ora"/>
+	<button label="Annulla riavvio" name="cancel_restart_btn" tool_tip="Ritarda il riavvio della regione di un&apos;ora"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_region_estate.xml b/indra/newview/skins/default/xui/it/panel_region_estate.xml
index da6b6b277f..98d9b86cfc 100644
--- a/indra/newview/skins/default/xui/it/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/it/panel_region_estate.xml
@@ -26,7 +26,7 @@
 		Consenti l&apos;accesso solo ai Residenti che:
 	</text>
 	<check_box label="Hanno memorizzato le informazioni per l&apos;addebito" name="limit_payment" tool_tip="Per poter visitare questa proprietà immobiliare i Residenti devono aver fornito informazioni di pagamento a Linden Lab.  Vedi [SUPPORT_SITE] per maggiori informazioni."/>
-	<check_box label="Hanno verificato l&apos;età" name="limit_age_verified" tool_tip="Per poter visitare questa proprietà immobiliare i Residenti devono aver verificato la propria età. Vedi [SUPPORT_SITE] per maggiori informazioni."/>
+	<check_box label="Hanno almeno 18 anni" name="limit_age_verified" tool_tip="Per poter visitare questa proprietà immobiliare i Residenti devono avere almeno 18 anni. Vedi [SUPPORT_SITE] per maggiori informazioni."/>
 	<check_box label="Permetti la chat voice" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Permetti teleport diretto" name="allow_direct_teleport"/>
diff --git a/indra/newview/skins/default/xui/it/panel_region_texture.xml b/indra/newview/skins/default/xui/it/panel_region_texture.xml
deleted file mode 100644
index 1337ed18ca..0000000000
--- a/indra/newview/skins/default/xui/it/panel_region_texture.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Texture del terreno" name="Textures">
-	<text name="region_text_lbl">
-		Regione:
-	</text>
-	<text name="region_text">
-		sconosciuto
-	</text>
-	<text name="detail_texture_text" width="380">
-		Texture del terreno (è necessario siano 512x512, 24 bit .tga files)
-	</text>
-	<text name="height_text_lbl">
-		1 (Bassa)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (Alta)
-	</text>
-	<text name="height_text_lbl5">
-		Range di elevazione della texture
-	</text>
-	<text name="height_text_lbl6">
-		Nordovest
-	</text>
-	<text name="height_text_lbl7">
-		Nordest
-	</text>
-	<text name="height_text_lbl8">
-		Sudovest
-	</text>
-	<text name="height_text_lbl9">
-		Sudest
-	</text>
-	<spinner label="Bassa" name="height_start_spin_0"/>
-	<spinner label="Bassa" name="height_start_spin_1"/>
-	<spinner label="Bassa" name="height_start_spin_2"/>
-	<spinner label="Bassa" name="height_start_spin_3"/>
-	<spinner label="Alta" name="height_range_spin_0"/>
-	<spinner label="Alta" name="height_range_spin_1"/>
-	<spinner label="Alta" name="height_range_spin_2"/>
-	<spinner label="Alta" name="height_range_spin_3"/>
-	<text name="height_text_lbl10">
-		Questi valori indicano la gamma di miscele per le texture di cui sopra.
-	</text>
-	<text name="height_text_lbl11">
-		Misurato in metri, il valore BASSO è la MASSIMA altezza della texture n. 1, e il valore ALTO è l&apos;altezza MINIMA della texture n. 4.
-	</text>
-	<text name="height_text_lbl12">
-		Texture #1, e il valore più ALTO all&apos;altezza MINIMA della Texture #4.
-	</text>
-	<button label="Applica" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_side_tray.xml b/indra/newview/skins/default/xui/it/panel_side_tray.xml
deleted file mode 100644
index e0143088a5..0000000000
--- a/indra/newview/skins/default/xui/it/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Apri/chiudi la barra laterale." name="sidebar_openclose" tab_title="Apri/chiudi la barra laterale"/>
-	<sidetray_tab description="Casa." name="sidebar_home" tab_title="Home">
-		<panel label="casa" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Modifica il tuo profilo pubblico e i preferiti." name="sidebar_me" tab_title="Il mio profilo">
-		<panel_container name="panel_container">
-			<panel label="Io" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Trova amici, contatti e persone nelle vicinanze." name="sidebar_people" tab_title="Persone">
-		<panel_container name="panel_container">
-			<panel label="Profilo del gruppo" name="panel_group_info_sidetray"/>
-			<panel label="Residenti e oggetti bloccati" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Trova luoghi dove andare e luoghi già visitati." label="Luoghi" name="sidebar_places" tab_title="Luoghi">
-		<panel label="Luoghi" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Sfoglia il tuo inventario." name="sidebar_inventory" tab_title="Il mio inventario">
-		<panel label="Modifica inventario" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Cambia il tuo aspetto ed il tuo look attuale." name="sidebar_appearance" tab_title="Il mio aspetto">
-		<panel label="Modifica aspetto fisico" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
index 900a65956b..2b3ea0fb83 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(sconosciuto)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(sconosciuto / multiplo)
+	</panel.string>
 	<panel.string name="public">
 		(pubblico)
 	</panel.string>
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 cfabdc81b0..8a0f93e650 100644
--- a/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/it/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		Non puoi modificare questi oggetti
 	</panel.string>
+	<panel.string name="text modify info 5">
+		Questo oggetto non può essere modificato attraverso il confine di una regione
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Questi oggetti non possono essere modificati attraverso il confine di una regione
+	</panel.string>
 	<panel.string name="text modify warning">
 		Questo oggetto ha parti collegate
 	</panel.string>
@@ -95,6 +101,9 @@
 		</combo_box>
 		<spinner label="Prezzo: L$" name="Edit Cost"/>
 		<check_box label="Mostra nella ricerca" name="search_check" tool_tip="Permetti alle persone di vedere questo oggetto nei risultati della ricerca"/>
+		<text name="pathfinding_attributes_label">
+			Attributi pathfinding:
+		</text>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 11accb5f08..f2afcafbea 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -997,6 +997,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="script_files">
 		Script
 	</string>
+	<string name="dictionary_files">
+		Dizionari
+	</string>
 	<string name="AvatarSetNotAway">
 		Imposta come non assente
 	</string>
@@ -3786,6 +3789,12 @@ Se il messaggio persiste, contatta [SUPPORT_SITE].
 	<string name="LocationCtrlSeeAVsTooltip">
 		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.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		Il pathfinding dinamico non è attivato in questa regione.
+	</string>
 	<string name="UpdaterWindowTitle">
 		Aggiornamento [APP_NAME]
 	</string>
@@ -4916,6 +4925,21 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="Normal">
 		Normale
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Nessuno
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Influenza il navmesh
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Personaggio
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(Multiple)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Molto basso
 	</string>
@@ -4931,4 +4955,10 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="snapshot_quality_very_high">
 		Molto alto
 	</string>
+	<string name="TeleportMaturityExceeded">
+		Il Residente non può visitare questa regione.
+	</string>
+	<string name="UserDictionary">
+		[User]
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/it/teleport_strings.xml b/indra/newview/skins/default/xui/it/teleport_strings.xml
index f485212290..bd967ebcc4 100644
--- a/indra/newview/skins/default/xui/it/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/it/teleport_strings.xml
@@ -43,6 +43,9 @@ Per ripetere l&apos;esercitazione, visita &apos;Welcome Island Public&apos;.
 		<message name="no_inventory_host">
 			L&apos;inventario è temporaneamente inaccessibile.
 		</message>
+		<message name="MustGetAgeRegion">
+			Per poter entrare in questa regione devi avere almeno 18 anni.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -78,5 +81,8 @@ Per ripetere l&apos;esercitazione, visita &apos;Welcome Island Public&apos;.
 		<message name="requesting">
 			Avvio teletrasporto....
 		</message>
+		<message name="pending">
+			Teleport in sospeso...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 3c7a210a22..6d5df75645 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -66,27 +66,26 @@ Qt Webkit バージョン： [QT_WEBKIT_VERSION]
 		</panel>
 		<panel label="ライセンス" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-APR Copyright (C) 2000-2004 The Apache Software Foundation
-Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
-cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+APR Copyright (C) 2011 The Apache Software Foundation
+Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
 DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
 expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
 GL Copyright (C) 1999-2004 Brian Paul.
 GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
 google-perftools Copyright (c) 2005, Google Inc.
 Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
 jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
 jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-ogg/vorbis Copyright (C) 2001, Xiphophorus
-OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-PCRE Copyright (c) 1997-2008 University of Cambridge
+ogg/vorbis Copyright (C) 2002, Xiphophorus
+OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+PCRE Copyright (c) 1997-2012 University of Cambridge
 SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
 SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-google-perftools Copyright (c) 2005, Google Inc.
+zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
 Second Life ビューワでは Havok (TM) Physics が使用されています。(c)Copyright 1999-2010 Havok.com Inc. (and its Licensors).無断複写・複製・転載を禁じます。詳細については www.havok.com をご参照ください。
 
diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml
index 7c87bad5a3..3b4b5ed070 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -464,7 +464,7 @@
 				次の住人にのみアクセスを許可：
 			</text>
 			<check_box label="支払情情報が登録されている [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="支払情報が登録されていないと、この区画にアクセスすることはできません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
-			<check_box label="年齢確認が済んでいる [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="この区画にアクセスするには、年齢確認を済ませる必要があります。詳細については、[SUPPORT_SITE] をご覧ください。"/>
+			<check_box label="18 才以上です [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="この区画にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
 			<check_box label="グループのアクセスを許可：[GROUP]" name="GroupCheck" tool_tip="「一般」タブで、グループを選択してください。"/>
 			<check_box label="入場許可を販売：" name="PassCheck" tool_tip="この区画への一時的なアクセスを許可します。"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml b/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
deleted file mode 100644
index 548d24097f..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_animation_preview.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<floater.string name="failed_to_initialize">
-		モーションを初期化できませんでした
-	</floater.string>
-	<floater.string name="anim_too_long">
-		アニメーションファイルの長さは[LENGTH]秒です。
-
-アニメーションの最大の長さは[MAX_LENGTH]秒です。
-	</floater.string>
-	<floater.string name="failed_file_read">
-		アニメーションファイルを読み取れません。
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		Ok
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		不完全なファイル。
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		制約定義を読みとれません。
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		BVH ファイルを開けません。
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		無効な HIERARCHY ヘッダーです。.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		ROOT または JOINT が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		JOINT ネームを取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		OFFSET が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		CHANNELS が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		回転順序を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		回転軸を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		MOTION が見つかりません。
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		フレーム数を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		フレームタイムを取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		ポジション値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		回転値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		ファイルを開けません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		読みとることができません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		読みとることができません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		読みとることができません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		読みとることができません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		読みとることができません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		読みとることができません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Mergechild 名を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Mergeparent 名を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		プロパティ値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		ループ値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		easeln 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		easeOut 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Hand morph 値を取得できません。
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		エモート名を読みとれません。
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		ルートジョイント名が無効です。「hip」を使用してください。
-	</floater.string>
-	<text name="name_label">
-		名前：
-	</text>
-	<text name="description_label">
-		説明：
-	</text>
-	<spinner label="優先順位" name="priority" tool_tip="このアニメーションがどのアニメーションを上書きするかを決めます"/>
-	<check_box label="ループ" name="loop_check" tool_tip="このアニメーションをループ再生します"/>
-	<spinner label="イン(％)" label_width="45" left="60" name="loop_in_point" tool_tip="アニメーションのループ復帰点を設定します" width="100"/>
-	<spinner label="アウト(％)" label_width="50" left="170" name="loop_out_point" tool_tip="アニメーションのループ終了点を設定します" width="100"/>
-	<text name="hand_label">
-		手の動き
-	</text>
-	<combo_box label="" name="hand_pose_combo" tool_tip="アニメーション再生中の手の動きを決めます">
-		<combo_box.item label="広げる" name="Spread"/>
-		<combo_box.item label="リラックス" name="Relaxed"/>
-		<combo_box.item label="指を指す・両手" name="PointBoth"/>
-		<combo_box.item label="拳" name="Fist"/>
-		<combo_box.item label="リラックス・左" name="RelaxedLeft"/>
-		<combo_box.item label="指を指す・左" name="PointLeft"/>
-		<combo_box.item label="拳を上げる・左" name="FistLeft"/>
-		<combo_box.item label="リラックス・右" name="RelaxedRight"/>
-		<combo_box.item label="指を指す・右" name="PointRight"/>
-		<combo_box.item label="拳を上げる・右" name="FistRight"/>
-		<combo_box.item label="敬礼・右" name="SaluteRight"/>
-		<combo_box.item label="タイピング" name="Typing"/>
-		<combo_box.item label="ピース・右" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		表現
-	</text>
-	<combo_box label="" name="emote_combo" tool_tip="アニメーション再生中の顔の表情を決めます">
-		<item label="（なし）" name="[None]" value=""/>
-		<item label="アーーーーー" name="Aaaaah" value="アーーーーー"/>
-		<item label="恐れる" name="Afraid" value="恐れる"/>
-		<item label="怒る" name="Angry" value="怒る"/>
-		<item label="満面の笑み" name="BigSmile" value="満面の笑み"/>
-		<item label="退屈" name="Bored" value="退屈"/>
-		<item label="泣く" name="Cry" value="泣く"/>
-		<item label="侮辱" name="Disdain" value="侮辱"/>
-		<item label="恥ずかしがる" name="Embarrassed" value="恥ずかしがる"/>
-		<item label="しかめっ面" name="Frown" value="しかめっ面"/>
-		<item label="キス" name="Kiss" value="キス"/>
-		<item label="笑う" name="Laugh" value="笑う"/>
-		<item label="Plllppt" name="Plllppt" value="Plllppt"/>
-		<item label="嫌悪感" name="Repulsed" value="嫌悪感"/>
-		<item label="悲しい" name="Sad" value="悲しい"/>
-		<item label="肩をすくめる" name="Shrug" value="肩をすくめる"/>
-		<item label="微笑む" name="Smile" value="微笑む"/>
-		<item label="驚く" name="Surprise" value="驚く"/>
-		<item label="ウィンク" name="Wink" value="ウィンク"/>
-		<item label="心配する" name="Worry" value="心配する"/>
-	</combo_box>
-	<text name="preview_label">
-		同時進行行動
-	</text>
-	<combo_box label="" name="preview_base_anim" tool_tip="アバターが普通の行動をするときのアニメーションの動きをテストするためにこれを使います。">
-		<item label="立つ" name="Standing" value="立つ"/>
-		<item label="歩く" name="Walking" value="歩く"/>
-		<item label="座る" name="Sitting" value="座る"/>
-		<item label="飛ぶ" name="Flying" value="飛ぶ"/>
-	</combo_box>
-	<spinner label="イーズイン(秒)" name="ease_in_time" tool_tip="アニメーションのブレンドイン時間（秒）"/>
-	<spinner label="イーズアウト(秒)" name="ease_out_time" tool_tip="アニメーションのブレンドアウト時間（秒）"/>
-	<button label="" name="play_btn" tool_tip="アニメーションを再生する"/>
-	<button name="pause_btn" tool_tip="アニメーションを一時停止する"/>
-	<button label="" name="stop_btn" tool_tip="アニメーションの再生を停止"/>
-	<slider label="" name="playback_slider"/>
-	<text name="bad_animation_text">
-		アニメーションファイルを読み込めません。
- 
- Poser 4からエクスポートされたBVHファイルを推奨します。
-	</text>
-	<button label="アップロードL$[AMOUNT]" name="ok_btn"/>
-	<button label="取り消し" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
new file mode 100644
index 0000000000..21abf59160
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="自動置換設定">
+	<check_box label="自動置換を有効にする" name="autoreplace_enable" tool_tip="チャットテキストを入力するにつれて、入力したキーワードを対応する置換キーワードに置き換えます"/>
+	<button label="リストをインポート..." name="autoreplace_import_list" tool_tip="以前にエクスポートしたリストをファイルからロードします。"/>
+	<button label="リストをエクスポート..." name="autoreplace_export_list" tool_tip="選択したリストをファイルに保存して、共有できるようにします。"/>
+	<button label="新規リスト..." name="autoreplace_new_list" tool_tip="新規リストを作成します。"/>
+	<button label="リストを削除" name="autoreplace_delete_list" tool_tip="選択したリストを削除します。"/>
+	<button name="autoreplace_list_up" tool_tip="このリストの優先度を上げます。"/>
+	<button name="autoreplace_list_down" tool_tip="このリストの優先度を下げます。"/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="キーワード" name="keyword"/>
+		<scroll_list.columns label="置換" name="replacement"/>
+	</scroll_list>
+	<button label="追加..." name="autoreplace_add_entry"/>
+	<button label="削除" name="autoreplace_delete_entry"/>
+	<button label="エントリを保存" name="autoreplace_save_entry" tool_tip="このエントリを保存します。"/>
+	<button label="変更を保存" name="autoreplace_save_changes" tool_tip="変更をすべて保存します。"/>
+	<button label="取り消し" name="autoreplace_cancel" tool_tip="変更をすべて破棄します。"/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory.xml b/indra/newview/skins/default/xui/ja/floater_inventory.xml
deleted file mode 100644
index b113fde94a..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="持ち物">
-	<floater.string name="Title">
-		持ち物
-	</floater.string>
-	<floater.string name="TitleFetching">
-		持ち物 （ [ITEM_COUNT]  アイテムを取得中...） [FILTER]
-	</floater.string>
-	<floater.string name="TitleCompleted">
-		持ち物 （ [ITEM_COUNT]  アイテム） [FILTER]
-	</floater.string>
-	<floater.string name="Fetched">
-		取得済
-	</floater.string>
-	<panel label="持ち物パネル" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_model_preview.xml b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
index c9ff0e29cb..942cc91317 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="三角形" name="triangles" value="三角形"/>
 				<text initial_value="頂点" name="vertices" value="頂点"/>
 				<text initial_value="高" name="high_label" value="高"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="ファイルからロード"/>
+					<item name="Generate" value="生成"/>
+				</combo_box>
 				<button label="参照" name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="三角形の限度数"/>
+					<item name="Error Threshold" value="エラーしきい値"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="中" name="medium_label" value="中"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="ファイルからロード"/>
+					<item name="Generate" value="生成"/>
+					<item name="Use LoD above" value="上記の LoD を使用"/>
+				</combo_box>
 				<button label="参照" name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="三角形の限度数"/>
+					<item name="Error Threshold" value="エラーしきい値"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="低" name="low_label" value="低"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="ファイルからロード"/>
+					<item name="Generate" value="生成"/>
+					<item name="Use LoD above" value="上記の LoD を使用"/>
+				</combo_box>
 				<button label="参照" name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="三角形の限度数"/>
+					<item name="Error Threshold" value="エラーしきい値"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="最低" name="lowest_label" value="最低"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="ファイルからロード"/>
+					<item name="Generate" value="生成"/>
+					<item name="Use LoD above" value="上記の LoD を使用"/>
+				</combo_box>
 				<button label="参照" name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="三角形の限度数"/>
+					<item name="Error Threshold" value="エラーしきい値"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="ノーマルの作成" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml b/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml
deleted file mode 100644
index bcddcc6907..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="近くのチャット">
-	<check_box label="チャットを翻訳" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
new file mode 100644
index 0000000000..ada96b5b62
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="パスファインディングキャラクター">
+	<floater.string name="messaging_get_inprogress">
+		パスファインディングキャラクターを照会中...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		パスファインディングキャラクターの照会中にエラーが発生しました。
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		パスファインディングキャラクターがありません。
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_TOTAL] キャラクター中 [NUM_SELECTED] キャラクターが選択されました。
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		この地域（リージョン）はパスファインディングに対応していません。
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Loading]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Unknown]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[group]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="名前" name="name"/>
+			<scroll_list.columns label="説明" name="description"/>
+			<scroll_list.columns label="所有者" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="高度" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			キャラクター:
+		</text>
+		<button label="リストを更新" name="refresh_objects_list"/>
+		<button label="すべて選択" name="select_all_objects"/>
+		<button label="何も選択しない" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			選択したキャラクターに対するアクション:
+		</text>
+		<check_box label="ビーコンを表示" name="show_beacon"/>
+		<check_box label="物理効果カプセルを表示" name="show_physics_capsule"/>
+		<button label="取る" name="take_objects"/>
+		<button label="コピーを取る" name="take_copy_objects"/>
+		<button label="私をそこにテレポートする" name="teleport_me_to_object" tool_tip="1 つのキャラクターが選択された場合にのみ有効です。"/>
+		<button label="返却" name="return_objects"/>
+		<button label="削除" name="delete_objects"/>
+	</panel>
+</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
new file mode 100644
index 0000000000..ec107f3e6b
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="パスファインディングの表示/テスト">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		パスファインディングライブラリの実装が見つかりません。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		この地域（リージョン）はパスファインディングに対応していません。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		地域（リージョン）の読み込みを待機しています。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		ナビメッシュのステータスを確認しています。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		ナビメッシュをダウンロードしています。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		サーバー上でナビメッシュが変わりました。最新のナビメッシュをダウンロードしています。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		最新のナビメッシュがダウンロードされました。
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		ナビメッシュを正しくダウンロードできません。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		ナビメッシュに保留中の変更があります。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		ナビメッシュを作成しています。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		ナビメッシュの一部の地域（リージョン）に保留中の変更があります。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		一部のナビメッシュ地域（リージョン）を構築しています。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		ナビメッシュの一部の地域（リージョン）に保留中の変更があり、その他の地域（リージョン）は構築中です。
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		ナビメッシュは最新です。
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		パスファインディングライブラリの実装が見つかりません。
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		この地域（リージョン）はパスファインディングに対応していません。
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		開始点と終了点を選択してください。
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		開始点を選択してください。
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		終了点を選択してください。
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		パスはオレンジ色で表示されています。
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		選択した 2 点間のパスが見つかりません。
+	</floater.string>
+	<floater.string name="pathing_error">
+		パスの生成中にエラーが発生しました。
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="表示" name="view_panel">
+			<text name="show_label">
+				表示：
+			</text>
+			<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">
+				歩行可能マップを表示:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="表示しない" name="show_heatmap_mode_none"/>
+				<combo_box.item label="キャラクター タイプ A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="キャラクター タイプ B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="キャラクター タイプ C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="キャラクター タイプ D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="歩行可能" name="show_walkables"/>
+			<check_box label="素材ボリューム" name="show_material_volumes"/>
+			<check_box label="静的障害物" name="show_static_obstacles"/>
+			<check_box label="除外ボリューム" name="show_exclusion_volumes"/>
+			<check_box label="水上飛行機" name="show_water_plane"/>
+			<check_box label="X 線表示による" name="show_xray"/>
+		</panel>
+		<panel label="パスをテスト" name="test_panel">
+			<text name="ctrl_click_label">
+				Ctrl キーを押しながらクリックして、開始点を選択します。
+			</text>
+			<text name="shift_click_label">
+				Shift キーを押しながらクリックして、終了点を選択します。
+			</text>
+			<text name="character_width_label">
+				キャラクターの幅
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				キャラクタータイプ
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="なし" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="パスをクリア" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
new file mode 100644
index 0000000000..d05a74fe09
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="パスファインディングリンクセット">
+	<floater.string name="messaging_get_inprogress">
+		パスファインディングリンクセットを照会中...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		パスファインディングリンクセットの照会中にエラーが発生しました。
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		選択したパスファインディングリンクセットを修正中...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		選択したパスファインディングリンクセットの修正中にエラーが発生しました。
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		パスファインディングリンクセットがありません。
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_TOTAL] リンクセット中 [NUM_SELECTED] リンクセットが選択されました。
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		この地域（リージョン）はパスファインディングに対応していません。
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terrain]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Loading]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Unknown]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[group]
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		歩行可能
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		静的障害物
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		可動障害物
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		素材ボリューム
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		除外ボリューム
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		可動ボリューム
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[unmodifiable]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[restricted]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[concave]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[restricted,concave]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		リンクセットの用途を選択...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="リンクセットの用途でフィルター..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="歩行可能" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="静的障害物" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="可動障害物" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="素材ボリューム" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="除外ボリューム" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="可動ボリューム" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="適用" name="apply_filters"/>
+		<button label="クリア" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="名前（ルートプリム）" name="name"/>
+			<scroll_list.columns label="説明（ルートプリム）" name="description"/>
+			<scroll_list.columns label="所有者" name="owner"/>
+			<scroll_list.columns label="負荷" name="land_impact"/>
+			<scroll_list.columns label="距離" name="dist_from_you"/>
+			<scroll_list.columns label="リンクセットの用途" name="linkset_use"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			リンクセット:
+		</text>
+		<button label="リスト更新" name="refresh_objects_list"/>
+		<button label="すべて選択" name="select_all_objects"/>
+		<button label="何も選択しない" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="ビーコンを表示" name="show_beacon"/>
+		<button label="取る" name="take_objects"/>
+		<button label="コピーを取る" name="take_copy_objects"/>
+		<button label="私をそこにテレポートする" name="teleport_me_to_object"/>
+		<button label="返却" name="return_objects"/>
+		<button label="削除" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			歩行可能性:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="タイプ A のキャラクターの歩行可能性。キャラクタータイプの例はヒューマノイドです。"/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="タイプ B のキャラクターの歩行可能性。キャラクタータイプの例はクリーチャーです。"/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="タイプ C のキャラクターの歩行可能性。キャラクタータイプの例はメカニカルです。"/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="タイプ D のキャラクターの歩行可能性。キャラクタータイプの例はその他です。"/>
+		<button label="変更を適用" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(ヒューマノイド)
+		</text>
+		<text name="suggested_use_b_label">
+			(クリーチャー)
+		</text>
+		<text name="suggested_use_c_label">
+			(メカニカル)
+		</text>
+		<text name="suggested_use_d_label">
+			(その他)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_postcard.xml b/indra/newview/skins/default/xui/ja/floater_postcard.xml
deleted file mode 100644
index 9d9b59fa51..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_postcard.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="スナップショットをEメールで送信">
-	<text name="to_label">
-		受信先のEメール：
-	</text>
-	<line_editor left="145" name="to_form" width="125"/>
-	<text name="from_label">
-		あなたのEメール：
-	</text>
-	<line_editor left="145" name="from_form" width="125"/>
-	<text name="name_label">
-		あなたの名前：
-	</text>
-	<line_editor left="145" name="name_form" width="125"/>
-	<text name="subject_label">
-		件名：
-	</text>
-	<line_editor label="件名を入力してください" left="145" name="subject_form" width="125"/>
-	<text name="msg_label">
-		メッセージ：
-	</text>
-	<text_editor bottom_delta="-120" height="110" name="msg_form">
-		メッセージをここに入力してください。
-	</text_editor>
-	<check_box label="Web上で公開" name="allow_publish_check" tool_tip="このポストカードをWeb上で公開します。"/>
-	<check_box label="成人向けコンテンツ" name="mature_check" tool_tip="このポストカードには成人向け内容が含まれます。"/>
-	<button label="?" left="300" name="publish_help_btn"/>
-	<text name="fine_print">
-		この受信者がSLに参加すると、あなたに紹介ボーナスが入ります
-	</text>
-	<button bottom_delta="-52" label="取り消し" name="cancel_btn"/>
-	<button label="送信" name="send_btn"/>
-	<text name="default_subject">
-		[SECOND_LIFE] からのポストカードです。
-	</text>
-	<text name="default_message">
-		これは絶対チェック！
-	</text>
-	<string name="upload_message">
-		送信中...
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
new file mode 100644
index 0000000000..31fbef9bcf
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="スペルチェッカーの設定">
+	<check_box label="スペルチェッカーを有効にする" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		メイン辞書:
+	</text>
+	<text label="ログ：" name="spellcheck_additional">
+		その他の辞書：
+	</text>
+	<text name="spellcheck_available">
+		入手可
+	</text>
+	<text name="spellcheck_active">
+		有効
+	</text>
+	<button label="削除" name="spellcheck_remove_btn"/>
+	<button label="インポート..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
new file mode 100644
index 0000000000..febe153d25
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="辞書をインポート">
+	<button label="参照" label_selected="参照" name="dictionary_path_browse"/>
+	<button label="インポート" name="ok_btn"/>
+	<button label="取り消し" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_stats.xml b/indra/newview/skins/default/xui/ja/floater_stats.xml
index da5358f06a..1922e4841a 100644
--- a/indra/newview/skins/default/xui/ja/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ja/floater_stats.xml
@@ -53,7 +53,13 @@
 				<stat_bar label="オブジェクト" name="simobjects"/>
 				<stat_bar label="アクティブなオブジェクト" name="simactiveobjects"/>
 				<stat_bar label="アクティブなスクリプト" name="simactivescripts"/>
+				<stat_bar label="スクリプト実行" name="simpctscriptsrun"/>
 				<stat_bar label="スクリプトイベント" name="simscripteps"/>
+				<stat_view label="パスファインディング" name="simpathfinding">
+					<stat_bar label="AIステップ時間" name="simsimaistepmsec"/>
+					<stat_bar label="スキップされたシルエットステップ" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="更新されたキャラクター" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_bar label="パケットイン" name="siminpps"/>
 				<stat_bar label="パケットアウト" name="simoutpps"/>
 				<stat_bar label="保留中のダウンロード" name="simpendingdownloads"/>
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 55fe840658..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,6 +20,8 @@
 	<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"/>
+	<text name="preview_disabled" value="プレビュー無効"/>
 	<filter_editor label="テクスチャをフィルター" name="inventory search editor"/>
 	<check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/>
 	<button label="追加" label_selected="追加" name="l_add_btn"/>
@@ -31,5 +33,4 @@
 	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
 	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-	<check_box initial_value="true" label="すぐ適用" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_tools.xml b/indra/newview/skins/default/xui/ja/floater_tools.xml
index 2d12a5e56a..4bd6439ad2 100644
--- a/indra/newview/skins/default/xui/ja/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tools.xml
@@ -148,6 +148,12 @@
 			<panel.string name="text modify info 4">
 				これらのオブジェクトを修正できません
 			</panel.string>
+			<panel.string name="text modify info 5">
+				地域（リージョン）の境界を越えてこのオブジェクトを修正できません
+			</panel.string>
+			<panel.string name="text modify info 6">
+				地域（リージョン）の境界を越えてこれらのオブジェクトを修正できません
+			</panel.string>
 			<panel.string name="text modify warning">
 				オブジェクト全体を選択して権限の設定を行ってください。
 			</panel.string>
@@ -203,12 +209,12 @@
 				<combo_box.item label="ズームする" name="Zoom"/>
 			</combo_box>
 			<check_box label="販売対象：" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="コピー" name="Copy"/>
 				<combo_box.item label="中身" name="Contents"/>
 				<combo_box.item label="オリジナル" name="Original"/>
 			</combo_box>
-			<spinner label="価格： L$" name="Edit Cost"/>
 			<check_box label="検索に表示" name="search_check" tool_tip="検索結果にこのオブジェクトを表示します"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -244,6 +250,11 @@
 					F：
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					パスファインディング属性:
+				</text>
+			</panel>
 		</panel>
 		<panel label="形状" name="Object">
 			<check_box label="ロック" name="checkbox locked" tool_tip="オブジェクトの移動と削除を禁止します。 この機能を使うと、制作中の意図せぬ編集を防ぐことができます"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_top_objects.xml b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
index bfc93e5624..c44f409d4e 100644
--- a/indra/newview/skins/default/xui/ja/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/ja/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		時間
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Monoタイム
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		上部コライダー
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="名前" name="name"/>
 		<scroll_list.columns label="所有者" name="owner"/>
 		<scroll_list.columns label="ロケーション" name="location"/>
+		<scroll_list.columns label="区画" name="parcel"/>
 		<scroll_list.columns label="時間" name="time"/>
-		<scroll_list.columns label="Monoタイム" name="mono_time"/>
 		<scroll_list.columns label="URL" name="URLs"/>
+		<scroll_list.columns label="メモリ（KB）" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		物体ID：
@@ -48,6 +46,10 @@
 		所有者：
 	</text>
 	<button label="フィルタ" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		区画：
+	</text>
+	<button label="フィルター" name="filter_parcel_btn"/>
 	<button label="更新" name="refresh_btn"/>
 	<button label="選択内容を返却" name="return_selected_btn"/>
 	<button label="すべて返却" name="return_all_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_bottomtray.xml b/indra/newview/skins/default/xui/ja/menu_bottomtray.xml
deleted file mode 100644
index 7f106c1ab5..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="スピーカーボタン" name="EnableVoiceChat"/>
-	<menu_item_check label="ジェスチャーボタン" name="ShowGestureButton"/>
-	<menu_item_check label="移動ボタン" name="ShowMoveButton"/>
-	<menu_item_check label="視界ボタン" name="ShowCameraButton"/>
-	<menu_item_check label="スナップショットボタン" name="ShowSnapshotButton"/>
-	<menu_item_check label="制作ボタン" name="ShowBuildButton"/>
-	<menu_item_check label="検索ボタン" name="ShowSearchButton"/>
-	<menu_item_check label="地図ボタン" name="ShowWorldMapButton"/>
-	<menu_item_check label="ミニマップボタン" name="ShowMiniMapButton"/>
-	<menu_item_call label="切り取り" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="コピー" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="貼り付け" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="削除" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="すべて選択" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_mode_change.xml b/indra/newview/skins/default/xui/ja/menu_mode_change.xml
deleted file mode 100644
index dff3392bd5..0000000000
--- a/indra/newview/skins/default/xui/ja/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="ベーシック" name="BasicMode"/>
-	<menu_item_check label="アドバンス" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_object.xml b/indra/newview/skins/default/xui/ja/menu_object.xml
index 4cee8089ee..01436ad12b 100644
--- a/indra/newview/skins/default/xui/ja/menu_object.xml
+++ b/indra/newview/skins/default/xui/ja/menu_object.xml
@@ -5,6 +5,8 @@
 	</menu_item_call>
 	<menu_item_call label="編集" name="Edit..."/>
 	<menu_item_call label="制作" name="Build"/>
+	<menu_item_call label="リンクセットで表示" name="show_in_linksets"/>
+	<menu_item_call label="キャラクターで表示" name="show_in_characters"/>
 	<menu_item_call label="開く" name="Open"/>
 	<menu_item_call label="ここに座る" name="Object Sit"/>
 	<menu_item_call label="立ち上がる" name="Object Stand Up"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_text_editor.xml b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
index fcb1038a6a..eda973c888 100644
--- a/indra/newview/skins/default/xui/ja/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/ja/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="（不明）" name="Suggestion 1"/>
+	<menu_item_call label="（不明）" name="Suggestion 2"/>
+	<menu_item_call label="（不明）" name="Suggestion 3"/>
+	<menu_item_call label="（不明）" name="Suggestion 4"/>
+	<menu_item_call label="（不明）" name="Suggestion 5"/>
+	<menu_item_call label="辞書に追加" name="Add to Dictionary"/>
+	<menu_item_call label="無視に追加" name="Add to Ignore"/>
 	<menu_item_call label="切り取り" name="Cut"/>
 	<menu_item_call label="コピー" name="Copy"/>
 	<menu_item_call label="貼り付け" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 3a398bd985..e60e6781c6 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -28,6 +28,7 @@
 		<menu_item_call label="環境設定..." name="Preferences"/>
 		<menu_item_call label="ツールバーのボタン..." name="Toolbars"/>
 		<menu_item_call label="全てのコントロールを非表示にする" name="Hide UI"/>
+		<menu_item_check label="HUD を表示" name="Show HUD Attachments"/>
 		<menu_item_call label="[APP_NAME] を終了" name="Quit"/>
 	</menu>
 	<menu label="コミュニケーション" name="Communicate">
@@ -39,6 +40,7 @@
 		<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">
 		<menu_item_call label="現在地をランドマーク" name="Create Landmark Here"/>
@@ -124,6 +126,11 @@
 			<menu_item_call label="スクリプトを実行中にする" name="Set Scripts to Running"/>
 			<menu_item_call label="スクリプトを実行停止にする" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="パスファインディング" name="Pathfinding">
+			<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>
 		<menu label="オプション" name="Options">
 			<menu_item_check label="権限の詳細を表示する" name="DebugPermissions"/>
 			<menu_item_check label="私のオブジェクトだけを選択する" name="Select Only My Objects"/>
@@ -174,7 +181,6 @@
 			<menu_item_check label="パーティクルを非表示にする" name="Hide Particles"/>
 			<menu_item_check label="選択したものを非表示にする" name="Hide Selected"/>
 			<menu_item_check label="透明部分をハイライトする" name="Highlight Transparent"/>
-			<menu_item_check label="HUD を表示する" name="Show HUD Attachments"/>
 			<menu_item_check label="一人称視点のときに十字線を表示する" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="レンダリング（種類）" name="Rendering Types">
@@ -377,7 +383,6 @@
 				<menu_item_call label="キャラクタジオメトリの切り替え" name="Toggle Character Geometry"/>
 				<menu_item_call label="男性アバターのテスト" name="Test Male"/>
 				<menu_item_call label="女性アバターのテスト" name="Test Female"/>
-				<menu_item_call label="PG のトグル" name="Toggle PG"/>
 				<menu_item_check label="選択アバター許可" name="Allow Select Avatar"/>
 			</menu>
 			<menu_item_call label="パラメータを強制的にデフォルトにする" name="Force Params to Default"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 6d13306ab2..9453e9ba3b 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -389,6 +395,12 @@ L$ が不足しているのでこのグループに参加することができ�
 	<notification name="InvalidCredentialFormat">
 		ユーザー名のフィールドにアバターのユーザー名もしくは氏名を入力してから、再度ログインする必要があります。
 	</notification>
+	<notification name="InvalidGrid">
+		&apos;[GRID]&apos; は有効なグリッド ID ではありません。
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		ログイン位置で有効なグリッドが指定されませんでした。
+	</notification>
 	<notification name="DeleteClassified">
 		クラシファイド広告 [NAME] を削除しますか？
 支払い済みの料金は返金されません。
@@ -495,7 +507,7 @@ L$ が不足しているのでこのグループに参加することができ�
 	</notification>
 	<notification name="StartRegionEmpty">
 		ログイン位置が指定されていません。
-ログイン位置の欄にリージョン名を入力するか、「最後にログアウトした場所」か「ホーム」を選択してください。
+ログイン位置の欄にリージョン名を入力するか、「最後にログアウトした場所」か「自宅（ホーム）」を選択してください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -623,6 +635,9 @@ L$ が不足しているのでこのグループに参加することができ�
 
 どのオブジェクトもロックされておらず、あなたのものであることを確認してください。
 	</notification>
+	<notification name="CannotLinkPermanent">
+		地域（リージョン）の境界を越えてオブジェクトをリンクできません。
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		所有者が異なるため、オブジェクトをリンクできません。
 
@@ -1009,6 +1024,40 @@ L$ は返金されません。
 			<button name="Cancel" text="キャンセル"/>
 		</form>
 	</notification>
+	<notification label="自動置換リストを追加" name="AddAutoReplaceList">
+		新しいリストの名前:
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="自動置換リストの名前を変更" name="RenameAutoReplaceList">
+		名前 &apos;[DUPNAME]&apos; は既に使われています
+一意の名前を入力してください:
+		<form name="form">
+			<button name="ReplaceList" text="着用中のリストを入れ替える"/>
+			<button name="SetName" text="新しい名前を使用"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		キーワードは一語でなければならず、置換は空にできません。
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		その置換リストは無効です。
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		ファイル、名前および言語を指定する必要があります。
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		辞書 [DIC_NAME] に「aff」ファイルがないようです。これはこの辞書が「セカンダリ」辞書であることを意味します。
+この辞書は追加辞書として使用できますが、メイン辞書としては使用できません。
+
+https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してください。
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		[FROM_NAME] から
+
+[TO_NAME] へコピーできません
+	</notification>
 	<notification label="アウトフィットを保存する" name="SaveOutfitAs">
 		着用中のアウトフィットを新しいアウトフットとして保存：
 		<form name="form">
@@ -1732,83 +1781,128 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name を参照してくだ�
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		あなたのレーティング区分により、そのリージョン（地域）へは入ることができません。 年齢を確認する際の情報に不足があったためと考えられます。
-
-最新ビューワがインストールされているかをご確認ください。このレーティング区分でのアクセスに関する詳細はナレッジベースをご覧ください。
+		訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		あなたのレーティング区分により、そのリージョン（地域）へは入ることができません。
-
-ナレッジベースを開きレーティング区分について学びますか？
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/ja
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="レーティング区分の制限のため、リージョンに入ることができないとき" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
+		<usetemplate ignoretext="リージョン（地域）の横断：訪問しようとしている地域（リージョン）には、成人のみアクセスできるコンテンツが含まれています。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		あなたのレーティング区分により、そのリージョン（地域）へは入ることができません。
+		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツ除外するように設定されています。
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		レーティング区分に関する設定により、その地域（リージョン）には立ち入れません。
-
-その地域に入るには、あなたのレーティング区分の設定を変更してください。変更すると、[REGIONMATURITY]のコンテンツの検索やアクセスが可能になります。変更内容を元に戻すには、ミー &gt; 環境設定 &gt; 一般を選択してください。
+		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更するか、取り消すことができます。環境設定を変更した後、もう一度、地域（リージョン）に入ることができます。
+		<form name="form">
+			<button name="OK" text="環境設定の変更"/>
+			<button default="true" name="Cancel" text="取り消し"/>
+			<ignore name="ignore" text="リージョン（地域）の横断：訪問しようとしている地域（リージョン）には現在の環境設定により除外されたコンテンツが含まれています。"/>
+		</form>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		あなたの環境設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+		</url>
+		<usetemplate ignoretext="テレポート：訪問しようとしている地域（リージョン）には、成人のみアクセスできるコンテンツが含まれています。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		訪問しようとしている地域（リージョン）には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
+		<form name="form">
+			<button name="OK" text="変更して続ける"/>
+			<button name="Cancel" text="取り消し"/>
+			<ignore name="ignore" text="テレポート（再起動可能）：訪問しようとしている地域（リージョン）には現在の環境設定により除外されたコンテンツが含まれています。"/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		訪問しようとしている地域（リージョン）には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更するか、テレポートを取り消すことができます。環境設定を変更した後、もう一度テレポートを実行する必要があります。
 		<form name="form">
 			<button name="OK" text="環境設定の変更"/>
-			<button default="true" name="Cancel" text="閉じる"/>
-			<ignore name="ignore" text="選択したレーティング区分が原因で、リージョンに入れないとき"/>
+			<button name="Cancel" text="取り消し"/>
+			<ignore name="ignore" text="テレポート（再起動不可）：訪問しようとしている地域（リージョン）には現在の環境設定により除外されたコンテンツが含まれています。"/>
 		</form>
 	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		あなたの環境設定がサーバーと同期していないため、テレポートに技術的な問題が発生しています。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		あなたのレーティング区分設定は現在 [RATING] です。
+		今後、[RATING] コンテンツ付きの地域（リージョン）を訪問しようとしているという通知を受け取りません。後でメニューバーの「ミー」 &gt; 「環境設定」 &gt; 「一般」を使用して、コンテンツの環境設定を変更できます。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		現在、[PREFERRED_MATURITY] コンテンツを表示するように環境設定を変更できませんでした。あなたの環境設定は、[ACTUAL_MATURITY] コンテンツを表示するようにリセットされました。メニューバーの「ミー」 &gt; 「環境設定」 &gt; 「一般」を使用して、もう一度環境設定を変更できます。
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		あなたのレーティング区分により、この土地を取得することはできません。 年齢を確認する際の情報に不足があったためと考えられます。
-
-最新ビューワがインストールされているかをご確認ください。このレーティング区分でのアクセスに関する詳細はナレッジベースをご覧ください。
+		取得しようとしている土地には現在の環境設定を超えるレーティング区分が含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		あなたのレーティング区分により、この土地を取得することはできません。
-
-ナレッジベースを開きレーティング区分について学びますか？
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		この土地を購入できるのは、成人だけです。
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/ja
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="レーティング区分の制限のため、この土地を取得できません" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
+		<usetemplate ignoretext="この土地を購入できるのは、成人だけです。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		あなたのレーティング区分により、この土地を取得することはできません。
+		取得しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		取得しようとしている土地には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		あなたのレーティング区分設定により、この土地を取得することはできません。
-
-「設定を変更」をクリックしてあなたのレーティング区分を上げると、入れるようになります。 あなたは今後 [REGIONMATURITY] コンテンツの検索及びアクセスが可能となります。 あとで設定を元に戻したい場合は、「編集」＞「環境設定」をご覧ください。
-		<usetemplate ignoretext="選択したレーティング区分が原因で、土地を取得できないとき" name="okcancelignore" notext="閉じる" yestext="設定の変更"/>
+		取得しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更して、もう一度土地の取得を試みることができます。
+		<form name="form">
+			<button name="OK" text="環境設定の変更"/>
+			<button name="Cancel" text="取り消し"/>
+			<ignore name="ignore" text="取得しようとしている土地には現在の環境設定により除外されたコンテンツが含まれています。"/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		あなたのレーティング区分により、この土地を購入することはできません。 年齢を確認する際の情報に不足があったためと考えられます。
-
-最新ビューワがインストールされているかをご確認ください。このレーティング区分でのアクセスに関する詳細はナレッジベースをご覧ください。
+		購入しようとしている土地には現在の環境設定を超えるレーティング区分が含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		あなたのレーティング区分により、この土地を購入することはできません。
-
-ナレッジベースを開きレーティング区分について学びますか？
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		この土地を取得できるのは、成人だけです。
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/ja
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="レーティング区分の制限のため、この土地を購入できません" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
+		<usetemplate ignoretext="この土地を取得できるのは、成人だけです。" name="okcancelignore" notext="閉じる" yestext="ナレッジベースを開く"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		あなたのレーティング区分により、この土地を購入することはできません。
+		購入しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		購入しようとしている土地には、成人のみアクセスできる [REGIONMATURITY] コンテンツが含まれています。
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		あなたのレーティング区分設定により、この土地を購入することができません。
-
-「設定を変更」をクリックしてあなたのレーティング区分を上げると、入れるようになります。 あなたは今後 [REGIONMATURITY] コンテンツの検索及びアクセスが可能となります。 あとで設定を元に戻したい場合は、「編集」＞「環境設定」をご覧ください。
-		<usetemplate ignoretext="選択したレーティング区分が原因で、土地を購入できないとき" name="okcancelignore" notext="閉じる" yestext="設定の変更"/>
+		購入しようとしている土地には [REGIONMATURITY] コンテンツが含まれていますが、現在の環境設定は [REGIONMATURITY] コンテンツを除外するように設定されています。環境設定を変更して、もう一度土地の購入を試みることができます。
+		<form name="form">
+			<button name="OK" text="環境設定の変更"/>
+			<button name="Cancel" text="取り消し"/>
+			<ignore name="ignore" text="購入しようとしている土地には現在の環境設定により除外されたコンテンツが含まれています。"/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		選択したプリムが多すぎます。  [MAX_PRIM_COUNT] 個選択するか、プリム数を減らしてもう一度お試しください。
@@ -1866,10 +1960,9 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します�
 		</form>
 	</notification>
 	<notification label="地域のレーティング区分指定変更済み" name="RegionMaturityChange">
-		このリージョン（地域）のレーティング区分がアップデートされました。
-地図に変更が反映されるまで数分かかることがあります。
-
-Adult 専用リージョンに入るには、住人のアカウントが年齢確認か支払方法のいずれかで「確認済み」でなければなりません。
+		このリージョンのレーティング区分が変更されました。
+地図にこの変更が反映するには数分かかることがあります。
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="ボイスバージョンの不一致" name="VoiceVersionMismatch">
 		[APP_NAME] のこのバージョンは、このリージョンにおけるボイスチャットの互換性がありません。 ボイスチャットを正常に行うためには、[APP_NAME] のアップデートが必要です。
@@ -2164,14 +2257,11 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		<usetemplate ignoretext="「容姿」を編集中に、作成する衣類を装着するとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Second Life で Adult 指定のコンテンツや領域にアクセスできるのは 18 歳以上のユーザーのみです。年齢確認ページで 18 歳以上であることを証明してください。 
-これをクリックするとウェブブラウザが開きます。
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="年齢の確認を済ませていないとき" name="okcancelignore" notext="取り消し" yestext="年齢確認ページを開く"/>
+		訪問しようとしているロケーションは、18 才以上の住人に制限されています。
+		<usetemplate ignoretext="年齢制限付きのエリアを訪問する年齢に達していません。" name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		ロケーションは 18 才以上に制限されています。
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		支払情報が登録されていないとこのエリアを訪れることができません。  [SECOND_LIFE] サイトで登録を行いますか？
@@ -2434,6 +2524,23 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 	<notification name="NoBuild">
 		このエリアでは制作が禁止されています。 オブジェクトを制作したり Rez することはできません。
 	</notification>
+	<notification name="PathfindingDirty">
+		この値域（リージョン）には、保留中のパスファインディングの変更があります。制作権がある場合は、「地域の再構築」ボタンをクリックして、地域（リージョン）を再構築できます。
+	</notification>
+	<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"/>
+	</notification>
 	<notification name="SeeAvatars">
 		この区画にいるアバターやこの区画内で行われる文字チャットは、他の区画から見えません。あなたには、この区画外にいる住人が見えず、外の住人にはあなたの姿が見えません。チャンネル 0 での通常の文字チャットもブロックされます。
 	</notification>
@@ -2452,9 +2559,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		そのリージョンにいないと公共の土地を取得することはできません。
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		あなたのレーティング区分によりそのリージョンへは入ることができません。 年齢確認を行うか、最新ビューワをインストールしてください。
-
-現在のレーティング区分でアクセス可能なエリアに関する詳細はナレッジベースを参照してください。
+		訪問しようとしている地域（リージョン）には現在の環境設定を超えるコンテンツが含まれています。「ミー」 &gt; 「環境設定」 &gt; 「一般」を選択して、環境設定を変更できます。
 	</notification>
 	<notification name="URBannedFromRegion">
 		あなたはリージョンへの立入が禁止されています。
@@ -2465,11 +2570,11 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 	<notification name="ImproperPaymentStatus">
 		このリージョンに入るために適した支払いステータスがありません。
 	</notification>
-	<notification name="MustGetAgeRgion">
-		このリージョンに入るためには、年齢確認を済ませる必要があります。
+	<notification name="MustGetAgeRegion">
+		この地域（リージョン）に入るには 18 才以上である必要があります。
 	</notification>
 	<notification name="MustGetAgeParcel">
-		この区画に入るためには、年齢確認を済ませる必要があります。
+		この区画に入るには 18 才以上である必要があります。
 	</notification>
 	<notification name="NoDestRegion">
 		目的地のリージョンが見つかりませんでした。
@@ -2571,12 +2676,33 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 	<notification name="TeleportOffered">
 		[NAME_SLURL] はテレポートであなたを呼んでいます。
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="テレポート"/>
 			<button name="Cancel" text="取り消し"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] はテレポートであなたを呼んでいます。
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+この地域（リージョン）には [REGION_CONTENT_MATURITY] コンテンツが含まれていますが、現在の環境設定は [REGION_CONTENT_MATURITY] コンテンツを除外するように設定されています。環境設定を変更してテレポートを続けるか、このテレポートを取り消すことができます。
+		<form name="form">
+			<button name="Teleport" text="変更して続ける"/>
+			<button name="Cancel" text="取り消し"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] はテレポートであなたを呼んでいます。
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+ただし、この地域（リージョン）には成人のみアクセスできるコンテンツが含まれています。
+	</notification>
 	<notification name="TeleportOfferSent">
 		[TO_NAME] にテレポートを送りました。
 	</notification>
@@ -2899,18 +3025,6 @@ M キーを押して変更します。
 [RESIDENTS]
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/>
 	</notification>
-	<notification name="ShareFolderConfirmation">
-		フォルダは一度に 1 つしか共有できません。
-
-次のアイテムを共有しますか？
-
-&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
-
-次の住人と共有：
-
-[RESIDENTS]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/>
-	</notification>
 	<notification name="ItemsShared">
 		アイテムが共有されました。
 	</notification>
@@ -2989,6 +3103,10 @@ M キーを押して変更します。
 		( 作成後[EXISTENCE]秒経過）
 &apos;[BODYREGION]&apos;の[RESOLUTION]のベークドテクスチャは[TIME]秒後にローカルに更新されました。
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		コピー不可および/または転送不可のため、このテクスチャを表示できません。
+		<usetemplate ignoretext="コピー不可および/または転送不可テクスチャでライブプレビューモードを使用できないことを警告する" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		このコールから抜けますか？
 		<usetemplate ignoretext="コールから抜ける前の確認" name="okcancelignore" notext="いいえ" yestext="はい"/>
@@ -3160,6 +3278,23 @@ M キーを押して変更します。
 		この操作により、全てのメニュー項目とボタンが非表示になります。再び表示するには [SHORTCUT] をもう一度クリックしてください。
 		<usetemplate ignoretext="UI を非表示にする前に確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestricted">
+		一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、&apos;[REQUESTED_TYPE]&apos; に設定できません。これらのリンクセットは代わりに &apos;[RESTRICTED_TYPE]&apos; に設定されます。
+		<usetemplate ignoretext="一部の選択されたリンクセットは、リンクセットへの権限が制限されているため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnVolume">
+		選択された一部のリンクセットは、形状が凸状でないため、&apos;[REQUESTED_TYPE]&apos; に設定できません。
+		<usetemplate ignoretext="選択された一部のリンクセットは、形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestrictedAndVolume">
+		一部の選択されたリンクセットは、リンクセットへの権限が制限されているため、&apos;[REQUESTED_TYPE]&apos; に設定できません。これらのリンクセットは代わりに &apos;[RESTRICTED_TYPE]&apos; に設定されます。
+選択された一部のリンクセットは、形状が凸状でないため、&apos;[REQUESTED_TYPE]&apos; に設定できません。これらのリンクセットの用途タイプは変わりません。
+		<usetemplate ignoretext="一部の選択されたリンクセットは、リンクセットへの権限が制限されており、また形状が凸状でないため設定できません。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。
+		<usetemplate ignoretext="選択されたオブジェクトはナビメッシュに影響を与えます。オブジェクトをフレキシブルパスに変更すると、ナビメッシュから削除されます。" name="okcancelignore" notext="取り消し" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		[APP_NAME] に必要なハードウェアがないようです。 [APP_NAME] にはマルチテクスチャをサポートする OpenGL グラフィックカードが必要です。 お使いのグラフィックカードの最新ドライバがインストールされているかどうか、オペレーティングシステムのサービスパックとパッチが入っているかをご確認ください。
 
@@ -3196,4 +3331,12 @@ M キーを押して変更します。
 		開くことができない、またはデコードできない無効または読み取り不能な画像ファイル [FNAME] を追加しようとしました。
 この試行はキャンセルされました。
 	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		[NUM_ITEMS] 個のアイテムを返却中です。続けますか？
+		<usetemplate ignoretext="複数のアイテムを返しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		[NUM_ITEMS] 個のアイテムを削除中です。続けますか？
+		<usetemplate ignoretext="複数のアイテムを削除しますか？" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml b/indra/newview/skins/default/xui/ja/panel_bottomtray.xml
deleted file mode 100644
index 3529abbf36..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="マイクのオン・オフ"/>
-	<string name="VoiceControlBtnToolTip" value="ボイスコントロールパネルの表示・非表示"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="話す" label_selected="話す" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="ジェスチャー" name="Gesture" tool_tip="ジェスチャーの表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="移動" name="movement_btn" tool_tip="移動コントロールの表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="視界" name="camera_btn" tool_tip="カメラコントロールの表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="スナップショットを撮ります"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="制作" name="build_btn" tool_tip="制作ツールの表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="検索" name="search_btn" tool_tip="検索の表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="地図" name="world_map_btn" tool_tip="世界地図の表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="ミニマップ" name="mini_map_btn" tool_tip="ミニマップの表示・非表示"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="会話"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="通知"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_group_invite.xml b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
index a21b340fdd..cc9ebc405b 100644
--- a/indra/newview/skins/default/xui/ja/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ja/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		選択した住人のなかに、既にグループに所属している人がいるため、招待を送ることができませんでした。
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		グループへの招待が送信されていません: 選択された住人が多すぎます。グループへの招待は1回のリクエストあたり100人に制限されています。
+	</panel.string>
 	<text bottom_delta="-96" font="SansSerifSmall" height="72" name="help_text">
 		グループには一度に複数の住人を招待することができます。 「リストから住人を選択」をクリックしてください。
 	</text>
diff --git a/indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml
new file mode 100644
index 0000000000..ea3ec32424
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_navmesh_rebake">
+	<button label="地域の再構築" name="navmesh_btn" tool_tip="クリックしてこの地域のナビメッシュを再構築します。"/>
+	<button label="再構築をリクエスト中" name="navmesh_btn_sending" tool_tip="再構築リクエストをサーバーに送信しています。"/>
+	<button label="地域（リージョン）を再構築中" name="navmesh_btn_baking" tool_tip="地域を再構築しています。完了すると、このボタンは消えます。"/>
+</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 75bf28a3c8..b6e344ca48 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -29,5 +29,7 @@
 	<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="ok_btn"/>
+	<button label="自動置換..." name="autoreplace_showgui"/>
+	<button label="スペルチェック中..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_debug.xml b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
index f6865c12b1..7d1d837b73 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_debug.xml
@@ -36,5 +36,5 @@
 	<button label="?" name="top_scripts_help"/>
 	<button label="地域再起動" name="restart_btn" tool_tip="2分間のカウントダウン後、地域を再起動します"/>
 	<button label="?" name="restart_help"/>
-	<button label="再起動を遅延" name="cancel_restart_btn" tool_tip="地域の再起動を１時間遅延します"/>
+	<button label="再起動をキャンセル" name="cancel_restart_btn" tool_tip="地域の再起動を１時間遅延します"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_region_estate.xml b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
index 2e58c5a8f1..b5cc6b9765 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_estate.xml
@@ -19,7 +19,7 @@
 		次の住人にのみアクセスを許可：
 	</text>
 	<check_box label="支払情情報が登録されている" name="limit_payment" tool_tip="支払情報が登録されていないと、この不動産にアクセスすることはできません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
-	<check_box label="年齢確認が済んでいる" name="limit_age_verified" tool_tip="この不動産にアクセスするには、年齢確認を済ませる必要があります。詳細については、[SUPPORT_SITE] をご覧ください。"/>
+	<check_box label="18 才以上です" name="limit_age_verified" tool_tip="この不動産（エステート）にアクセスするには、18 才以上でなければなりません。詳細については、[SUPPORT_SITE] をご覧ください。"/>
 	<check_box label="ボイスチャットを許可" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<text name="abuse_email_text">
diff --git a/indra/newview/skins/default/xui/ja/panel_region_texture.xml b/indra/newview/skins/default/xui/ja/panel_region_texture.xml
deleted file mode 100644
index 9e442ce091..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_region_texture.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="地面テクスチャ" name="Textures">
-	<text name="region_text_lbl">
-		地域：
-	</text>
-	<text name="region_text">
-		未知
-	</text>
-	<text name="detail_texture_text">
-		地形のテクスチャ （512x512、24ビット .tgaファイルが必要です）
-	</text>
-	<text name="height_text_lbl">
-		1（低）
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4（高）
-	</text>
-	<text name="height_text_lbl5">
-		地形テクスチャの隆起範囲
-	</text>
-	<text name="height_text_lbl6">
-		北西
-	</text>
-	<text name="height_text_lbl7">
-		北東
-	</text>
-	<text name="height_text_lbl8">
-		南西
-	</text>
-	<text name="height_text_lbl9">
-		南東
-	</text>
-	<spinner label="低" name="height_start_spin_0"/>
-	<spinner label="低" name="height_start_spin_1"/>
-	<spinner label="低" name="height_start_spin_2"/>
-	<spinner label="低" name="height_start_spin_3"/>
-	<spinner label="高" name="height_range_spin_0"/>
-	<spinner label="高" name="height_range_spin_1"/>
-	<spinner label="高" name="height_range_spin_2"/>
-	<spinner label="高" name="height_range_spin_3"/>
-	<text name="height_text_lbl10">
-		数値は上のテクスチャが調和する範囲を示します。
-	</text>
-	<text name="height_text_lbl11">
-		計測単位はメートルで、「低」の値は、1番のテクスチャの高さの
-「最大値」です。「高」の値は、4番のテクスチャの高さの「最低値」です。
-	</text>
-	<text name="height_text_lbl12">
-		そして「高」の値はテクスチャ#4の高さの下限となります。
-	</text>
-	<button label="適用" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_side_tray.xml b/indra/newview/skins/default/xui/ja/panel_side_tray.xml
deleted file mode 100644
index 3fd14ece06..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="サイドバーを表示・非表示" name="sidebar_openclose" tab_title="サイドバーを開く・閉じる"/>
-	<sidetray_tab description="ホーム。" name="sidebar_home" tab_title="ホーム">
-		<panel label="ホーム" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="あなたの公開プロフィールとピックを編集してください。" name="sidebar_me" tab_title="マイ プロフィール">
-		<panel_container name="panel_container">
-			<panel label="ミー" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="フレンド、連絡先、近くの人を探してください。" name="sidebar_people" tab_title="人">
-		<panel_container name="panel_container">
-			<panel label="グループ情報" name="panel_group_info_sidetray"/>
-			<panel label="ブロックされた住人とオブジェクト" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="行きたい場所、行ったことのある場所を探してください。" label="場所" name="sidebar_places" tab_title="場所">
-		<panel label="場所" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="あなたの持ち物を眺めてください。" name="sidebar_inventory" tab_title="持ち物">
-		<panel label="持ち物を編集" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="あなたの容姿や現在の見た目を変更してください。" name="sidebar_appearance" tab_title="容姿">
-		<panel label="容姿の編集" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
index 6931e448b3..e70d91d258 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="item properties" title="アイテムのプロフィール">
 	<panel.string name="unknown">
 		（不明）
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(不明/複数)
+	</panel.string>
 	<panel.string name="public">
 		（公開）
 	</panel.string>
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 eb2bfa993b..c61c73657f 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		これらのオブジェクトを修正できません
 	</panel.string>
+	<panel.string name="text modify info 5">
+		地域（リージョン）の境界を越えてこのオブジェクトを修正できません
+	</panel.string>
+	<panel.string name="text modify info 6">
+		地域（リージョン）の境界を越えてこれらのオブジェクトを修正できません
+	</panel.string>
 	<panel.string name="text modify warning">
 		このオブジェクトには、パーツがリンクされています
 	</panel.string>
@@ -95,6 +101,9 @@
 		</combo_box>
 		<spinner label="価格： L$" name="Edit Cost"/>
 		<check_box label="検索に表示" name="search_check" tool_tip="このオブジェクトを検索結果に表示します"/>
+		<text name="pathfinding_attributes_label">
+			パスファインディング属性:
+		</text>
 		<text name="B:">
 			B.
 		</text>
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index f6b3edc57f..7c3f9489da 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -1006,6 +1006,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="script_files">
 		スクリプト
 	</string>
+	<string name="dictionary_files">
+		辞書
+	</string>
 	<string name="AvatarSetNotAway">
 		一時退席中解除
 	</string>
@@ -3864,6 +3867,12 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="LocationCtrlSeeAVsTooltip">
 		この区画外にアバターを見えるようにして、チャットも許可
 	</string>
+	<string name="LocationCtrlPathfindingDirtyTooltip">
+		地域（リージョン）が再構築されるまで、移動するオブジェクトは正しく動作しない可能性があります。
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		この地域（リージョン）でダイナミックパスファインディングが有効になっていません。
+	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] アップデート
 	</string>
@@ -5006,6 +5015,21 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="Normal">
 		普通
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		なし
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		ナビメッシュに影響を与える
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		キャラクター
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		（複数）
+	</string>
 	<string name="snapshot_quality_very_low">
 		非常に低い
 	</string>
@@ -5021,4 +5045,10 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="snapshot_quality_very_high">
 		非常に高い
 	</string>
+	<string name="TeleportMaturityExceeded">
+		住人はこの地域（リージョン）を訪問できません。
+	</string>
+	<string name="UserDictionary">
+		[User]
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ja/teleport_strings.xml b/indra/newview/skins/default/xui/ja/teleport_strings.xml
index 64f01f4030..7868c25807 100644
--- a/indra/newview/skins/default/xui/ja/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ja/teleport_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <teleport_messages>
 	<message_set name="errors">
 		<message name="invalid_tport">
@@ -47,6 +47,9 @@
 		<message name="no_inventory_host">
 			インベントリシステムは現在利用できません。
 		</message>
+		<message name="MustGetAgeRegion">
+			この地域（リージョン）に入るには 18 才以上である必要があります。
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -82,5 +85,8 @@
 		<message name="requesting">
 			テレポートをリクエスト...
 		</message>
+		<message name="pending">
+			テレポートを保留中...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index e843e56090..299f88b22a 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -65,27 +65,26 @@ Versão do servidor de voz: [VOICE_VERSION]
 		</panel>
 		<panel label="Licenças" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-        APR Copyright (C) 2000-2004 The Apache Software Foundation
-        Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
-        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK Copyright (C) 1992-2009 3Dconnexion
+        APR Copyright (C) 2011 The Apache Software Foundation
+        Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+        cURL Copyright (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
         DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
         expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType Copyright (C) 1996-2002, 2006 David Turner, Robert Wilhelm, and Werner Lemberg.
         GL Copyright (C) 1999-2004 Brian Paul.
         GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University e David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Copyright (c) 2005, Google Inc.
         Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Copyright (C) 2001, Xiphophorus
-        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-        PCRE Copyright (c) 1997-2008 University of Cambridge
+        ogg/vorbis Copyright (C) 2002, Xiphophorus
+        OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+        PCRE Copyright (c) 1997-2012 University of Cambridge
         SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-        zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-        google-perftools Copyright (c) 2005, Google Inc.
+        zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
         O Visualizador do Second Life usa Havok (TM) Physics. (c)Copyright 1999-2010 Havok.com Inc. (e seus Licenciantes). Todos os direitos reservados. Consulte www.havok.com para obter detalhes.
 
diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml
index cd0fb4c41b..f48280840c 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -465,7 +465,7 @@ Mídia:
 				Permitir acesso apenas para residentes que:
 			</text>
 			<check_box label="Possuam Dados de pagamento fornecidos [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Os residentes devem ter seus dados de pagamento cadastrados para acessar este lote.  Consulte o [SUPPORT_SITE] para saber mais."/>
-			<check_box label="Tiveram sua idade verificada [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Os residentes devem ter a idade verificada para acessar este lote. Consulte o [SUPPORT_SITE] para saber mais."/>
+			<check_box label="Tem 18 anos ou mais [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Os residentes devem ter 18 anos ou mais para acessar este lote. Consulte o [SUPPORT_SITE] para obter mais informações."/>
 			<check_box label="Permitir acesso do grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/>
 			<check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml b/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
deleted file mode 100644
index 3ec81612a1..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_animation_preview.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<floater.string name="failed_to_initialize">
-		Não foi possível iniciar o movimento
-	</floater.string>
-	<floater.string name="anim_too_long">
-		O arquivo de animação tem [LENGTH] segundos de duração. 
-
-A duração máxima de animação permitida é de [MAX_LENGTH] segundos.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		Não foi possível ler o arquivo de animação.
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		OK
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Fim de arquivo prematuro
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Impossível ler definição constraint.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		Impossível abrir arquivo BVH.
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		Invalid HIERARCHY header.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		RAIZ ou JUNTA não encontrados.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		Impossível obter nome JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		Impossível localizar OFFSET.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		Impossível localizar CHANNELS.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Impossível obter ordem de rotação.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Impossível obter eixo de rotação.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		Impossível localizar MOTION.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		Impossível determinar número de quadros.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Impossível determinar tempo dos quadros.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Impossível definir posicionamento.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Impossível definir valores da rotação.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Impossível abrir arquivo de tradução.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Impossível ler cabeçalho de tradução.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Impossível ler nomes traduzidos.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Impossível obter valor traduzido a ignorar.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Impossível obter valor traduzido relativo.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Impossível obter valor traduzido.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Impossível ler matriz de tradução.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Impossível obter nome mergechild.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Impossível obter nome mergeparent.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Impossível obter valor prioritário.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Impossível obter valor do loop.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Impossível obter valor easeIn.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		Impossível obter valor easeOut.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Impossível obter valor de morph da mão.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Impossível ler nome do emote.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Nome da junta incorreto, use &quot;quadril&quot;.
-	</floater.string>
-	<text name="name_label">
-		Nome:
-	</text>
-	<text name="description_label">
-		Descrição:
-	</text>
-	<spinner label="Prioridade" label_width="72" name="priority" tool_tip="Controla quais animações podem ser interrompidas por esta animação" width="110"/>
-	<check_box label="Loop" name="loop_check" tool_tip="Executa esta animação sem parar"/>
-	<spinner label="Dentro(%)" label_width="56" left="65" name="loop_in_point" tool_tip="Define o ponto em que a animação em loop reinicia" width="116"/>
-	<spinner label="Fora(%)" label_width="40" left="185" name="loop_out_point" tool_tip="Define o ponto em que a animação em loop acaba"/>
-	<text name="hand_label">
-		Pose de Mão
-	</text>
-	<combo_box left_delta="100" name="hand_pose_combo" tool_tip="Controla os gestos das mãos durante a animação" width="184">
-		<combo_box.item label="Abrir" name="Spread"/>
-		<combo_box.item label="Relaxado" name="Relaxed"/>
-		<combo_box.item label="Apontar ambas" name="PointBoth"/>
-		<combo_box.item label="Punho" name="Fist"/>
-		<combo_box.item label="E relaxada" name="RelaxedLeft"/>
-		<combo_box.item label="Apontar E" name="PointLeft"/>
-		<combo_box.item label="Punho E" name="FistLeft"/>
-		<combo_box.item label="D relaxada" name="RelaxedRight"/>
-		<combo_box.item label="Apontar D" name="PointRight"/>
-		<combo_box.item label="Punho D" name="FistRight"/>
-		<combo_box.item label="Saudação D" name="SaluteRight"/>
-		<combo_box.item label="Escrevendo" name="Typing"/>
-		<combo_box.item label="Paz D" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Expressão
-	</text>
-	<combo_box left_delta="100" name="emote_combo" tool_tip="Controla as expressões faciais durante a animação" width="184">
-		<item label="(nenhum)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Com medo" name="Afraid" value="Com medo"/>
-		<item label="Bravo" name="Angry" value="Bravo"/>
-		<item label="Sorriso contagiante" name="BigSmile" value="Sorriso contagiante"/>
-		<item label="À toa" name="Bored" value="À toa"/>
-		<item label="Chorar" name="Cry" value="Chorar"/>
-		<item label="Desdenho" name="Disdain" value="Desdenho"/>
-		<item label="Com vergonha" name="Embarrassed" value="Com vergonha"/>
-		<item label="Franzir testa" name="Frown" value="Franzir testa"/>
-		<item label="Beijo" name="Kiss" value="Beijo"/>
-		<item label="Rir" name="Laugh" value="Rir"/>
-		<item label="Mostrar a língua" name="Plllppt" value="Mostrar a língua"/>
-		<item label="Asco" name="Repulsed" value="Asco"/>
-		<item label="Triste" name="Sad" value="Triste"/>
-		<item label="Encolher os ombros" name="Shrug" value="Encolher os ombros"/>
-		<item label="Sorriso" name="Smile" value="Sorriso"/>
-		<item label="Surpresa" name="Surprise" value="Surpresa"/>
-		<item label="Piscar" name="Wink" value="Piscar"/>
-		<item label="Preocupado" name="Worry" value="Preocupado"/>
-	</combo_box>
-	<text name="preview_label" width="250">
-		Prever enquanto
-	</text>
-	<combo_box left_delta="100" name="preview_base_anim" tool_tip="Use isto para testar o comportamento de sua animação enquanto seu avatar executa ações comuns." width="130">
-		<item label="Em pé" name="Standing" value="Em pé"/>
-		<item label="Andando" name="Walking" value="Andando"/>
-		<item label="Sentado" name="Sitting" value="Sentado"/>
-		<item label="Voando" name="Flying" value="Voando"/>
-	</combo_box>
-	<spinner label="Facilitar a entrada (sec)" label_width="125" name="ease_in_time" tool_tip="Tempo (em segundos) da transição inicial da animação" width="192"/>
-	<spinner bottom_delta="-20" label="Facilitar a saída (sec)" label_width="125" left="10" name="ease_out_time" tool_tip="Tempo (em segundos) da transição de saída da animação" width="192"/>
-	<button bottom_delta="-32" name="play_btn" tool_tip="Executar animação"/>
-	<button name="pause_btn" tool_tip="Pausar a animação"/>
-	<button label="" name="stop_btn" tool_tip="Interrompe a execução da animação."/>
-	<text name="bad_animation_text">
-		Incapaz de ler o arquivo de animação.
-
-Nós recomendamos exportar arquivos BVH do
-Poser 4.
-	</text>
-	<button label="Carregar (L$[AMOUNT])" name="ok_btn"/>
-	<button label="Cancelar" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_autoreplace.xml b/indra/newview/skins/default/xui/pt/floater_autoreplace.xml
new file mode 100644
index 0000000000..ca813a8540
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Configurações da substituição automática">
+	<check_box label="Habilitar substituição automática" name="autoreplace_enable" tool_tip="Ao inserir texto de bate-papo, substitua quaisquer palavras-chave inseridas pela substituição correspondente"/>
+	<button label="Importar lista..." name="autoreplace_import_list" tool_tip="Carrega uma lista exportada anteriormente de um arquivo."/>
+	<button label="Exportar lista..." name="autoreplace_export_list" tool_tip="Salva um arquivo da lista selecionada para compartilhá-la."/>
+	<button label="Nova lista..." name="autoreplace_new_list" tool_tip="Cria uma nova lista."/>
+	<button label="Excluir lista" name="autoreplace_delete_list" tool_tip="Exclui a lista selecionada."/>
+	<button name="autoreplace_list_up" tool_tip="Aumenta a prioridade desta lista."/>
+	<button name="autoreplace_list_down" tool_tip="Diminui a prioridade desta lista."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Palavra-chave" name="keyword"/>
+		<scroll_list.columns label="Substituição" name="replacement"/>
+	</scroll_list>
+	<button label="Adicionar..." name="autoreplace_add_entry"/>
+	<button label="Remover" name="autoreplace_delete_entry"/>
+	<button label="Salvar entrada" name="autoreplace_save_entry" tool_tip="Salva esta entrada."/>
+	<button label="Salvar alterações" name="autoreplace_save_changes" tool_tip="Salvar todas as alterações."/>
+	<button label="Cancelar" name="autoreplace_cancel" tool_tip="Descarta todas as alterações."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory.xml b/indra/newview/skins/default/xui/pt/floater_inventory.xml
deleted file mode 100644
index ae3312eab0..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_inventory.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="MEU INVENTÁRIO">
-	<floater.string name="Title">
-		MEU INVENTÁRIO
-	</floater.string>
-	<floater.string name="TitleFetching">
-		MEU INVENTÁRIO (Pegando [ITEM_COUNT] items...) [FILTER]
-	</floater.string>
-	<floater.string name="TitleCompleted">
-		MEU INVENTÁRIO ([ITEM_COUNT] items) [FILTER]
-	</floater.string>
-	<floater.string name="Fetched">
-		Obtido
-	</floater.string>
-	<panel label="Painel do inventário" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_model_preview.xml b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
index 8960500831..8194278b16 100644
--- a/indra/newview/skins/default/xui/pt/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Triângulos" name="triangles" value="Triângulos"/>
 				<text initial_value="Vértices" name="vertices" value="Vértices"/>
 				<text initial_value="Alto" name="high_label" value="Alto"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Carregar do arquivo"/>
+					<item name="Generate" value="Gerar"/>
+				</combo_box>
 				<button label="Procurar..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Limite de triângulos"/>
+					<item name="Error Threshold" value="Limite de erro"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Médio" name="medium_label" value="Médio"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Carregar do arquivo"/>
+					<item name="Generate" value="Gerar"/>
+					<item name="Use LoD above" value="Usar LoD acima"/>
+				</combo_box>
 				<button label="Procurar..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Limite de triângulos"/>
+					<item name="Error Threshold" value="Limite de erro"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Baixo" name="low_label" value="Baixo"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Carregar do arquivo"/>
+					<item name="Generate" value="Gerar"/>
+					<item name="Use LoD above" value="Usar LoD acima"/>
+				</combo_box>
 				<button label="Procurar..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Limite de triângulos"/>
+					<item name="Error Threshold" value="Limite de erro"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="Mais baixo" name="lowest_label" value="Mais baixo"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Carregar do arquivo"/>
+					<item name="Generate" value="Gerar"/>
+					<item name="Use LoD above" value="Usar LoD acima"/>
+				</combo_box>
 				<button label="Procurar..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Limite de triângulos"/>
+					<item name="Error Threshold" value="Limite de erro"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Gerar normais" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml b/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml
deleted file mode 100644
index 653861f7d8..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="Bate-papo local">
-	<check_box label="Traduzir bate-papo" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml
new file mode 100644
index 0000000000..05784115e7
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Personagens do pathfinding">
+	<floater.string name="messaging_get_inprogress">
+		Procurando por personagens do pathfinding...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Erro detectado ao procurar por personagens do pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Nenhum personagem do pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] personagens selecionados de [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		Esta região não está habilitada para pathfinding.
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Carregando]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Desconhecido]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[grupo]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nome" name="name"/>
+			<scroll_list.columns label="Descrição" name="description"/>
+			<scroll_list.columns label="Proprietário" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="Altitude" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Personagens:
+		</text>
+		<button label="Atualizar lista" name="refresh_objects_list"/>
+		<button label="Selecionar tudo" name="select_all_objects"/>
+		<button label="Selecionar nenhum" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Ações nos personagens selecionados:
+		</text>
+		<check_box label="Exibir baliza" name="show_beacon"/>
+		<check_box label="Exibir cápsula da física" name="show_physics_capsule"/>
+		<button label="Pegar" name="take_objects"/>
+		<button label="Pegar uma cópia" name="take_copy_objects"/>
+		<button label="Teletransportar-me até ele" name="teleport_me_to_object" tool_tip="Habilitado apenas quando um personagem é selecionado."/>
+		<button label="Devolver" name="return_objects"/>
+		<button label="Excluir" name="delete_objects"/>
+	</panel>
+</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
new file mode 100644
index 0000000000..182f2513e0
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Visualização/teste do pathfinding">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		Impossível encontrar a implementação de biblioteca de pathing.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		Esta região não está habilitada para pathfinding.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		Aguardando a conclusão do carregamento da região.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Verificando o status do navmesh.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Baixando o navmesh.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		O navmesh foi alterado no servidor. Baixando o navmesh mais recente.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		O navmesh mais recente foi baixado.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		Impossível baixar o navmesh com êxito.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		O navmesh tem alterações pendentes.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		O navmesh está compilando.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		Algumas regiões navmesh têm alterações pendentes.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		Algumas regiões navmesh estão compilando.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		Algumas regiões navmesh têm alterações pendentes e outras estão compilando.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		O navmesh está atualizado.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		Impossível encontrar a implementação de biblioteca de pathing.
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		Esta região não está habilitada para pathfinding.
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Escolha os pontos inicial e final.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Escolha o ponto inicial.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Escolha o ponto final.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		O caminho é exibido em laranja.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		Impossível encontrar um caminho entre os pontos escolhidos.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Ocorreu um erro durante a geração do caminho.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Visualizar" name="view_panel">
+			<text name="show_label">
+				Exibir:
+			</text>
+			<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">
+				Exibir mapa de possibilidade de caminhar:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="Não exibir" name="show_heatmap_mode_none"/>
+				<combo_box.item label="Tipo de personagem A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="Tipo de personagem B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="Tipo de personagem C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="Tipo de personagem D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Caminháveis" name="show_walkables"/>
+			<check_box label="Volumes materiais" name="show_material_volumes"/>
+			<check_box label="Obstáculos estáticos" name="show_static_obstacles"/>
+			<check_box label="Volumes de exclusão" name="show_exclusion_volumes"/>
+			<check_box label="Plano aquático" name="show_water_plane"/>
+			<check_box label="Com visão de raio X" name="show_xray"/>
+		</panel>
+		<panel label="Testar caminho" name="test_panel">
+			<text name="ctrl_click_label">
+				Aperte a tecla Ctrl e clique com o mouse para selecionar o ponto inicial.
+			</text>
+			<text name="shift_click_label">
+				Aperte a tecla Shift e clique com o mouse para selecionar o ponto final.
+			</text>
+			<text name="character_width_label">
+				Largura do personagem
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				Tipo de personagem
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Nenhum" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Limpar caminho" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml
new file mode 100644
index 0000000000..8dc14a79a5
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Linksets do pathfinding">
+	<floater.string name="messaging_get_inprogress">
+		Procurando por linksets do pathfinding...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Erro detectado ao procurar por linksets do pathfinding.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Modificando os linksets do pathfinding selecionados...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Erro detectado ao modificar os linksets do pathfinding selecionados.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Nenhum linkset do pathfinding.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		[NUM_SELECTED] linksets selecionados de [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		Esta região não está habilitada para pathfinding.
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Terreno]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Carregando]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Desconhecido]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[grupo]
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Caminhável
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Obstáculo estático
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Obstáculo móvel
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Volume material
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Volume de exclusão
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Fantasma móvel
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[inalterável]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[restrito]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[côncavo]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[restrito,côncavo]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Escolher uso do linkset...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Filtrar por uso do linkset..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Caminhável" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Obstáculo estático" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Obstáculo móvel" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Volume material" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Volume de exclusão" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Fantasma móvel" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Aplicar" name="apply_filters"/>
+		<button label="Limpar" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Nome (prim raiz)" name="name"/>
+			<scroll_list.columns label="Descrição (prim raiz)" name="description"/>
+			<scroll_list.columns label="Proprietário" name="owner"/>
+			<scroll_list.columns label="Impacto" name="land_impact"/>
+			<scroll_list.columns label="Distância" name="dist_from_you"/>
+			<scroll_list.columns label="Uso do linkset" name="linkset_use"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Linksets:
+		</text>
+		<button label="Atualizar lista" name="refresh_objects_list"/>
+		<button label="Selecionar tudo" name="select_all_objects"/>
+		<button label="Selecionar nenhum" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="Exibir baliza" name="show_beacon"/>
+		<button label="Pegar" name="take_objects"/>
+		<button label="Pegar uma cópia" name="take_copy_objects"/>
+		<button label="Teletransportar-me até ele" name="teleport_me_to_object"/>
+		<button label="Devolver" name="return_objects"/>
+		<button label="Excluir" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Possibilidade de caminhar:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="Possibilidade de caminhar para os personagens do tipo A. Por exemplo: o tipo do personagem é humano."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="Possibilidade de caminhar para os personagens do tipo B. Por exemplo: o tipo do personagem é criatura."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="Possibilidade de caminhar para os personagens do tipo C. Por exemplo: o tipo do personagem é robô."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="Possibilidade de caminhar para os personagens do tipo D. Por exemplo: o tipo do personagem é outro."/>
+		<button label="Aplicar alterações" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Humano)
+		</text>
+		<text name="suggested_use_b_label">
+			(Criatura)
+		</text>
+		<text name="suggested_use_c_label">
+			(Robô)
+		</text>
+		<text name="suggested_use_d_label">
+			(Outro)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_postcard.xml b/indra/newview/skins/default/xui/pt/floater_postcard.xml
deleted file mode 100644
index 9740fbcb4d..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_postcard.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="ENVIAR FOTO VIA EMAIL">
-	<text name="to_label" width="135">
-		Para (email):
-	</text>
-	<line_editor left="143" name="to_form" width="127"/>
-	<text name="from_label">
-		De (email):
-	</text>
-	<line_editor left="143" name="from_form" width="127"/>
-	<text name="name_label">
-		Seu nome:
-	</text>
-	<line_editor left="143" name="name_form" width="127"/>
-	<text name="subject_label">
-		Assunto:
-	</text>
-	<line_editor left="143" name="subject_form" width="127"/>
-	<line_editor label="Digite o assunto aqui" name="subject_form"/>
-	<text name="msg_label">
-		Mensagem:
-	</text>
-	<text_editor name="msg_form">
-		Digite sua mensagem aqui.
-	</text_editor>
-	<text name="fine_print">
-		Se seu indicado entrar no [SECOND_LIFE], você receberá um bônus pela indicação.
-	</text>
-	<button label="Cancelar" name="cancel_btn"/>
-	<button label="Enviar" name="send_btn"/>
-	<string name="default_subject">
-		Postal do [SECOND_LIFE].
-	</string>
-	<string name="default_message">
-		Dá uma olhada nisto!
-	</string>
-	<string name="upload_message">
-		Enviando...
-	</string>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_spellcheck.xml b/indra/newview/skins/default/xui/pt/floater_spellcheck.xml
new file mode 100644
index 0000000000..02bb154d26
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Configurações do verificador ortográfico">
+	<check_box label="Habilitar verificador ortográfico" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Dicionário principal:
+	</text>
+	<text label="Logs:" name="spellcheck_additional">
+		Dicionários adicionais:
+	</text>
+	<text name="spellcheck_available">
+		Disponível
+	</text>
+	<text name="spellcheck_active">
+		Ativo
+	</text>
+	<button label="Remover" name="spellcheck_remove_btn"/>
+	<button label="Importar..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml
new file mode 100644
index 0000000000..f4e95bddec
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Importar dicionário">
+	<button label="Procurar" label_selected="Procurar" name="dictionary_path_browse"/>
+	<button label="Importar" name="ok_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_stats.xml b/indra/newview/skins/default/xui/pt/floater_stats.xml
index e770c6ac38..be53624145 100644
--- a/indra/newview/skins/default/xui/pt/floater_stats.xml
+++ b/indra/newview/skins/default/xui/pt/floater_stats.xml
@@ -47,6 +47,12 @@
 					<stat_bar label="Low LOD Objects" name="physicslodtasks"/>
 					<stat_bar label="Memory Allocated" name="physicsmemoryallocated"/>
 				</stat_view>
+				<stat_bar label="Scripts executados" name="simpctscriptsrun"/>
+				<stat_view label="Pathfinding" name="simpathfinding">
+					<stat_bar label="Tempo de etapa de AI" name="simsimaistepmsec"/>
+					<stat_bar label="Etapas de silhueta ignoradas" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Personagens atualizados" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_view label="Time (ms)" name="simperf">
 					<stat_bar label="Total Frame Time" name="simframemsec"/>
 					<stat_bar label="Net Time" name="simnetmsec"/>
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 57223beaeb..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,6 +19,8 @@
 	<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="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"/>
 	<button label="Adicionar" label_selected="Adicionar" name="l_add_btn"/>
@@ -30,5 +32,4 @@
 	</scroll_list>
 	<button label="OK" label_selected="OK" name="Select"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
-	<check_box initial_value="true" label="Applicar agora" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml
index 4b31833602..8c245c582e 100644
--- a/indra/newview/skins/default/xui/pt/floater_tools.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tools.xml
@@ -148,6 +148,12 @@
 			<panel.string name="text modify info 4">
 				Você não pode modificar estes objetos
 			</panel.string>
+			<panel.string name="text modify info 5">
+				Não é possível modificar este objeto através de uma demarcação da região
+			</panel.string>
+			<panel.string name="text modify info 6">
+				Não é possível modificar estes objetos através de uma demarcação da região
+			</panel.string>
 			<panel.string name="text modify warning">
 				Selecione o objeto inteiro para configurar as autorizações
 			</panel.string>
@@ -197,12 +203,12 @@
 				<combo_box.item label="Zoom" name="Zoom"/>
 			</combo_box>
 			<check_box label="À venda" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Cópia" name="Copy"/>
 				<combo_box.item label="Conteúdo" name="Contents"/>
 				<combo_box.item label="Original" name="Original"/>
 			</combo_box>
-			<spinner label="Preço: L$" name="Edit Cost"/>
 			<check_box label="Mostrar na busca" name="search_check" tool_tip="Permitir que as pessoas vejam este objeto nos resultados de busca"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -238,6 +244,11 @@
 					F:
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Atributos do pathfinding:
+				</text>
+			</panel>
 		</panel>
 		<panel label="Objeto" name="Object">
 			<check_box label="Travado" name="checkbox locked" tool_tip="Previne que o objeto seja movido ou apagado. Muito útil para evitar edições não intencionais durante a construção."/>
diff --git a/indra/newview/skins/default/xui/pt/floater_top_objects.xml b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
index c3d5820616..ef682714c6 100644
--- a/indra/newview/skins/default/xui/pt/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/pt/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		Tempo
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Hora Mono
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		Principais Colidentes
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Nome" name="name"/>
 		<scroll_list.columns label="Proprietário" name="owner"/>
 		<scroll_list.columns label="Local" name="location"/>
+		<scroll_list.columns label="Lote" name="parcel"/>
 		<scroll_list.columns label="Tempo" name="time"/>
-		<scroll_list.columns label="Hora Mono" name="mono_time"/>
 		<scroll_list.columns label="URLs" name="URLs"/>
+		<scroll_list.columns label="Memória (KB)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		ID do Objeto:
@@ -51,6 +49,10 @@
 	</text>
 	<line_editor font="SansSerifSmall" left="140" name="owner_name_editor" width="280"/>
 	<button label="Filtro" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		Lote:
+	</text>
+	<button label="Filtrar" name="filter_parcel_btn"/>
 	<button label="Atualizar" name="refresh_btn"/>
 	<button label="Retornar Selecionado" name="return_selected_btn" width="170"/>
 	<button label="Retornar Tudo" left="190" name="return_all_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_bottomtray.xml b/indra/newview/skins/default/xui/pt/menu_bottomtray.xml
deleted file mode 100644
index 4598b8ab25..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Botão Falar" name="EnableVoiceChat"/>
-	<menu_item_check label="Botão de gestos" name="ShowGestureButton"/>
-	<menu_item_check label="Botão de movimento" name="ShowMoveButton"/>
-	<menu_item_check label="Botão de ver" name="ShowCameraButton"/>
-	<menu_item_check label="Botão de fotos" name="ShowSnapshotButton"/>
-	<menu_item_check label="Botão Construir" name="ShowBuildButton"/>
-	<menu_item_check label="Botão Buscar" name="ShowSearchButton"/>
-	<menu_item_check label="Botão Mapa" name="ShowWorldMapButton"/>
-	<menu_item_check label="Botão do Mini mapa" name="ShowMiniMapButton"/>
-	<menu_item_call label="Cortar" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Copiar" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Colar" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Excluir" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Selecionar tudo" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_mode_change.xml b/indra/newview/skins/default/xui/pt/menu_mode_change.xml
deleted file mode 100644
index 314d3e409b..0000000000
--- a/indra/newview/skins/default/xui/pt/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Básico" name="BasicMode"/>
-	<menu_item_check label="Avançado" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_object.xml b/indra/newview/skins/default/xui/pt/menu_object.xml
index f4919e0c1f..28dd9febe2 100644
--- a/indra/newview/skins/default/xui/pt/menu_object.xml
+++ b/indra/newview/skins/default/xui/pt/menu_object.xml
@@ -5,6 +5,8 @@
 	</menu_item_call>
 	<menu_item_call label="Editar" name="Edit..."/>
 	<menu_item_call label="Construir" name="Build"/>
+	<menu_item_call label="Exibir em linksets" name="show_in_linksets"/>
+	<menu_item_call label="Exibir em personagens" name="show_in_characters"/>
 	<menu_item_call label="Abrir" name="Open"/>
 	<menu_item_call label="Sentar aqui" name="Object Sit"/>
 	<menu_item_call label="Ficar de pé" name="Object Stand Up"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_text_editor.xml b/indra/newview/skins/default/xui/pt/menu_text_editor.xml
index 31c284c6ed..a26b50e1c2 100644
--- a/indra/newview/skins/default/xui/pt/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/pt/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(desconhecido)" name="Suggestion 1"/>
+	<menu_item_call label="(desconhecido)" name="Suggestion 2"/>
+	<menu_item_call label="(desconhecido)" name="Suggestion 3"/>
+	<menu_item_call label="(desconhecido)" name="Suggestion 4"/>
+	<menu_item_call label="(desconhecido)" name="Suggestion 5"/>
+	<menu_item_call label="Adicionar ao dicionário" name="Add to Dictionary"/>
+	<menu_item_call label="Adicionar para ignorar" name="Add to Ignore"/>
 	<menu_item_call label="Cortar" name="Cut"/>
 	<menu_item_call label="Copiar" name="Copy"/>
 	<menu_item_call label="Colar" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index d93330e6df..ca378c1b58 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -28,6 +28,7 @@
 		<menu_item_call label="Preferências..." name="Preferences"/>
 		<menu_item_call label="Botões da barra de ferramentas..." name="Toolbars"/>
 		<menu_item_call label="Ocultar todos os controles" name="Hide UI"/>
+		<menu_item_check label="Exibir anexos de HUD" name="Show HUD Attachments"/>
 		<menu_item_call label="Sair do [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Comunicar" name="Communicate">
@@ -39,6 +40,7 @@
 		<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">
 		<menu_item_call label="Criar marco deste lugar" name="Create Landmark Here"/>
@@ -124,6 +126,11 @@
 			<menu_item_call label="Scripts em modo execução" name="Set Scripts to Running"/>
 			<menu_item_call label="Scripts em modo não execução" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Pathfinding" name="Pathfinding">
+			<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>
 		<menu label="Opções" name="Options">
 			<menu_item_check label="Mostrar permissões avançadas" name="DebugPermissions"/>
 			<menu_item_check label="Só selecionar meus objetos" name="Select Only My Objects"/>
@@ -174,7 +181,6 @@
 			<menu_item_check label="Esconder partículas" name="Hide Particles"/>
 			<menu_item_check label="Ocultar seleções" name="Hide Selected"/>
 			<menu_item_check label="Realçar transparentes" name="Highlight Transparent"/>
-			<menu_item_check label="Mostrar anexos HUD" name="Show HUD Attachments"/>
 			<menu_item_check label="Mostrar retículo na vista subjetiva" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Tipos de renderização" name="Rendering Types">
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index 5484dd2007..11d987d73a 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -364,6 +370,12 @@ Digite o nome de usuário de seu avatar.
 	<notification name="InvalidCredentialFormat">
 		Digite o nome de usuário ou o nome e sobrenome do seu avatar no campo Nome de usuário, depois entre em sua conta novamente.
 	</notification>
+	<notification name="InvalidGrid">
+		&apos;[GRID]&apos; não é um identificador de grade válido.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		Seu ponto de partida não especificou uma grade válida.
+	</notification>
 	<notification name="DeleteClassified">
 		Apagar classificado&apos;[NAME]&apos;?
 Não há reembolso por taxas já pagas.
@@ -466,8 +478,8 @@ O objeto pode estar fora de alcance ou ter sido deletado.
 		Houve um problema em salvar uma compilação de script devido a seguinte razão: [REASON].  Por favor, tente salvar novamente o script mais tarde.
 	</notification>
 	<notification name="StartRegionEmpty">
-		Oops, você ainda não definiu sua região de partida. 
-Digite o nome da região na caixa &apos;Ponto de partida&apos; ou selecione &apos;Última localização&apos; ou &apos;Meu início&apos; como ponto de partida.
+		Sua região de partida não está definida.
+Digite o nome da região na caixa &apos;Ponto de partida&apos; ou selecione &apos;Meu último local&apos; ou &apos;Minha casa&apos; como ponto de partida.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -594,6 +606,9 @@ Você pode unir um máximo de [MAX] objetos.
 
 Por favor, certifique-se de que nenhum deles está travado e que você é dono de todos eles.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		Os objetos não podem ser vinculados através de demarcações de região.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Impossibilitado de unir porque nem todos os objetos são do mesmo dono.
 
@@ -972,6 +987,41 @@ Oferecer amizade para [NAME]?
 			<button name="Cancel" text="Cancelar"/>
 		</form>
 	</notification>
+	<notification label="Adicionar lista de substituição automática" name="AddAutoReplaceList">
+		Nome para a nova lista:
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="Renomear lista de substituição automática" name="RenameAutoReplaceList">
+		O nome &apos;[DUPNAME]&apos; já está em uso
+    Insira um novo nome exclusivo:
+		<form name="form">
+			<button name="ReplaceList" text="Substituir lista atual"/>
+			<button name="SetName" text="Usar novo nome"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		A palavra-chave deve ser uma palavra única e a substituição não pode estar vazia.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		A lista de substituição é inválida.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Você deve especificar um arquivo, um nome e um idioma.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		O dicionário [DIC_NAME] não aparenta ter um arquivo &quot;aff&quot;; isso significa que ele é um dicionário &quot;secundário&quot;.
+Ele pode ser usado como dicionário adicional mas não como dicionário Principal.
+
+Consulte https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		Impossível copiar
+    [FROM_NAME]
+    para
+    [TO_NAME]
+	</notification>
 	<notification label="Salvar este look" name="SaveOutfitAs">
 		Veja o meu novo visual:
 		<form name="form">
@@ -1164,7 +1214,7 @@ Enquando isso, use o [SECOND_LIFE] normalmente. Seu visual será exibido correta
 	<notification name="FirstRun">
 		A instalação do [APP_NAME] está pronta. 
 
-Se você ainda não conhece o [SECOND_LIFE], basta criar uma conta para começar. 
+Se você ainda não conhece o [SECOND_LIFE], basta criar uma conta para começar.
 		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Nova conta.."/>
 	</notification>
 	<notification name="LoginPacketNeverReceived">
@@ -1681,83 +1731,128 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar.
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Mudar"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		Você não é permitido na Região devido à sua Classificação de maturidade. Isto pode ser o resultado da falta de informação de validação de sua idade.
-
-Por favor, verifique se você está com o último Visualizador instalado e vá ao Banco de Conhecimento para detalhes em como acessar áreas com esta classificação de maturidade.
+		A região que você está tentando visitar tem conteúdo que excede suas preferências atuais.  Você pode alterar suas preferências acessando Eu &gt; Preferências &gt; Geral.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		Você não é permitido nesta região devido à sua Classificação de maturidade.
-
-Ir para o Banco de Conhecimento para maiores informações sobre Classificações de maturidade?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], acessível apenas para adultos.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/pt
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Não posso entrar nessa região devido à classificação do conteúdo" name="okcancelignore" notext="Fechar" yestext="Ir para o Banco de Conhecimento"/>
+		<usetemplate ignoretext="Passagem de região: A região que você está tentando visitar tem conteúdo acessível apenas para adultos." name="okcancelignore" notext="Fechar" yestext="Ir para a Base de Conhecimento"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		Você não é permitido nesta região devido à sua Classificação de maturidade.
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY].
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], acessível apenas para adultos.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Você não pode entrar nessa região devido à sua seleção de maturidade.
-
-Para entrar na região desejada, mude o nível de maturidade.  Você então poderá fazer buscas e acessar conteúdo [REGIONMATURITY]. Para desfazer qualquer mudança, vá para Eu &gt; Preferências &gt; Geral.
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY]. Podemos alterar suas preferências ou você pode cancelar. Após a alteração de suas preferências, você pode tentar acessar a região novamente.
+		<form name="form">
+			<button name="OK" text="Mudar preferências"/>
+			<button default="true" name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Passagem de região: A região que você está tentando visitar tem conteúdo excluído por suas preferências."/>
+		</form>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		Estamos tendo dificuldades técnicas com seu teletransporte, pois suas preferências estão dessincronizadas com o servidor.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		A região que você está tentando visitar tem conteúdo que excede suas preferências atuais.  Você pode alterar suas preferências acessando Eu &gt; Preferências &gt; Geral.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], acessível apenas para adultos.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+		</url>
+		<usetemplate ignoretext="Teletransportar: A região que você está tentando visitar tem conteúdo acessível apenas para adultos." name="okcancelignore" notext="Fechar" yestext="Ir para a Base de Conhecimento"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY].
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], acessível apenas para adultos.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY]. Podemos alterar suas preferências e continuar o teletransporte, ou você pode cancelar este teletransporte.
 		<form name="form">
-			<button name="OK" text="Mudar preferência"/>
-			<button default="true" name="Cancel" text="Fechar"/>
-			<ignore name="ignore" text="Minha preferência de maturidade impede que eu vá a uma região"/>
+			<button name="OK" text="Alterar e continuar"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Teletransportar (reinicializável): A região que você está tentando visitar tem conteúdo excluído por suas preferências."/>
 		</form>
 	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY]. Podemos alterar suas preferências ou você pode cancelar o teletransporte. Após a alteração de suas preferências, você pode tentar se teletransportar novamente.
+		<form name="form">
+			<button name="OK" text="Mudar preferências"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Teletransportar (não reinicializável): A região que você está tentando visitar tem conteúdo excluído por suas preferências."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		Estamos tendo dificuldades técnicas com seu teletransporte, pois suas preferências estão dessincronizadas com o servidor.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		Sua opção de nível de maturidade é [RATING].
+		Você não receberá mais notificações de que está prestes a visitar uma região com conteúdo [RATING].  Posteriormente você poderá alterar suas preferências de conteúdo acessando Eu &gt; Preferências &gt; Geral da barra do menu.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		Impossível alterar suas preferências para visualizar conteúdo [PREFERRED_MATURITY] no momento.  Suas preferências foram redefinidas para visualizar conteúdo [ACTUAL_MATURITY].  Você pode tentar alterar suas preferências novamente acessando Eu &gt; Preferências &gt; Geral na barra do menu.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		Você não pode reclamar esta terra devido à sua Classificação de maturidade. Isto pode ser o resultado de falta de informação na validação de sua idade.
-
-Por favor, verifique se você tem o último Visualizador instalado e vá para o Banco de Conhecimento para detalhes sobre o acesso de áreas com esta Classificação de maturidade.
+		O terreno que você está tentando reivindicar possui uma classificação de maturidade que excede suas preferências atuais.  Você pode alterar suas preferências acessando Eu &gt; Preferências &gt; Geral.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		Você não pode reclamar esta terra devido à sua Classificação de maturidade.
-
-Ir para a o Banco de Conhecimento para maiores informações sobre Classificações de maturidade?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		Apenas adultos podem reivindicar este terreno.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/pt
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Não reivindicar essa região devido à classificação do conteúdo" name="okcancelignore" notext="Fechar" yestext="Ir para o Banco de Conhecimento"/>
+		<usetemplate ignoretext="Apenas adultos podem reivindicar este terreno." name="okcancelignore" notext="Fechar" yestext="Ir para a Base de Conhecimento"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		Você não pode reclamar esta terra devido à sua Classificação de maturidade.
+		O terreno que você está tentando reivindicar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY].
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		O terreno que você está tentando reivindicar tem conteúdo [REGIONMATURITY], que é acessível apenas para adultos.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		Você não pode reivindicar essa região devido à sua preferência de maturidade
-
-Clique em &apos;Mudar preferência&apos; para aumentar o nível de maturidade e entrar nessa região.  De agora em diante você pode buscar e acessar conteúdo [REGIONMATURITY] .  Para modificar esta configuração, vá à Eu &gt; Preferências &gt; Geral.
-		<usetemplate ignoretext="Minha preferência de conteúdo impede que eu reivindique terrenos" name="okcancelignore" notext="Fechar" yestext="Mudar Preferência"/>
+		O terreno que você está tentando reivindicar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY]. Podemos alterar suas preferências e, então, você poderá tentar reivindicar a região novamente.
+		<form name="form">
+			<button name="OK" text="Mudar preferências"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="O terreno que você está tentando reivindicar tem conteúdo excluído por suas preferências."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		Você não pode comprar esta terra devido à sua Classificação de maturidade. Isto pode ser o resultado de falta de informação na validação de sua idade.
-
-Por favor, verifique se você tem o último Visualizador instalado e vá para o Banco de Conhecimento para detalhes sobre o acesso de áreas com esta Classificação de maturidade.
+		O terreno que você está tentando comprar possui uma classificação de maturidade que excede suas preferências atuais.  Você pode alterar suas preferências acessando Eu &gt; Preferências &gt; Geral.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		Você não pode comprar esta terra devido à sua Classificação de maturidade.
-
-Ir para o Banco de Conhecimento para maiores informações sobre Classificações de Maturidade?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Apenas adultos podem comprar este terreno.
 		<url name="url">
-			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/pt
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Não posso comprar essa região devido à classificação do conteúdo" name="okcancelignore" notext="Fechar" yestext="Ir para o Banco de Conhecimento"/>
+		<usetemplate ignoretext="Apenas adultos podem comprar este terreno." name="okcancelignore" notext="Fechar" yestext="Ir para a Base de Conhecimento"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		Você não pode comprar esta terra devido à sua Classificação de maturidade.
+		O terreno que você está tentando comprar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY].
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		A região que você está tentando visitar tem conteúdo [REGIONMATURITY], que é acessível apenas para adultos.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		Você não pode comprar esse terreno devido à sua preferência de maturidade
-
-Clique em &apos;Mudar preferência&apos; para aumentar o nível de maturidade e entrar nessa região.  De agora em diante você pode buscar e acessar conteúdo [REGIONMATURITY] .  Para modificar esta configuração, vá à Eu &gt; Preferências &gt; Geral.
-		<usetemplate ignoretext="Minha preferência de conteúdo não me deixa comprar terrenos" name="okcancelignore" notext="Fechar" yestext="Mudar Preferência"/>
+		O terreno que você está tentando comprar tem conteúdo [REGIONMATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGIONMATURITY]. Podemos alterar suas preferências e, então, você poderá tentar comprar a região novamente.
+		<form name="form">
+			<button name="OK" text="Mudar preferências"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="O terreno que você está tentando comprar tem conteúdo excluído por suas preferências."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Muitos prims foram selecionados.   Selecione [MAX_PRIM_COUNT] ou menos prims, e tente de novo
@@ -1812,10 +1907,9 @@ Publicar este classificado agora por L$ [AMOUNT]?
 		</form>
 	</notification>
 	<notification label="Modificar a maturidade da Região" name="RegionMaturityChange">
-		O conteúdo desta região foi reclassificado. 
-Talvez leve algum tempo para a mudança ser refletida no mapa. 
-
-Para ir a regiões de conteúdo Adulto, é preciso ter uma conta verificada, seja comprovando a idade ou com dados de pagamento.
+		A classificação de maturidade desta região foi alterada.
+Talvez leve algum tempo para que esta mudança seja refletida no mapa.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="Discordância de Versão de Voz" name="VoiceVersionMismatch">
 		Esta versão do [APP_NAME] não é compatível com o recurso &apos;Bate-papo de voz&apos; desta região.  Para o bate-papo de voz funcionar, atualize o [APP_NAME].
@@ -2105,14 +2199,11 @@ Inclua um link para facilitar o acesso para visitantes. Teste o link na barra de
 		<usetemplate ignoretext="Vestir as roupas que eu criar enquanto edito minha aparência" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Você deve ter no mínimo 18 anos para acessar conteúdo e áreas adultas no Second Life. Visite nossa página de verificação de idade para confirmar que você tem mais de 18 anos. 
-Isso abrirá o seu navegador.
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="Ainda não comprovei minha idade" name="okcancelignore" notext="Cancelar" yestext="Ir para verificação de idade"/>
+		O local que você está tentando visitar é restrito a residentes com 18 anos ou mais.
+		<usetemplate ignoretext="Não tenho idade suficiente para visitar áreas com restrição de idade." name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		Localização restrita para 18 anos de idade ou mais.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Área restrita a residentes que já cadastraram seus dados de pagamento  Deseja ir ao site do [SECOND_LIFE] para cuidar disso? 
@@ -2370,6 +2461,23 @@ Logo, não é possível voar aqui.
 	<notification name="NoBuild">
 		Esta área desativou a opção de construir.  Não é possível construir ou fazer rez de objetos nesta área.
 	</notification>
+	<notification name="PathfindingDirty">
+		A região possui alterações de pathfinding pendentes.  Se você possui direitos de construção, poderá recarregar a região clicando no botão “Recarregar região”.
+	</notification>
+	<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"/>
+	</notification>
 	<notification name="SeeAvatars">
 		Este terreno oculta os avatares e bate-papo de outro terreno.    Não é possível ver residentes fora do terreno e vice-versa.   O bate-papo por texto no canal 0 também está bloqueado.
 	</notification>
@@ -2388,9 +2496,7 @@ Os únicos scripts que funcionam são os do proprietário do terreno.
 		Você só pode reivindicar terrenos públicos na região onde você está.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		Você não é permitido na Região devido à sua Classificação de maturidade. Você precisa validar sua idade e/ou instalar o último Visualizador.
-
-Por favor, vá ao Banco de Conhecimento para detalhes sobre o acesso de áreas com esta Classificação de maturidade.
+		A região que você está tentando visitar tem conteúdo que excede suas preferências atuais.  Você pode alterar suas preferências acessando Eu &gt; Preferências &gt; Geral.
 	</notification>
 	<notification name="URBannedFromRegion">
 		Você está banido da região.
@@ -2401,8 +2507,11 @@ Por favor, vá ao Banco de Conhecimento para detalhes sobre o acesso de áreas c
 	<notification name="ImproperPaymentStatus">
 		Você não tem o status de pagamento adequado para entrar nesta região.
 	</notification>
+	<notification name="MustGetAgeRegion">
+		Você deve ter 18 anos ou mais para acessar esta região.
+	</notification>
 	<notification name="MustGetAgeParcel">
-		Você precisa ter a idade verificada para entrar neste lote.
+		Você deve ter 18 anos ou mais para acessar este lote.
 	</notification>
 	<notification name="NoDestRegion">
 		Nenhuma região de destino encontrada.
@@ -2504,12 +2613,33 @@ Por favor, tente novamente em alguns instantes.
 	<notification name="TeleportOffered">
 		[NAME_SLURL] quer teletransportar você para a região deles:
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Teletransporte"/>
 			<button name="Cancel" text="Cancelar"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] quer teletransportar você para a região deles:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+A região tem conteúdo [REGION_CONTENT_MATURITY], mas suas preferências atuais estão definidas para excluir conteúdo [REGION_CONTENT_MATURITY].  Podemos alterar suas preferências e continuar o teletransporte, ou você pode cancelar este teletransporte.
+		<form name="form">
+			<button name="Teleport" text="Alterar e continuar"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] quer teletransportar você para a região deles:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+No entanto, esta região tem conteúdo acessível apenas para adultos.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Oferta de teletransporte enviada para [TO_NAME]
 	</notification>
@@ -2907,6 +3037,10 @@ Você carregou uma textura com [RESOLUTION] para o(a) &apos;[BODYREGION]&apos; e
 		( [EXISTENCE] segundos de vida )
 Você carregou uma textura com [RESOLUTION] para o(a) &apos;[BODYREGION]&apos; em [TIME] segundos.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		Não podemos exibir uma visualização desta textura, pois ela é cópia proibida e/ou transferência proibida.
+		<usetemplate ignoretext="Avise-me quando o modo Visualização em Tempo Real estiver indisponível para texturas de cópia proibida e/ou transferência proibida" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Tem certeza de que quer sair desta ligação?
 		<usetemplate ignoretext="Confirmar antes de deixar ligação" name="okcancelignore" notext="Não" yestext="Sim"/>
@@ -3076,6 +3210,23 @@ Se o botão Falar for ocultado, o recurso de voz será desabilitado.
 		Essa ação irá ocultar todos os itens de menu e botões. Para trazê-los de volta, clique em [SHORTCUT] novamente.
 		<usetemplate ignoretext="Confirmar antes de ocultar interface" name="okcancelignore" notext="Cancelar" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestricted">
+		Alguns linksets selecionados não podem ser definidos como &apos;[REQUESTED_TYPE]&apos; devido às restrições de permissão no linkset.  Ao invés disso, estes linksets serão definidos como &apos;[RESTRICTED_TYPE]&apos;.
+		<usetemplate ignoretext="Alguns linksets selecionados não podem ser definidos devido às restrições de permissão no linkset." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnVolume">
+		Alguns linksets selecionados não podem ser definidos como &apos;[REQUESTED_TYPE]&apos;, pois a forma não é convexa.
+		<usetemplate ignoretext="Alguns linksets selecionados não podem ser definidos, pois a forma não é convexa." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestrictedAndVolume">
+		Alguns linksets selecionados não podem ser definidos como &apos;[REQUESTED_TYPE]&apos; devido às restrições de permissão no linkset.  Ao invés disso, estes linksets serão definidos como &apos;[RESTRICTED_TYPE]&apos;.
+ Alguns linksets selecionados não podem ser definidos como &apos;[REQUESTED_TYPE]&apos;, pois a forma não é convexa. Estes tipos de uso de linksets não mudarão.
+		<usetemplate ignoretext="Alguns linksets selecionados não podem ser definido devido às restrições de permissão no linkset e porque a forma não é convexa." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		O objeto selecionado afeta o navmesh.  Alterá-lo para um Caminho Flexível irá removê-lo do navmesh.
+		<usetemplate ignoretext="O objeto selecionado afeta o navmesh.  Alterá-lo para um Caminho Flexível irá removê-lo do navmesh." name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		Aparentemente a sua máquina não atende os requisitos de hardware do [APP_NAME].  [APP_NAME] requer placas de vídeo OpenGL com suporte a multitexturas.  Se sua place de vídeo tiver este perfil, atualize o driver da placa de vídeo, assim como patches e service packs do sistema operacional. 
 
@@ -3112,4 +3263,12 @@ Desabilitando atualizações futuras deste arquivo.
 		Tentativa de adição de um formato de imagem inválido ou ilegível [FNAME] que não pode ser aberto ou decodificado.
 Tentativa cancelada.
 	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		Você está devolvendo [NUM_ITEMS] itens.  Tem certeza de que deseja continuar?
+		<usetemplate ignoretext="Tem certeza de que deseja devolver múltiplos itens?" name="okcancelignore" notext="Não" yestext="Sim"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		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>
 </notifications>
diff --git a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml b/indra/newview/skins/default/xui/pt/panel_bottomtray.xml
deleted file mode 100644
index cb517f643c..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Liga e desliga o microfone"/>
-	<string name="VoiceControlBtnToolTip" value="Mostra/oculta os controles de voz"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Falar" label_selected="Falar" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Gesto" name="Gesture" tool_tip="Mostra/oculta os gestos"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Movimentar" name="movement_btn" tool_tip="Mostra/oculta os controles de movimento"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Exibir" name="camera_btn" tool_tip="Mostra/oculta os controles da câmera"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="Tirar foto"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Construir" name="build_btn" tool_tip="Mostra/oculta ferramentas de Construção"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Busca" name="search_btn" tool_tip="Mostra/oculta os gestos"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Mapa" name="world_map_btn" tool_tip="Mostra/oculta o Mapa Múndi"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Mini Mapa" name="mini_map_btn" tool_tip="Mostra/oculta o Mini Mapa"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Conversas"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Notificações"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_group_invite.xml b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
index c7def0ed96..de057481de 100644
--- a/indra/newview/skins/default/xui/pt/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/pt/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Alguns dos residentes selecionados já estão no grupo, portanto não receberam convite.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Os convites para o grupo não foram enviados: muitos residentes selecionados. Os convites para o grupo são limitados a 100 por solicitação.
+	</panel.string>
 	<text name="help_text" width="214">
 		Selecione um ou mais residentes para convidar.  Clique em &apos;Abrir seletor de residentes&apos; para começar.
 	</text>
diff --git a/indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml
new file mode 100644
index 0000000000..aa885ae031
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_navmesh_rebake">
+	<button label="Recarregar região" name="navmesh_btn" tool_tip="Clique para recarregar o navmesh da região."/>
+	<button label="Solicitando recarregamento" name="navmesh_btn_sending" tool_tip="Enviando solicitação de recarregamento para o servidor."/>
+	<button label="A região está recarregando" name="navmesh_btn_baking" tool_tip="A região está sendo recarregada.  Este botão desaparecerá após a conclusão."/>
+</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 c5a4febb0e..350d53b81c 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -29,5 +29,7 @@
 	<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="Configurações de tradução de bate-papo" name="ok_btn"/>
+	<button label="Tradução..." name="ok_btn"/>
+	<button label="Substituição automática..." name="autoreplace_showgui"/>
+	<button label="Verificando a ortografia..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_debug.xml b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
index f2cc9f644d..72e348e48c 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_debug.xml
@@ -36,5 +36,5 @@
 	<button label="?" left="297" name="top_scripts_help"/>
 	<button label="Reiniciar a região" name="restart_btn" tool_tip="Após 2 minutos de contagem regressiva, reiniciar a região"/>
 	<button label="?" name="restart_help"/>
-	<button label="Adiar reinício" name="cancel_restart_btn" tool_tip="Adiar o reinício da região por uma hora"/>
+	<button label="Cancelar reinício" name="cancel_restart_btn" tool_tip="Adiar o reinício da região por uma hora"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_estate.xml b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
index 6c5945aa15..b1453c9c32 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_estate.xml
@@ -26,7 +26,7 @@
 		Permitir acesso apenas para residentes que:
 	</text>
 	<check_box label="Dados de pagamento constam no registro." name="limit_payment" tool_tip="Propriedade de acesso restrito a residentes que já cadastraram seus dados de pagamento  Consulte o [SUPPORT_SITE] para saber mais."/>
-	<check_box label="A idade foi verificada" name="limit_age_verified" tool_tip="Residentes devem ter a idade verificada para acessar esta propriedade. Consulte o [SUPPORT_SITE] para saber mais."/>
+	<check_box label="Tem 18 anos ou mais" name="limit_age_verified" tool_tip="Os residentes devem ter 18 anos ou mais para acessar esta propriedade. Consulte o [SUPPORT_SITE] para obter mais informações."/>
 	<check_box label="Permitir conversa de voz" name="voice_chat_check"/>
 	<button label="?" name="voice_chat_help"/>
 	<check_box label="Permitir Tele-transporte direto" name="allow_direct_teleport"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_texture.xml b/indra/newview/skins/default/xui/pt/panel_region_texture.xml
deleted file mode 100644
index 35928ccc67..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_region_texture.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Texturas de Chão" name="Textures">
-	<text name="region_text_lbl">
-		Região:
-	</text>
-	<text name="region_text">
-		desconhecido
-	</text>
-	<text name="detail_texture_text" width="380">
-		Texturas de Terreno (requer 512x512, arquivos 24 bit .tga )
-	</text>
-	<text name="height_text_lbl">
-		1 (baixo)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (alto)
-	</text>
-	<text name="height_text_lbl5">
-		Escalas de Elevação de Terreno
-	</text>
-	<text name="height_text_lbl6">
-		Noroeste
-	</text>
-	<text name="height_text_lbl7">
-		Nordeste
-	</text>
-	<text name="height_text_lbl8">
-		Sudoeste
-	</text>
-	<text name="height_text_lbl9">
-		Sudeste
-	</text>
-	<spinner label="Baixo" name="height_start_spin_0"/>
-	<spinner label="Baixo" name="height_start_spin_1"/>
-	<spinner label="Baixo" name="height_start_spin_2"/>
-	<spinner label="Baixo" name="height_start_spin_3"/>
-	<spinner label="Alto" name="height_range_spin_0"/>
-	<spinner label="Alto" name="height_range_spin_1"/>
-	<spinner label="Alto" name="height_range_spin_2"/>
-	<spinner label="Alto" name="height_range_spin_3"/>
-	<text name="height_text_lbl10">
-		Os valores representam o intervalo de mistura das texturas acima.
-	</text>
-	<text name="height_text_lbl11">
-		Em metros, o valor BAIXO é a altura MÁXIMA da Textura 1, e HIGH é a altura MÍNIMA da Textura 4.
-	</text>
-	<text name="height_text_lbl12">
-		e o valor Alto é a altura Mínima da Textura #4.
-	</text>
-	<button label="Aplicar" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_side_tray.xml b/indra/newview/skins/default/xui/pt/panel_side_tray.xml
deleted file mode 100644
index 1a424fb7f1..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Exibir ou não barra lateral" name="sidebar_openclose" tab_title="Exibir ou não barra lateral"/>
-	<sidetray_tab description="Início" name="sidebar_home" tab_title="Início">
-		<panel label="Início" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Edite seu perfil público e destaques." name="sidebar_me" tab_title="Meu perfil">
-		<panel_container name="panel_container">
-			<panel label="Eu" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Encontre seus amigos, contatos e pessoas nas proximidades." name="sidebar_people" tab_title="Pessoas">
-		<panel_container name="panel_container">
-			<panel label="Perfil do grupo" name="panel_group_info_sidetray"/>
-			<panel label="Residentes&amp; Objetos bloqueados" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Encontre lugares para ir e lugares que você ja visitou." label="Lugares" name="sidebar_places" tab_title="Lugares">
-		<panel label="Lugares" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Abra seu inventário." name="sidebar_inventory" tab_title="Meu inventário">
-		<panel label="Editar inventário" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Muda sua aparência e seu visual atual." name="sidebar_appearance" tab_title="Minha aparência">
-		<panel label="Editar aparência" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
index e6370ea830..d3cb087108 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(desconhecido)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(desconhecido / múltiplo)
+	</panel.string>
 	<panel.string name="public">
 		(público)
 	</panel.string>
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 8092e6c145..3cfe0fe4f4 100644
--- a/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/pt/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		Você não pode modificar estes objetos
 	</panel.string>
+	<panel.string name="text modify info 5">
+		Não é possível modificar este objeto através de uma demarcação da região
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Não é possível modificar estes objetos através de uma demarcação da região
+	</panel.string>
 	<panel.string name="text modify warning">
 		O objeto contém links ligando suas partes
 	</panel.string>
@@ -95,6 +101,9 @@
 		</combo_box>
 		<spinner label="Preço: L$" name="Edit Cost"/>
 		<check_box label="Mostrar nos resultados de busca" name="search_check" tool_tip="Incluir o objeto nos resultados de busca"/>
+		<text name="pathfinding_attributes_label">
+			Atributos do pathfinding:
+		</text>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index fd8f22f331..a7234bdc14 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -952,6 +952,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="script_files">
 		Scripts
 	</string>
+	<string name="dictionary_files">
+		Dicionários
+	</string>
 	<string name="AvatarSetNotAway">
 		deixar como ausente
 	</string>
@@ -3740,6 +3743,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="LocationCtrlSeeAVsTooltip">
 		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.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		O pathfinding dinâmico não está habilitado nesta região.
+	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] Atualização
 	</string>
@@ -4873,6 +4882,21 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="Normal">
 		Normal
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Nenhum
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Afeta o navmesh
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Personagem
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(Múltiplo)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Muito baixo
 	</string>
@@ -4888,4 +4912,10 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="snapshot_quality_very_high">
 		Muito alto
 	</string>
+	<string name="TeleportMaturityExceeded">
+		O residente não pode visitar a região.
+	</string>
+	<string name="UserDictionary">
+		[Usuário]
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/pt/teleport_strings.xml b/indra/newview/skins/default/xui/pt/teleport_strings.xml
index 3fb77a02d2..40fb4caebf 100644
--- a/indra/newview/skins/default/xui/pt/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/pt/teleport_strings.xml
@@ -43,6 +43,9 @@ Vá para a &apos;Ilha Welcome Pública&apos; para repetir o tutorial.
 		<message name="no_inventory_host">
 			O sistema de inventário está indisponível no momento.
 		</message>
+		<message name="MustGetAgeRegion">
+			Você deve ter 18 anos ou mais para acessar esta região.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -78,5 +81,8 @@ Vá para a &apos;Ilha Welcome Pública&apos; para repetir o tutorial.
 		<message name="requesting">
 			Solicitando teletransporte...
 		</message>
+		<message name="pending">
+			Teletransporte pendente...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
index 119f104906..bb6266ac9a 100644
--- a/indra/newview/skins/default/xui/ru/floater_about.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about.xml
@@ -62,27 +62,26 @@
 		</panel>
 		<panel label="Лицензии" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK (C) 1992-2007 3Dconnexion
-        APR (C) 2000-2004 The Apache Software Foundation
-        Collada DOM (C) 2005 Sony Computer Entertainment Inc.
-        cURL (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK (C) 1992-2009 3Dconnexion
+        APR (C) 2011 The Apache Software Foundation
+        Collada DOM (C) 2006 Sony Computer Entertainment Inc.
+        cURL (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
         DBus/dbus-glib (C) 2002, 2003  CodeFactory AB / (C) 2003, 2004 Red Hat, Inc.
         expat (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType (C) 1996-2002, 2006 David Turner, Robert Wilhelm и Werner Lemberg.
         GL (C) 1999-2004 Brian Paul.
         GLOD (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Университет Джона Гопкинса и David Luebke, Brenden Schubert, Университет Вирджинии.
         google-perftools (c) 2005, Google Inc.
         Havok.com(TM) (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 (C) 2001, David Taubman, Университет Нового Южного Уэльса (UNSW)
         jpeglib (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis (C) 2001, Xiphophorus
-        OpenSSL (C) 1998-2002 The OpenSSL Project.
-        PCRE (c) 1997-2008, Кембриджский университет
+        ogg/vorbis (C) 2002, Xiphophorus
+        OpenSSL (C) 1998-2008 The OpenSSL Project.
+        PCRE (c) 1997-2012, Кембриджский университет
         SDL (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi (C) 2000 Epinions, Inc.
-        zlib (C) 1995-2002 Jean-loup Gailly и Mark Adler.
-        google-perftools (c) 2005, Google Inc.
+        zlib (C) 1995-2012 Jean-loup Gailly и Mark Adler.
 
         В клиенте Second Life используется технология Havok (TM) Physics. (C) 1999-2010 Havok.com Inc. (и лицензиары компании). Все права защищены. Подробнее см. веб-сайт www.havok.com.
 
diff --git a/indra/newview/skins/default/xui/ru/floater_about_land.xml b/indra/newview/skins/default/xui/ru/floater_about_land.xml
index ee74aad5cc..12691df684 100644
--- a/indra/newview/skins/default/xui/ru/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about_land.xml
@@ -451,7 +451,7 @@
 				Разрешить доступ только таким жителям:
 			</text>
 			<check_box label="Зарегистрирована информация об оплате [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Для доступа к этому участку у жителя должна быть зарегистрирована информация об оплате.  Более подробная информация находится здесь: [SUPPORT_SITE]."/>
-			<check_box label="Подтвержден возраст [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Для доступа к этому участку житель должен подтвердить свой возраст. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
+			<check_box label="18 лет и старше [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Доступ к этому участку имеют только жители 18 лет и старше. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
 			<check_box label="Разрешить доступ группе: [GROUP]" name="GroupCheck" tool_tip="Группа устанавливается на основной вкладке."/>
 			<check_box label="Продать доступ:" name="PassCheck" tool_tip="Разрешить временный доступ к участку."/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/ru/floater_animation_preview.xml b/indra/newview/skins/default/xui/ru/floater_animation_preview.xml
deleted file mode 100644
index b7075fbf97..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_animation_preview.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview">
-	<floater.string name="failed_to_initialize">
-		Невозможно инициализировать движение
-	</floater.string>
-	<floater.string name="anim_too_long">
-		Длина файла анимации: [LENGTH] с.
-Максимальная длина анимации: [MAX_LENGTH] с.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		Невозможно прочитать файл анимации.
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		ОК
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Преждевременный конец файла.
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Не могу прочитать определение ограничений.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		Не удалось открыть BVH-файл.
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		Неправильный заголовок HIERARCHY.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		Не удалось найти ROOT или JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		Не удалось получить имя JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		Не удалось найти OFFSET.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		Не удалось найти CHANNELS.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Не удалось получить порядок вращения.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Не удалось получить оси вращения.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		Не удалось найти MOTION.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		Не удалось получить количество кадров.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Не удалось получить время кадра.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Не удалось получить значения position.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Не удалось получить значения rotation.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Не удалось открыть файл перевода.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Не удалось прочитать заголовок перевода.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Не удалось прочитать имена перевода.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Не удалось прочитать значение перевода ignore.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Не удалось прочитать значение перевода relative.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Не удалось прочитать значение перевода outname.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Не удалось прочитать матрицу перевода.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Не удалось получить имя mergechild.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Не удалось получить имя mergeparent.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Не удалось получить значение priority.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Не удалось получить значение loop.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Не удалось получить значения easeIn.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		Не удалось получить значения easeOut.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Не удалось получить значение hand morph.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Не удалось прочитать имя emote.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Неверное имя корневого соединения, должно быть «hip».
-	</floater.string>
-	<text name="name_label">
-		Название:
-	</text>
-	<text name="description_label">
-		Описание:
-	</text>
-	<spinner label="Приоритет" name="priority" tool_tip="Управляет тем, как другие анимации могут перекрываться этой"/>
-	<check_box label="Цикл" name="loop_check" tool_tip="Делает анимацию зацикленной"/>
-	<spinner label="Начало(%)" name="loop_in_point" tool_tip="Устанавливает точку возврата цикла"/>
-	<spinner label="Конец(%)" name="loop_out_point" tool_tip="Устанавливает точку конца цикла"/>
-	<text name="hand_label">
-		Положение пальцев
-	</text>
-	<combo_box name="hand_pose_combo" tool_tip="Контролирует положение пальцев во время анимации">
-		<combo_box.item label="Разведены" name="Spread"/>
-		<combo_box.item label="Расслаблены" name="Relaxed"/>
-		<combo_box.item label="Указывают" name="PointBoth"/>
-		<combo_box.item label="Сжаты в кулаки" name="Fist"/>
-		<combo_box.item label="Левые расслаблены" name="RelaxedLeft"/>
-		<combo_box.item label="Левые указывают" name="PointLeft"/>
-		<combo_box.item label="Левые в кулак" name="FistLeft"/>
-		<combo_box.item label="Правые расслаблены" name="RelaxedRight"/>
-		<combo_box.item label="Правые указывают" name="PointRight"/>
-		<combo_box.item label="Правые в кулак" name="FistRight"/>
-		<combo_box.item label="Правые в приветствии" name="SaluteRight"/>
-		<combo_box.item label="Печатают" name="Typing"/>
-		<combo_box.item label="Правые «V»" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Выражение лица
-	</text>
-	<combo_box name="emote_combo" tool_tip="Контролирует выражение лица во время анимации">
-		<item label="(нет)" name="[None]" value=""/>
-		<item label="Ааааах" name="Aaaaah" value="Ааааах"/>
-		<item label="Боится" name="Afraid" value="Боится"/>
-		<item label="Злится" name="Angry" value="Злится"/>
-		<item label="Широко улыбается" name="BigSmile" value="Широко улыбается"/>
-		<item label="Скучает" name="Bored" value="Скучает"/>
-		<item label="Плачет" name="Cry" value="Плачет"/>
-		<item label="Презирает" name="Disdain" value="Презирает"/>
-		<item label="Смущается" name="Embarrassed" value="Смущается"/>
-		<item label="Хмурится" name="Frown" value="Хмурится"/>
-		<item label="Целует" name="Kiss" value="Целует"/>
-		<item label="Смеется" name="Laugh" value="Смеется"/>
-		<item label="Дразнится" name="Plllppt" value="Дразнится"/>
-		<item label="Не соглашается" name="Repulsed" value="Не соглашается"/>
-		<item label="Грустит" name="Sad" value="Грустит"/>
-		<item label="Не понимает" name="Shrug" value="Не понимает"/>
-		<item label="Улыбается" name="Smile" value="Улыбается"/>
-		<item label="Удивляется" name="Surprise" value="Удивляется"/>
-		<item label="Подмигивает" name="Wink" value="Подмигивает"/>
-		<item label="Беспокоится" name="Worry" value="Беспокоится"/>
-	</combo_box>
-	<text name="preview_label">
-		Просмотр во время
-	</text>
-	<combo_box name="preview_base_anim" tool_tip="Просмотр вашей анимации во время выполнения аватаром действий.">
-		<item label="Стояние" name="Standing" value="Стояние"/>
-		<item label="Ходьба" name="Walking" value="Ходьба"/>
-		<item label="Сидение" name="Sitting" value="Сидение"/>
-		<item label="Полет" name="Flying" value="Полет"/>
-	</combo_box>
-	<spinner label="Вход (сек.)" name="ease_in_time" tool_tip="Количество времени (в секундах) для входа в стартовое положение"/>
-	<spinner label="Выход (сек.)" name="ease_out_time" tool_tip="Количество времени (в секундах) для выхода из анимации"/>
-	<button name="play_btn" tool_tip="Проиграть анимацию"/>
-	<button name="pause_btn" tool_tip="Приостановить анимацию"/>
-	<button name="stop_btn" tool_tip="Остановить проигрывание анимации"/>
-	<text name="bad_animation_text">
-		Невозможно прочитать файл анимации.
-Рекомендуется использовать BVH-файлы, экспортированные из Poser 4.
-	</text>
-	<button label="Передать (L$[AMOUNT])" name="ok_btn"/>
-	<button label="Отмена" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_autoreplace.xml b/indra/newview/skins/default/xui/ru/floater_autoreplace.xml
new file mode 100644
index 0000000000..6827931e5d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Настройки автозамены">
+	<check_box label="Включить автозамену" name="autoreplace_enable" tool_tip="В чате по мере ввода текста ключевые слова будут заменяться соответствующими заменителями"/>
+	<button label="Импорт списка..." name="autoreplace_import_list" tool_tip="Загрузить ранее экспортированный список из файла."/>
+	<button label="Экспорт списка..." name="autoreplace_export_list" tool_tip="Сохранить выбранный список в файл для последующего распространения."/>
+	<button label="Новый список..." name="autoreplace_new_list" tool_tip="Создать новый список."/>
+	<button label="Удалить список" name="autoreplace_delete_list" tool_tip="Удалить выбранный список."/>
+	<button name="autoreplace_list_up" tool_tip="Повысить приоритет списка."/>
+	<button name="autoreplace_list_down" tool_tip="Понизить приоритет списка."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Ключевое слово" name="keyword"/>
+		<scroll_list.columns label="Замена" name="replacement"/>
+	</scroll_list>
+	<button label="Добавить..." name="autoreplace_add_entry"/>
+	<button label="Удалить" name="autoreplace_delete_entry"/>
+	<button label="Сохранить запись" name="autoreplace_save_entry" tool_tip="Сохранить эту запись."/>
+	<button label="Сохранить изменения" name="autoreplace_save_changes" tool_tip="Сохранить все изменения."/>
+	<button label="Отмена" name="autoreplace_cancel" tool_tip="Отменить все изменения."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/ru/floater_env_settings.xml b/indra/newview/skins/default/xui/ru/floater_env_settings.xml
deleted file mode 100644
index a3e77d61de..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_env_settings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="РЕДАКТОР СРЕДЫ">
-	<floater.string name="timeStr">
-		[hour,datetime,utc]:[min,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Время суток
-	</text>
-	<text name="EnvTimeText2">
-		12:00
-	</text>
-	<text name="EnvCloudText">
-		Облачность
-	</text>
-	<text name="EnvWaterColorText">
-		Цвет воды
-	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Щелкните для выбора цвета"/>
-	<text name="EnvWaterFogText">
-		Водный туман
-	</text>
-	<button label="Использовать время в землевладении" name="EnvUseEstateTimeButton"/>
-	<button label="Улучшенное небо" name="EnvAdvancedSkyButton"/>
-	<button label="Улучшенная вода" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory.xml b/indra/newview/skins/default/xui/ru/floater_inventory.xml
deleted file mode 100644
index 35cbcf177d..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_inventory.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="МОЙ ИНВЕНТАРЬ">
-	<panel label="Панель инвентаря" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_model_preview.xml b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
index 5bb96b8de4..0c6d41b4ef 100644
--- a/indra/newview/skins/default/xui/ru/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Треугольники" name="triangles" value="Треугольники"/>
 				<text initial_value="Вершины" name="vertices" value="Вершины"/>
 				<text initial_value="Высокий" name="high_label" value="Высокий"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Загрузка из файла"/>
+					<item name="Generate" value="Создать"/>
+				</combo_box>
 				<button label="Обзор..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Предельное число треугольников"/>
+					<item name="Error Threshold" value="Порог ошибки"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Средний" name="medium_label" value="Средний"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Загрузка из файла"/>
+					<item name="Generate" value="Создать"/>
+					<item name="Use LoD above" value="Использовать УД выше"/>
+				</combo_box>
 				<button label="Обзор..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Предельное число треугольников"/>
+					<item name="Error Threshold" value="Порог ошибки"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Низкий" name="low_label" value="Низкий"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Загрузка из файла"/>
+					<item name="Generate" value="Создать"/>
+					<item name="Use LoD above" value="Использовать УД выше"/>
+				</combo_box>
 				<button label="Обзор..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Предельное число треугольников"/>
+					<item name="Error Threshold" value="Порог ошибки"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="Самый низкий" name="lowest_label" value="Самый низкий"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Загрузка из файла"/>
+					<item name="Generate" value="Создать"/>
+					<item name="Use LoD above" value="Использовать УД выше"/>
+				</combo_box>
 				<button label="Обзор..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Предельное число треугольников"/>
+					<item name="Error Threshold" value="Порог ошибки"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Генерировать нормали" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml b/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml
deleted file mode 100644
index 184c753e40..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="ЛОКАЛЬНЫЙ ЧАТ">
-	<check_box label="Перевод чата" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml
new file mode 100644
index 0000000000..ce7ffc3d20
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Персонажи с поиском пути">
+	<floater.string name="messaging_get_inprogress">
+		Опрос персонажей с поиском пути...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Ошибка при опросе персонажей с поиском пути.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Нет персонажей с поиском пути.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		Выбрано персонажей: [NUM_SELECTED] из [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		В этом регионе не разрешен поиск пути.
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] мкс
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Загрузка]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Неизвестно]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[группа]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Имя" name="name"/>
+			<scroll_list.columns label="Описание" name="description"/>
+			<scroll_list.columns label="Владелец" name="owner"/>
+			<scroll_list.columns label="ЦП" name="cpu_time"/>
+			<scroll_list.columns label="Высота" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Персонажи:
+		</text>
+		<button label="Обновить список" name="refresh_objects_list"/>
+		<button label="Выбрать все" name="select_all_objects"/>
+		<button label="Отменить выбор" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Действия с выбранными персонажами:
+		</text>
+		<check_box label="Показать метку" name="show_beacon"/>
+		<check_box label="Показать физическую капсулу" name="show_physics_capsule"/>
+		<button label="Взять" name="take_objects"/>
+		<button label="Сделать копию" name="take_copy_objects"/>
+		<button label="Телепортировать меня туда" name="teleport_me_to_object" tool_tip="Разрешено, только если выбран один персонаж."/>
+		<button label="Возврат" name="return_objects"/>
+		<button label="Удалить" name="delete_objects"/>
+	</panel>
+</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
new file mode 100644
index 0000000000..fa72df04fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Просмотр/тестирование поиска пути">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		Не удалось найти реализацию библиотеки поиска пути
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		В этом регионе не разрешен поиск пути.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		Ожидание окончания загрузки региона.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Проверка состояния навигационной сетки.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Загрузка навигационной сетки.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		На сервере изменилась навигационная сетка. Загрузка новой навигационной сетки.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		Загружена последняя навигационная сетка.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		Не удалось загрузить навигационную сетку.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		В навигационной сетке есть незавершенные изменения.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		Идет построение навигационной сетки.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		В некоторых регионах навигационной сетки есть незавершенные изменения.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		Идет построение регионов навигационной сетки.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		В некоторых регионах навигационной сетки есть незавершенные изменения, идет построение других регионов.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		Навигационная сетка уже обновлена.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		Не удалось найти реализацию библиотеки поиска пути
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		В этом регионе не разрешен поиск пути.
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Выберите начальную и конечную точки.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Выберите начальную точку.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Выберите конечную точку.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		Путь показан оранжевым цветом.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		Не удалось найти путь между выбранными точками.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Ошибка при создании пути.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Вид" name="view_panel">
+			<text name="show_label">
+				Показать:
+			</text>
+			<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">
+				Показать карту проходимости:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="Не показывать" name="show_heatmap_mode_none"/>
+				<combo_box.item label="Тип персонажа A" name="show_heatmap_mode_a"/>
+				<combo_box.item label="Тип персонажа B" name="show_heatmap_mode_b"/>
+				<combo_box.item label="Тип персонажа C" name="show_heatmap_mode_c"/>
+				<combo_box.item label="Тип персонажа D" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Проходимые места" name="show_walkables"/>
+			<check_box label="Материальные объемы" name="show_material_volumes"/>
+			<check_box label="Статичные препятствия" name="show_static_obstacles"/>
+			<check_box label="Исключающие объемы" name="show_exclusion_volumes"/>
+			<check_box label="Водное зеркало" name="show_water_plane"/>
+			<check_box label="Рентгеновское зрение" name="show_xray"/>
+		</panel>
+		<panel label="Проверить путь" name="test_panel">
+			<text name="ctrl_click_label">
+				Ctrl-щелчок для выбора начальной точки.
+			</text>
+			<text name="shift_click_label">
+				Shift-щелчок для выбора конечной точки.
+			</text>
+			<text name="character_width_label">
+				Ширина персонажа
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				м
+			</text>
+			<text name="character_type_label">
+				Тип персонажа
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Нет" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Удалить путь" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml
new file mode 100644
index 0000000000..f1b8e23a2c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Наборы связей для поиска пути">
+	<floater.string name="messaging_get_inprogress">
+		Запрос наборов связей для поиска пути...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Ошибка при запросе наборов связей для поиска пути.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Изменение выбранных наборов связей для поиска пути...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Ошибка при изменении выбранных наборов связей для поиска пути.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Нет наборов связей для поиска пути.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		Выбрано наборов связей: [NUM_SELECTED] из [NUM_TOTAL].
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		В этом регионе не разрешен поиск пути.
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Ландшафт]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Загрузка]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Неизвестно]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[группа]
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Проходимое место
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Статичное препятствие
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Перемещаемое препятствие
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Материальный объем
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Исключающий объем
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Перемещаемый фантом
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[неизменяемый]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[ограниченный]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[вогнутый]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[ограниченный,вогнутый]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Выберите степень использования наборов связей...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Фильтр по степени использования наборов связей..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Проходимое место" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Статичное препятствие" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Перемещаемое препятствие" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Материальный объем" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Исключающий объем" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Перемещаемый фантом" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Применить" name="apply_filters"/>
+		<button label="Чисто" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Имя (корневой примитив)" name="name"/>
+			<scroll_list.columns label="Описание (корневой примитив)" name="description"/>
+			<scroll_list.columns label="Владелец" name="owner"/>
+			<scroll_list.columns label="Воздействие" name="land_impact"/>
+			<scroll_list.columns label="Расстояние" name="dist_from_you"/>
+			<scroll_list.columns label="Использование набора связей" name="linkset_use"/>
+			<scroll_list.columns label="A %" name="a_percent"/>
+			<scroll_list.columns label="B %" name="b_percent"/>
+			<scroll_list.columns label="C %" name="c_percent"/>
+			<scroll_list.columns label="D %" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Наборы связей:
+		</text>
+		<button label="Обновить список" name="refresh_objects_list"/>
+		<button label="Выбрать все" name="select_all_objects"/>
+		<button label="Отменить выбор" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="Показать метку" name="show_beacon"/>
+		<button label="Взять" name="take_objects"/>
+		<button label="Сделать копию" name="take_copy_objects"/>
+		<button label="Телепортировать меня туда" name="teleport_me_to_object"/>
+		<button label="Возврат" name="return_objects"/>
+		<button label="Удалить" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Проходимость:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="Проходимость для персонажей типа A.  Пример персонажа – гуманоид."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="Проходимость для персонажей типа B.  Пример персонажа – существо."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="Проходимость для персонажей типа C.  Пример персонажа – механизм."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="Проходимость для персонажей типа D.  Пример персонажа – иное."/>
+		<button label="Применить изменения" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Гуманоид)
+		</text>
+		<text name="suggested_use_b_label">
+			(Существо)
+		</text>
+		<text name="suggested_use_c_label">
+			(Механизм)
+		</text>
+		<text name="suggested_use_d_label">
+			(Иное)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_postcard.xml b/indra/newview/skins/default/xui/ru/floater_postcard.xml
deleted file mode 100644
index 889d219511..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_postcard.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="ПОСЛАТЬ СНИМОК ПО EMAIL">
-	<floater.string name="default_subject">
-		Открытка из [SECOND_LIFE].
-	</floater.string>
-	<floater.string name="default_message">
-		Побывай здесь!
-	</floater.string>
-	<floater.string name="upload_message">
-		Отправка...
-	</floater.string>
-	<text name="to_label">
-		Email получателя:
-	</text>
-	<text name="from_label">
-		Ваш Email:
-	</text>
-	<text name="name_label">
-		Ваше имя:
-	</text>
-	<text name="subject_label">
-		Тема:
-	</text>
-	<line_editor label="Введите тему письма." name="subject_form"/>
-	<text name="msg_label">
-		Сообщение:
-	</text>
-	<text_editor name="msg_form">
-		Введите текст письма.
-	</text_editor>
-	<button label="Отмена" name="cancel_btn"/>
-	<button label="Отправить" name="send_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_spellcheck.xml b/indra/newview/skins/default/xui/ru/floater_spellcheck.xml
new file mode 100644
index 0000000000..691b4a89c3
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Настройки проверки правописания">
+	<check_box label="Включить проверку правописания" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Основной словарь:
+	</text>
+	<text label="Журналы:" name="spellcheck_additional">
+		Дополнительные словари:
+	</text>
+	<text name="spellcheck_available">
+		Доступно
+	</text>
+	<text name="spellcheck_active">
+		Активно
+	</text>
+	<button label="Удалить" name="spellcheck_remove_btn"/>
+	<button label="Импорт..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml
new file mode 100644
index 0000000000..a01866db73
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Импорт словаря">
+	<button label="Обзор" label_selected="Обзор" name="dictionary_path_browse"/>
+	<button label="Импорт" name="ok_btn"/>
+	<button label="Отмена" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_stats.xml b/indra/newview/skins/default/xui/ru/floater_stats.xml
index 2243c0f385..46426495dc 100644
--- a/indra/newview/skins/default/xui/ru/floater_stats.xml
+++ b/indra/newview/skins/default/xui/ru/floater_stats.xml
@@ -53,7 +53,13 @@
 				<stat_bar label="Объекты" name="simobjects"/>
 				<stat_bar label="Активные объекты" name="simactiveobjects"/>
 				<stat_bar label="Активные скрипты" name="simactivescripts"/>
+				<stat_bar label="Запущенные скрипты" name="simpctscriptsrun"/>
 				<stat_bar label="События скрипта" name="simscripteps"/>
+				<stat_view label="Поиск пути" name="simpathfinding">
+					<stat_bar label="Время шага ИИ" name="simsimaistepmsec"/>
+					<stat_bar label="Пропущенные силуэтные шаги" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Обновленные персонажи" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_bar label="Входящие пакеты" name="siminpps"/>
 				<stat_bar label="Исходящие пакеты" name="simoutpps"/>
 				<stat_bar label="Отложенные загрузки" name="simpendingdownloads"/>
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 f8693b8359..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,6 +19,8 @@
 	<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"/>
+	<text name="preview_disabled" value="Просмотр отключен"/>
 	<filter_editor label="Фильтровать текстуры" name="inventory search editor"/>
 	<check_box initial_value="ложь" label="Показывать папки" name="show_folders_check"/>
 	<button label="Добавить" label_selected="Добавить" name="l_add_btn"/>
@@ -30,5 +32,4 @@
 	</scroll_list>
 	<button label="ОК" label_selected="ОК" name="Select"/>
 	<button label="Отмена" label_selected="Отмена" name="Cancel"/>
-	<check_box initial_value="истина" label="Применить сейчас" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_tools.xml b/indra/newview/skins/default/xui/ru/floater_tools.xml
index 3d7d1198f0..c312f73428 100644
--- a/indra/newview/skins/default/xui/ru/floater_tools.xml
+++ b/indra/newview/skins/default/xui/ru/floater_tools.xml
@@ -150,6 +150,12 @@
 			<panel.string name="text modify info 4">
 				Эти объекты нельзя изменять
 			</panel.string>
+			<panel.string name="text modify info 5">
+				Этот объект нельзя изменять через границу региона
+			</panel.string>
+			<panel.string name="text modify info 6">
+				Эти объекты нельзя изменять через границу региона
+			</panel.string>
 			<panel.string name="text modify warning">
 				Чтобы задать права доступа, нужно выделить объект целиком
 			</panel.string>
@@ -199,12 +205,12 @@
 				<combo_box.item label="Увеличение" name="Zoom"/>
 			</combo_box>
 			<check_box label="Для продажи:" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Копировать" name="Copy"/>
 				<combo_box.item label="Контент" name="Contents"/>
 				<combo_box.item label="Оригинал" name="Original"/>
 			</combo_box>
-			<spinner label="Цена: L$" name="Edit Cost"/>
 			<check_box label="Показать в поиске" name="search_check" tool_tip="Показывать объект в результатах поиска"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -240,6 +246,11 @@
 					F:
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Атрибуты поиска пути:
+				</text>
+			</panel>
 		</panel>
 		<panel label="Объект" name="Object">
 			<check_box label="Фиксированный" name="checkbox locked" tool_tip="Предотвращение перемещения или удаления объекта. Обычно эта функция полезна во время стройки для избежания нежелательных изменений."/>
diff --git a/indra/newview/skins/default/xui/ru/floater_top_objects.xml b/indra/newview/skins/default/xui/ru/floater_top_objects.xml
index a6ffe5c030..c7ece5c9c9 100644
--- a/indra/newview/skins/default/xui/ru/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/ru/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		Время
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Время моно
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		Лучшие столкновения
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Название" name="name"/>
 		<scroll_list.columns label="Владелец" name="owner"/>
 		<scroll_list.columns label="Место" name="location"/>
+		<scroll_list.columns label="Участок" name="parcel"/>
 		<scroll_list.columns label="Время" name="time"/>
-		<scroll_list.columns label="Время моно" name="mono_time"/>
 		<scroll_list.columns label="URL-адреса" name="URLs"/>
+		<scroll_list.columns label="Память (КБ)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		ID объекта:
@@ -48,6 +46,10 @@
 		Владелец:
 	</text>
 	<button label="Фильтр" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		Участок:
+	</text>
+	<button label="Фильтр" name="filter_parcel_btn"/>
 	<button label="Вернуть выбранное" name="return_selected_btn"/>
 	<button label="Вернуть все" name="return_all_btn"/>
 	<button label="Отключить выбранное" name="disable_selected_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_water.xml b/indra/newview/skins/default/xui/ru/floater_water.xml
deleted file mode 100644
index 5030351f5b..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_water.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="РАСШИРЕННЫЙ РЕДАКТОР ВОДЫ">
-	<floater.string name="WLDefaultWaterNames">
-		По умолчанию:глянец:пруд:туман:Second Plague:SNAKE!!!:Valdez
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		Настройки воды:
-	</text>
-	<button label="Создать" label_selected="Создать" name="WaterNewPreset"/>
-	<button label="Сохранить" label_selected="Сохранить" name="WaterSavePreset"/>
-	<button label="Удалить" label_selected="Удалить" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="НАСТРОЙКИ" name="Settings">
-			<text name="BHText">
-				Цвет водного тумана
-			</text>
-			<color_swatch name="WaterFogColor" tool_tip="Щелкните для выбора цвета"/>
-			<text name="WaterFogDensText">
-				Плотность тумана
-			</text>
-			<text name="WaterUnderWaterFogModText">
-				Подводный туман
-			</text>
-			<text name="BDensText">
-				Уровень отражения волн
-			</text>
-			<slider label="1" name="WaterNormalScaleX"/>
-			<slider label="2" name="WaterNormalScaleY"/>
-			<slider label="3" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Масштаб Френеля
-			</text>
-			<text name="FresnelOffsetText">
-				Сдвиг Френеля
-			</text>
-			<text name="DensMultText">
-				Преломление над водой
-			</text>
-			<text name="WaterScaleBelowText">
-				Преломление под водой
-			</text>
-			<text name="MaxAltText">
-				Коэффициент размытия
-			</text>
-		</panel>
-		<panel label="ИЗОБРАЖЕНИЕ" name="Waves">
-			<text name="BHText">
-				Направление больших волн
-			</text>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Направление маленьких волн
-			</text>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Карта поверхности
-			</text>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_windlight_options.xml b/indra/newview/skins/default/xui/ru/floater_windlight_options.xml
deleted file mode 100644
index bbb37aaaa0..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_windlight_options.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="РАСШИРЕННЫЙ РЕДАКТОР НЕБА">
-	<floater.string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		Настройки неба:
-	</text>
-	<button label="Новая" label_selected="Новая" name="WLNewPreset"/>
-	<button label="Сохранить" label_selected="Сохранить" name="WLSavePreset"/>
-	<button label="Удалить" label_selected="Удалить" name="WLDeletePreset"/>
-	<button label="Редактор суточных циклов" label_selected="Редактор суточных циклов" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="АТМОСФЕРА" name="Atmosphere">
-			<text name="BHText">
-				Голубой горизонт
-			</text>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Дымка на горизонте
-			</text>
-			<text name="BDensText2">
-				Насыщенность голубого
-			</text>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Плотность дымки
-			</text>
-			<text name="DensMultText">
-				Коэффициент плотности
-			</text>
-			<text name="WLDistanceMultText">
-				Коэффициент расстояния
-			</text>
-			<text name="MaxAltText">
-				Максимальная высота
-			</text>
-		</panel>
-		<panel label="ОСВЕЩЕНИЕ" name="Lighting">
-			<text name="SLCText">
-				Цвет солнца/луны
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Положение солнца/луны
-			</text>
-			<text name="WLAmbientText">
-				Рассеянное
-			</text>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Смещение относительно востока
-			</text>
-			<text name="SunGlowText">
-				Сияние солнца
-			</text>
-			<slider label="Фокус" name="WLGlowB"/>
-			<slider label="Размер" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Гамма-коррекция сцены
-			</text>
-			<text name="WLStarText">
-				Яркость звезд
-			</text>
-		</panel>
-		<panel label="ОБЛАКА" name="Clouds">
-			<text name="WLCloudColorText">
-				Цвет
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Положение и плотность
-			</text>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				П
-			</text>
-			<text name="WLCloudCoverageText">
-				Облачность
-			</text>
-			<text name="WLCloudScaleText">
-				Размеры
-			</text>
-			<text name="WLCloudDetailText">
-				Детализация (положение/плотность)
-			</text>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				П
-			</text>
-			<text name="WLCloudScrollXText">
-				Скорость по X
-			</text>
-			<check_box label="На месте" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Скорость по Y
-			</text>
-			<check_box label="На месте" name="WLCloudLockY"/>
-			<check_box label="Создать классические облака" name="DrawClassicClouds"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_bottomtray.xml b/indra/newview/skins/default/xui/ru/menu_bottomtray.xml
deleted file mode 100644
index fa3558945b..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Кнопка разговора" name="EnableVoiceChat"/>
-	<menu_item_check label="Кнопка жестов" name="ShowGestureButton"/>
-	<menu_item_check label="Кнопка движения" name="ShowMoveButton"/>
-	<menu_item_check label="Кнопка камеры" name="ShowCameraButton"/>
-	<menu_item_check label="Кнопка снимка" name="ShowSnapshotButton"/>
-	<menu_item_check label="Кнопка строительства" name="ShowBuildButton"/>
-	<menu_item_check label="Кнопка поиска" name="ShowSearchButton"/>
-	<menu_item_check label="Кнопка карты" name="ShowWorldMapButton"/>
-	<menu_item_check label="Кнопка миникарты" name="ShowMiniMapButton"/>
-	<menu_item_call label="Вырезать" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Копировать" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Вставить" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Удалить" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Выделить все" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_mode_change.xml b/indra/newview/skins/default/xui/ru/menu_mode_change.xml
deleted file mode 100644
index 25d6e9af27..0000000000
--- a/indra/newview/skins/default/xui/ru/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Основной" name="BasicMode"/>
-	<menu_item_check label="Расширенный" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_object.xml b/indra/newview/skins/default/xui/ru/menu_object.xml
index d6abfd12a2..288df3beb9 100644
--- a/indra/newview/skins/default/xui/ru/menu_object.xml
+++ b/indra/newview/skins/default/xui/ru/menu_object.xml
@@ -3,6 +3,8 @@
 	<menu_item_call label="Коснуться" name="Object Touch"/>
 	<menu_item_call label="Изменить" name="Edit..."/>
 	<menu_item_call label="Строительство" name="Build"/>
+	<menu_item_call label="Показывать в наборах связей" name="show_in_linksets"/>
+	<menu_item_call label="Показывать в персонажах" name="show_in_characters"/>
 	<menu_item_call label="Открыто" name="Open"/>
 	<menu_item_call label="Сесть здесь" name="Object Sit"/>
 	<menu_item_call label="Встать" name="Object Stand Up"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_text_editor.xml b/indra/newview/skins/default/xui/ru/menu_text_editor.xml
index 113dd85318..0c928308a1 100644
--- a/indra/newview/skins/default/xui/ru/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/ru/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(неизвестно)" name="Suggestion 1"/>
+	<menu_item_call label="(неизвестно)" name="Suggestion 2"/>
+	<menu_item_call label="(неизвестно)" name="Suggestion 3"/>
+	<menu_item_call label="(неизвестно)" name="Suggestion 4"/>
+	<menu_item_call label="(неизвестно)" name="Suggestion 5"/>
+	<menu_item_call label="Добавить в словарь" name="Add to Dictionary"/>
+	<menu_item_call label="Добавить в список игнорируемых" name="Add to Ignore"/>
 	<menu_item_call label="Вырезать" name="Cut"/>
 	<menu_item_call label="Копировать" name="Copy"/>
 	<menu_item_call label="Вставить" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index 701f097ddb..d9425937c3 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -26,6 +26,7 @@
 		<menu_item_call label="Настройки..." name="Preferences"/>
 		<menu_item_call label="Кнопки панели инструментов..." name="Toolbars"/>
 		<menu_item_call label="Скрыть все элементы управления" name="Hide UI"/>
+		<menu_item_check label="Показывать присоединения HUD" name="Show HUD Attachments"/>
 		<menu_item_call label="Выход из [APP_NAME]" name="Quit"/>
 	</menu>
 	<menu label="Общение" name="Communicate">
@@ -37,6 +38,7 @@
 		<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">
 		<menu_item_call label="Добавить закладку на это место" name="Create Landmark Here"/>
@@ -122,6 +124,11 @@
 			<menu_item_call label="Запустить скрипты" name="Set Scripts to Running"/>
 			<menu_item_call label="Остановить скрипты" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Поиск пути" name="Pathfinding">
+			<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>
 		<menu label="Параметры" name="Options">
 			<menu_item_check label="Показать расширенные разрешения" name="DebugPermissions"/>
 			<menu_item_check label="Выбирать только мои объекты" name="Select Only My Objects"/>
@@ -172,7 +179,6 @@
 			<menu_item_check label="Скрыть частицы" name="Hide Particles"/>
 			<menu_item_check label="Скрыть выбранное" name="Hide Selected"/>
 			<menu_item_check label="Подсветка прозрачного" name="Highlight Transparent"/>
-			<menu_item_check label="Показывать присоединения HUD" name="Show HUD Attachments"/>
 			<menu_item_check label="Показывать прицел при обзоре мышью" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="Типы визуализации" name="Rendering Types">
@@ -375,7 +381,6 @@
 				<menu_item_call label="Активировать геометрию персонажа" name="Toggle Character Geometry"/>
 				<menu_item_call label="Проверка мужчины" name="Test Male"/>
 				<menu_item_call label="Проверка женщины" name="Test Female"/>
-				<menu_item_call label="Активировать PG-контент" name="Toggle PG"/>
 				<menu_item_check label="Разрешить выбор аватара" name="Allow Select Avatar"/>
 			</menu>
 			<menu_item_call label="Скинуть параметры" name="Force Params to Default"/>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index d4b3c06719..9dad569ddd 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -367,6 +373,12 @@
 	<notification name="InvalidCredentialFormat">
 		Введите имя пользователя или имя и фамилию вашего аватара в поле «Имя пользователя», затем снова войдите в программу.
 	</notification>
+	<notification name="InvalidGrid">
+		«[GRID]» – недопустимый идентификатор сетки.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		В месте старта не указана правильная сетка.
+	</notification>
 	<notification name="DeleteClassified">
 		Удалить рекламу «[NAME]»?
 Плата за нее не будет возвращена.
@@ -472,8 +484,8 @@
 		Ошибка при сохранении скомпилированного скрипта по следующей причине: [REASON].  Попробуйте сохранить скрипт через некоторое время.
 	</notification>
 	<notification name="StartRegionEmpty">
-		Ай-яй-яй, ваш стартовый регион не определен.
-Введите название региона в поле «Место старта» или выберите в качестве места старта «Мое последнее местоположение» или «Мой дом».
+		Ваш стартовый регион не определен.
+Введите название региона в поле «Место старта» или выберите в качестве места старта «Мое последнее место» или «Мой дом».
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -600,6 +612,9 @@
 
 Убедитесь, что все объекты разблокированы и что вы владеете всеми ими.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		Объекты нельзя связывать через границу региона.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Невозможно объединить объекты: не у всех объектов один владелец.
 
@@ -978,6 +993,41 @@
 			<button name="Cancel" text="Отмена"/>
 		</form>
 	</notification>
+	<notification label="Добавить список автозамены" name="AddAutoReplaceList">
+		Имя нового списка:
+		<form name="form">
+			<button name="SetName" text="OK"/>
+		</form>
+	</notification>
+	<notification label="Переименовать список автозамены" name="RenameAutoReplaceList">
+		Имя «[DUPNAME]» уже занято.
+    Введите новое уникальное имя:
+		<form name="form">
+			<button name="ReplaceList" text="Заменить текущий список"/>
+			<button name="SetName" text="Использовать новое имя"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		Ключевое слово должно быть одним словом, а поле замены не может быть пустым.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		Недопустимый список замены.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Следует указать файл, имя и язык.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		Словарь [DIC_NAME] не является aff-файлом, т. е. это «вспомогательный» словарь.
+Он может использоваться как дополнительный, но не как основной словарь.
+
+См. https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		Невозможно скопировать
+    [FROM_NAME]
+    в
+    [TO_NAME]
+	</notification>
 	<notification label="Сохранить костюм" name="SaveOutfitAs">
 		Сохранить текущую одежду как новый костюм:
 		<form name="form">
@@ -1693,83 +1743,128 @@ http://secondlife.com/download.
 		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		Вам нельзя быть в этом регионе из-за вашего рейтинга зрелости. Возможно, это результат недостатка информации, подтверждающей ваш возраст.
-
-Убедитесь, что у вас установлена последняя версия клиента, и прочитайте в Базе знаний о доступе к областям с этим рейтингом зрелости.
+		Вы пытаетесь посетить регион, контент в котором не соответствует вашим настройкам.  Попробуйте изменить настройки в меню «Я &gt; Настройки &gt; Общие».
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		Вам нельзя быть в этом регионе из-за вашего рейтинга зрелости.
-
-Перейти в Базу знаний и ознакомиться с рейтингами зрелости?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY] и предназначен только для взрослых.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Я не могу войти в этот регион из-за ограничений по рейтингу зрелости" name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
+		<usetemplate ignoretext="Пересечение региона: вы пытаетесь посетить регион, контент в котором предназначен только для взрослых." name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		Вам нельзя быть в этом регионе из-за вашего рейтинга зрелости.
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY].
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY] и предназначен только для взрослых.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Вам нельзя быть в этом регионе из-за вашей настройки рейтинга зрелости.
-
-Для входа в желаемый регион измените настройку рейтинга зрелости. После этого вам будет разрешено искать и просматривать контент [REGIONMATURITY]. Для отмены изменений выберите команды «Я &gt; Настройки &gt; Общие».
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY]. Вы можете отказаться от посещения, или ваши настройки будут изменены. После изменения настроек вы можете попробовать войти в регион снова.
 		<form name="form">
-			<button name="OK" text="Изменить настройку"/>
-			<button name="Cancel" text="Закрыть"/>
-			<ignore name="ignore" text="Выбранная мной настройка рейтинга запрещает мне вход в регион"/>
+			<button name="OK" text="Изменить настройки"/>
+			<button name="Cancel" text="Отмена"/>
+			<ignore name="ignore" text="Пересечение региона: вы пытаетесь посетить регион, контент в котором запрещен вашими настройками."/>
 		</form>
 	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		При телепортации возникли технические проблемы, так как ваши настройки не синхронизированы с сервером.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		Вы пытаетесь посетить регион, контент в котором не соответствует вашим настройкам.  Попробуйте изменить настройки в меню «Я &gt; Настройки &gt; Общие».
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY] и предназначен только для взрослых.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+		</url>
+		<usetemplate ignoretext="Телепортация: вы пытаетесь посетить регион, контент в котором предназначен только для взрослых." name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY].
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY] и предназначен только для взрослых.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY]. Вы можете отказаться от телепортации, или ваши настройки будут изменены.
+		<form name="form">
+			<button name="OK" text="Изменить и продолжить"/>
+			<button name="Cancel" text="Отмена"/>
+			<ignore name="ignore" text="Телепортация (возобновляемая): вы пытаетесь посетить регион, контент в котором запрещен вашими настройками."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		Вы пытаетесь посетить регион, контент в котором имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY]. Вы можете отказаться от телепортации, или ваши настройки будут изменены. После изменения настроек вы можете попробовать телепортироваться снова.
+		<form name="form">
+			<button name="OK" text="Изменить настройки"/>
+			<button name="Cancel" text="Отмена"/>
+			<ignore name="ignore" text="Телепортация (невозобновляемая): вы пытаетесь посетить регион, контент в котором запрещен вашими настройками."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		При телепортации возникли технические проблемы, так как ваши настройки не синхронизированы с сервером.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		Теперь ваша настройка рейтинга зрелости: [RATING].
+		Вы больше не будете получать уведомлений о посещении региона с контентом рейтинга [RATING].  Настройки для контента можно изменить на будущее с помощью команд меню «Я &gt; Настройки &gt; Общие».
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		Не удалось изменить ваши настройки так, чтобы вы могли видеть контент с рейтингом [PREFERRED_MATURITY].  Ваши теперешние настройки разрешают просматривать контент [ACTUAL_MATURITY].  Попробуйте изменить настройки снова с помощью команд меню «Я &gt; Настройки &gt; Общие».
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		Вы не можете претендовать на эту землю из-за вашего рейтинга зрелости. Возможно, это результат недостатка информации, подтверждающей ваш возраст.
-
-Убедитесь, что у вас установлена последняя версия клиента, и прочитайте в Базе знаний о доступе к областям с этим рейтингом зрелости.
+		Вы претендуете на землю, рейтинг зрелости контента на которой не соответствует вашим настройкам.  Попробуйте изменить настройки в меню «Я &gt; Настройки &gt; Общие».
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		Вы не можете претендовать на эту землю из-за вашего рейтинга зрелости.
-
-Перейти в Базу знаний и ознакомиться с рейтингами зрелости?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		На эту землю могут претендовать только взрослые.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Я не могу претендовать на эту землю из-за ограничений по рейтингу зрелости" name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
+		<usetemplate ignoretext="На эту землю могут претендовать только взрослые." name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		Вы не можете претендовать на эту землю из-за вашего рейтинга зрелости.
+		Вы претендуете на землю, контент на которой имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY].
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		Вы претендуете на землю с контентом [REGIONMATURITY], который предназначен только для взрослых.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		Вы не можете претендовать на эту землю из-за вашей настройки рейтинга зрелости.
-
-Нажмите кнопку «Изменить настройку», чтобы повысить свой рейтинг зрелости. После этого вам будет разрешено искать и просматривать контент [REGIONMATURITY]. Если в будущем понадобится отменить это изменение, выберите команды «Я &gt; Настройки &gt; Общие».
-		<usetemplate ignoretext="Выбранная мной настройка рейтинга запрещает мне претендовать на землю" name="okcancelignore" notext="Закрыть" yestext="Изменить настройку"/>
+		Вы претендуете на землю, контент на которой имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY]. Мы можем изменить ваши настройки, после чего вы сможете претендовать на землю снова.
+		<form name="form">
+			<button name="OK" text="Изменить настройки"/>
+			<button name="Cancel" text="Отмена"/>
+			<ignore name="ignore" text="Вы претендуете на землю, контент на которой запрещен вашими настройками."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		Вы не можете купить эту землю из-за вашего рейтинга зрелости. Возможно, это результат недостатка информации, подтверждающей ваш возраст.
-
-Убедитесь, что у вас установлена последняя версия клиента, и прочитайте в Базе знаний о доступе к областям с этим рейтингом зрелости.
+		Вы пытаетесь купить землю, рейтинг зрелости контента на которой не соответствует вашим настройкам.  Попробуйте изменить настройки в меню «Я &gt; Настройки &gt; Общие».
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		Вы не можете купить эту землю из-за вашего рейтинга зрелости.
-
-Перейти в Базу знаний и ознакомиться с рейтингами зрелости?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Эту землю могут купить только взрослые.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Я не могу купить эту землю из-за ограничений по рейтингу зрелости" name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
+		<usetemplate ignoretext="Эту землю могут купить только взрослые." name="okcancelignore" notext="Закрыть" yestext="Перейти в Базу знаний"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		Вы не можете купить эту землю из-за вашего рейтинга зрелости.
+		Вы пытаетесь купить землю, контент на которой имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY].
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		Вы пытаетесь купить землю с контентом [REGIONMATURITY], который предназначен только для взрослых.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		Вы не можете купить эту землю из-за выбранного вами рейтинга зрелости.
-
-Нажмите кнопку «Изменить настройку», чтобы повысить свой рейтинг зрелости. После этого вам будет разрешено искать и просматривать контент [REGIONMATURITY]. Если в будущем понадобится отменить это изменение, выберите команды «Я &gt; Настройки &gt; Общие».
-		<usetemplate ignoretext="Выбранная мной настройка рейтинга запрещает мне покупать землю" name="okcancelignore" notext="Закрыть" yestext="Изменить настройку"/>
+		Вы пытаетесь купить землю, контент на которой имеет рейтинг [REGIONMATURITY], но ваши настройки не допускают контента [REGIONMATURITY]. Мы можем изменить ваши настройки, после чего вы сможете попробовать купить землю снова.
+		<form name="form">
+			<button name="OK" text="Изменить настройки"/>
+			<button name="Cancel" text="Отмена"/>
+			<ignore name="ignore" text="Вы пытаетесь купить землю, контент на которой запрещен вашими настройками."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Выбрано слишком много примитивов.  Выберите [MAX_PRIM_COUNT] или меньше примитивов и повторите попытку.
@@ -1823,10 +1918,9 @@ http://secondlife.com/download.
 		</form>
 	</notification>
 	<notification label="Изменен рейтинг зрелости региона" name="RegionMaturityChange">
-		Рейтинг зрелости для этого региона будет обновлен.
+		Рейтинг зрелости для этого региона был изменен.
 Отображение этого изменения на карте может занять некоторое время.
-
-Для входа в регионы для взрослых у жителя должен быть подтвержденный аккаунт: либо с подтверждением возраста, либо с подтверждением оплаты.
+		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification label="Несоответствие версии голоса" name="VoiceVersionMismatch">
 		Данная версия [APP_NAME] несовместима с функцией голосового чата в этом регионе. Для правильной работы голосового чата необходимо обновить [APP_NAME].
@@ -2116,14 +2210,11 @@ http://secondlife.com/download.
 		<usetemplate ignoretext="Надевать одежду, создаваемую при редактировании моей внешности" name="okcancelignore" notext="Нет" yestext="Да"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Доступ к контенту и областям для взрослых в Second Life разрешен только с 18 лет. Посетите нашу страницу проверки возраста и подтвердите, что вам уже исполнилось 18. 
-Страница будет открыта в браузере.
-
-[_URL]
-		<url name="url">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="Мой возраст не подтвержден" name="okcancelignore" notext="Отмена" yestext="Перейти к проверке возраста"/>
+		Вы пытаетесь посетить место, доступ в которое разрешен только жителям 18 лет и старше.
+		<usetemplate ignoretext="Мне еще рано посещать места с ограничениями по возрасту." name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		Это место разрешено для жителей 18 лет и старше.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Для посещения этой области необходимо зарегистрировать платеж.  Перейти на веб-сайт [SECOND_LIFE] и ввести эту информацию?
@@ -2385,6 +2476,23 @@ http://secondlife.com/download.
 	<notification name="NoBuild">
 		В этой области запрещено строительство. Здесь вы не сможете строить или выкладывать объекты.
 	</notification>
+	<notification name="PathfindingDirty">
+		В регионе есть незавершенные изменения поиска пути.  Если у вас есть права на строительство, восстановите регион, нажав кнопку «Восстановить регион».
+	</notification>
+	<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"/>
+	</notification>
 	<notification name="SeeAvatars">
 		На этом участке аватары и текстовый чат скрыты от другого участка.   Жителей за пределами этого участка не будет видно, а они не будут видеть вас.  Обычный текстовый чат на канале 0 также блокируется.
 	</notification>
@@ -2403,9 +2511,7 @@ http://secondlife.com/download.
 		Вы можете претендовать на публичную землю только в регионе, в котором вы находитесь.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		Вам нельзя быть в этом регионе из-за вашего рейтинга зрелости. Подтвердите свой возраст и/или установите последнюю версию клиента.
-
-Прочитайте в Базе знаний о доступе к областям с этим рейтингом зрелости.
+		Вы пытаетесь посетить регион, контент в котором не соответствует вашим настройкам.  Попробуйте изменить настройки в меню «Я &gt; Настройки &gt; Общие».
 	</notification>
 	<notification name="URBannedFromRegion">
 		Вы забанены в регионе.
@@ -2416,11 +2522,11 @@ http://secondlife.com/download.
 	<notification name="ImproperPaymentStatus">
 		У вас нет необходимого статуса оплаты для входа в этот регион.
 	</notification>
-	<notification name="MustGetAgeRgion">
-		Для входа в этот регион необходимо подтверждение возраста.
+	<notification name="MustGetAgeRegion">
+		Входить в этот регион могут только жители 18 лет и старше.
 	</notification>
 	<notification name="MustGetAgeParcel">
-		Для входа на этот участок необходимо подтверждение возраста.
+		Входить на этот участок могут только жители 18 лет и старше.
 	</notification>
 	<notification name="NoDestRegion">
 		Не найден регион назначения.
@@ -2522,12 +2628,33 @@ http://secondlife.com/download.
 	<notification name="TeleportOffered">
 		[NAME_SLURL] предложил(а) телепортировать вас к себе:
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+«[MESSAGE]»
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Телепортация"/>
 			<button name="Cancel" text="Отмена"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] предложил(а) телепортировать вас к себе:
+
+«[MESSAGE]»
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Этот регион содержит контент с рейтингом [REGION_CONTENT_MATURITY], но ваши настройки не допускают контента [REGION_CONTENT_MATURITY].  Вы можете отказаться от телепортации, или ваши настройки будут изменены.
+		<form name="form">
+			<button name="Teleport" text="Изменить и продолжить"/>
+			<button name="Cancel" text="Отмена"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] предложил(а) телепортировать вас к себе:
+
+«[MESSAGE]»
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Однако этот регион содержит контент, доступный только для взрослых.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Предложение телепортации отправлено [TO_NAME]
 	</notification>
@@ -2931,6 +3058,10 @@ http://secondlife.com/download.
 		( [EXISTENCE] сек. жизни )
 Вы локально обновили готовую текстуру [RESOLUTION] для «[BODYREGION]» через [TIME] сек.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		Просмотр этой текстуры невозможен, так как запрещено ее копирование и/или перенос.
+		<usetemplate ignoretext="Предупреждать, если режим просмотра вживую недоступен для текстур с запрещенным копированием и/или переносом" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Действительно покинуть этот разговор?
 		<usetemplate ignoretext="Подтверждать перед выходом из разговора" name="okcancelignore" notext="Нет" yestext="Да"/>
@@ -3102,6 +3233,23 @@ http://secondlife.com/download.
 		Это действие приведет к скрытию всех меню и кнопок. Чтобы вернуть их, щелкните [SHORTCUT] снова.
 		<usetemplate ignoretext="Подтверждать перед скрытием интерфейса" name="okcancelignore" notext="Отмена" yestext="OK"/>
 	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestricted">
+		Для некоторых выбранных наборов связей нельзя задать тип «[REQUESTED_TYPE]» из-за ограничений этих наборов.  Эти наборы связей будут иметь тип «[RESTRICTED_TYPE]».
+		<usetemplate ignoretext="Нельзя задать некоторые выбранные наборы связей из-за ограничений этих наборов." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnVolume">
+		Для некоторых выбранных наборов связей невозможно задать тип «[REQUESTED_TYPE]», так как фигура не выпуклая.
+		<usetemplate ignoretext="Нельзя задать некоторые выбранные наборы связей, так как фигура не выпуклая." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestrictedAndVolume">
+		Для некоторых выбранных наборов связей нельзя задать тип «[REQUESTED_TYPE]» из-за ограничений этих наборов.  Эти наборы связей будут иметь тип «[RESTRICTED_TYPE]».
+ Для некоторых выбранных наборов связей невозможно задать тип «[REQUESTED_TYPE]», так как фигура не выпуклая. Тип использования этих наборов связей не изменится.
+		<usetemplate ignoretext="Нельзя задать некоторые выбранные наборы связей из-за ограничений этих наборов и потому, что фигура не выпуклая." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		Выбранный объект влияет на навигационную сетку.  Если заменить его на гибкий путь, он будет удален из навигационной сетки.
+		<usetemplate ignoretext="Выбранный объект влияет на навигационную сетку.  Если заменить его на гибкий путь, он будет удален из навигационной сетки." name="okcancelignore" notext="Отмена" yestext="OK"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		По-видимому, ваше оборудование не удовлетворяет требованиям [APP_NAME]. Для работы [APP_NAME] необходима графическая карта OpenGL с поддержкой мультитекстур. Если у вас есть такая карта, убедитесь, что установлены новейшие версии драйверов для нее и пакеты обновлений и исправления для операционной системы.
 
@@ -3138,4 +3286,12 @@ http://secondlife.com/download.
 		Попытка добавить недопустимый или нечитаемый файл изображения [FNAME], который не удалось открыть или декодировать.
 Попытка отменена.
 	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		Возвращено [NUM_ITEMS] элементов.  Продолжить?
+		<usetemplate ignoretext="Возвратить несколько предметов?" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		Вы удаляете несколько предметов ([NUM_ITEMS]).  Продолжить?
+		<usetemplate ignoretext="Удалить несколько предметов?" name="okcancelignore" notext="Нет" yestext="Да"/>
+	</notification>
 </notifications>
diff --git a/indra/newview/skins/default/xui/ru/panel_bottomtray.xml b/indra/newview/skins/default/xui/ru/panel_bottomtray.xml
deleted file mode 100644
index ebf6c4264b..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Включить/выключить микрофон"/>
-	<string name="VoiceControlBtnToolTip" value="Показать/скрыть панель управления голосом"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Говорить" label_selected="Говорить" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Жесты" name="Gesture" tool_tip="Показать/скрыть жесты"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Перемещение" name="movement_btn" tool_tip="Показать/скрыть панель управления движением"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Камера" name="camera_btn" tool_tip="Показать/скрыть управление камерой"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button name="snapshots" tool_tip="Сделать снимок"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Строительство" name="build_btn" tool_tip="Показать/скрыть инструменты"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Поиск" name="search_btn" tool_tip="Показать/скрыть поиск"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Карта" name="world_map_btn" tool_tip="Показать/скрыть карту мира"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Миникарта" name="mini_map_btn" tool_tip="Показать/скрыть миникарту"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Общение"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Уведомления"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_group_invite.xml b/indra/newview/skins/default/xui/ru/panel_group_invite.xml
index 3041046041..68dac5cd7e 100644
--- a/indra/newview/skins/default/xui/ru/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/ru/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Несколько выбранных жителей уже состоят в группе. Им приглашения не были отправлены.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Групповые приглашения не отправлены: выбрано слишком много жителей. Групповые приглашения могут охватывать не более 100 пользователей за один запрос.
+	</panel.string>
 	<text name="help_text">
 		Можно выбрать несколько жителей для приглашения в группу. Чтобы начать, щелкните «Выбрать жителей».
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml
new file mode 100644
index 0000000000..fdc374a024
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_navmesh_rebake">
+	<button label="Восстановить регион" name="navmesh_btn" tool_tip="Восстановить навигационную сетку региона."/>
+	<button label="Запрос на восстановление" name="navmesh_btn_sending" tool_tip="Отправка запроса на восстановление на сервер."/>
+	<button label="Идет восстановление региона" name="navmesh_btn_baking" tool_tip="Идет восстановление региона.  Когда оно завершится, эта кнопка исчезнет."/>
+</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 a9d5569c7f..9283fc9e6e 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -29,5 +29,7 @@
 	<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="ok_btn"/>
+	<button label="Автозамена..." name="autoreplace_showgui"/>
+	<button label="Проверка правописания..." name="spellcheck_showgui"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_debug.xml b/indra/newview/skins/default/xui/ru/panel_region_debug.xml
index c21d2d7051..7bef927507 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_debug.xml
@@ -30,5 +30,5 @@
 	<button label="Самые активные участники столкновений..." name="top_colliders_btn" tool_tip="Список объектов, для которых столкновения наиболее вероятны"/>
 	<button label="Список лучших скриптов..." name="top_scripts_btn" tool_tip="Объекты, в которых скрипты выполняются дольше всего"/>
 	<button label="Перезагрузить регион" name="restart_btn" tool_tip="Отсчитать 2 минуты и перезагрузить регион"/>
-	<button label="Отложить перезагрузку" name="cancel_restart_btn" tool_tip="Отложить перезагрузку региона на час"/>
+	<button label="Отменить перезапуск" name="cancel_restart_btn" tool_tip="Отложить перезагрузку региона на час"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_estate.xml b/indra/newview/skins/default/xui/ru/panel_region_estate.xml
index 93b21704bc..bcfb974fcb 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_estate.xml
@@ -23,7 +23,7 @@
 		Разрешить доступ только таким жителям:
 	</text>
 	<check_box label="Зарегистрирована информация об оплате" name="limit_payment" tool_tip="Для доступа к этому землевладению у жителя должна быть зарегистрирована информация об оплате.  Более подробная информация находится здесь: [SUPPORT_SITE]."/>
-	<check_box label="Подтвержден возраст" name="limit_age_verified" tool_tip="Для доступа к этому землевладению житель должен подтвердить свой возраст. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
+	<check_box label="18 лет и старше" name="limit_age_verified" tool_tip="Доступ к этому землевладению имеют только жители 18 лет и старше. Более подробная информация находится здесь: [SUPPORT_SITE]."/>
 	<check_box label="Разрешить голосовое общение" name="voice_chat_check"/>
 	<check_box label="Разрешить прямой телепорт" name="allow_direct_teleport"/>
 	<button label="Применить" name="apply_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_region_texture.xml b/indra/newview/skins/default/xui/ru/panel_region_texture.xml
deleted file mode 100644
index c4b35a536d..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_region_texture.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Текстуры земли" name="Textures">
-	<text name="region_text_lbl">
-		Регион:
-	</text>
-	<text name="region_text">
-		неизвестен
-	</text>
-	<text name="detail_texture_text">
-		Текстуры ландшафта (требования: 512x512, 24-битные TGA-файлы)
-	</text>
-	<text name="height_text_lbl">
-		1 (низ)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (верх)
-	</text>
-	<text name="height_text_lbl5">
-		Диапазон высот текстур
-	</text>
-	<text name="height_text_lbl6">
-		Северо-запад
-	</text>
-	<text name="height_text_lbl7">
-		Северо-восток
-	</text>
-	<spinner label="Низ" name="height_start_spin_1"/>
-	<spinner label="Низ" name="height_start_spin_3"/>
-	<spinner label="Верх" name="height_range_spin_1"/>
-	<spinner label="Верх" name="height_range_spin_3"/>
-	<text name="height_text_lbl8">
-		Юго-запад
-	</text>
-	<text name="height_text_lbl9">
-		Юго-восток
-	</text>
-	<spinner label="Низ" name="height_start_spin_0"/>
-	<spinner label="Низ" name="height_start_spin_2"/>
-	<spinner label="Верх" name="height_range_spin_0"/>
-	<spinner label="Верх" name="height_range_spin_2"/>
-	<text name="height_text_lbl10">
-		Эти значения отображают диапазон перекрытия вышеуказанных текстур.
-	</text>
-	<text name="height_text_lbl11">
-		Измеряется в метрах, значение «Низ» – это МАКСИМАЛЬНАЯ высота текстуры №1, значение «Верх» – это МИНИМАЛЬНАЯ высота текстуры №4.
-	</text>
-	<button label="Применить" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_side_tray.xml b/indra/newview/skins/default/xui/ru/panel_side_tray.xml
deleted file mode 100644
index 10c5775291..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Открыть/закрыть боковую панель" name="sidebar_openclose" tab_title="Открыть/закрыть боковую панель"/>
-	<sidetray_tab description="Дом." name="sidebar_home" tab_title="Дом">
-		<panel label="дом" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Изменение своего профиля и подборки." name="sidebar_me" tab_title="Мой профиль">
-		<panel_container name="panel_container">
-			<panel label="Я" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Поиск друзей, контактов и находящихся поблизости людей." name="sidebar_people" tab_title="Люди">
-		<panel_container name="panel_container">
-			<panel label="Профиль группы" name="panel_group_info_sidetray"/>
-			<panel label="Черный список жителей и объектов" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Поиск мест, которые можно было бы посетить или которые вы уже посещали ранее." label="Места" name="sidebar_places" tab_title="Места">
-		<panel label="Места" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Просмотрите свой инвентарь." name="sidebar_inventory" tab_title="Мой инвентарь">
-		<panel label="Изменить инвентарь" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Изменение внешнего вида и текущего образа." name="sidebar_appearance" tab_title="Мой внешний вид">
-		<panel label="Изменить внешний вид" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml b/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml
index 62095acbaf..0106ed50ac 100644
--- a/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(неизвестно)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(неизвестно/несколько)
+	</panel.string>
 	<panel.string name="public">
 		(публичное)
 	</panel.string>
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 8e56dd80c0..e9dd3760b5 100644
--- a/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/ru/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		Эти объекты нельзя изменять
 	</panel.string>
+	<panel.string name="text modify info 5">
+		Этот объект нельзя изменять через границу региона
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Эти объекты нельзя изменять через границу региона
+	</panel.string>
 	<panel.string name="text modify warning">
 		Этот объект содержит объединенные части
 	</panel.string>
@@ -95,6 +101,9 @@
 		</combo_box>
 		<spinner label="Цена: L$" name="Edit Cost"/>
 		<check_box label="Показать в результатах поиска" name="search_check" tool_tip="Показывать объект в результатах поиска"/>
+		<text name="pathfinding_attributes_label">
+			Атрибуты поиска пути:
+		</text>
 		<text name="B:">
 			Н:
 		</text>
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 78e4b134fb..3745aff8fd 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -1003,6 +1003,9 @@ support@secondlife.com.
 	<string name="script_files">
 		Скрипты
 	</string>
+	<string name="dictionary_files">
+		Словари
+	</string>
 	<string name="AvatarSetNotAway">
 		На месте
 	</string>
@@ -3858,6 +3861,12 @@ support@secondlife.com.
 	<string name="LocationCtrlSeeAVsTooltip">
 		Все жители с других участков могут видеть аватары и общаться в чате
 	</string>
+	<string name="LocationCtrlPathfindingDirtyTooltip">
+		Возможны неполадки подвижных объектов в этом регионе, пока регион не будет восстановлен.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		В этом регионе не разрешен динамический поиск пути.
+	</string>
 	<string name="UpdaterWindowTitle">
 		Обновление [APP_NAME]
 	</string>
@@ -5012,6 +5021,21 @@ support@secondlife.com.
 	<string name="Normal">
 		Нормальный
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Нет
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Влияет на навигационную сетку
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Персонаж
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(несколько)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Очень низкий
 	</string>
@@ -5027,4 +5051,10 @@ support@secondlife.com.
 	<string name="snapshot_quality_very_high">
 		Очень высокий
 	</string>
+	<string name="TeleportMaturityExceeded">
+		Житель не может посетить этот регион.
+	</string>
+	<string name="UserDictionary">
+		[Пользователь]
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ru/teleport_strings.xml b/indra/newview/skins/default/xui/ru/teleport_strings.xml
index feff286111..40c9267408 100644
--- a/indra/newview/skins/default/xui/ru/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/ru/teleport_strings.xml
@@ -45,6 +45,9 @@
 		<message name="no_inventory_host">
 			Система инвентаря сейчас недоступна.
 		</message>
+		<message name="MustGetAgeRegion">
+			Входить в этот регион могут только жители 18 лет и старше.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -80,5 +83,8 @@
 		<message name="requesting">
 			Запрос телепортации…
 		</message>
+		<message name="pending">
+			Телепортация не закончена...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
index 8fa12ea759..9cc9c7a220 100644
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -63,27 +63,26 @@ Ses Sunucusu Sürümü: [VOICE_VERSION]
 		</panel>
 		<panel label="Lisanslar" name="licenses_panel">
 			<text_editor name="credits_editor">
-				3Dconnexion SDK Telif Hakkı (C) 1992-2007 3Dconnexion
-        APR Telif Hakkı (C) 2000-2004 The Apache Software Foundation
-        Collada DOM Telif Hakkı 2005 Sony Computer Entertainment Inc.
-        cURL Telif Hakkı (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+				3Dconnexion SDK Telif Hakkı (C) 1992-2009 3Dconnexion
+        APR Telif Hakkı (C) 2011 The Apache Software Foundation
+        Collada DOM Telif Hakkı 2006 Sony Computer Entertainment Inc.
+        cURL Telif Hakkı (C) 1996-2010, Daniel Stenberg, (daniel@haxx.se)
         DBus/dbus-glib Telif Hakkı (C) 2002, 2003  CodeFactory AB / Telif Hakkı (C) 2003, 2004 Red Hat, Inc.
         expat Telif Hakkı (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-        FreeType Telif Hakkı (C) 1996-2002, The FreeType Project (www.freetype.org).
+        FreeType Telif Hakkı (C) 1996-2002, 2006 David Turner, Robert Wilhelm ve Werner Lemberg.
         GL Telif Hakkı (C) 1999-2004 Brian Paul.
         GLOD Telif Hakkı (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University ve David Luebke, Brenden Schubert, University of Virginia.
         google-perftools Telif Hakkı (c) 2005, Google Inc.
         Havok.com(TM) Telif Hakkı (C) 1999-2001, Telekinesys Research Limited.
         jpeg2000 Telif Hakkı (C) 2001, David Taubman, The University of New South Wales (UNSW)
         jpeglib Telif Hakkı (C) 1991-1998, Thomas G. Lane.
-        ogg/vorbis Telif Hakkı (C) 2001, Xiphophorus
-        OpenSSL Telif Hakkı (C) 1998-2002 The OpenSSL Project.
-        PCRE Telif Hakkı (c) 1997-2008 University of Cambridge
+        ogg/vorbis Telif Hakkı (C) 2002, Xiphophorus
+        OpenSSL Telif Hakkı (C) 1998-2008 The OpenSSL Project.
+        PCRE Telif Hakkı (c) 1997-2012 University of Cambridge
         SDL Telif Hakkı (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
         SSLeay Telif Hakkı (C) 1995-1998 Eric Young (eay@cryptsoft.com)
         xmlrpc-epi Telif Hakkı (C) 2000 Epinions, Inc.
-        zlib Telif Hakkı (C) 1995-2002 Jean-loup Gailly ve Mark Adler.
-        google-perftools Telif Hakkı (c) 2005, Google Inc.
+        zlib Telif Hakkı (C) 1995-2012 Jean-loup Gailly ve Mark Adler.
 
         Second Life Görüntüleyicisi Havok (TM) Fizik motorunu kullanmaktadır. (c)Telif Hakkı 1999-2010 Havok.com Inc. (ve Lisans Verenleri). Tüm Hakları Saklıdır. Ayrıntılı bilgi için bkz. www.havok.com
 
diff --git a/indra/newview/skins/default/xui/tr/floater_about_land.xml b/indra/newview/skins/default/xui/tr/floater_about_land.xml
index a478d347a8..481fc540d0 100644
--- a/indra/newview/skins/default/xui/tr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about_land.xml
@@ -451,7 +451,7 @@ Sadece büyük parseller aramada görünür.
 				Sadece şu Sakinlere erişim izni verin:
 			</text>
 			<check_box label="Ödeme bilgileri kayıtlı [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Sakinlerin bu parsele erişebilmesi için ödeme bilgilerinin kayıtlı olması gerekir.  Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
-			<check_box label="Yaş doğrulaması yapılmış [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Sakinlerin bu parsele erişebilmesi için yaş doğrulamalarının yapılmış olması gerekir. Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
+			<check_box label="18 veya üzeri bir yaşta [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Sakinlerin bu parsele erişebilmesi için 18 veya üzeri bir yaşta olmaları gerekir. Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
 			<check_box label="Grup Erişimine İzin Ver: [GROUP]" name="GroupCheck" tool_tip="Genel sekmesinde grup ayarla."/>
 			<check_box label="Geçiş haklr. şuna sat:" name="PassCheck" tool_tip="Bu parsele geçici erişim verir"/>
 			<combo_box name="pass_combo">
diff --git a/indra/newview/skins/default/xui/tr/floater_animation_preview.xml b/indra/newview/skins/default/xui/tr/floater_animation_preview.xml
deleted file mode 100644
index f8800c674d..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_animation_preview.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview">
-	<floater.string name="failed_to_initialize">
-		Hareket başlatılamadı
-	</floater.string>
-	<floater.string name="anim_too_long">
-		Animasyon dosyası [LENGTH] saniye uzunluğunda.
-
-Maksimum animasyon uzunluğu [LENGTH] saniye.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		Animasyon dosyası okunamadı.
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		Tamam
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Dosyanın zamanından önce sonu.
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Kısıtlama tanımı okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		BVH dosyası açılamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		Geçersiz HİYERARŞİ üst bilgisi.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		KÖK veya EKLEM bulunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		EKLEM adı alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		OFSET bulunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		KANALLAR bulunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Döndürme sırası alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Döndürme ekseni alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		HAREKET bulunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		kARE SAYISI alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Kare zamanı alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Konum değerleri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Döndürme değerleri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Çeviri dosyası açılamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Çeviri üst bilgisi okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Çeviri adları okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Çeviri yoksay değeri okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Çeviri nisbi değeri okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Çeviri çıkış adı değeri okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Çeviri matrisi okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Birleştirme alt birim adı alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Birleştirme üst birim adı alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Öncelik değerleri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Döngü (tekrar) değerleri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Easln (Yavaş Başlangıç) değerleri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		EaseOut (Yavaş Bitiş) değerleri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		El şekillendirme değeri alınamadı.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Duygu ifadesi adı okunamadı.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Yanlış kök eklem adı, &quot;kalça&quot; kullanın
-	</floater.string>
-	<text name="name_label">
-		Ad:
-	</text>
-	<text name="description_label">
-		Açıklama:
-	</text>
-	<spinner label="Öncelik" name="priority" tool_tip="Bu animasyonun diğer animasyonları geçersiz kılabileceği kontrolleri"/>
-	<check_box label="Döngü" name="loop_check" tool_tip="Bu animasyonun döngülenmesini (tekrarlanmasını) sağlar"/>
-	<spinner label="İç (%)" name="loop_in_point" tool_tip="Döngünün döndüğü animasyon noktasını belirler"/>
-	<spinner label="Dış (%)" name="loop_out_point" tool_tip="Animasyonda döngünün bittiği noktayı belirler"/>
-	<text name="hand_label">
-		El Duruşu
-	</text>
-	<combo_box name="hand_pose_combo" tool_tip="Ellerin animasyon sırasında neler yaptığını kontrol eder">
-		<combo_box.item label="Yayılım" name="Spread"/>
-		<combo_box.item label="Rahat" name="Relaxed"/>
-		<combo_box.item label="Her İkisi de İşaret Ediyor" name="PointBoth"/>
-		<combo_box.item label="Yumruk" name="Fist"/>
-		<combo_box.item label="Sol Rahat" name="RelaxedLeft"/>
-		<combo_box.item label="Sol İşaret Ediyor" name="PointLeft"/>
-		<combo_box.item label="Sol Yumruk" name="FistLeft"/>
-		<combo_box.item label="Sağ Rahat" name="RelaxedRight"/>
-		<combo_box.item label="Sağ İşaret Ediyor" name="PointRight"/>
-		<combo_box.item label="Sağ Yumruk" name="FistRight"/>
-		<combo_box.item label="Sağı Selamlıyor" name="SaluteRight"/>
-		<combo_box.item label="Yazı Yazıyor" name="Typing"/>
-		<combo_box.item label="Sağ Barış" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		İfade
-	</text>
-	<combo_box name="emote_combo" tool_tip="Yüzün animasyon sırasındaki ifadesini kontrol eder">
-		<item label="(Hiçbiri)" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Korkmuş" name="Afraid" value="Korkmuş"/>
-		<item label="Kızgın" name="Angry" value="Kızgın"/>
-		<item label="Yaygın Gülümseyiş" name="BigSmile" value="Yaygın Gülümseyiş"/>
-		<item label="Canı Sıkılmış" name="Bored" value="Canı Sıkılmış"/>
-		<item label="Ağlama" name="Cry" value="Ağlama"/>
-		<item label="Dudak Bükme" name="Disdain" value="Dudak Bükme"/>
-		<item label="Utanmış" name="Embarrassed" value="Utanmış"/>
-		<item label="Kaş Çatma" name="Frown" value="Kaş Çatma"/>
-		<item label="Öpücük" name="Kiss" value="Öpücük"/>
-		<item label="Gülme" name="Laugh" value="Gülme"/>
-		<item label="Kahkaha" name="Plllppt" value="Kahkaha"/>
-		<item label="Tiksinmiş" name="Repulsed" value="Tiksinmiş"/>
-		<item label="Üzgün" name="Sad" value="Üzgün"/>
-		<item label="Omuz Silkme" name="Shrug" value="Omuz Silkme"/>
-		<item label="Gülümseme" name="Smile" value="Gülümseme"/>
-		<item label="Sürpriz" name="Surprise" value="Sürpriz"/>
-		<item label="Göz Kırpma" name="Wink" value="Göz Kırpma"/>
-		<item label="Endişelenme" name="Worry" value="Endişelenme"/>
-	</combo_box>
-	<text name="preview_label">
-		Şu sırada önizle
-	</text>
-	<combo_box name="preview_base_anim" tool_tip="Animasyon davranışınızı avatarınız genel hareketleri yaparken test etmek için bunu kullanın.">
-		<item label="Ayakta Duruyor" name="Standing" value="Ayakta Duruyor"/>
-		<item label="Yürüyor" name="Walking" value="Yürüyor"/>
-		<item label="Oturuyor" name="Sitting" value="Oturuyor"/>
-		<item label="Uçuyor" name="Flying" value="Uçuyor"/>
-	</combo_box>
-	<spinner label="Yavaş Başlangıç (saniye)" name="ease_in_time" tool_tip="Animasyonun kaynaştığı süre (saniye olarak)"/>
-	<spinner label="Yavaş Bitiş (saniye)" name="ease_out_time" tool_tip="Animasyonun ayrıştığı süre (saniye olarak)"/>
-	<button name="play_btn" tool_tip="Animasyonunu oynat"/>
-	<button name="pause_btn" tool_tip="Animasyonunu duraklat"/>
-	<button name="stop_btn" tool_tip="Animasyo oynatmayı durdur"/>
-	<text name="bad_animation_text">
-		Animasyon dosyası okunamadı.
-
-Poser 4&apos;ten aktarılan BHV dosyalarını tavsiye ederiz.
-	</text>
-	<button label="Karşıya Yükle (L$[AMOUNT])" name="ok_btn"/>
-	<button label="İptal" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_autoreplace.xml b/indra/newview/skins/default/xui/tr/floater_autoreplace.xml
new file mode 100644
index 0000000000..e52e05dc61
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_autoreplace.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="autoreplace_floater" title="Otomatik Yerine Koyma Ayarları">
+	<check_box label="Otomatik Yerine Koymayı Etkinleştir" name="autoreplace_enable" tool_tip="Siz sohbet metni girdikçe, girilen herhangi bir anahtar kelimenin yerine karşılık gelen değiştirmeyi koyabilirsiniz"/>
+	<button label="Listeyi İçeri Aktar..." name="autoreplace_import_list" tool_tip="Daha önce aktarılan bir listeyi yükler."/>
+	<button label="Listeyi Aktarın..." name="autoreplace_export_list" tool_tip="Seçilen listeyi bir dosyaya kaydederek paylaşın."/>
+	<button label="Yeni Liste..." name="autoreplace_new_list" tool_tip="Yeni bir liste oluşturun."/>
+	<button label="Listeyi Sil" name="autoreplace_delete_list" tool_tip="Seçilen listeyi silin."/>
+	<button name="autoreplace_list_up" tool_tip="Bu listenin önceliğini yükseltin."/>
+	<button name="autoreplace_list_down" tool_tip="Bu listenin önceliğini azaltın."/>
+	<scroll_list name="autoreplace_list_replacements">
+		<scroll_list.columns label="Anahtar kelime" name="keyword"/>
+		<scroll_list.columns label="Değiştirme" name="replacement"/>
+	</scroll_list>
+	<button label="Ekle..." name="autoreplace_add_entry"/>
+	<button label="Kaldır" name="autoreplace_delete_entry"/>
+	<button label="Girişi Kaydet" name="autoreplace_save_entry" tool_tip="Bu girişi kaydet."/>
+	<button label="Değişiklikleri Kaydet" name="autoreplace_save_changes" tool_tip="Tüm değişiklikleri kaydet."/>
+	<button label="İptal" name="autoreplace_cancel" tool_tip="Tüm değişiklikleri iptal et."/>
+</floater>
+<!--
+  <text 
+   top_pad="10"
+   left="10"
+   height="16"
+   width="260"
+   follows="left|top"
+   halign="center"
+   mouse_opaque="true"
+   name="autoreplace_text2">
+    Entries
+  </text>
+-->
diff --git a/indra/newview/skins/default/xui/tr/floater_env_settings.xml b/indra/newview/skins/default/xui/tr/floater_env_settings.xml
deleted file mode 100644
index d53629f6fe..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_env_settings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="ÇEVRE DÜZENLEYİCİ">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Günün Saati
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<text name="EnvCloudText">
-		Bulut Örtüsü
-	</text>
-	<text name="EnvWaterColorText">
-		Su Rengi
-	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Renk seçiciyi açmak için tıklayın"/>
-	<text name="EnvWaterFogText">
-		Su Sisi
-	</text>
-	<button label="Gayrimenkul Saati Kullan" name="EnvUseEstateTimeButton"/>
-	<button label="Gelişmiş Gökyüzü" name="EnvAdvancedSkyButton"/>
-	<button label="Gelişmiş Su" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory.xml b/indra/newview/skins/default/xui/tr/floater_inventory.xml
deleted file mode 100644
index cfb12d4b68..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_inventory.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="ENVANTERİM">
-	<panel label="Envanter Paneli" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_model_preview.xml b/indra/newview/skins/default/xui/tr/floater_model_preview.xml
index 0c7cabc6ea..c00cadd3bd 100644
--- a/indra/newview/skins/default/xui/tr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/tr/floater_model_preview.xml
@@ -92,19 +92,54 @@
 				<text initial_value="Üçgenler" name="triangles" value="Üçgenler"/>
 				<text initial_value="Köşeler" name="vertices" value="Köşeler"/>
 				<text initial_value="Yüksek" name="high_label" value="Yüksek"/>
+				<combo_box name="lod_source_high">
+					<item name="Load from file" value="Dosyadan yükle"/>
+					<item name="Generate" value="Oluştur"/>
+				</combo_box>
 				<button label="Gözat..." name="lod_browse_high"/>
+				<combo_box name="lod_mode_high">
+					<item name="Triangle Limit" value="Üçgen Limiti"/>
+					<item name="Error Threshold" value="Hata Eşiği"/>
+				</combo_box>
 				<text initial_value="0" name="high_triangles" value="0"/>
 				<text initial_value="0" name="high_vertices" value="0"/>
 				<text initial_value="Orta" name="medium_label" value="Orta"/>
+				<combo_box name="lod_source_medium">
+					<item name="Load from file" value="Dosyadan yükle"/>
+					<item name="Generate" value="Oluştur"/>
+					<item name="Use LoD above" value="Yukarıdaki ayrıntı seviyesini kullan"/>
+				</combo_box>
 				<button label="Gözat..." name="lod_browse_medium"/>
+				<combo_box name="lod_mode_medium">
+					<item name="Triangle Limit" value="Üçgen Limiti"/>
+					<item name="Error Threshold" value="Hata Eşiği"/>
+				</combo_box>
 				<text initial_value="0" name="medium_triangles" value="0"/>
 				<text initial_value="0" name="medium_vertices" value="0"/>
 				<text initial_value="Düşük" name="low_label" value="Düşük"/>
+				<combo_box name="lod_source_low">
+					<item name="Load from file" value="Dosyadan yükle"/>
+					<item name="Generate" value="Oluştur"/>
+					<item name="Use LoD above" value="Yukarıdaki ayrıntı seviyesini kullan"/>
+				</combo_box>
 				<button label="Gözat..." name="lod_browse_low"/>
+				<combo_box name="lod_mode_low">
+					<item name="Triangle Limit" value="Üçgen Limiti"/>
+					<item name="Error Threshold" value="Hata Eşiği"/>
+				</combo_box>
 				<text initial_value="0" name="low_triangles" value="0"/>
 				<text initial_value="0" name="low_vertices" value="0"/>
 				<text initial_value="En Düşük" name="lowest_label" value="En Düşük"/>
+				<combo_box name="lod_source_lowest">
+					<item name="Load from file" value="Dosyadan yükle"/>
+					<item name="Generate" value="Oluştur"/>
+					<item name="Use LoD above" value="Yukarıdaki ayrıntı seviyesini kullan"/>
+				</combo_box>
 				<button label="Gözat..." name="lod_browse_lowest"/>
+				<combo_box name="lod_mode_lowest">
+					<item name="Triangle Limit" value="Üçgen Limiti"/>
+					<item name="Error Threshold" value="Hata Eşiği"/>
+				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
 				<check_box label="Normalleri Oluştur" name="gen_normals"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml b/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml
deleted file mode 100644
index 6b12ad0ef5..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="YAKINDAKİ SOHBET">
-	<check_box label="Sohbeti çevir" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml
new file mode 100644
index 0000000000..f38d8c84c6
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_characters" title="Yol bulma karakterleri">
+	<floater.string name="messaging_get_inprogress">
+		Yol bulma karakterleri için sorgulama yapılıyor ...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Yol bulma karakterleri için sorgulama yapılırken hata saptandı.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Yol bulma karakterleri yok.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		Toplam [NUM_TOTAL] karakter içerisinden [NUM_SELECTED] adet seçildi.
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		Bu bölgede yol bulma etkin değil.
+	</floater.string>
+	<floater.string name="character_cpu_time">
+		[CPU_TIME] µs
+	</floater.string>
+	<floater.string name="character_owner_loading">
+		[Yükleniyor]
+	</floater.string>
+	<floater.string name="character_owner_unknown">
+		[Bilinmiyor]
+	</floater.string>
+	<floater.string name="character_owner_group">
+		[grup]
+	</floater.string>
+	<panel>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Ad" name="name"/>
+			<scroll_list.columns label="Açıklama" name="description"/>
+			<scroll_list.columns label="Sahip" name="owner"/>
+			<scroll_list.columns label="CPU" name="cpu_time"/>
+			<scroll_list.columns label="İrtifa" name="altitude"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Karakterler:
+		</text>
+		<button label="Listeyi yenile" name="refresh_objects_list"/>
+		<button label="Tümünü seç" name="select_all_objects"/>
+		<button label="Hiçbirini seçme" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<text name="actions_label">
+			Seçilen karakterler üzerinde eylemler:
+		</text>
+		<check_box label="İşareti göster" name="show_beacon"/>
+		<check_box label="Fizik kapsülünü göster" name="show_physics_capsule"/>
+		<button label="Al" name="take_objects"/>
+		<button label="Kopya al" name="take_copy_objects"/>
+		<button label="Beni ona ışınla" name="teleport_me_to_object" tool_tip="Sadece bir karakter seçildiğinde etkindir."/>
+		<button label="İade Et" name="return_objects"/>
+		<button label="Sil" name="delete_objects"/>
+	</panel>
+</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
new file mode 100644
index 0000000000..6eecc7fb77
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_console" title="Yol bulma görüntüleme / test">
+	<floater.string name="navmesh_viewer_status_library_not_implemented">
+		Yol bulma kütüphanesi uygulaması bulunamıyor.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_not_enabled">
+		Bu bölgede yol bulma etkin değil.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_region_loading">
+		Bölgenin yüklenmesinin bitmesi bekleniyor.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_checking_version">
+		Navigasyon örgüsünün durumu kontrol ediliyor.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_downloading">
+		Navigasyon örgüsü indiriliyor.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_updating">
+		Sunucudaki navigasyon örgüsü değişti. En son navigasyon örgüsü indiriliyor.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_has_navmesh">
+		En son navigasyon örgüsü indirildi.
+	</floater.string>
+	<floater.string name="navmesh_viewer_status_error">
+		Navigasyon örgüsü başarıyla indirilemedi.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending">
+		Navigasyon örgüsünde bekleyen değişiklikler var.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_building">
+		Navigasyon örgüsü oluşturuluyor.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_pending">
+		Bazı navigasyon örgüsü bölgelerinde bekleyen değişiklikler var.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_some_building">
+		Bazı navigasyon örgüsü bölgeleri oluşturuluyor.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_pending_and_building">
+		Bazı navigasyon örgüsü bölgelerinde bekleyen değişiklikler var, bazıları ise oluşturuluyor.
+	</floater.string>
+	<floater.string name="navmesh_simulator_status_complete">
+		Navigasyon örgüsü güncel.
+	</floater.string>
+	<floater.string name="pathing_library_not_implemented">
+		Yol bulma kütüphanesi uygulaması bulunamıyor.
+	</floater.string>
+	<floater.string name="pathing_region_not_enabled">
+		Bu bölgede yol bulma etkin değil.
+	</floater.string>
+	<floater.string name="pathing_choose_start_and_end_points">
+		Lütfen başlangıç ve bitim noktalarını seçin.
+	</floater.string>
+	<floater.string name="pathing_choose_start_point">
+		Lütfen başlangıç noktasını seçin.
+	</floater.string>
+	<floater.string name="pathing_choose_end_point">
+		Lütfen bitim noktasını seçin.
+	</floater.string>
+	<floater.string name="pathing_path_valid">
+		Yol turuncu olarak gösterilmiştir.
+	</floater.string>
+	<floater.string name="pathing_path_invalid">
+		Seçilen noktalar arasında bir yol bulunamıyor.
+	</floater.string>
+	<floater.string name="pathing_error">
+		Yol oluşturma sırasında bir hata meydana geldi.
+	</floater.string>
+	<tab_container name="view_test_tab_container">
+		<panel label="Görünüm" name="view_panel">
+			<text name="show_label">
+				Göster:
+			</text>
+			<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">
+				Yürüyebilirlik haritasını göster:
+			</text>
+			<combo_box name="show_heatmap_mode">
+				<combo_box.item label="Gösterme" name="show_heatmap_mode_none"/>
+				<combo_box.item label="A karakter tipi" name="show_heatmap_mode_a"/>
+				<combo_box.item label="B karakter tipi" name="show_heatmap_mode_b"/>
+				<combo_box.item label="C karakter tipi" name="show_heatmap_mode_c"/>
+				<combo_box.item label="D karakter tipi" name="show_heatmap_mode_d"/>
+			</combo_box>
+			<check_box label="Yürüyebilirler" name="show_walkables"/>
+			<check_box label="Maddi hacimler" name="show_material_volumes"/>
+			<check_box label="Statik engeller" name="show_static_obstacles"/>
+			<check_box label="Hariç tutma hacimleri" name="show_exclusion_volumes"/>
+			<check_box label="Su düzlemi" name="show_water_plane"/>
+			<check_box label="X-ışını görünümü ile" name="show_xray"/>
+		</panel>
+		<panel label="Yolu test et" name="test_panel">
+			<text name="ctrl_click_label">
+				Başlangıç noktasını seçmek için Ctrl tuşuna basarak tıklayın.
+			</text>
+			<text name="shift_click_label">
+				Bitim noktasını seçmek için Shift tuşuna basarak tıklayın.
+			</text>
+			<text name="character_width_label">
+				Karakter genişliği
+			</text>
+			<slider name="character_width" value="1"/>
+			<text name="character_width_unit_label">
+				m
+			</text>
+			<text name="character_type_label">
+				Karakter tipi
+			</text>
+			<combo_box name="path_character_type">
+				<combo_box.item label="Hiçbiri" name="path_character_type_none"/>
+				<combo_box.item label="A" name="path_character_type_a"/>
+				<combo_box.item label="B" name="path_character_type_b"/>
+				<combo_box.item label="C" name="path_character_type_c"/>
+				<combo_box.item label="D" name="path_character_type_d"/>
+			</combo_box>
+			<button label="Yolu temizle" name="clear_path"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml
new file mode 100644
index 0000000000..3aee66a860
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_pathfinding_linksets" title="Yol bulma bağlantı kümeleri">
+	<floater.string name="messaging_get_inprogress">
+		Yol bulma bağlantı kümeleri için sorgulama yapılıyor ...
+	</floater.string>
+	<floater.string name="messaging_get_error">
+		Yol bulma bağlantı kümeleri için sorgulama yapılırken hata saptandı.
+	</floater.string>
+	<floater.string name="messaging_set_inprogress">
+		Seçilen yol bulma bağlantı kümeleri değiştiriliyor ...
+	</floater.string>
+	<floater.string name="messaging_set_error">
+		Seçilen yol bulma bağlantı kümeleri değiştirilirken hata saptandı.
+	</floater.string>
+	<floater.string name="messaging_complete_none_found">
+		Yol bulma bağlantı kümeleri yok.
+	</floater.string>
+	<floater.string name="messaging_complete_available">
+		Toplam [NUM_TOTAL] bağlantı kümesi içerisinden [NUM_SELECTED] adet seçildi.
+	</floater.string>
+	<floater.string name="messaging_not_enabled">
+		Bu bölgede yol bulma etkin değil.
+	</floater.string>
+	<floater.string name="linkset_terrain_name">
+		[Yüzey]
+	</floater.string>
+	<floater.string name="linkset_terrain_description">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_owner">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_land_impact">
+		--
+	</floater.string>
+	<floater.string name="linkset_terrain_dist_from_you">
+		--
+	</floater.string>
+	<floater.string name="linkset_owner_loading">
+		[Yükleniyor]
+	</floater.string>
+	<floater.string name="linkset_owner_unknown">
+		[Bilinmiyor]
+	</floater.string>
+	<floater.string name="linkset_owner_group">
+		[grup]
+	</floater.string>
+	<floater.string name="linkset_use_walkable">
+		Yürüyebilir
+	</floater.string>
+	<floater.string name="linkset_use_static_obstacle">
+		Statik engel
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_obstacle">
+		Hareket ettirilebilir engel
+	</floater.string>
+	<floater.string name="linkset_use_material_volume">
+		Maddi hacim
+	</floater.string>
+	<floater.string name="linkset_use_exclusion_volume">
+		Hariç tutma hacmi
+	</floater.string>
+	<floater.string name="linkset_use_dynamic_phantom">
+		Hareket ettirilebilir fantom
+	</floater.string>
+	<floater.string name="linkset_is_terrain">
+		[değiştirilemez]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_state">
+		[kısıtlı]
+	</floater.string>
+	<floater.string name="linkset_is_non_volume_state">
+		[konkav]
+	</floater.string>
+	<floater.string name="linkset_is_restricted_non_volume_state">
+		[kısıtlı, konkav]
+	</floater.string>
+	<floater.string name="linkset_choose_use">
+		Bağlantı kümesi kullanımını seç...
+	</floater.string>
+	<panel>
+		<combo_box name="filter_by_linkset_use">
+			<combo_box.item label="Bağlantı kümesi kullanımına göre filtrele..." name="filter_by_linkset_use_none"/>
+			<combo_box.item label="Yürüyebilir" name="filter_by_linkset_use_walkable"/>
+			<combo_box.item label="Statik engel" name="filter_by_linkset_use_static_obstacle"/>
+			<combo_box.item label="Hareket ettirilebilir engel" name="filter_by_linkset_use_dynamic_obstacle"/>
+			<combo_box.item label="Maddi hacim" name="filter_by_linkset_use_material_volume"/>
+			<combo_box.item label="Hariç tutma hacmi" name="filter_by_linkset_use_exclusion_volume"/>
+			<combo_box.item label="Hareket ettirilebilir fantom" name="filter_by_linkset_use_dynamic_phantom"/>
+		</combo_box>
+		<button label="Uygula" name="apply_filters"/>
+		<button label="Temizle" name="clear_filters"/>
+		<scroll_list name="objects_scroll_list">
+			<scroll_list.columns label="Ad (kök prim)" name="name"/>
+			<scroll_list.columns label="Açıklama (kök prim)" name="description"/>
+			<scroll_list.columns label="Sahip" name="owner"/>
+			<scroll_list.columns label="Etki" name="land_impact"/>
+			<scroll_list.columns label="Mesafe" name="dist_from_you"/>
+			<scroll_list.columns label="Bağlantı kümesi kullanımı" name="linkset_use"/>
+			<scroll_list.columns label="% A" name="a_percent"/>
+			<scroll_list.columns label="% B" name="b_percent"/>
+			<scroll_list.columns label="% C" name="c_percent"/>
+			<scroll_list.columns label="% D" name="d_percent"/>
+		</scroll_list>
+		<text name="messaging_status">
+			Bağlantı kümeleri:
+		</text>
+		<button label="Listeyi yenile" name="refresh_objects_list"/>
+		<button label="Tümünü seç" name="select_all_objects"/>
+		<button label="Hiçbirini seçme" name="select_none_objects"/>
+	</panel>
+	<panel>
+		<check_box label="İşareti göster" name="show_beacon"/>
+		<button label="Al" name="take_objects"/>
+		<button label="Kopya al" name="take_copy_objects"/>
+		<button label="Beni ona ışınla" name="teleport_me_to_object"/>
+		<button label="İade Et" name="return_objects"/>
+		<button label="Sil" name="delete_objects"/>
+	</panel>
+	<panel>
+		<text name="walkability_coefficients_label">
+			Yürüyebilirlik:
+		</text>
+		<text name="edit_a_label">
+			A
+		</text>
+		<line_editor name="edit_a_value" tool_tip="A tipi karakterleri için yürüyebilirlik. Örnek karakter tipi humanoiddir."/>
+		<text name="edit_b_label">
+			B
+		</text>
+		<line_editor name="edit_b_value" tool_tip="B tipi karakterleri için yürüyebilirlik. Örnek karakter tipi yaratıktır."/>
+		<text name="edit_c_label">
+			C
+		</text>
+		<line_editor name="edit_c_value" tool_tip="C tipi karakterleri için yürüyebilirlik. Örnek karakter tipi mekaniktir."/>
+		<text name="edit_d_label">
+			D
+		</text>
+		<line_editor name="edit_d_value" tool_tip="D tipi karakterleri için yürüyebilirlik. Örnek karakter tipi diğerdir."/>
+		<button label="Değişiklikleri uygula" name="apply_edit_values"/>
+		<text name="suggested_use_a_label">
+			(Humanoid)
+		</text>
+		<text name="suggested_use_b_label">
+			(Yaratık)
+		</text>
+		<text name="suggested_use_c_label">
+			(Mekanik)
+		</text>
+		<text name="suggested_use_d_label">
+			(Diğer)
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_postcard.xml b/indra/newview/skins/default/xui/tr/floater_postcard.xml
deleted file mode 100644
index ef11c68afe..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_postcard.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="ANLIK GÖRÜNTÜYÜ E-POSTAYLA GÖNDER">
-	<floater.string name="default_subject">
-		SECOND_LIFE]&apos;dan posta kartı.
-	</floater.string>
-	<floater.string name="default_message">
-		Buna bakın!
-	</floater.string>
-	<floater.string name="upload_message">
-		Gönderiyor...
-	</floater.string>
-	<text name="to_label">
-		Alıcının E-postası:
-	</text>
-	<text name="from_label">
-		E-postanız:
-	</text>
-	<text name="name_label">
-		Adınız:
-	</text>
-	<text name="subject_label">
-		Konu:
-	</text>
-	<line_editor label="Konunuzu buraya yazın." name="subject_form"/>
-	<text name="msg_label">
-		İleti:
-	</text>
-	<text_editor name="msg_form">
-		İletinizi buraya yazın.
-	</text_editor>
-	<button label="İptal" name="cancel_btn"/>
-	<button label="Gönder" name="send_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_spellcheck.xml b/indra/newview/skins/default/xui/tr/floater_spellcheck.xml
new file mode 100644
index 0000000000..f5f0ba8fd9
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_spellcheck.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_floater" title="Yazım Denetimcisi Ayarları">
+	<check_box label="Yazım denetimcisini etkinleştir" name="spellcheck_enable"/>
+	<text name="spellcheck_main">
+		Ana sözlük :
+	</text>
+	<text label="Günlükler:" name="spellcheck_additional">
+		İlave sözlükler :
+	</text>
+	<text name="spellcheck_available">
+		Mevcut
+	</text>
+	<text name="spellcheck_active">
+		Etkin
+	</text>
+	<button label="Kaldır" name="spellcheck_remove_btn"/>
+	<button label="İçeri Aktar..." name="spellcheck_import_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml
new file mode 100644
index 0000000000..ded71cad40
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="spellcheck_import" title="Sözlüğü İçeri Aktar">
+	<button label="Gözat" label_selected="Gözat" name="dictionary_path_browse"/>
+	<button label="İçeri Aktar" name="ok_btn"/>
+	<button label="İptal" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_stats.xml b/indra/newview/skins/default/xui/tr/floater_stats.xml
index e3f54fc338..afce87bdaa 100644
--- a/indra/newview/skins/default/xui/tr/floater_stats.xml
+++ b/indra/newview/skins/default/xui/tr/floater_stats.xml
@@ -53,7 +53,13 @@
 				<stat_bar label="Nesneler" name="simobjects"/>
 				<stat_bar label="Etkin Nesneler" name="simactiveobjects"/>
 				<stat_bar label="Etkin Komut Dosyaları" name="simactivescripts"/>
+				<stat_bar label="Çalıştırılan Komut Dosyaları" name="simpctscriptsrun"/>
 				<stat_bar label="Komut Dosyası Etkinlikleri" name="simscripteps"/>
+				<stat_view label="Yol bulma" name="simpathfinding">
+					<stat_bar label="Yapay Zeka Adım Süresi" name="simsimaistepmsec"/>
+					<stat_bar label="Atlanan Siluet Adımları" name="simsimskippedsilhouettesteps"/>
+					<stat_bar label="Güncellenen Karakterler" name="simsimpctsteppedcharacters"/>
+				</stat_view>
 				<stat_bar label="Gelen Paketler" name="siminpps"/>
 				<stat_bar label="Giden Paketler" name="simoutpps"/>
 				<stat_bar label="Bekleyen Karşıdan Yüklemeler" name="simpendingdownloads"/>
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 67bf9071b3..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,6 +19,8 @@
 	<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="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"/>
 	<button label="Ekle" label_selected="Ekle" name="l_add_btn"/>
@@ -30,5 +32,4 @@
 	</scroll_list>
 	<button label="Tamam" label_selected="Tamam" name="Select"/>
 	<button label="İptal" label_selected="İptal" name="Cancel"/>
-	<check_box initial_value="true" label="Şimdi uygula" name="apply_immediate_check"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_tools.xml b/indra/newview/skins/default/xui/tr/floater_tools.xml
index b0c59ced42..4bf0372a8a 100644
--- a/indra/newview/skins/default/xui/tr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/tr/floater_tools.xml
@@ -150,6 +150,12 @@
 			<panel.string name="text modify info 4">
 				Bu nesneleri değiştiremezsiniz
 			</panel.string>
+			<panel.string name="text modify info 5">
+				Bir bölge sınırı üzerinden bu nesneyi değiştiremezsiniz
+			</panel.string>
+			<panel.string name="text modify info 6">
+				Bir bölge sınırı üzerinden bu nesneleri değiştiremezsiniz
+			</panel.string>
 			<panel.string name="text modify warning">
 				İzinleri ayarlamak için tüm nesneyi seçmelisiniz
 			</panel.string>
@@ -199,12 +205,12 @@
 				<combo_box.item label="Yakınlaştır" name="Zoom"/>
 			</combo_box>
 			<check_box label="Satılık:" name="checkbox for sale"/>
+			<spinner label="L$" name="Edit Cost"/>
 			<combo_box name="sale type">
 				<combo_box.item label="Kopyala" name="Copy"/>
 				<combo_box.item label="İçerik" name="Contents"/>
 				<combo_box.item label="Orijinal" name="Original"/>
 			</combo_box>
-			<spinner label="Fiyat: L$" name="Edit Cost"/>
 			<check_box label="Aramada göster" name="search_check" tool_tip="Kişiler arama sonuçlarında bu nesneyi görebilsin"/>
 			<panel name="perms_build">
 				<text name="perm_modify">
@@ -240,6 +246,11 @@
 					F:
 				</text>
 			</panel>
+			<panel name="pathfinding_attrs_panel">
+				<text name="pathfinding_attributes_label">
+					Yol bulma özellikleri:
+				</text>
+			</panel>
 		</panel>
 		<panel label="Nesne" name="Object">
 			<check_box label="Kilitli" name="checkbox locked" tool_tip="Nesnenin hareket ettirilmesini veya silinmesini engeller. Arzulanmayan düzenlemelerden kaçınmak için inşa işlemleri sırasında oldukça faydalıdır."/>
diff --git a/indra/newview/skins/default/xui/tr/floater_top_objects.xml b/indra/newview/skins/default/xui/tr/floater_top_objects.xml
index e726f583cc..19420c68e3 100644
--- a/indra/newview/skins/default/xui/tr/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/tr/floater_top_objects.xml
@@ -9,9 +9,6 @@
 	<floater.string name="scripts_score_label">
 		Süre
 	</floater.string>
-	<floater.string name="scripts_mono_time_label">
-		Mono Süre
-	</floater.string>
 	<floater.string name="top_colliders_title">
 		En Çok Çarpışanlar
 	</floater.string>
@@ -32,9 +29,10 @@
 		<scroll_list.columns label="Ad" name="name"/>
 		<scroll_list.columns label="Sahip" name="owner"/>
 		<scroll_list.columns label="Konum" name="location"/>
+		<scroll_list.columns label="Parsel" name="parcel"/>
 		<scroll_list.columns label="Süre" name="time"/>
-		<scroll_list.columns label="Mono Süre" name="mono_time"/>
 		<scroll_list.columns label="URL&apos;ler" name="URLs"/>
+		<scroll_list.columns label="Bellek (KB)" name="memory"/>
 	</scroll_list>
 	<text name="id_text">
 		Nesne Kimliği:
@@ -48,6 +46,10 @@
 		Sahip:
 	</text>
 	<button label="Filtrele" name="filter_owner_btn"/>
+	<text name="parcel_name_text">
+		Parsel:
+	</text>
+	<button label="Filtrele" name="filter_parcel_btn"/>
 	<button label="Seçileni İade Et" name="return_selected_btn"/>
 	<button label="Tümünü İade Et" name="return_all_btn"/>
 	<button label="Seçileni Devre Dışı Bırak" name="disable_selected_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_water.xml b/indra/newview/skins/default/xui/tr/floater_water.xml
deleted file mode 100644
index 66d6c1e30d..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_water.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="GELİŞMİŞ SU DÜZENLEYİCİ">
-	<floater.string name="WLDefaultWaterNames">
-		Varsayılan:Camsı:Havuz:çamurlu:İkinci Veba:YILAN!!!:Valdez
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		Su Ön Ayarları:
-	</text>
-	<button label="Yeni" label_selected="Yeni" name="WaterNewPreset"/>
-	<button label="Kaydet" label_selected="Kaydet" name="WaterSavePreset"/>
-	<button label="Sil" label_selected="Sil" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="AYARLAR" name="Settings">
-			<text name="BHText">
-				Su Sisi Rengi
-			</text>
-			<color_swatch name="WaterFogColor" tool_tip="Renk seçiciyi açmak için tıklayın"/>
-			<text name="WaterFogDensText">
-				Su Yoğunluk Üssü
-			</text>
-			<text name="WaterUnderWaterFogModText">
-				Sualtı Sis Değiştiricisi
-			</text>
-			<text name="BDensText">
-				Yansıma Dalgacığı Ölçeği
-			</text>
-			<slider label="1" name="WaterNormalScaleX"/>
-			<slider label="2" name="WaterNormalScaleY"/>
-			<slider label="3" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Fresnel Ölçeği
-			</text>
-			<text name="FresnelOffsetText">
-				Fresnel Dengeleyicisi
-			</text>
-			<text name="DensMultText">
-				Yukarıdan Kırılma Ölçeği
-			</text>
-			<text name="WaterScaleBelowText">
-				Aşağıdan Kırılma Ölçeği
-			</text>
-			<text name="MaxAltText">
-				Bulanıklaştırma Çarpanı
-			</text>
-		</panel>
-		<panel label="GÖRÜNTÜ" name="Waves">
-			<text name="BHText">
-				Büyük Dalga Yönü
-			</text>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Küçük Dalga Yönü
-			</text>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Normal Harita
-			</text>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_windlight_options.xml b/indra/newview/skins/default/xui/tr/floater_windlight_options.xml
deleted file mode 100644
index 6c5fba374c..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_windlight_options.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="GELİŞMİŞ GÖKYÜZÜ DÜZENLEYİCİ">
-	<floater.string name="WLDefaultSkyNames">
-		A-12:A-24:A-3:A-15:A-16.30:A-6:A-18:A-9:A-21:Barselona:Tipi:Mavi Gün Ortası:Sahilde Öğleden Sonra:Sahilde Gün Batımı:Varsayılan:Çölde Gün Batımı:Güzel Bir Gün:Kabarık Büyük Bulutlar:Sisli:Şık Şık:Şık Şık Şık:Dondurma:Hayalet:Uygunsuz Gerçekler:Gün Ortası1:Gün Ortası 2:Gün Ortası 3:Gün Ortası 4:Gece:Korsan:Mor:Denizcinin Keyfi:Saf Tensel
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		Gökyüzü Ön Ayarları:
-	</text>
-	<button label="Yeni" label_selected="Yeni" name="WLNewPreset"/>
-	<button label="Kaydet" label_selected="Kaydet" name="WLSavePreset"/>
-	<button label="Sil" label_selected="Sil" name="WLDeletePreset"/>
-	<button label="Gün Döngüsü Düzenleyici" label_selected="Gün Döngüsü Düzenleyici" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="ATMOSFER" name="Atmosphere">
-			<text name="BHText">
-				Mavi Ufuk
-			</text>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Puslu Ufuk
-			</text>
-			<text name="BDensText2">
-				Mavi Yoğunluğu
-			</text>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Pus Yoğunluğu
-			</text>
-			<text name="DensMultText">
-				Yoğunluk Çarpanı
-			</text>
-			<text name="WLDistanceMultText">
-				Mesafe Çarpanı
-			</text>
-			<text name="MaxAltText">
-				Maks İrtifa
-			</text>
-		</panel>
-		<panel label="AYDINLATMA" name="Lighting">
-			<text name="SLCText">
-				Güneş/Ay Rengi
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Güneş/Ay Konumu
-			</text>
-			<text name="WLAmbientText">
-				Ortam
-			</text>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Doğu Açısı
-			</text>
-			<text name="SunGlowText">
-				Güneş Parıltısı
-			</text>
-			<slider label="Odak" name="WLGlowB"/>
-			<slider label="Büyüklük" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				Sahne Gaması
-			</text>
-			<text name="WLStarText">
-				Yıldız Parlaklığı
-			</text>
-		</panel>
-		<panel label="BULUTLAR" name="Clouds">
-			<text name="WLCloudColorText">
-				Bulut Rengi
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Bulut XY/Yoğunluğu
-			</text>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Bulut Örtüsü
-			</text>
-			<text name="WLCloudScaleText">
-				Bulut Yüksekliği
-			</text>
-			<text name="WLCloudDetailText">
-				Bulut Ayrıntısı (XY/Yoğunluğu)
-			</text>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Bulut Kaydırma X
-			</text>
-			<check_box label="Kilitle" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				Bulut Kaydırma Y
-			</text>
-			<check_box label="Kilitle" name="WLCloudLockY"/>
-			<check_box label="Klasik Bulutlar Çiz" name="DrawClassicClouds"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/menu_bottomtray.xml b/indra/newview/skins/default/xui/tr/menu_bottomtray.xml
deleted file mode 100644
index f17c0f9971..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="Konuşma Düğmesi" name="EnableVoiceChat"/>
-	<menu_item_check label="Mimik düğmesi" name="ShowGestureButton"/>
-	<menu_item_check label="Taşıma düğmesi" name="ShowMoveButton"/>
-	<menu_item_check label="Görüntüleme düğmesi" name="ShowCameraButton"/>
-	<menu_item_check label="Anlık görüntü düğmesi" name="ShowSnapshotButton"/>
-	<menu_item_check label="İnşa Et düğmesi" name="ShowBuildButton"/>
-	<menu_item_check label="Arama düğmesi" name="ShowSearchButton"/>
-	<menu_item_check label="Harita düğmesi" name="ShowWorldMapButton"/>
-	<menu_item_check label="Mini-harita düğmesi" name="ShowMiniMapButton"/>
-	<menu_item_call label="Kes" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="Kopyala" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="Yapıştır" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="Sil" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="Tümünü Seç" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_mode_change.xml b/indra/newview/skins/default/xui/tr/menu_mode_change.xml
deleted file mode 100644
index 678950b633..0000000000
--- a/indra/newview/skins/default/xui/tr/menu_mode_change.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<toggleable_menu name="Mode Change">
-	<menu_item_check label="Temel" name="BasicMode"/>
-	<menu_item_check label="Gelişmiş" name="AdvancedMode"/>
-</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_object.xml b/indra/newview/skins/default/xui/tr/menu_object.xml
index d60c68e5e9..72f7adf016 100644
--- a/indra/newview/skins/default/xui/tr/menu_object.xml
+++ b/indra/newview/skins/default/xui/tr/menu_object.xml
@@ -3,6 +3,8 @@
 	<menu_item_call label="Dokun" name="Object Touch"/>
 	<menu_item_call label="Düzenle" name="Edit..."/>
 	<menu_item_call label="İnşa Et" name="Build"/>
+	<menu_item_call label="Bağlantı kümelerinde göster" name="show_in_linksets"/>
+	<menu_item_call label="Karakterlerde göster" name="show_in_characters"/>
 	<menu_item_call label="Aç" name="Open"/>
 	<menu_item_call label="Buraya Otur" name="Object Sit"/>
 	<menu_item_call label="Kalk" name="Object Stand Up"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_text_editor.xml b/indra/newview/skins/default/xui/tr/menu_text_editor.xml
index ffbf309e84..76c7b43e1e 100644
--- a/indra/newview/skins/default/xui/tr/menu_text_editor.xml
+++ b/indra/newview/skins/default/xui/tr/menu_text_editor.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Text editor context menu">
+	<menu_item_call label="(bilinmiyor)" name="Suggestion 1"/>
+	<menu_item_call label="(bilinmiyor)" name="Suggestion 2"/>
+	<menu_item_call label="(bilinmiyor)" name="Suggestion 3"/>
+	<menu_item_call label="(bilinmiyor)" name="Suggestion 4"/>
+	<menu_item_call label="(bilinmiyor)" name="Suggestion 5"/>
+	<menu_item_call label="Sözlüğe Ekle" name="Add to Dictionary"/>
+	<menu_item_call label="Yok saya ekle" name="Add to Ignore"/>
 	<menu_item_call label="Kes" name="Cut"/>
 	<menu_item_call label="Kopyala" name="Copy"/>
 	<menu_item_call label="Yapıştır" name="Paste"/>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index ea84e7d24b..7a7faf6ac4 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -26,6 +26,7 @@
 		<menu_item_call label="Tercihler..." name="Preferences"/>
 		<menu_item_call label="Araç çubuğu düğmeleri..." name="Toolbars"/>
 		<menu_item_call label="Tüm denetimleri sakla" name="Hide UI"/>
+		<menu_item_check label="BÜG Aksesuarlarını Göster" name="Show HUD Attachments"/>
 		<menu_item_call label="[APP_NAME]&apos;den Çık" name="Quit"/>
 	</menu>
 	<menu label="İletişim Kur" name="Communicate">
@@ -37,6 +38,7 @@
 		<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">
 		<menu_item_call label="Bu Yeri Yer İmlerine Ekle" name="Create Landmark Here"/>
@@ -122,6 +124,11 @@
 			<menu_item_call label="Komut Dosyalarını Çalışıyor Olarak Ayarla" name="Set Scripts to Running"/>
 			<menu_item_call label="Komut Dosyalarını Çalışmıyor Olarak Ayarla" name="Set Scripts to Not Running"/>
 		</menu>
+		<menu label="Yol bulma" name="Pathfinding">
+			<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>
 		<menu label="Seçenklr." name="Options">
 			<menu_item_check label="Gelişmiş İzinleri Göster" name="DebugPermissions"/>
 			<menu_item_check label="Sadece Nesnelerimi Seç" name="Select Only My Objects"/>
@@ -172,7 +179,6 @@
 			<menu_item_check label="Parçacıkları Gizle" name="Hide Particles"/>
 			<menu_item_check label="Seçilenleri Gizle" name="Hide Selected"/>
 			<menu_item_check label="Saydamı Vurgula" name="Highlight Transparent"/>
-			<menu_item_check label="BÜG Aksesuarlarını Göster" name="Show HUD Attachments"/>
 			<menu_item_check label="Fare Üzerinden Görünüm Artı İşaretini Göster" name="ShowCrosshairs"/>
 		</menu>
 		<menu label="İşleme Türleri" name="Rendering Types">
@@ -375,7 +381,6 @@
 				<menu_item_call label="Karakter Geometrisini Aç/Kapa" name="Toggle Character Geometry"/>
 				<menu_item_call label="Test Erkeği" name="Test Male"/>
 				<menu_item_call label="Test Dişisi" name="Test Female"/>
-				<menu_item_call label="PG&apos;yi Aç/Kapa" name="Toggle PG"/>
 				<menu_item_check label="Avatar Seçimine İzin Ver" name="Allow Select Avatar"/>
 			</menu>
 			<menu_item_call label="Parametreleri Varsayılana Zorla" name="Force Params to Default"/>
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index 1d7334be49..708e05062f 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -37,6 +37,12 @@
 			<button name="Help" text="$helptext"/>
 		</form>
 	</template>
+	<template name="okhelpignore">
+		<form>
+			<button name="OK_okhelpignore" text="$yestext"/>
+			<button name="Help_okhelpignore" text="$helptext"/>
+		</form>
+	</template>
 	<template name="yesnocancelbuttons">
 		<form>
 			<button name="Yes" text="$yestext"/>
@@ -367,6 +373,12 @@ Avatarınızın Kullanıcı adını girmeniz gerekmektedir.
 	<notification name="InvalidCredentialFormat">
 		Kullanıcı adı alanına Avatarınızın Kullanıcı adını ya da Ad ve Soyadını girmeniz ve yeniden oturum açmanız gerekmektedir.
 	</notification>
+	<notification name="InvalidGrid">
+		&apos;[GRID]&apos; geçerli bir ağ tanımlayıcısı değil.
+	</notification>
+	<notification name="InvalidLocationSLURL">
+		Başlangıç konumunuz için geçerli bir ağ belirtilmedi.
+	</notification>
 	<notification name="DeleteClassified">
 		&apos;[NAME]&apos; ilanı silinsin mi?
 Ödenen ücretler iade edilmeyecektir.
@@ -472,8 +484,8 @@ Nesne aralık dışında ya da silinmiş olabilir.
 		Aşağıdaki nedenden dolayı, derlenen komut dosyası kaydedilirken bir sorun oluştu: [REASON].  Lütfen komut dosyasını kaydetmeyi daha sonra tekrar deneyin.
 	</notification>
 	<notification name="StartRegionEmpty">
-		Hata. Başlangıç Bölgeniz tanımlanmamış.
-Lütfen Başlangıç Konumu kutusuna Bölge adını yazın ya da Son Konumum veya Ana Konumumu Başlangıç Konumu olarak seçin.
+		Başlangıç Bölgeniz tanımlanmamış.
+Lütfen Başlangıç Konumu kutusuna Bölge adını yazın ya da Son Bulunduğum Konum veya Ana Konumumu Başlangıç Konumu olarak seçin.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
 	<notification name="CouldNotStartStopScript">
@@ -600,6 +612,9 @@ En fazla [MAX] nesneyi birbirine bağlayabilirsiniz.
 
 Lütfen hiçbirinin kilitli olmadığından ve hepsine sahip olduğunuzdan emin olun.
 	</notification>
+	<notification name="CannotLinkPermanent">
+		Nesneler bölge sınırları üzerinden bağlantılandırılamaz.
+	</notification>
 	<notification name="CannotLinkDifferentOwners">
 		Nesnelerin hepsinin sahibi aynı olmadığı için nesneler birbirine bağlanamıyor.
 
@@ -978,6 +993,41 @@ Etkin grubunuz adına arazi satın almak için gerekli izne sahip değilsiniz.
 			<button name="Cancel" text="İptal"/>
 		</form>
 	</notification>
+	<notification label="Otomatik Yerine Koyma Listesine Ekle" name="AddAutoReplaceList">
+		Yeni liste için isim:
+		<form name="form">
+			<button name="SetName" text="Tamam"/>
+		</form>
+	</notification>
+	<notification label="Otomatik Yerine Koyma Listesinin Adını Değiştir" name="RenameAutoReplaceList">
+		&apos;[DUPNAME]&apos; adı kullanılıyor
+    Benzersiz yeni bir ad girin:
+		<form name="form">
+			<button name="ReplaceList" text="Mevcut Listenin Yerine Koy"/>
+			<button name="SetName" text="Yeni Adı Kullan"/>
+		</form>
+	</notification>
+	<notification name="InvalidAutoReplaceEntry">
+		Anahtar kelime tek bir kelime olmalıdır; değiştirme boş olamaz.
+	</notification>
+	<notification name="InvalidAutoReplaceList">
+		Bu değiştirme listesi geçerli değil.
+	</notification>
+	<notification name="SpellingDictImportRequired">
+		Bir dosya, ad ve dil belirtmelisiniz.
+	</notification>
+	<notification name="SpellingDictIsSecondary">
+		[DIC_NAME] sözlüğünde bir &quot;aff&quot; dosyası yok gibi görünüyor; bu da &quot;ikincil&quot; bir sözlük olduğu anlamına gelir.
+İlave bir sözlük olarak kullanılabilir; ancak Ana sözlüğünüz olarak kullanılamaz.
+
+Bkz. https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries
+	</notification>
+	<notification name="SpellingDictImportFailed">
+		Şu kopyalama yapılamıyor:
+    [FROM_NAME]
+    kaynağından şuraya:
+    [TO_NAME]
+	</notification>
 	<notification label="Dış Görünümü Kaydet" name="SaveOutfitAs">
 		Üzerimdekileri yeni bir Dış Görünüm olarak kaydet:
 		<form name="form">
@@ -1693,83 +1743,128 @@ Binlerce bölgeyi değiştirecek ve alan sunucusunu kesintiye uğratacaktır.
 		<usetemplate name="okcancelbuttons" notext="İptal" yestext="Tamam"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu Bölgeye giremezsiniz. Bu sorun yaşınızı doğrulamak için gerekli bilgilerin eksik olmasından kaynaklanabilir.
-
-Lütfen en son Görüntüleyicinin yüklü olduğunu doğrulayın ve bu erişkinlik seviyesi ile erişilecek alanlar hakkında ayrıntılı bilgi edinmek için Bilgi Bankası&apos;nı ziyaret edin.
+		Ziyaret etmeye çalıştığınız bölge, mevcut tercihlerinizi aşan içeriğe sahip.  Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu bölgeye giremezsiniz.
-
-Erişkinlik Seviyeleri hakkında daha fazla bilgi edinmek için Bilgi Bankası&apos;nı ziyaret etmek ister misiniz?
+	<notification name="RegionEntryAccessBlocked_AdultsOnlyContent">
+		Ziyaret etmeye çalıştığınız bölge [REGIONMATURITY] içeriğe sahip, buna sadece yetişkinler erişebilir.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Erişkinlik Seviyesi ile ilgili kısıtlamalardan dolayı bu Bölgeye giremiyorum" name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
+		<usetemplate ignoretext="Bölge geçişi: Ziyaret etmeye çalıştığınız bölge, sadece yetişkinlerin erişebileceği içeriğe sahip." name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Notify">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu bölgeye giremezsiniz.
+		Ziyaret etmeye çalıştığınız bölgede [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış.
+	</notification>
+	<notification name="RegionEntryAccessBlocked_NotifyAdultsOnly">
+		Ziyaret etmeye çalıştığınız bölge [REGIONMATURITY] içeriğe sahip, buna sadece yetişkinler erişebilir.
 	</notification>
 	<notification name="RegionEntryAccessBlocked_Change">
-		Erişkinlik Seviyesi tercihlerinizden dolayı bu Bölgeye giremezsiniz.
-
-İstenilen bölgeye girmek için, lütfen erişkinlik Seviyesi tercihinizi değiştirin. Bu tercih [REGIONMATURITY] içerikli alanlar içinde arama yapabilmenizi ve bu alanlara erişebilmenizi sağlayacak. Değişiklikleri geri almak için, Ben &gt; Tercihler &gt; Genel sekmesine gidin.
+		Ziyaret etmeye çalıştığınız bölgede [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış. Tercihlerinizi değiştirebilirsiniz veya iptal edebilirsiniz. Tercihleriniz değiştikten sonra bölgeye tekrar girmeye çalışabilirsiniz.
 		<form name="form">
-			<button name="OK" text="Tercihi Değiştir"/>
-			<button name="Cancel" text="Kapat"/>
-			<ignore name="ignore" text="Seçtiğim Seviye tercihleri bir bölgeye girmemi engelliyor"/>
+			<button name="OK" text="Tercihleri değiştirin"/>
+			<button name="Cancel" text="İptal"/>
+			<ignore name="ignore" text="Bölge geçişi: Ziyaret etmeye çalıştığınız bölge, mevcut tercihleriniz tarafından dışlanan içeriğe sahip."/>
 		</form>
 	</notification>
+	<notification name="RegionEntryAccessBlocked_PreferencesOutOfSync">
+		Tercihleriniz ile sunucu arasında senkronizasyon eksikliği olduğu için ışınlama işleminizde teknik sorunlar yaşanıyoruz.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked">
+		Ziyaret etmeye çalıştığınız bölge, mevcut tercihlerinizi aşan içeriğe sahip.  Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_AdultsOnlyContent">
+		Ziyaret etmeye çalıştığınız bölge [REGIONMATURITY] içeriğe sahip, buna sadece yetişkinler erişebilir.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
+		</url>
+		<usetemplate ignoretext="Işınla: Ziyaret etmeye çalıştığınız bölge, sadece yetişkinlerin erişebileceği içeriğe sahip." name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Notify">
+		Ziyaret etmeye çalıştığınız bölgede [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_NotifyAdultsOnly">
+		Ziyaret etmeye çalıştığınız bölge [REGIONMATURITY] içeriğe sahip, buna sadece yetişkinler erişebilir.
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_ChangeAndReTeleport">
+		Ziyaret etmeye çalıştığınız bölgede [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış. Tercihlerinizi değiştirebilirsiniz ve ışınlamaya devam edebilirsiniz veya bu ışınlama işlemini iptal edebilirsiniz.
+		<form name="form">
+			<button name="OK" text="Değiştir ve devam et"/>
+			<button name="Cancel" text="İptal"/>
+			<ignore name="ignore" text="Işınlama (yeniden başlatılabilir): Ziyaret etmeye çalıştığınız bölge, mevcut tercihleriniz tarafından dışlanan içeriğe sahip."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_Change">
+		Ziyaret etmeye çalıştığınız bölgede [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış. Tercihlerinizi değiştirebilirsiniz veya ışınlamayı iptal edebilirsiniz. Tercihleriniz değiştikten sonra ışınlamayı tekrar yapmaya kalkışmanız gerekecek.
+		<form name="form">
+			<button name="OK" text="Tercihleri değiştirin"/>
+			<button name="Cancel" text="İptal"/>
+			<ignore name="ignore" text="Işınlama (yeniden başlatılamaz): Ziyaret etmeye çalıştığınız bölge, mevcut tercihleriniz tarafından dışlanan içeriğe sahip."/>
+		</form>
+	</notification>
+	<notification name="TeleportEntryAccessBlocked_PreferencesOutOfSync">
+		Tercihleriniz ile sunucu arasında senkronizasyon eksikliği olduğu için ışınlama işleminizde teknik sorunlar yaşanıyoruz.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
 	<notification name="PreferredMaturityChanged">
-		Erişkinlik Seviyesi tercihiniz artık [RATING].
+		[RATING] içeriğine sahip bir bölgeyi ziyaret edeceğiniz hakkında başka bildirim almayacaksınız.  Daha sonra menü çubuğunda Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
+	<notification name="MaturityChangeError">
+		Şu anda [PREFERRED_MATURITY] içeriğini görüntüleyecek şekilde tercihlerinizi değiştiremedik.  Tercihleriniz, [ACTUAL_MATURITY] içeriğini görüntüleyecek şekilde sıfırlandı.  Menü çubuğunda Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi tekrar değiştirmeyi deneyebilirsiniz.
+		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu arazi üzerinde hak talebinde bulunamazsınız. Bu sorun yaşınızı doğrulamak için gerekli bilgilerin eksik olmasından kaynaklanabilir.
-
-Lütfen en son Görüntüleyicinin yüklü olduğunu doğrulayın ve bu erişkinlik seviyesi ile erişilecek alanlar hakkında ayrıntılı bilgi edinmek için Bilgi Bankası&apos;nı ziyaret edin.
+		Hak talebinde bulunduğunuz arazinin erişkinlik seviyesi mevcut tercihlerinizi aşıyor.  Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu arazi üzerinde hak talebinde bulunamazsınız.
-
-Erişkinlik Seviyeleri hakkında daha fazla bilgi edinmek için Bilgi Bankası&apos;nı ziyaret etmek ister misiniz?
+	<notification name="LandClaimAccessBlocked_AdultsOnlyContent">
+		Bu arazi üzerinde sadece yetişkinler hak talebinde bulunabilir.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Erişkinlik Seviyesi ile ilgili kısıtlandırmalardan dolayı bu Arazi üzerinde hak talebinde bulunamıyorum." name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
+		<usetemplate ignoretext="Bu arazi üzerinde sadece yetişkinler hak talebinde bulunabilir." name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
 	</notification>
 	<notification name="LandClaimAccessBlocked_Notify">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu arazi üzerinde hak talebinde bulunamazsınız.
+		Hak talebinde bulunduğunuz arazide [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış.
+	</notification>
+	<notification name="LandClaimAccessBlocked_NotifyAdultsOnly">
+		Hak talebinde bulunduğunuz arazi [REGIONMATURITY] içeriğe sahip, buna sadece yetişkinler erişebilir.
 	</notification>
 	<notification name="LandClaimAccessBlocked_Change">
-		Erişkinlik Seviyesi tercihinizden dolayı bu arazi üzerinde hak talebinde bulunamazsınız.
-
-Erişkinlik Seviyesi tercihinizi şimdi yükseltmek ve araziye girebilmek için &apos;Tercihi Değiştir&apos; seçeneğini tıklatabilirsiniz. Böylece [REGIONMATURITY] içerikli alanlar içinde arama yapabilecek ve bu alanlara erişebileceksiniz. İleride bu ayarı eski haline döndürmek isterseniz, Ben &gt; Tercihler &gt; Genel sekmesine gidin.
-		<usetemplate ignoretext="Seçtiğim Seviye tercihi Arazi üzerinde hak talebinde bulunmamı engelliyor" name="okcancelignore" notext="Kapat" yestext="Tercihi Değiştir"/>
+		Hak talebinde bulunduğunuz arazide [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış. Tercihlerinizi değiştirebilirsiniz, sonra arazi üzerinde tekar hak talebinde bulunabilirsiniz.
+		<form name="form">
+			<button name="OK" text="Tercihleri değiştirin"/>
+			<button name="Cancel" text="İptal"/>
+			<ignore name="ignore" text="Hak talebinde bulunduğunuz arazi, mevcut tercihleriniz tarafından dışlanan içeriğe sahip."/>
+		</form>
 	</notification>
 	<notification name="LandBuyAccessBlocked">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu araziyi satın alamazsınız. Bu sorun yaşınızı doğrulamak için gerekli bilgilerin eksik olmasından kaynaklanabilir.
-
-Lütfen en son Görüntüleyicinin yüklü olduğunu doğrulayın ve bu erişkinlik seviyesi ile erişilecek alanlar hakkında ayrıntılı bilgi edinmek için Bilgi Bankası&apos;nı ziyaret edin.
+		Satın almaya çalıştığınız arazinin erişkinlik seviyesi mevcut tercihlerinizi aşıyor.  Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu araziyi satın alamazsınız.
-
-Erişkinlik Seviyeleri hakkında daha fazla bilgi edinmek için Bilgi Bankası&apos;nı ziyaret etmek ister misiniz?
+	<notification name="LandBuyAccessBlocked_AdultsOnlyContent">
+		Bu araziyi sadece yetişkinler satın alabilir.
 		<url name="url">
 			http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview
 		</url>
-		<usetemplate ignoretext="Erişkinlik Seviyesi ile ilgili kısıtlandırmalardan dolayı bu Araziyi satın alamıyorum" name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
+		<usetemplate ignoretext="Bu araziyi sadece yetişkinler satın alabilir." name="okcancelignore" notext="Kapat" yestext="Bilgi Bankası&apos;na Git"/>
 	</notification>
 	<notification name="LandBuyAccessBlocked_Notify">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu araziyi satın alamazsınız.
+		Satın almaya çalıştığınız arazide [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış.
+	</notification>
+	<notification name="LandBuyAccessBlocked_NotifyAdultsOnly">
+		Ziyaret etmeye çalıştığınız arazi [REGIONMATURITY] içeriğe sahip, buna sadece yetişkinler erişebilir.
 	</notification>
 	<notification name="LandBuyAccessBlocked_Change">
-		Erişkinlik Seviyesi tercihinizden dolayı bu araziyi satın alamazsınız.
-
-Erişkinlik Seviyesi tercihinizi şimdi yükseltmek ve araziye girebilmek için &apos;Tercihi Değiştir&apos; seçeneğini tıklatabilirsiniz. Böylece [REGIONMATURITY] içerikli alanlar içinde arama yapabilecek ve bu alanlara erişebileceksiniz. İleride bu ayarı eski haline döndürmek isterseniz, Ben &gt; Tercihler &gt; Genel sekmesine gidin.
-		<usetemplate ignoretext="Seçtiğim Seviye tercihi Araziyi satın almamı engelliyor" name="okcancelignore" notext="Kapat" yestext="Tercihi Değiştir"/>
+		Satın almaya çalıştığınız arazide [REGIONMATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGIONMATURITY] içeriğini dışlayacak şekilde ayarlanmış. Tercihlerinizi değiştirebilirsiniz, sonra araziyi tekrar satın almaya çalışabilirsiniz.
+		<form name="form">
+			<button name="OK" text="Tercihleri değiştirin"/>
+			<button name="Cancel" text="İptal"/>
+			<ignore name="ignore" text="Satın almaya çalıştığınız arazi, mevcut tercihleriniz tarafından dışlanan içeriğe sahip."/>
+		</form>
 	</notification>
 	<notification name="TooManyPrimsSelected">
 		Çok fazla prim seçilmiş. Lütfen [MAX_PRIM_COUNT] ya da daha az prim seçin ve tekrar deneyin
@@ -1823,10 +1918,9 @@ Erişkinlik Seviyesi tercihinizi şimdi yükseltmek ve araziye girebilmek için
 		</form>
 	</notification>
 	<notification label="Bölgenin Erişkinlik Seviyesi Değişti" name="RegionMaturityChange">
-		Bu bölgenin erişkinlik seviyesi güncellendi.
-Değişikliğin harita üzerine yansıtılması biraz zaman alabilir.
-
-Yetişkin bölgelerine girebilmek için, Sakinlerin yaş doğrulama ya da ödeme doğrulama yoluyla Doğrulanmış bir Hesaba sahip olmaları gerekmektedir.
+		Bu bölgenin yetişkin içerik seviyesi değişti.
+Bu değişikliğin harita üzerine yansıtılması biraz zaman alabilir.
+		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
 	<notification label="Sesli Sohbet Sürüm Uyumsuzluğu" name="VoiceVersionMismatch">
 		[APP_NAME] uygulamasının bu sürümü bu bölgedeki Sesli Sohbet özelliği ile uyumlu değil. Sesli Sohbet özelliğinin düzgün bir şekilde çalışabilmesi için [APP_NAME] uygulamasını güncellemeniz gerekiyor.
@@ -2116,14 +2210,11 @@ Diğer kişilerin bu konuma kolayca erişmesini sağlamak için bu adrese bir we
 		<usetemplate ignoretext="Görünümümü düzenlerken oluşturduğum giysiyi giy" name="okcancelignore" notext="Hayır" yestext="Evet"/>
 	</notification>
 	<notification name="NotAgeVerified">
-		Second Life içinde yetişkinlere yönelik içeriğe ve bölgelere erişmek için en az 18 yaşında olmalısınız. 18 yaşından büyük olduğunuzu onaylamak için lütfen yaş doğrulama sayfamızı ziyaret edin. 
-Bu adımda web tarayıcınızın başlatılacağına dikkat edin.
-
-[_URL]
-		<url name="url">
-			https://secondlife.com/my/account/verification.php
-		</url>
-		<usetemplate ignoretext="Yaşımı doğrulatmadım" name="okcancelignore" notext="İptal" yestext="Yaş Doğrulamasına Git"/>
+		Ziyaret etmeye çalıştığınız konum, yaşı 18 ve üzeri olan sakinlere kısıtlanmıştır.
+		<usetemplate ignoretext="Yaş kısıtı olan alanları ziyaret etmek için yaşım yeterli değil." name="okignore" yestext="Tamam"/>
+	</notification>
+	<notification name="NotAgeVerified_Notify">
+		Konum, 18 veya üzeri bir yaşta olanlara kısıtlanmıştır.
 	</notification>
 	<notification name="Cannot enter parcel: no payment info on file">
 		Bu alanı ziyaret edebilmek için ödeme bilgilerinizin kayıtlı olması gerekir. [SECOND_LIFE] web sitesine gitmek ve bunu ayarlamak istiyor musunuz?
@@ -2184,7 +2275,7 @@ Bu adımda web tarayıcınızın başlatılacağına dikkat edin.
 		Terrain.raw karşıdan yüklendi
 	</notification>
 	<notification name="GestureMissing">
-		Hmm. [NAME] mimiği veri tabanında yok.
+		[NAME] mimiği veri tabanında yok.
 	</notification>
 	<notification name="UnableToLoadGesture">
 		[NAME] mimiği karşıya yüklenemiyor.
@@ -2385,6 +2476,23 @@ Burada uçamazsınız.
 	<notification name="NoBuild">
 		Bu alanda inşa etme özelliği devre dışı. Burada nesne inşa edemez ve oluşturamazsınız.
 	</notification>
+	<notification name="PathfindingDirty">
+		Bu bölgede bekleyen yol bulma değişiklikleri var.  Eğer oluşturma haklarına sahipseniz, “Bölgeyi yeniden kaydet” düğmesine tıklayarak bölgeyi yeniden kaydedebilirsiniz.
+	</notification>
+	<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"/>
+	</notification>
 	<notification name="SeeAvatars">
 		Bu parsel, avatarları ve metin sohbetini başka bir parselden saklar.   Parselin dışındaki diğer sakinleri göremezsiniz, dışardakiler de sizi göremez.  0. kanaldaki normal metin sohbeti de engellenmiştir.
 	</notification>
@@ -2403,9 +2511,7 @@ Arazi sahibine ait olanlar dışında hiçbir komut dosyası çalışmayacak.
 		İçinde bulunduğunuz Bölgede sadece kamuya ait araziler üzerinde hak talebinde bulunabilirsiniz.
 	</notification>
 	<notification name="RegionTPAccessBlocked">
-		Erişkinlik Seviyesi ayarlarınızdan dolayı bu Bölgeye giremezsiniz. Yaşınızı doğrulatmanız ve/veya en son Görüntüleyici&apos;yi yüklemeniz gerekebilir.
-
-Lütfen bu erişkinlik Seviyesi ile erişilecek alanlar hakkında ayrıntılı bilgi edinmek için Bilgi Bankası&apos;na gidin.
+		Ziyaret etmeye çalıştığınız bölge, mevcut tercihlerinizi aşan içeriğe sahip.  Ben &gt; Tercihler &gt; Genel sekmesini kullanarak tercihlerinizi değiştirebilirsiniz.
 	</notification>
 	<notification name="URBannedFromRegion">
 		Bu bölgeye erişiminiz yasaklandı.
@@ -2416,11 +2522,11 @@ Lütfen bu erişkinlik Seviyesi ile erişilecek alanlar hakkında ayrıntılı b
 	<notification name="ImproperPaymentStatus">
 		Bu bölgeye girmek için gerekli ödeme durumuna sahip değilsiniz.
 	</notification>
-	<notification name="MustGetAgeRgion">
-		Bu bölgeye girebilmek için yaş doğrulamanızın yapılmış olması gerekir.
+	<notification name="MustGetAgeRegion">
+		Bu bölgeye girebilmek için 18 veya üzeri bir yaşta olmanız gerekir.
 	</notification>
 	<notification name="MustGetAgeParcel">
-		Bu parsele girebilmek için yaş doğrulamanızın yapılmış olması gerekir.
+		Bu parsele girebilmek için 18 veya üzeri bir yaşta olmanız gerekir.
 	</notification>
 	<notification name="NoDestRegion">
 		Seçili hedef bölge yok.
@@ -2522,12 +2628,33 @@ Lütfen biraz sonra tekrar deneyin.
 	<notification name="TeleportOffered">
 		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti:
 
-[MESSAGE] - [MATURITY_STR] &lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt;
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
 		<form name="form">
 			<button name="Teleport" text="Işınla"/>
 			<button name="Cancel" text="İptal"/>
 		</form>
 	</notification>
+	<notification name="TeleportOffered_MaturityExceeded">
+		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Bu bölgede [REGION_CONTENT_MATURITY] içeriği mevcut, ama mevcut tercihleriniz [REGION_CONTENT_MATURITY] içeriğini dışlayacak şekilde ayarlanmış durumda.  Tercihlerinizi değiştirebilirsiniz ve ışınlamaya devam edebilirsiniz veya bu ışınlama işlemini iptal edebilirsiniz.
+		<form name="form">
+			<button name="Teleport" text="Değiştir ve Devam Et"/>
+			<button name="Cancel" text="İptal"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered_MaturityBlocked">
+		[NAME_SLURL] size kendi konumuna ışınlanmayı teklif etti:
+
+“[MESSAGE]”
+&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
+
+Ancak bu bölge sadece yetişkinlerin erişebileceği içeriğe sahip.
+	</notification>
 	<notification name="TeleportOfferSent">
 		Işınlanma teklifi [TO_NAME] adlı kişiye gönderildi
 	</notification>
@@ -2931,6 +3058,10 @@ Lütfen ağ ve güvenlik duvarı ayarlarınızı kontrol edin.
 		( [EXISTENCE] saniyedir hayatta )
  &apos;[BODYREGION]&apos; için [RESOLUTION] çözünürlükte kaydedilmiş bir dokuyu [TIME] saniye sonra yerel olarak güncellediniz.
 	</notification>
+	<notification name="LivePreviewUnavailable">
+		Kopyalanamaz ve/veya aktarılamaz olduğu için bu dokunun bir önizlemesini görüntüleyemiyoruz.
+		<usetemplate ignoretext="Kopyalanamayan ve/veya aktarılamayan dokular için Canlı Önizleme modu mevcut olmayınca beni uyar" name="okignore" yestext="Tamam"/>
+	</notification>
 	<notification name="ConfirmLeaveCall">
 		Bu aramadan çıkmak istediğinize emin misiniz?
 		<usetemplate ignoretext="Aramadan çıkmadan önce doğrulama iste" name="okcancelignore" notext="Hayır" yestext="Evet"/>
@@ -3102,6 +3233,23 @@ Görünümünüzü döndürmek için dünya üzerindeki herhangi bir yeri tıkla
 		Bu eylem tüm menü öğelerini ve düğmelerini gizler. Bunları geri almak için [SHORTCUT] üzerine tekrar tıklayın.
 		<usetemplate ignoretext="KA&apos;ni gizlemeden önce onayla" name="okcancelignore" notext="İptal" yestext="Tamam"/>
 	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestricted">
+		Seçilen bazı bağlantı kümeleri, bağlantı kümesi için izin kısıtlamaları nedeniyle &apos;[REQUESTED_TYPE]&apos; olarak ayarlanamıyor.  Bunun yerine bu bağlantı kümeleri &apos;[RESTRICTED_TYPE]&apos; olarak ayarlanacak.
+		<usetemplate ignoretext="Seçilen bazı bağlantı kümeleri, bağlantı kümesi için izin kısıtlamaları nedeniyle ayarlanamıyor." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnVolume">
+		Seçilen bazı bağlantı kümeleri &apos;[REQUESTED_TYPE]&apos; olarak ayarlanamaz, çünkü şekil konveks değil.
+		<usetemplate ignoretext="Seçilen bazı bağlantı kümeleri ayarlanamaz, çünkü şekil konveks değil." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PathfindingLinksets_SetLinksetUseMismatchOnRestrictedAndVolume">
+		Seçilen bazı bağlantı kümeleri, bağlantı kümesi için izin kısıtlamaları nedeniyle &apos;[REQUESTED_TYPE]&apos; olarak ayarlanamıyor.  Bunun yerine bu bağlantı kümeleri &apos;[RESTRICTED_TYPE]&apos; olarak ayarlanacak.
+ Seçilen bazı bağlantı kümeleri &apos;[REQUESTED_TYPE]&apos; olarak ayarlanamaz, çünkü şekil konveks değil. Bu bağlantı kümelerinin kullanım tipleri değişmez.
+		<usetemplate ignoretext="Seçilen bazı bağlantı kümeleri, bağlantı kümesi için izin kısıtlamaları nedeniyle ve şekil konveks olmadığı için ayarlanamıyor." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
+	<notification name="PathfindingLinksets_ChangeToFlexiblePath">
+		Seçilen nesne navigasyon örgüsünü etkiliyor.  Bunu bir Esnek Yol olarak değiştirirseniz, navigasyon örgüsünden çıkartmış olursunuz.
+		<usetemplate ignoretext="Seçilen nesne navigasyon örgüsünü etkiliyor.  Bunu bir Esnek Yol olarak değiştirirseniz, navigasyon örgüsünden çıkartmış olursunuz." name="okcancelignore" notext="İptal" yestext="Tamam"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		[APP_NAME] uygulaması için gerekli donanım gereksinimlerine sahip olmadığınız görünüyor. [APP_NAME] çoklu doku desteği sunan bir OpenGL grafik kartı gerektiriyor. Eğer grafik kartınız bu özellikteyse, grafik kartınızın en son sürücülerine ve işletim sisteminiz için gerekli Service Pack ve yamalara sahip olup olmadığınızı kontrol etmeyi deneyebilirsiniz.
 
@@ -3138,4 +3286,12 @@ Bundan sonra bu dosya için güncellemeler devre dışı bırakılacak.
 		Geçersiz veya okunamayan bir görüntü dosyası [FNAME] eklenmeye kalkışıldı, ancak dosya açılamadı veya şifresi çözülemedi.
 Girişim iptal edildi.
 	</notification>
+	<notification name="PathfindingReturnMultipleItems">
+		[NUM_ITEMS] öğeyi iade ediyorsunuz.  Devam etmek istediğinize emin misiniz?
+		<usetemplate ignoretext="Birden çok öğeyi iade etmek istediğinize emin misiniz?" name="okcancelignore" notext="Hayır" yestext="Evet"/>
+	</notification>
+	<notification name="PathfindingDeleteMultipleItems">
+		[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>
 </notifications>
diff --git a/indra/newview/skins/default/xui/tr/panel_bottomtray.xml b/indra/newview/skins/default/xui/tr/panel_bottomtray.xml
deleted file mode 100644
index 26118d8b39..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Mikrofonu açar/kapatır"/>
-	<string name="VoiceControlBtnToolTip" value="Ses kontrol panelini gösterir/gizler"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Konuş" label_selected="Konuş" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Mimik" name="Gesture" tool_tip="Mimikleri gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="Hareket Et" name="movement_btn" tool_tip="Hareket kontrollerini gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="Görünüm" name="camera_btn" tool_tip="Kamera kontrollerini gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button name="snapshots" tool_tip="Anlık görüntü al"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="İnşa Et" name="build_btn" tool_tip="İnşa Et Aracını gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Ara" name="search_btn" tool_tip="Aramayı gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Harita" name="world_map_btn" tool_tip="Dünya Haritasını gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Mini-Harita" name="mini_map_btn" tool_tip="Mini Haritayı gösterir/gizler"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Sohbetler"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Bildirimler"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_group_invite.xml b/indra/newview/skins/default/xui/tr/panel_group_invite.xml
index 9b0c7f799a..4ba5761edb 100644
--- a/indra/newview/skins/default/xui/tr/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/tr/panel_group_invite.xml
@@ -9,6 +9,9 @@
 	<panel.string name="already_in_group">
 		Seçtiğiniz bazı Sakinler zaten grupta yer alıyor, bu yüzden bunlara davetiye gönderilmedi.
 	</panel.string>
+	<panel.string name="invite_selection_too_large">
+		Gönderilmeyen Grup Davetiyeleri: Çok fazla Sakin seçilmiş. Grup Davetiyelerinde talep başına 100 sınırı vardır.
+	</panel.string>
 	<text name="help_text">
 		Grubunuza davet etmek için birden fazla Sakin seçebilirsiniz. Başlamak için &quot;Sakin Seçiciyi Aç&quot; üzerine tıklayın.
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml
new file mode 100644
index 0000000000..78cb8bcc02
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="panel_navmesh_rebake">
+	<button label="Bölgeyi yeniden kaydet" name="navmesh_btn" tool_tip="Bölgenin navigasyon örgüsünü tekrar kaydetmek için tıkla."/>
+	<button label="Yeniden kaydetme talep ediliyor" name="navmesh_btn_sending" tool_tip="Yeniden kaydetme talebi sunucuya gönderiliyor."/>
+	<button label="Bölge yeniden kaydediliyor" name="navmesh_btn_baking" tool_tip="Bölge yeniden kaydediliyor.  Tamamlandığında bu düğme kaybolacak."/>
+</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 9caf95a122..231e8fc5fe 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
@@ -29,5 +29,7 @@
 	<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="Sohbet Çevirisi Ayarları" name="ok_btn"/>
+	<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"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_debug.xml b/indra/newview/skins/default/xui/tr/panel_region_debug.xml
index 6e15e0f6f6..3f101a1824 100644
--- a/indra/newview/skins/default/xui/tr/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_debug.xml
@@ -30,5 +30,5 @@
 	<button label="En Çok Çarpışanlar..." name="top_colliders_btn" tool_tip="En çok potansiyel çarpışma yaşayan nesnelerin listesi"/>
 	<button label="En Çok Komut Dsy. Çalştr...." name="top_scripts_btn" tool_tip="Komut dosyalarını çalıştırırken en çok zaman harcayan nesnelerin listesi"/>
 	<button label="Bölgeyi Yeniden Başlat" name="restart_btn" tool_tip="2 dakikalık bir geri sayımdan sonra bölgeyi yeniden başlat"/>
-	<button label="Yeniden Başlatmayı Ertele" name="cancel_restart_btn" tool_tip="Bölgenin yeniden başlatılmasını 1 saat ertele"/>
+	<button label="Yeniden Başlatmayı İptal Et" name="cancel_restart_btn" tool_tip="Bölgenin yeniden başlatılmasını 1 saat ertele"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_estate.xml b/indra/newview/skins/default/xui/tr/panel_region_estate.xml
index f1df13df61..4a9028643f 100644
--- a/indra/newview/skins/default/xui/tr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/tr/panel_region_estate.xml
@@ -23,7 +23,7 @@
 		Sadece şu Sakinlere erişim izni verin:
 	</text>
 	<check_box label="Ödeme bilgileri kayıtlı" name="limit_payment" tool_tip="Sakinlerin bu gayrimenkule erişebilmesi için ödeme bilgilerinin kayıtlı olması gerekir.  Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
-	<check_box label="Yaş doğrulaması yapılmış" name="limit_age_verified" tool_tip="Sakinlerin bu gayrimenkule erişebilmesi için yaş doğrulamalarının yapılmış olması gerekir. Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
+	<check_box label="18 veya üzeri bir yaşta" name="limit_age_verified" tool_tip="Sakinlerin bu gayrimenkule erişebilmesi için 18 veya üzeri bir yaşta olmaları gerekir. Daha fazla bilgi için [SUPPORT_SITE] adresini ziyaret edin."/>
 	<check_box label="Sesli Sohbete İzin Ver" name="voice_chat_check"/>
 	<check_box label="Doğrudan Işınlamaya İzin Ver" name="allow_direct_teleport"/>
 	<button label="Uygula" name="apply_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_region_texture.xml b/indra/newview/skins/default/xui/tr/panel_region_texture.xml
deleted file mode 100644
index fd7ca2a893..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_region_texture.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Zemin Dokuları" name="Textures">
-	<text name="region_text_lbl">
-		Bölge:
-	</text>
-	<text name="region_text">
-		bilinmiyor
-	</text>
-	<text name="detail_texture_text">
-		Yüzey Dokuları (512x512, 24 bit .tga dosyalar gerektirir)
-	</text>
-	<text name="height_text_lbl">
-		1 (Düşük)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (Yüksek)
-	</text>
-	<text name="height_text_lbl5">
-		Doku Yükselti Aralıkları
-	</text>
-	<text name="height_text_lbl6">
-		Kuzeybatı
-	</text>
-	<text name="height_text_lbl7">
-		Kuzeydoğu
-	</text>
-	<spinner label="Düşük" name="height_start_spin_1"/>
-	<spinner label="Düşük" name="height_start_spin_3"/>
-	<spinner label="Yüksek" name="height_range_spin_1"/>
-	<spinner label="Yüksek" name="height_range_spin_3"/>
-	<text name="height_text_lbl8">
-		Güneybatı
-	</text>
-	<text name="height_text_lbl9">
-		Güneydoğu
-	</text>
-	<spinner label="Düşük" name="height_start_spin_0"/>
-	<spinner label="Düşük" name="height_start_spin_2"/>
-	<spinner label="Yüksek" name="height_range_spin_0"/>
-	<spinner label="Yüksek" name="height_range_spin_2"/>
-	<text name="height_text_lbl10">
-		Bu değerler yukarıdaki dokular için karışım aralığını temsil eder.
-	</text>
-	<text name="height_text_lbl11">
-		Metre cinsinden olan bu değerler için, DÜŞÜK değer 1. Dokunun MAKSİMUM yüksekliği, YÜKSEK değer ise 4. Dokunun MİNİMUM yüksekliğidir.
-	</text>
-	<button label="Uygula" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_side_tray.xml b/indra/newview/skins/default/xui/tr/panel_side_tray.xml
deleted file mode 100644
index 97bca38a50..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="Yan Çubuğu Aç/Kapa." name="sidebar_openclose" tab_title="Yan Çubuğu Aç/Kapa"/>
-	<sidetray_tab description="Ana konum." name="sidebar_home" tab_title="Ana konum">
-		<panel label="ana konum" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="Kamuya açık profilinizi ve Favorilerinizi düzenleyin." name="sidebar_me" tab_title="Profilim">
-		<panel_container name="panel_container">
-			<panel label="Ben" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Yakındaki arkadaşlarınızı, irtibatları ve kişileri bulun." name="sidebar_people" tab_title="Kişiler">
-		<panel_container name="panel_container">
-			<panel label="Grup Profili" name="panel_group_info_sidetray"/>
-			<panel label="Engellenmiş Sakinler ve Nesneler" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Gitmek istediğiniz yerleri ve daha önce uğradığınız yerleri bulun." label="Yerler" name="sidebar_places" tab_title="Yerler">
-		<panel label="Yerler" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="Envanterinize göz atın." name="sidebar_inventory" tab_title="Envanterim">
-		<panel label="Envanteri Düzenle" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="Görünümünüzü değiştirin." name="sidebar_appearance" tab_title="Görünümüm">
-		<panel label="Görünümü Düzenle" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml b/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml
index 81291a431c..86b684c497 100644
--- a/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_item_info.xml
@@ -3,6 +3,9 @@
 	<panel.string name="unknown">
 		(bilinmiyor)
 	</panel.string>
+	<panel.string name="unknown_multiple">
+		(bilinmiyor veya birden çok değer)
+	</panel.string>
 	<panel.string name="public">
 		(kamuya açık)
 	</panel.string>
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 2fa6281f05..b0b9ab7716 100644
--- a/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
+++ b/indra/newview/skins/default/xui/tr/sidepanel_task_info.xml
@@ -18,6 +18,12 @@
 	<panel.string name="text modify info 4">
 		Bu nesneleri değiştiremezsiniz
 	</panel.string>
+	<panel.string name="text modify info 5">
+		Bir bölge sınırı üzerinden bu nesneyi değiştiremezsiniz
+	</panel.string>
+	<panel.string name="text modify info 6">
+		Bir bölge sınırı üzerinden bu nesneleri değiştiremezsiniz
+	</panel.string>
 	<panel.string name="text modify warning">
 		Bu nesne bağlantılı parçalara sahip
 	</panel.string>
@@ -95,6 +101,9 @@
 		</combo_box>
 		<spinner label="Fiyat: L$" name="Edit Cost"/>
 		<check_box label="Aramada göster" name="search_check" tool_tip="Kişiler arama sonuçlarında bu nesneyi görebilsin"/>
+		<text name="pathfinding_attributes_label">
+			Yol bulma özellikleri:
+		</text>
 		<text name="B:">
 			B:
 		</text>
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 1be0970e4e..eed65f8c75 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -1003,6 +1003,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="script_files">
 		Komut Dosyaları
 	</string>
+	<string name="dictionary_files">
+		Sözlükler
+	</string>
 	<string name="AvatarSetNotAway">
 		Uzakta Değil
 	</string>
@@ -3861,6 +3864,12 @@ Bu iletiyi almaya devam ederseniz, lütfen [SUPPORT_SITE] bölümüne başvurun.
 	<string name="LocationCtrlSeeAVsTooltip">
 		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.
+	</string>
+	<string name="LocationCtrlPathfindingDisabledTooltip">
+		Bu bölgede dinamik yol bulma etkin değil.
+	</string>
 	<string name="UpdaterWindowTitle">
 		[APP_NAME] Güncelleştirme
 	</string>
@@ -5013,6 +5022,21 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="Normal">
 		Normal
 	</string>
+	<string name="Pathfinding_Wiki_URL">
+		http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+	</string>
+	<string name="Pathfinding_Object_Attr_None">
+		Hiçbiri
+	</string>
+	<string name="Pathfinding_Object_Attr_Permanent">
+		Navigasyon örgüsünü etkiler
+	</string>
+	<string name="Pathfinding_Object_Attr_Character">
+		Karakter
+	</string>
+	<string name="Pathfinding_Object_Attr_MultiSelect">
+		(Birden çok)
+	</string>
 	<string name="snapshot_quality_very_low">
 		Çok Düşük
 	</string>
@@ -5028,4 +5052,10 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="snapshot_quality_very_high">
 		Çok Yüksek
 	</string>
+	<string name="TeleportMaturityExceeded">
+		Sakin bu bölgeyi ziyaret edemez.
+	</string>
+	<string name="UserDictionary">
+		[User]
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/tr/teleport_strings.xml b/indra/newview/skins/default/xui/tr/teleport_strings.xml
index 62aaaf671f..20d09b1ee2 100644
--- a/indra/newview/skins/default/xui/tr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/tr/teleport_strings.xml
@@ -45,6 +45,9 @@ Bir dakika sonra tekrar deneyin.
 		<message name="no_inventory_host">
 			Envanter sistemi şu anda kullanılamıyor.
 		</message>
+		<message name="MustGetAgeRegion">
+			Bu bölgeye girebilmek için 18 veya üzeri bir yaşta olmanız gerekir.
+		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
@@ -80,5 +83,8 @@ Bir dakika sonra tekrar deneyin.
 		<message name="requesting">
 			Işınlanma talep ediliyor...
 		</message>
+		<message name="pending">
+			Işınlama Bekliyor...
+		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index 211839bcb3..48a417ba46 100644
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -57,24 +57,28 @@ Qt Webkit 版本： [QT_WEBKIT_VERSION]
 			<text_editor name="credits_editor">
 				3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
 APR Copyright (C) 2000-2004 The Apache Software Foundation
+Collada DOM Copyright 2005 Sony Computer Entertainment Inc.
 cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
 DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
 expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
 FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
 GL Copyright (C) 1999-2004 Brian Paul.
+GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
 google-perftools Copyright (c) 2005, Google Inc.
 Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
 jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
 jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
 ogg/vorbis Copyright (C) 2001, Xiphophorus
 OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-Pth Copyright (C) 1999-2006 Ralf S. Engelschall &lt;rse@gnu.org&gt;
+PCRE Copyright (c) 1997-2008 University of Cambridge
 SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
 SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
 zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
 google-perftools Copyright (c) 2005, Google Inc.
 
+第二人生 Viewer 採用 Havok (TM) 物理引擎。 (c)Copyright 1999-2010 Havok.com Inc.（及其放照人）。 保留一切權利。 詳情見 www.havok.com。
+
 保留一切權利。  詳情見 licenses.txt。
 
 語音聊天音頻技術：Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
diff --git a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml b/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
deleted file mode 100644
index c5e2eac446..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_animation_preview.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview">
-	<floater.string name="failed_to_initialize">
-		Failed to initialize motion
-	</floater.string>
-	<floater.string name="anim_too_long">
-		Animation file is [LENGTH] seconds in length.
-
-Maximum animation length is [MAX_LENGTH] seconds.
-	</floater.string>
-	<floater.string name="failed_file_read">
-		無法讀取動作檔。
-
-[STATUS]
-	</floater.string>
-	<floater.string name="E_ST_OK">
-		確定
-	</floater.string>
-	<floater.string name="E_ST_EOF">
-		Premature end of file.
-	</floater.string>
-	<floater.string name="E_ST_NO_CONSTRAINT">
-		Cannot read constraint definition.
-	</floater.string>
-	<floater.string name="E_ST_NO_FILE">
-		無法開啟 BVH 檔案。
-	</floater.string>
-	<floater.string name="E_ST_NO_HIER">
-		Invalid HIERARCHY header.
-	</floater.string>
-	<floater.string name="E_ST_NO_JOINT">
-		Cannot find ROOT or JOINT.
-	</floater.string>
-	<floater.string name="E_ST_NO_NAME">
-		Cannot get JOINT name.
-	</floater.string>
-	<floater.string name="E_ST_NO_OFFSET">
-		無法尋找位移。
-	</floater.string>
-	<floater.string name="E_ST_NO_CHANNELS">
-		Cannot find CHANNELS.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROTATION">
-		Cannot get rotation order.
-	</floater.string>
-	<floater.string name="E_ST_NO_AXIS">
-		Cannot get rotation axis.
-	</floater.string>
-	<floater.string name="E_ST_NO_MOTION">
-		Cannot find MOTION.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAMES">
-		Cannot get number of frames.
-	</floater.string>
-	<floater.string name="E_ST_NO_FRAME_TIME">
-		Cannot get frame time.
-	</floater.string>
-	<floater.string name="E_ST_NO_POS">
-		Cannot get position values.
-	</floater.string>
-	<floater.string name="E_ST_NO_ROT">
-		Cannot get rotation values.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_FILE">
-		Cannot open translation file.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HEADER">
-		Cannot read translation header.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_NAME">
-		Cannot read translation names.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_IGNORE">
-		Cannot read translation ignore value.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_RELATIVE">
-		Cannot read translation relative value.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_OUTNAME">
-		Cannot read translation outname value.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MATRIX">
-		Cannot read translation matrix.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGECHILD">
-		Cannot get mergechild name.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_MERGEPARENT">
-		Cannot get mergeparent name.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_PRIORITY">
-		Cannot get priority value.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_LOOP">
-		Cannot get loop value.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEIN">
-		Cannot get easeIn values.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EASEOUT">
-		Cannot get easeOut values.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_HAND">
-		Cannot get hand morph value.
-	</floater.string>
-	<floater.string name="E_ST_NO_XLT_EMOTE">
-		Cannot read emote name.
-	</floater.string>
-	<floater.string name="E_ST_BAD_ROOT">
-		Incorrect root joint name, use &quot;hip&quot;.
-	</floater.string>
-	<text name="name_label">
-		名稱：
-	</text>
-	<text name="description_label">
-		描述：
-	</text>
-	<spinner label="優先度" name="priority" tool_tip="Controls which other animations can be overridden by this animation"/>
-	<check_box label="Loop" name="loop_check" tool_tip="Makes this animation loop"/>
-	<spinner label="In(%)" name="loop_in_point" tool_tip="Sets point in animation that looping returns to"/>
-	<spinner label="Out(%)" name="loop_out_point" tool_tip="Sets point in animation that ends a loop"/>
-	<text name="hand_label">
-		Hand Pose
-	</text>
-	<combo_box name="hand_pose_combo" tool_tip="Controls what hands do during animation">
-		<combo_box.item label="Spread" name="Spread"/>
-		<combo_box.item label="Relaxed" name="Relaxed"/>
-		<combo_box.item label="Point Both" name="PointBoth"/>
-		<combo_box.item label="Fist" name="Fist"/>
-		<combo_box.item label="Relaxed Left" name="RelaxedLeft"/>
-		<combo_box.item label="Point Left" name="PointLeft"/>
-		<combo_box.item label="Fist Left" name="FistLeft"/>
-		<combo_box.item label="Relaxed Right" name="RelaxedRight"/>
-		<combo_box.item label="Point Right" name="PointRight"/>
-		<combo_box.item label="Fist Right" name="FistRight"/>
-		<combo_box.item label="Salute Right" name="SaluteRight"/>
-		<combo_box.item label="Typing" name="Typing"/>
-		<combo_box.item label="Peace Right" name="PeaceRight"/>
-	</combo_box>
-	<text name="emote_label">
-		Expression
-	</text>
-	<combo_box name="emote_combo" tool_tip="Controls what face does during animation">
-		<item label="（無）" name="[None]" value=""/>
-		<item label="Aaaaah" name="Aaaaah" value="Aaaaah"/>
-		<item label="Afraid" name="Afraid" value="Afraid"/>
-		<item label="Angry" name="Angry" value="Angry"/>
-		<item label="Big Smile" name="BigSmile" value="Big Smile"/>
-		<item label="Bored" name="Bored" value="Bored"/>
-		<item label="Cry" name="Cry" value="Cry"/>
-		<item label="Disdain" name="Disdain" value="Disdain"/>
-		<item label="Embarrassed" name="Embarrassed" value="Embarrassed"/>
-		<item label="Frown" name="Frown" value="Frown"/>
-		<item label="Kiss" name="Kiss" value="Kiss"/>
-		<item label="Laugh" name="Laugh" value="Laugh"/>
-		<item label="Plllppt" name="Plllppt" value="Plllppt"/>
-		<item label="Repulsed" name="Repulsed" value="Repulsed"/>
-		<item label="Sad" name="Sad" value="Sad"/>
-		<item label="Shrug" name="Shrug" value="Shrug"/>
-		<item label="Smile" name="Smile" value="Smile"/>
-		<item label="Surprise" name="Surprise" value="Surprise"/>
-		<item label="Wink" name="Wink" value="Wink"/>
-		<item label="Worry" name="Worry" value="Worry"/>
-	</combo_box>
-	<text name="preview_label">
-		Preview while
-	</text>
-	<combo_box name="preview_base_anim" tool_tip="Use this to test your animation behavior while your avatar performs common actions.">
-		<item label="Standing" name="Standing" value="Standing"/>
-		<item label="Walking" name="Walking" value="Walking"/>
-		<item label="Sitting" name="Sitting" value="Sitting"/>
-		<item label="飛行" name="Flying" value="飛行"/>
-	</combo_box>
-	<spinner label="淡入（秒）" name="ease_in_time" tool_tip="Amount of time (in seconds) over which animations blends in"/>
-	<spinner label="淡出（秒）" name="ease_out_time" tool_tip="Amount of time (in seconds) over which animations blends out"/>
-	<button name="play_btn" tool_tip="播放你的動作"/>
-	<button name="pause_btn" tool_tip="暫停你的動做"/>
-	<button name="stop_btn" tool_tip="Stop animation playback"/>
-	<text name="bad_animation_text">
-		Unable to read animation file.
-
-We recommend BVH files exported from Poser 4.
-	</text>
-	<button label="上傳（L$[AMOUNT]）" name="ok_btn"/>
-	<button label="取消" name="cancel_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
index 0355f940a2..5e4153de66 100644
--- a/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/zh/floater_buy_contents.xml
@@ -10,7 +10,7 @@
 		（禁止轉讓）
 	</floater.string>
 	<text name="contains_text">
-		[NAME] 包含：
+		&lt;nolink&gt;[NAME]&lt;/nolink&gt; 內含：
 	</text>
 	<text name="buy_text">
 		是否花 L$[AMOUNT] 向 [NAME] 購買？
diff --git a/indra/newview/skins/default/xui/zh/floater_env_settings.xml b/indra/newview/skins/default/xui/zh/floater_env_settings.xml
deleted file mode 100644
index 534ee7f0d0..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_env_settings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Environment Editor Floater" title="ENVIRONMENT EDITOR">
-	<floater.string name="timeStr">
-		[hour12,datetime,utc]:[min,datetime,utc] [ampm,datetime,utc]
-	</floater.string>
-	<text name="EnvTimeText">
-		Time of Day
-	</text>
-	<text name="EnvTimeText2">
-		12:00 PM
-	</text>
-	<text name="EnvCloudText">
-		Cloud Cover
-	</text>
-	<text name="EnvWaterColorText">
-		水色
-	</text>
-	<color_swatch name="EnvWaterColor" tool_tip="Click to open color picker"/>
-	<text name="EnvWaterFogText">
-		水霧
-	</text>
-	<button label="Use Estate Time" name="EnvUseEstateTimeButton"/>
-	<button label="進階天空" name="EnvAdvancedSkyButton"/>
-	<button label="進階水文" name="EnvAdvancedWaterButton"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_import_collada.xml b/indra/newview/skins/default/xui/zh/floater_import_collada.xml
new file mode 100644
index 0000000000..8f6b476ccf
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_import_collada.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Import Collada" title="匯入場景">
+	<text name="mesh count">
+		網面：[COUNT]
+	</text>
+	<text name="texture count">
+		材質： [COUNT]
+	</text>
+	<text name="status">
+		狀態：[STATUS]
+	</text>
+	<button label="取消" name="cancel"/>
+	<button label="確定" name="ok"/>
+	<string name="status_idle">
+		閒置中
+	</string>
+	<string name="status_uploading">
+		正在上傳 [NAME]
+	</string>
+	<string name="status_creating">
+		正在建立 [NAME] 物件
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory.xml b/indra/newview/skins/default/xui/zh/floater_inventory.xml
deleted file mode 100644
index da4619c964..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_inventory.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory" title="我的收納區">
-	<panel label="收納區面板" name="Inventory Panel"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
index 4ee58f7c51..6d1d18b67c 100644
--- a/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/zh/floater_inventory_view_finder.xml
@@ -5,6 +5,7 @@
 	<check_box label="服裝" name="check_clothing"/>
 	<check_box label="姿勢" name="check_gesture"/>
 	<check_box label="地標" name="check_landmark"/>
+	<check_box label="網面" name="check_mesh"/>
 	<check_box label="記事卡" name="check_notecard"/>
 	<check_box label="物件" name="check_object"/>
 	<check_box label="腳本" name="check_script"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
new file mode 100644
index 0000000000..970e9e6f4f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Model Preview" title="上傳模型">
+	<string name="status_idle">
+		閒置中
+	</string>
+	<string name="status_reading_file">
+		載入中...
+	</string>
+	<string name="status_generating_meshes">
+		正在生成網面…
+	</string>
+	<string name="status_vertex_number_overflow">
+		錯誤：頂點數目超過 65534，程序已中止！
+	</string>
+	<string name="high">
+		高
+	</string>
+	<string name="medium">
+		中
+	</string>
+	<string name="low">
+		低
+	</string>
+	<string name="lowest">
+		最低
+	</string>
+	<string name="mesh_status_good">
+		確定產生！
+	</string>
+	<string name="mesh_status_na">
+		不適用
+	</string>
+	<string name="mesh_status_none">
+		無
+	</string>
+	<string name="mesh_status_submesh_mismatch">
+		細節層次裡，可使用材質的臉部數目不同。
+	</string>
+	<string name="mesh_status_mesh_mismatch">
+		細節層次裡，網面實例的數目不同。
+	</string>
+	<string name="mesh_status_too_many_vertices">
+		細節層次裡，頂點數目太多。
+	</string>
+	<string name="mesh_status_missing_lod">
+		缺乏需要的細節層次。
+	</string>
+	<string name="layer_all">
+		全部
+	</string>
+	<string name="decomposing">
+		分析中…
+	</string>
+	<string name="simplifying">
+		簡化中…
+	</string>
+	<text name="name_label">
+		名稱：
+	</text>
+	<text name="lod_label">
+		預覽：
+	</text>
+	<combo_box name="preview_lod_combo" tool_tip="要在呈像預覽中察看的細節層次">
+		<combo_item name="high">
+			細節層次：高度
+		</combo_item>
+		<combo_item name="medium">
+			細節層次：中度
+		</combo_item>
+		<combo_item name="low">
+			細節層次：低度
+		</combo_item>
+		<combo_item name="lowest">
+			細節層次：最低
+		</combo_item>
+	</combo_box>
+	<panel>
+		<text name="streaming cost">
+			資源花費：[COST]
+		</text>
+		<text name="physics cost">
+			物理花費：[COST]
+		</text>
+		<text name="upload fee">
+			上傳費：無
+		</text>
+	</panel>
+	<text name="status">
+		[STATUS]
+	</text>
+	<button label="預設值" name="reset_btn" tool_tip="重設為預設值"/>
+	<button label="上傳" name="ok_btn" tool_tip="上傳至模擬器"/>
+	<button label="取消" name="cancel_btn"/>
+	<tab_container name="import_tab">
+		<panel label="細節層次" name="lod_panel">
+			<text name="lod_table_header">
+				選擇細節層次：
+			</text>
+			<text name="high_label" value="高"/>
+			<text name="high_triangles" value="0"/>
+			<text name="high_vertices" value="0"/>
+			<text name="medium_label" value="中"/>
+			<text name="medium_triangles" value="0"/>
+			<text name="medium_vertices" value="0"/>
+			<text name="low_label" value="低"/>
+			<text name="low_triangles" value="0"/>
+			<text name="low_vertices" value="0"/>
+			<text name="lowest_label" value="最低"/>
+			<text name="lowest_triangles" value="0"/>
+			<text name="lowest_vertices" value="0"/>
+			<text name="lod_table_footer">
+				細節層次：[DETAIL]
+			</text>
+			<radio_group name="lod_file_or_limit" value="lod_from_file">
+				<radio_item label="從檔案載入" name="lod_from_file"/>
+				<radio_item label="自動生成" name="lod_auto_generate"/>
+				<radio_item label="無" name="lod_none"/>
+			</radio_group>
+			<button label="瀏覽…" name="lod_browse"/>
+			<combo_box name="lod_mode">
+				<combo_item name="triangle_limit">
+					三角形上限
+				</combo_item>
+				<combo_item name="error_threshold">
+					錯誤門檻
+				</combo_item>
+			</combo_box>
+			<text name="build_operator_text">
+				建製操作元：
+			</text>
+			<text name="queue_mode_text">
+				佇列模式：
+			</text>
+			<combo_box name="build_operator">
+				<combo_item name="edge_collapse">
+					側邊摺疊
+				</combo_item>
+				<combo_item name="half_edge_collapse">
+					半側邊摺疊
+				</combo_item>
+			</combo_box>
+			<combo_box name="queue_mode">
+				<combo_item name="greedy">
+					儘量最大
+				</combo_item>
+				<combo_item name="lazy">
+					儘量最小
+				</combo_item>
+				<combo_item name="independent">
+					獨立
+				</combo_item>
+			</combo_box>
+			<text name="border_mode_text">
+				邊界模式：
+			</text>
+			<text name="share_tolderance_text">
+				分享容忍：
+			</text>
+			<combo_box name="border_mode">
+				<combo_item name="border_unlock">
+					解鎖
+				</combo_item>
+				<combo_item name="border_lock">
+					鎖定
+				</combo_item>
+			</combo_box>
+			<text name="crease_label">
+				皺褶角度：
+			</text>
+			<spinner name="crease_angle" value="75"/>
+		</panel>
+		<panel label="物理" name="physics_panel">
+			<panel name="physics geometry">
+				<radio_group name="physics_load_radio" value="physics_load_from_file">
+					<radio_item label="檔案：" name="physics_load_from_file"/>
+					<radio_item label="使用細節層次：" name="physics_use_lod"/>
+				</radio_group>
+				<combo_box name="physics_lod_combo" tool_tip="物理形狀所採用的細節層次">
+					<combo_item name="physics_lowest">
+						最低
+					</combo_item>
+					<combo_item name="physics_low">
+						低
+					</combo_item>
+					<combo_item name="physics_medium">
+						中
+					</combo_item>
+					<combo_item name="physics_high">
+						高
+					</combo_item>
+				</combo_box>
+				<button label="瀏覽…" name="physics_browse"/>
+			</panel>
+			<panel name="physics analysis">
+				<slider label="平滑：" name="Smooth"/>
+				<check_box label="關閉洞口（慢）" name="Close Holes (Slow)"/>
+				<button label="分析" name="Decompose"/>
+				<button label="取消" name="decompose_cancel"/>
+			</panel>
+			<panel name="physics simplification">
+				<slider label="階段數：" name="Combine Quality"/>
+				<slider label="細節比例：" name="Detail Scale"/>
+				<slider label="保留：" name="Retain%"/>
+				<button label="簡化" name="Simplify"/>
+				<button label="取消" name="simplify_cancel"/>
+			</panel>
+			<panel name="physics info">
+				<slider label="預覽伸展：" name="physics_explode"/>
+				<text name="physics_triangles">
+					三角形：[TRIANGLES]
+				</text>
+				<text name="physics_points">
+					頂點：[POINTS]
+				</text>
+				<text name="physics_hulls">
+					殼面：[HULLS]
+				</text>
+			</panel>
+		</panel>
+		<panel label="修飾器" name="modifiers_panel">
+			<spinner name="import_scale" value="1.0"/>
+			<text name="import_dimensions">
+				[X] x [Y] x [Z] 公尺
+			</text>
+			<check_box label="材質" name="upload_textures"/>
+			<check_box label="表皮重量" name="upload_skin"/>
+			<check_box label="接點位置" name="upload_joints"/>
+			<spinner name="pelvis_offset" value="0.0"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml b/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml
deleted file mode 100644
index 38a5dab523..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_nearby_chat.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="nearby_chat" title="附近的聊天">
-	<check_box label="Translate chat" name="translate_chat_checkbox"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_postcard.xml b/indra/newview/skins/default/xui/zh/floater_postcard.xml
deleted file mode 100644
index 6f6b75f468..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_postcard.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Postcard" title="EMAIL SNAPSHOT">
-	<floater.string name="default_subject">
-		Postcard from [SECOND_LIFE].
-	</floater.string>
-	<floater.string name="default_message">
-		Check this out!
-	</floater.string>
-	<floater.string name="upload_message">
-		傳送中...
-	</floater.string>
-	<text name="to_label">
-		收件人電子郵件地址：
-	</text>
-	<text name="from_label">
-		你的電子郵件地址：
-	</text>
-	<text name="name_label">
-		你的名稱：
-	</text>
-	<text name="subject_label">
-		主旨：
-	</text>
-	<line_editor label="在此輸入你的主旨。" name="subject_form"/>
-	<text name="msg_label">
-		訓息：
-	</text>
-	<text_editor name="msg_form">
-		在此輸入你的訊息。
-	</text_editor>
-	<button label="取消" name="cancel_btn"/>
-	<button label="送出" name="send_btn"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
new file mode 100644
index 0000000000..078b490655
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_price_for_listing.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="price_for_listing" title="刊登個人廣告">
+	<text name="explanation_text">
+		你的個人廣告將從刊登日起連續刊載一星期。
+
+你的廣告在個人廣告欄出現的位置，取決於你決定付費的多寡。
+
+付費越多的個人廣告會出現在接近最上方位置，並顯示於搜尋結果的前面。
+	</text>
+	<text name="price_text">
+		刊登費：
+	</text>
+	<text name="price_symbol">
+		L$
+	</text>
+	<button label="確定" name="set_price_btn"/>
+	<button label="取消" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_sound_devices.xml b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml
new file mode 100644
index 0000000000..0374c74f8f
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_sound_devices" title="聲音裝置">
+	<text name="voice_label">
+		語音聊天
+	</text>
+	<check_box label="已啟用" name="enable_voice"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_tools.xml b/indra/newview/skins/default/xui/zh/floater_tools.xml
index bddd1f4d88..62d1b6a820 100644
--- a/indra/newview/skins/default/xui/zh/floater_tools.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tools.xml
@@ -127,6 +127,18 @@
 	<text name="prim_count">
 		幾何元件： [COUNT]
 	</text>
+	<text name="linked_set_count">
+		聯結集合：[COUNT]
+	</text>
+	<text name="linked_set_cost" tool_tip="目前所選聯結幾何 [prims],[physics complexity] 的費用">
+		費用：[COST] / [PHYSICS]
+	</text>
+	<text name="object_count">
+		物件： [COUNT]
+	</text>
+	<text name="object_cost" tool_tip="目前所選物件 [prims] / [physics complexity] 的費用">
+		費用：[COST] / [PHYSICS]
+	</text>
 	<tab_container name="Object Info Tabs">
 		<panel label="一般" name="General">
 			<panel.string name="text deed continued">
@@ -271,15 +283,6 @@
 				<combo_box.item label="圓環" name="Ring"/>
 				<combo_box.item label="雕刻的" name="Sculpted"/>
 			</combo_box>
-			<combo_box name="material">
-				<combo_box.item label="石頭" name="Stone"/>
-				<combo_box.item label="金屬" name="Metal"/>
-				<combo_box.item label="玻璃" name="Glass"/>
-				<combo_box.item label="木頭" name="Wood"/>
-				<combo_box.item label="肌肉" name="Flesh"/>
-				<combo_box.item label="塑膠" name="Plastic"/>
-				<combo_box.item label="橡膠" name="Rubber"/>
-			</combo_box>
 			<text name="text cut">
 				路徑切斷（開始 / 結束）
 			</text>
@@ -352,9 +355,19 @@
 				<combo_box.item label="環面" name="Torus"/>
 				<combo_box.item label="平面" name="Plane"/>
 				<combo_box.item label="圓柱體" name="Cylinder"/>
+				<combo_box.item label="網面" name="Mesh"/>
 			</combo_box>
 		</panel>
 		<panel label="特性" name="Features">
+			<panel.string name="None">
+				無
+			</panel.string>
+			<panel.string name="Prim">
+				幾何元件
+			</panel.string>
+			<panel.string name="Convex Hull">
+				凸包
+			</panel.string>
 			<text name="select_single">
 				只能選擇一個幾何元件去編輯細節。
 			</text>
@@ -379,6 +392,23 @@
 			<spinner label="焦點" name="Light Focus"/>
 			<spinner label="衰減" name="Light Falloff"/>
 			<spinner label="環境" name="Light Ambiance"/>
+			<text name="label physicsshapetype">
+				物理形狀類型：
+			</text>
+			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="選擇物理形狀類型"/>
+			<combo_box name="material">
+				<combo_box.item label="石頭" name="Stone"/>
+				<combo_box.item label="金屬" name="Metal"/>
+				<combo_box.item label="玻璃" name="Glass"/>
+				<combo_box.item label="木頭" name="Wood"/>
+				<combo_box.item label="肌肉" name="Flesh"/>
+				<combo_box.item label="塑膠" name="Plastic"/>
+				<combo_box.item label="橡膠" name="Rubber"/>
+			</combo_box>
+			<spinner label="重力" name="Physics Gravity"/>
+			<spinner label="摩擦" name="Physics Friction"/>
+			<spinner label="密度" name="Physics Density"/>
+			<spinner label="恢復" name="Physics Restitution"/>
 		</panel>
 		<panel label="材質" name="Texture">
 			<panel.string name="string repeats per meter">
@@ -477,14 +507,7 @@
 			面積： [AREA] m²
 		</text>
 		<button label="土地資料" label_selected="土地資料" name="button about land"/>
-		<check_box label="顯示所有人" name="checkbox show owners" tool_tip="根據所有人將地段分類上色： 
-
-綠色 = 你的土地 
-水藍 = 你群組的土地 
-紅色 = 其他人所有 
-黃色 = 出售 
-紫色 = 拍賣 
-灰色 = 公有地"/>
+		<check_box label="顯示所有人" name="checkbox show owners" tool_tip="根據所有人將地段分類上色：   綠色 = 你的土地  水藍 = 你群組的土地  紅色 = 其他人所有  黃色 = 出售  紫色 = 拍賣  灰色 = 公有地"/>
 		<text name="label_parcel_modify">
 			修改地段
 		</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_water.xml b/indra/newview/skins/default/xui/zh/floater_water.xml
deleted file mode 100644
index 5fb57272af..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_water.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Water Floater" title="進階水文編輯器">
-	<floater.string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		Water Presets:
-	</text>
-	<button label="新增" label_selected="新增" name="WaterNewPreset"/>
-	<button label="儲存" label_selected="儲存" name="WaterSavePreset"/>
-	<button label="刪除" label_selected="刪除" name="WaterDeletePreset"/>
-	<tab_container name="Water Tabs">
-		<panel label="設定" name="Settings">
-			<text name="BHText">
-				Water Fog Color
-			</text>
-			<color_swatch name="WaterFogColor" tool_tip="點擊以開啟顏色挑選器"/>
-			<text name="WaterFogDensText">
-				Fog Density Exponent
-			</text>
-			<text name="WaterUnderWaterFogModText">
-				Underwater Fog Modifier
-			</text>
-			<text name="BDensText">
-				Reflection Wavelet Scale
-			</text>
-			<slider label="1" name="WaterNormalScaleX"/>
-			<slider label="2" name="WaterNormalScaleY"/>
-			<slider label="3" name="WaterNormalScaleZ"/>
-			<text name="HDText">
-				Fresnel Scale
-			</text>
-			<text name="FresnelOffsetText">
-				Fresnel Offset
-			</text>
-			<text name="DensMultText">
-				Refract Scale Above
-			</text>
-			<text name="WaterScaleBelowText">
-				Refract Scale Below
-			</text>
-			<text name="MaxAltText">
-				Blur Multiplier
-			</text>
-		</panel>
-		<panel label="圖像" name="Waves">
-			<text name="BHText">
-				Big Wave Direction
-			</text>
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Little Wave Direction
-			</text>
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				正常地圖
-			</text>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml b/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
deleted file mode 100644
index 383e35d50d..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_windlight_options.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="WindLight floater" title="進階天空編輯器">
-	<floater.string name="WLDefaultSkyNames">
-		A-12AM:A-12PM:A-3AM:A-3PM:A-4.30PM:A-6AM:A-6PM:A-9AM:A-9PM:Barcelona:Blizzard:Blue Midday:Coastal Afternoon:Coastal Sunset:Default:Desert Sunset:Fine Day:Fluffy Big Clouds:Foggy:Funky Funky:Funky Funky Funky:Gelatto:Ghost:Incongruent Truths:Midday 1:Midday 2:Midday 3:Midday 4:Night:Pirate:Purple:Sailor&apos;s Delight:Sheer Sensuality
-	</floater.string>
-	<text name="KeyFramePresetsText">
-		天空預設值：
-	</text>
-	<button label="新增" label_selected="新增" name="WLNewPreset"/>
-	<button label="儲存" label_selected="儲存" name="WLSavePreset"/>
-	<button label="刪除" label_selected="刪除" name="WLDeletePreset"/>
-	<button label="日循環編輯器" label_selected="日循環編輯器" name="WLDayCycleMenuButton"/>
-	<tab_container name="WindLight Tabs">
-		<panel label="大氣" name="Atmosphere">
-			<text name="BHText">
-				藍天水平線
-			</text>
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				G
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				陰霾水平線
-			</text>
-			<text name="BDensText2">
-				藍天密度
-			</text>
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				G
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				陰霾密度
-			</text>
-			<text name="DensMultText">
-				密度倍增
-			</text>
-			<text name="WLDistanceMultText">
-				距離倍增
-			</text>
-			<text name="MaxAltText">
-				最大高度
-			</text>
-		</panel>
-		<panel label="照明" name="Lighting">
-			<text name="SLCText">
-				日／月 顏色
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				日／月 位置
-			</text>
-			<text name="WLAmbientText">
-				環境
-			</text>
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				G
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				東升角度
-			</text>
-			<text name="SunGlowText">
-				太陽光輝
-			</text>
-			<slider label="焦點" name="WLGlowB"/>
-			<slider label="尺寸" name="WLGlowR"/>
-			<text name="SceneGammaText">
-				場景 Gamma 值
-			</text>
-			<text name="WLStarText">
-				星空量度
-			</text>
-		</panel>
-		<panel label="雲彩" name="Clouds">
-			<text name="WLCloudColorText">
-				雲彩顏色
-			</text>
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				G
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				雲彩 XY 軸 / 密度
-			</text>
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				雲彩覆蓋
-			</text>
-			<text name="WLCloudScaleText">
-				雲彩規模
-			</text>
-			<text name="WLCloudDetailText">
-				雲彩細節（XY 軸 / 密度）
-			</text>
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				雲彩 X 滾軸
-			</text>
-			<check_box label="鎖定" name="WLCloudLockX"/>
-			<text name="WLCloudScrollYText">
-				雲彩 Y 滾軸
-			</text>
-			<check_box label="鎖定" name="WLCloudLockY"/>
-			<check_box label="描繪傳統雲彩" name="DrawClassicClouds"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_bottomtray.xml b/indra/newview/skins/default/xui/zh/menu_bottomtray.xml
deleted file mode 100644
index a00aa7cd35..0000000000
--- a/indra/newview/skins/default/xui/zh/menu_bottomtray.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="hide_camera_move_controls_menu">
-	<menu_item_check label="講話按鈕" name="EnableVoiceChat"/>
-	<menu_item_check label="姿勢按鈕" name="ShowGestureButton"/>
-	<menu_item_check label="移動按鈕" name="ShowMoveButton"/>
-	<menu_item_check label="視角按鈕" name="ShowCameraButton"/>
-	<menu_item_check label="快照按鈕" name="ShowSnapshotButton"/>
-	<menu_item_check label="建造按鈕" name="ShowBuildButton"/>
-	<menu_item_check label="搜尋按鈕" name="ShowSearchButton"/>
-	<menu_item_check label="地圖按鈕" name="ShowWorldMapButton"/>
-	<menu_item_check label="迷你地圖按鈕" name="ShowMiniMapButton"/>
-	<menu_item_call label="剪下" name="NearbyChatBar_Cut"/>
-	<menu_item_call label="覆製" name="NearbyChatBar_Copy"/>
-	<menu_item_call label="貼上" name="NearbyChatBar_Paste"/>
-	<menu_item_call label="刪除" name="NearbyChatBar_Delete"/>
-	<menu_item_call label="全選" name="NearbyChatBar_Select_All"/>
-</menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
index f3a62a9866..30bf5a7e75 100644
--- a/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
+++ b/indra/newview/skins/default/xui/zh/menu_inventory_add.xml
@@ -4,6 +4,8 @@
 		<menu_item_call label="圖像（L$[COST]）..." name="Upload Image"/>
 		<menu_item_call label="聲音（L$[COST]）..." name="Upload Sound"/>
 		<menu_item_call label="動作（L$[COST]）..." name="Upload Animation"/>
+		<menu_item_call label="模型…" name="Upload Model"/>
+		<menu_item_call label="模型精靈…" name="Upload Model Wizard"/>
 		<menu_item_call label="批量（每檔案 L$[COST] ）..." name="Bulk Upload"/>
 		<menu_item_call label="設定預設上傳權限" name="perm prefs"/>
 	</menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml
new file mode 100644
index 0000000000..5f82685632
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_model_import_gear_default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<toggleable_menu name="model_menu_gear_default">
+	<menu_item_check label="顯示側邊" name="show_edges"/>
+	<menu_item_check label="顯示物理" name="show_physics"/>
+	<menu_item_check label="顯示材質" name="show_textures"/>
+	<menu_item_check label="顯示表皮重量" name="show_skin_weight"/>
+	<menu_item_check label="顯示接點位置" name="show_joint_positions"/>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 6e4921cf33..262cc2440c 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -118,6 +118,8 @@
 			<menu_item_call label="圖像（L$[COST]）..." name="Upload Image"/>
 			<menu_item_call label="聲音（L$[COST]）..." name="Upload Sound"/>
 			<menu_item_call label="動作（L$[COST]）..." name="Upload Animation"/>
+			<menu_item_call label="模型…" name="Upload Model"/>
+			<menu_item_call label="模型精靈…" name="Upload Model Wizard"/>
 			<menu_item_call label="批量（每檔案 L$[COST] ）..." name="Bulk Upload"/>
 			<menu_item_call label="設定預設上傳權限" name="perm prefs"/>
 		</menu>
@@ -158,7 +160,7 @@
 			<menu_item_check label="半透明" name="Alpha"/>
 			<menu_item_check label="樹木" name="Tree"/>
 			<menu_item_check label="化身" name="Character"/>
-			<menu_item_check label="地表" name="SurfacePath"/>
+			<menu_item_check label="表面修補" name="Surface Patch"/>
 			<menu_item_check label="天空" name="Sky"/>
 			<menu_item_check label="水文" name="Water"/>
 			<menu_item_check label="地面" name="Ground"/>
@@ -217,6 +219,7 @@
 			<menu_item_check label="材質分類控制台" name="Texture Category"/>
 			<menu_item_check label="快速碼錶" name="Fast Timers"/>
 			<menu_item_check label="記憶體" name="Memory"/>
+			<menu_item_check label="場景統計資料" name="Scene Statistics"/>
 			<menu_item_call label="地區資訊傳至除錯控制台" name="Region Info to Debug Console"/>
 			<menu_item_call label="群組資訊至除錯控制台" name="Group Info to Debug Console"/>
 			<menu_item_call label="性能資訊傳至除錯控制台" name="Capabilities Info to Debug Console"/>
@@ -227,6 +230,7 @@
 		</menu>
 		<menu label="顯示資訊" name="Display Info">
 			<menu_item_check label="顯示時間" name="Show Time"/>
+			<menu_item_check label="顯示上傳費用" name="Show Upload Cost"/>
 			<menu_item_check label="顯示呈像資訊" name="Show Render Info"/>
 			<menu_item_check label="顯示材質資訊" name="Show Texture Info"/>
 			<menu_item_check label="顯示矩陣" name="Show Matrices"/>
@@ -252,8 +256,10 @@
 		</menu>
 		<menu label="呈像的元資料" name="Render Metadata">
 			<menu_item_check label="外框箱" name="Bounding Boxes"/>
+			<menu_item_check label="法線" name="Normals"/>
 			<menu_item_check label="八叉樹" name="Octree"/>
 			<menu_item_check label="陰影平截頭體" name="Shadow Frusta"/>
+			<menu_item_check label="物理形狀" name="Physics Shapes"/>
 			<menu_item_check label="遮蔽" name="Occlusion"/>
 			<menu_item_check label="呈像批次" name="Render Batches"/>
 			<menu_item_check label="更新類型" name="Update Type"/>
@@ -261,9 +267,12 @@
 			<menu_item_check label="材質優先序" name="Texture Priority"/>
 			<menu_item_check label="材質區域" name="Texture Area"/>
 			<menu_item_check label="臉區域" name="Face Area"/>
+			<menu_item_check label="細節層次資訊" name="LOD Info"/>
+			<menu_item_check label="建製佇列" name="Build Queue"/>
 			<menu_item_check label="燈光" name="Lights"/>
 			<menu_item_check label="碰撞骨架" name="Collision Skeleton"/>
 			<menu_item_check label="光線投射" name="Raycast"/>
+			<menu_item_check label="雕刻" name="Sculpt"/>
 		</menu>
 		<menu label="呈像" name="Rendering">
 			<menu_item_check label="軸" name="Axes"/>
@@ -271,7 +280,6 @@
 			<menu_item_call label="已選取材質資訊基礎" name="Selected Texture Info Basis"/>
 			<menu_item_check label="線框" name="Wireframe"/>
 			<menu_item_check label="物件導向的遮蔽" name="Object-Object Occlusion"/>
-			<menu_item_check label="幀緩衝區物件" name="Framebuffer Objects"/>
 			<menu_item_check label="光線和陰影" name="Lighting and Shadows"/>
 			<menu_item_check label="來自日/月/投影物的陰影" name="Shadows from Sun/Moon/Projectors"/>
 			<menu_item_check label="屏幕空間環境光遮蔽和陰影平滑技術" name="SSAO and Shadow Smoothing"/>
@@ -370,6 +378,7 @@
 			<menu_item_call label="傾印本地材質" name="Dump Local Textures"/>
 		</menu>
 		<menu_item_check label="HTTP 材質" name="HTTP Textures"/>
+		<menu_item_check label="HTTP 收納區" name="HTTP Inventory"/>
 		<menu_item_call label="壓縮圖像" name="Compress Images"/>
 		<menu_item_check label="輸出除錯小型傾印" name="Output Debug Minidump"/>
 		<menu_item_check label="下次執行時顯示控制台視窗" name="Console Window"/>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index e6c5ef2555..97a1bd6c84 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -2149,6 +2149,12 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="RezItemNoPermissions">
 		產生物件時發生權限衝突。
 	</notification>
+	<notification name="IMAcrossParentEstates">
+		無法對不同的母領地發出即時訊息。
+	</notification>
+	<notification name="TransferInventoryAcrossParentEstates">
+		收納區無法轉移到不同的母領地。
+	</notification>
 	<notification name="UnableToLoadNotecard">
 		無法載入記事卡。
 請再試一次。
@@ -2726,6 +2732,10 @@ SHA1 指紋：[MD5_DIGEST]
 		主持人已將你的語音消音。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
+	<notification name="UploadCostConfirmation">
+		上傳將花費 L$[PRICE]，是否繼續？
+		<usetemplate name="okcancelbuttons" notext="取消" yestext="上傳"/>
+	</notification>
 	<notification name="ConfirmClearTeleportHistory">
 		確定清除你的瞬間傳送歷史記錄？
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
@@ -2737,6 +2747,9 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="ShareNotification">
 		選取要分享的居民。
 	</notification>
+	<notification name="MeshUploadError">
+		[LABEL] 上傳失敗：[MESSAGE] [IDENTIFIER] [INVALIDITY_IDENTIFIER]
+	</notification>
 	<notification name="ShareItemsConfirmation">
 		請確定你要和居民分享這些物項：
 
@@ -2753,6 +2766,19 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="DeedToGroupFail">
 		讓渡給群組失敗。
 	</notification>
+	<notification name="ReleaseLandThrottled">
+		目前無法遺棄 [PARCEL_NAME] 地段。
+	</notification>
+	<notification name="ReleasedLandWithReclaim">
+		[AREA] 平方公尺的地段「[PARCEL_NAME]」已釋出。
+
+你須在 [RECLAIM_PERIOD] 小時內領回（花費 L$0），否則將開放出售給任何人。
+	</notification>
+	<notification name="ReleasedLandNoReclaim">
+		[AREA] 平方公尺的地段「[PARCEL_NAME]」已釋出。
+
+現已開放出售給任何人。
+	</notification>
 	<notification name="AvatarRezNotification">
 		（存續 [EXISTENCE] 秒鐘）
 化身 &apos;[NAME]&apos; 在 [TIME] 秒內完全呈現。
@@ -2893,6 +2919,10 @@ SHA1 指紋：[MD5_DIGEST]
 		只有進階模式才能新建或編輯群組。 你是否想要結束離開，以便變更模式？ 你可在登入畫面選擇想要的模式。
 		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
+	<notification label="" name="NoPlaceInfo">
+		只有進階模式才能察看地點檔案。 你是否想要結束離開，以便變更模式？ 你可在登入畫面選擇想要的模式。
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
+	</notification>
 	<notification label="" name="NoPicks">
 		只有進階模式才能新建或編輯精選地點。 你是否想要結束離開，以便變更模式？ 你可在登入畫面選擇想要的模式。
 		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
@@ -2913,9 +2943,18 @@ SHA1 指紋：[MD5_DIGEST]
 		只有進階模式才能付費給其他居民。 你是否要登出並且變更模式？
 		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
 	</notification>
-	<global name="UnsupportedCPU">
-		- 你的 CPU 運算速度未達到系統最低配備要求。
-	</global>
+	<notification label="" name="NoInventory">
+		只有進階模式才能察看收納區。 你是否要登出並且變更模式？
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
+	</notification>
+	<notification label="" name="NoAppearance">
+		只有進階模式才能使用外觀編輯器。 你是否要登出並且變更模式？
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
+	</notification>
+	<notification label="" name="NoSearch">
+		只有進階模式才能搜尋。 你是否要登出並且變更模式？
+		<usetemplate name="okcancelbuttons" notext="不要結束退出" yestext="結束退出"/>
+	</notification>
 	<global name="UnsupportedGLRequirements">
 		你的硬體設備似乎不符 [APP_NAME] 的要求。 [APP_NAME] 需要可以支援多材質的 OpenGL 顯像卡。 在這狀況下，請確定你的顯像卡安裝了最新的驅動程式，作業系統也安裝了最新的服務包和嵌補程式。
 
diff --git a/indra/newview/skins/default/xui/zh/panel_bottomtray.xml b/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
deleted file mode 100644
index 734b83e6cc..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_bottomtray.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="bottom_tray">
-	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Turns microphone on/off"/>
-	<string name="VoiceControlBtnToolTip" value="顯示 / 隱藏 語音控制板"/>
-	<layout_stack name="toolbar_stack">
-		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Speak" label_selected="Speak" name="speak_btn"/>
-			</talk_button>
-		</layout_panel>
-		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="姿勢" name="Gesture" tool_tip="顯示 / 隱藏 姿勢"/>
-		</layout_panel>
-		<layout_panel name="movement_panel">
-			<bottomtray_button label="移動" name="movement_btn" tool_tip="顯示 / 隱藏 移動控制"/>
-		</layout_panel>
-		<layout_panel name="cam_panel">
-			<bottomtray_button label="視角" name="camera_btn" tool_tip="顯示 / 隱藏 攝影機控制"/>
-		</layout_panel>
-		<layout_panel name="snapshot_panel">
-			<bottomtray_button name="snapshots" tool_tip="拍攝快照"/>
-		</layout_panel>
-		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="建造" name="build_btn" tool_tip="顯示 / 隱藏 建造工具"/>
-		</layout_panel>
-		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="搜尋" name="search_btn" tool_tip="顯示 / 隱藏 搜尋"/>
-		</layout_panel>
-		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="地圖" name="world_map_btn" tool_tip="顯示 / 隱藏 世界地圖"/>
-		</layout_panel>
-		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="迷你地圖" name="mini_map_btn" tool_tip="顯示 / 隱藏 迷你地圖"/>
-		</layout_panel>
-		<layout_panel name="im_well_panel">
-			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Conversations"/>
-			</chiclet_im_well>
-		</layout_panel>
-		<layout_panel name="notification_well_panel">
-			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="通知"/>
-			</chiclet_notification>
-		</layout_panel>
-	</layout_stack>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
index d1e8487c13..6af4bb8970 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_colors.xml
@@ -22,6 +22,9 @@
 	<text name="text_box5">
 		錯誤
 	</text>
+	<text name="text_box10">
+		直接
+	</text>
 	<text name="text_box7">
 		所有人
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
index fd7d5cca43..3948a48992 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -27,8 +27,20 @@
 		</text>
 		<check_box initial_value="true" label="清澈透明的水" name="TransparentWater"/>
 		<check_box initial_value="true" label="凹凸映射與光澤效果" name="BumpShiny"/>
+		<check_box initial_value="true" label="本地光線" name="LocalLights"/>
 		<check_box initial_value="true" label="基本著色" name="BasicShaders" tool_tip="關閉此一選項可能避免部分顯示卡驅動程式損毀當機"/>
 		<check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/>
+		<check_box initial_value="true" label="光線和陰影" name="UseLightShaders"/>
+		<check_box initial_value="true" label="環境光遮蔽" name="UseSSAO"/>
+		<check_box initial_value="true" label="景深" name="UseDoF"/>
+		<text name="shadows_label">
+			陰影：
+		</text>
+		<combo_box name="ShadowDetail">
+			<combo_box.item label="無" name="0"/>
+			<combo_box.item label="日 / 月" name="1"/>
+			<combo_box.item label="日 / 月 + 投影物" name="2"/>
+		</combo_box>
 		<text name="reflection_label">
 			水文反射：
 		</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_region_general.xml b/indra/newview/skins/default/xui/zh/panel_region_general.xml
index d81733bee7..f6b2c46354 100644
--- a/indra/newview/skins/default/xui/zh/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/zh/panel_region_general.xml
@@ -25,6 +25,7 @@
 	<check_box label="允許土地轉售" name="allow_land_resell_check"/>
 	<check_box label="允許土地 合併/分割" name="allow_parcel_changes_check"/>
 	<check_box label="阻擋土地顯示於搜尋中" name="block_parcel_search_check" tool_tip="讓其他人可以在搜尋結果中看到這個地區與其中的地段"/>
+	<check_box label="允許網面物件" name="mesh_rez_enabled_check" tool_tip="允許大家在此地區產生網面物件"/>
 	<spinner label="人數上限" name="agent_limit_spin"/>
 	<spinner label="物件紅利" name="object_bonus_spin"/>
 	<text label="分級" name="access_text">
diff --git a/indra/newview/skins/default/xui/zh/panel_region_texture.xml b/indra/newview/skins/default/xui/zh/panel_region_texture.xml
deleted file mode 100644
index 7b6152121f..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_region_texture.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="地面材質" name="Textures">
-	<text name="region_text_lbl">
-		地區：
-	</text>
-	<text name="region_text">
-		未知
-	</text>
-	<text name="detail_texture_text">
-		地形材質（須 512x512，24 位元 .tga 檔格式）
-	</text>
-	<text name="height_text_lbl">
-		1 (Low)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (High)
-	</text>
-	<text name="height_text_lbl5">
-		Texture Elevation Ranges
-	</text>
-	<text name="height_text_lbl6">
-		Northwest
-	</text>
-	<text name="height_text_lbl7">
-		Northeast
-	</text>
-	<spinner label="Low" name="height_start_spin_1"/>
-	<spinner label="Low" name="height_start_spin_3"/>
-	<spinner label="High" name="height_range_spin_1"/>
-	<spinner label="High" name="height_range_spin_3"/>
-	<text name="height_text_lbl8">
-		Southwest
-	</text>
-	<text name="height_text_lbl9">
-		Southeast
-	</text>
-	<spinner label="Low" name="height_start_spin_0"/>
-	<spinner label="Low" name="height_start_spin_2"/>
-	<spinner label="High" name="height_range_spin_0"/>
-	<spinner label="High" name="height_range_spin_2"/>
-	<text name="height_text_lbl10">
-		These values represent the blend range for the textures above.
-	</text>
-	<text name="height_text_lbl11">
-		Measured in meters, the LOW value is the MAXIMUM height of Texture #1, and the HIGH value is the MINIMUM height of Texture #4.
-	</text>
-	<button label="套用" name="apply_btn"/>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_side_tray.xml b/indra/newview/skins/default/xui/zh/panel_side_tray.xml
deleted file mode 100644
index e5c7deb7d6..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_side_tray.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- Side tray cannot show background because it is always
-	partially on screen to hold tab buttons. -->
-<side_tray name="sidebar">
-	<sidetray_tab description="側邊欄切換。" name="sidebar_openclose" tab_title="側邊欄切換"/>
-	<sidetray_tab description="首頁。" name="sidebar_home" tab_title="首頁">
-		<panel label="首頁" name="panel_home"/>
-	</sidetray_tab>
-	<sidetray_tab description="編輯你的公開檔案及精選地點。" name="sidebar_me" tab_title="我的檔案">
-		<panel_container name="panel_container">
-			<panel label="自己" name="panel_me"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Find your friends, contacts and people nearby." name="sidebar_people" tab_title="人群">
-		<panel_container name="panel_container">
-			<panel label="群組檔案" name="panel_group_info_sidetray"/>
-			<panel label="Blocked Residents &amp; Objects" name="panel_block_list_sidetray"/>
-		</panel_container>
-	</sidetray_tab>
-	<sidetray_tab description="Find places to go and places you&apos;ve visited before." label="地點" name="sidebar_places" tab_title="地點">
-		<panel label="地點" name="panel_places"/>
-	</sidetray_tab>
-	<sidetray_tab description="瀏覽你的收納區。" name="sidebar_inventory" tab_title="我的收納區">
-		<panel label="編輯收納區" name="sidepanel_inventory"/>
-	</sidetray_tab>
-	<sidetray_tab description="變更你的外觀與目前樣貌。" name="sidebar_appearance" tab_title="我的外觀">
-		<panel label="編輯外觀" name="sidepanel_appearance"/>
-	</sidetray_tab>
-</side_tray>
diff --git a/indra/newview/skins/default/xui/zh/panel_sound_devices.xml b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
new file mode 100644
index 0000000000..96b00c3235
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_sound_devices.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<panel label="設備設定" name="device_settings_panel">
+	<panel.string name="default_text">
+		預設
+	</panel.string>
+	<text name="Input">
+		輸入
+	</text>
+	<text name="My volume label">
+		我的音量：
+	</text>
+	<slider_bar initial_value="1.0" name="mic_volume_slider" tool_tip="用這控制條改變音量"/>
+	<text name="wait_text">
+		請稍候
+	</text>
+	<text name="Output">
+		輸出
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index dfb75076b7..9114cc079d 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -130,6 +130,134 @@
 	<string name="create_account_url">
 		http://join.secondlife.com/
 	</string>
+	<string name="LoginFailedViewerNotPermitted">
+		你目前所用的 Viewer 已經無法再進入第二人生。 請到這個頁面下載最新 Viewer：
+http://secondlife.com/download
+
+欲知詳情，請參閱下面的常見問題集：
+http://secondlife.com/viewer-access-faq
+	</string>
+	<string name="LoginIntermediateOptionalUpdateAvailable">
+		有可以選擇性安裝的更新版：[VERSION]
+	</string>
+	<string name="LoginFailedRequiredUpdate">
+		你必須更新為這個版本：[VERSION]
+	</string>
+	<string name="LoginFailedAlreadyLoggedIn">
+		此用戶已經登入。
+	</string>
+	<string name="LoginFailedAuthenticationFailed">
+		抱歉！ 我們無法讓你登入。
+請檢查確定你輸入了正確的
+    * 使用者名稱（例：bobsmith123 或 steller.sunshine）
+    * 密碼
+並請確定鍵盤沒有鎖定大寫鍵。
+	</string>
+	<string name="LoginFailedPasswordChanged">
+		為了安全起見，已經變更你的密碼。
+請到位於 http://secondlife.com/password 的帳號頁面
+回答安全驗證問題後，重設密碼。
+如有造成不便請多包涵。
+	</string>
+	<string name="LoginFailedPasswordReset">
+		我們系統有所變更，你必須重設密碼。
+請到位於 http://secondlife.com/password 的帳號頁面
+回答安全驗證問題後，重設密碼。
+如有造成不便請多包涵。
+	</string>
+	<string name="LoginFailedEmployeesOnly">
+		第二人生目前暫時關閉進行維護。
+目前僅允許林登員工登入。
+請到 www.secondlife.com/status 察看最新公告。
+	</string>
+	<string name="LoginFailedPremiumOnly">
+		第二人生此時暫時限制登入，以確保不影響效能，讓目前虛擬世界裡的用戶享受最佳的體驗。
+	 	
+免費帳戶的用戶此時暫時無法進入第二人生，因為我們必須優先容納付費用戶。
+	</string>
+	<string name="LoginFailedComputerProhibited">
+		無法從這部電腦進入第二人生。
+如你認為這是我們弄錯，請聯絡 support@secondlife.com。
+	</string>
+	<string name="LoginFailedAcountSuspended">
+		你的帳號要等到 [TIME] （太平洋時間）才可使用。
+	</string>
+	<string name="LoginFailedAccountDisabled">
+		此時無法完成你的請求。
+請到 http://secondlife.com/support 聯絡支援人員獲得幫助。
+如果你無法變更密碼，請致電 (866) 476-9763 （美國）。
+	</string>
+	<string name="LoginFailedTransformError">
+		登入時的資料不一致。
+請聯絡 support@secondlife.com。
+	</string>
+	<string name="LoginFailedAccountMaintenance">
+		你的帳號目前正在進行小規模的維護。
+你的帳號要等到 [TIME] （太平洋時間）才可使用。
+如你認為這是我們弄錯，請聯絡 support@secondlife.com。
+	</string>
+	<string name="LoginFailedPendingLogoutFault">
+		模擬器回應：登出請求出錯。
+	</string>
+	<string name="LoginFailedPendingLogout">
+		系統正在處理你的登出。
+你的帳號要等到 [TIME] （太平洋時間）才可使用。
+	</string>
+	<string name="LoginFailedUnableToCreateSession">
+		無法建立有效的時域。
+	</string>
+	<string name="LoginFailedUnableToConnectToSimulator">
+		無法連接到模擬器。
+	</string>
+	<string name="LoginFailedRestrictedHours">
+		你的帳號僅能在 [START] 到 [END] （太平洋時間）時段進入第二人生。
+請耐心等到該時段再回來。
+如你認為這是我們弄錯，請聯絡 support@secondlife.com。
+	</string>
+	<string name="LoginFailedIncorrectParameters">
+		錯誤的參數。
+如你認為這是我們弄錯，請聯絡 support@secondlife.com。
+	</string>
+	<string name="LoginFailedFirstNameNotAlphanumeric">
+		全名的第一個字(first name)須為英文字母或數字。
+如你認為這是我們弄錯，請聯絡 support@secondlife.com。
+	</string>
+	<string name="LoginFailedLastNameNotAlphanumeric">
+		全名的第二個字(last name)須為英文字母或數字。
+如你認為這是我們弄錯，請聯絡 support@secondlife.com。
+	</string>
+	<string name="LogoutFailedRegionGoingOffline">
+		地區即將離線。
+請稍待一分鐘再試。
+	</string>
+	<string name="LogoutFailedAgentNotInRegion">
+		用戶不在地區裡。
+請稍待一分鐘再試。
+	</string>
+	<string name="LogoutFailedPendingLogin">
+		地區正在登入另一個時域。
+請稍待一分鐘再試。
+	</string>
+	<string name="LogoutFailedLoggingOut">
+		地區正在登入上一個時域。
+請稍待一分鐘再試。
+	</string>
+	<string name="LogoutFailedStillLoggingOut">
+		地區正在登出上一個時域。
+請稍待一分鐘再試。
+	</string>
+	<string name="LogoutSucceeded">
+		地區剛剛登出上一個時域。
+請稍待一分鐘再試。
+	</string>
+	<string name="LogoutFailedLogoutBegun">
+		地區已經開始登出程序。
+請稍待一分鐘再試。
+	</string>
+	<string name="LoginFailedLoggingOutSession">
+		系統已經開始登出你的上一個時域。
+請稍待一分鐘再試。
+	</string>
 	<string name="AgentLostConnection">
 		本區域可能正發生問題。  請檢查你的網際網路連線是否正常。
 	</string>
@@ -438,6 +566,9 @@
 	<string name="symbolic folder link">
 		資料夾聯結
 	</string>
+	<string name="mesh">
+		網面
+	</string>
 	<string name="AvatarEditingAppearance">
 		（外觀編輯中）
 	</string>
@@ -1177,6 +1308,9 @@
 	<string name="InvFolder Accessories">
 		配件
 	</string>
+	<string name="InvFolder Meshes">
+		網面
+	</string>
 	<string name="InvFolder Friends">
 		朋友
 	</string>
@@ -3759,6 +3893,9 @@
 	<string name="session_initialization_timed_out_error">
 		會話初始化逾時，無法完成
 	</string>
+	<string name="Home position set.">
+		我的家位置已定。
+	</string>
 	<string name="voice_morphing_url">
 		http://secondlife.com/landing/voicemorphing
 	</string>