merge changes for MAINT-6236 and other translations

370 files changed, 5042 insertions, 1773 deletions

diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index ee631476cb..42e23b2089 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -3,6 +3,7 @@
 	<tab_container name="about_tab">
 		<panel label="Info" name="support_panel">
 			<button label="In Zwischenablage kopieren" name="copy_btn"/>
+			<button label="Nach Updates suchen" name="update_btn"/>
 		</panel>
 		<panel label="Danksagung" name="credits_panel">
 			<text name="linden_intro">Second Life wird präsentiert von den Lindens 
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 60f25704dd..07f297cf0a 100644
--- a/indra/newview/skins/default/xui/de/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/de/floater_about_land.xml
@@ -10,13 +10,13 @@
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
 	<floater.string name="Minutes">
-		[MINUTES] Minuten
+		[MINUTES] Min.
 	</floater.string>
 	<floater.string name="Minute">
-		Minute
+		Min.
 	</floater.string>
 	<floater.string name="Seconds">
-		[SECONDS] Sekunden
+		[SECONDS] Sek.
 	</floater.string>
 	<floater.string name="Remaining">
 		Restzeit
@@ -449,7 +449,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 			<spinner label="Online-Zeit:" name="HoursSpin"/>
 			<panel name="Allowed_layout_panel">
 				<text label="Immer erlauben" name="AllowedText">
-					Zulässige Einwohner
+					Zulässige Einwohner ([COUNT])
 				</text>
 				<name_list name="AccessList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
 				<button label="Hinzufügen" name="add_allowed"/>
@@ -457,7 +457,7 @@ Nur große Parzellen können in der Suche aufgeführt werden.
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Verbannen" name="BanCheck">
-					Verbannte Einwohner
+					Verbannte Einwohner ([COUNT])
 				</text>
 				<name_list name="BannedList" tool_tip="([LISTED] aufgeführt, [MAX] max)"/>
 				<button label="Hinzufügen" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/de/floater_autoreplace.xml b/indra/newview/skins/default/xui/de/floater_autoreplace.xml
index 0c774990ef..fc37818dfb 100644
--- a/indra/newview/skins/default/xui/de/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/de/floater_autoreplace.xml
@@ -13,6 +13,12 @@
 	</scroll_list>
 	<button label="Hinzufügen..." name="autoreplace_add_entry"/>
 	<button label="Entfernen" name="autoreplace_delete_entry"/>
+	<text name="autoreplace_keyword_txt">
+		Schlüsselwort:
+	</text>
+	<text name="autoreplace_replacement_txt">
+		Ersetzung:
+	</text>
 	<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."/>
diff --git a/indra/newview/skins/default/xui/de/floater_bumps.xml b/indra/newview/skins/default/xui/de/floater_bumps.xml
index 5d02511ab1..9e519ca121 100644
--- a/indra/newview/skins/default/xui/de/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/de/floater_bumps.xml
@@ -19,6 +19,6 @@
 		[TIME]  [NAME] hat Sie mit einem physischen Objekt getroffen
 	</floater.string>
 	<floater.string name="timeStr">
-		[[hour,datetime,slt]:[min,datetime,slt]]
+		[[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
 	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/de/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000..172a08e0ca
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="BEVORZ. VOREINST. LöSCHEN">
+	<string name="title_graphic">
+		Grafikvoreinstellung löschen
+	</string>
+	<string name="title_camera">
+		Kameravoreinstellung löschen
+	</string>
+	<text name="Preset">
+		Voreinstellung auswählen
+	</text>
+	<button label="Löschen" name="delete"/>
+	<button label="Abbrechen" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_experience_search.xml b/indra/newview/skins/default/xui/de/floater_experience_search.xml
index 0fda5086ff..4e2cc1ecbd 100644
--- a/indra/newview/skins/default/xui/de/floater_experience_search.xml
+++ b/indra/newview/skins/default/xui/de/floater_experience_search.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="experiencepicker" title="ERLEBNIS AUSWÄHLEN"/>
+<floater name="experiencepicker" title="ERLEBNIS AUSWäHLEN"/>
diff --git a/indra/newview/skins/default/xui/de/floater_experienceprofile.xml b/indra/newview/skins/default/xui/de/floater_experienceprofile.xml
index a553a5b6f0..33c9f6dbe5 100644
--- a/indra/newview/skins/default/xui/de/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/de/floater_experienceprofile.xml
@@ -66,7 +66,7 @@
 					<icons_combo_box label="Moderat" name="edit_ContentRatingText" tool_tip="Bei Erhöhung der Inhaltseinstufung eines Erlebnisses wird die Berechtigung für alle Einwohner zurückgesetzt, die das Erlebnis zugelassen haben.">
 						<icons_combo_box.item label="Adult" name="Adult" value="42"/>
 						<icons_combo_box.item label="Moderat" name="Mature" value="21"/>
-						<icons_combo_box.item label="Allgemein" name="PG" value="13"/>
+						<icons_combo_box.item label="Generell" name="PG" value="13"/>
 					</icons_combo_box>
 					<text name="edit_Location">
 						Standort:
diff --git a/indra/newview/skins/default/xui/de/floater_fast_timers.xml b/indra/newview/skins/default/xui/de/floater_fast_timers.xml
index e61e542688..4b5383c64d 100644
--- a/indra/newview/skins/default/xui/de/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/de/floater_fast_timers.xml
@@ -6,5 +6,16 @@
 	<string name="run">
 		Rennen
 	</string>
+	<combo_box name="time_scale_combo">
+		<item label="2x Durchschnitt" name="2x Average"/>
+		<item label="Höchstwert" name="Max"/>
+		<item label="Jüngster Höchstwert" name="Recent Max"/>
+		<item label="100 ms" name="100ms"/>
+	</combo_box>
+	<combo_box name="metric_combo">
+		<item label="Zeit" name="Time"/>
+		<item label="Anzahl von Aufrufen" name="Number of Calls"/>
+		<item label="Hz" name="Hz"/>
+	</combo_box>
 	<button label="Pause" name="pause_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
index 0820e75029..23c7157333 100644
--- a/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/de/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
 		<radio_item label="Älter als" name="older"/>
 	</radio_group>
 	<spinner label="Stunden zuvor" label_width="80" name="spin_hours_ago"/>
+	<text name="label_hours">
+		Stunden
+	</text>
 	<spinner label="Tage zuvor" name="spin_days_ago"/>
+	<text name="label_days">
+		Tage
+	</text>
 	<button label="Schließen" label_selected="Schließen" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/de/floater_load_pref_preset.xml
new file mode 100644
index 0000000000..23102d19ea
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="BEVORZ. VOREINST. LADEN">
+	<string name="title_graphic">
+		Grafikvoreinstellung laden
+	</string>
+	<string name="title_camera">
+		Kameravoreinstellung laden
+	</string>
+	<text name="Preset">
+		Voreinstellung auswählen
+	</text>
+	<button label="OK" name="ok"/>
+	<button label="Abbrechen" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml
index a412b530a4..4070dee84c 100644
--- a/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/de/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
 	<string name="OutboxInitializing">
 		Initialisieren...
 	</string>
-	<panel label="">
-		<panel>
+	<panel label="" name="panel_1">
+		<panel name="panel_2">
 			<panel name="outbox_inventory_placeholder_panel">
 				<text name="outbox_inventory_placeholder_title">
 					Laden...
 				</text>
 			</panel>
 		</panel>
-		<panel>
+		<panel name="panel_3">
+			<panel name="outbox_generic_drag_target">
+				<text name="text_1">
+					Artikel hierher ziehen, um Ordner zu erstellen
+				</text>
+			</panel>
 			<button label="In Marktplatz übertragen" name="outbox_import_btn" tool_tip="In meinen Marktplatz-Laden verschieben"/>
 		</panel>
 	</panel>
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 4285462bc8..f06e856966 100644
--- a/indra/newview/skins/default/xui/de/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/de/floater_model_preview.xml
@@ -55,6 +55,9 @@
 	<string name="mesh_status_invalid_material_list">
 		Detailstufenmaterial ist keine Teilmenge des Referenzmodells.
 	</string>
+	<string name="phys_status_vertex_limit_exceeded">
+		Einige physische Hüllen überschreiten die Vertexbeschränkungen.
+	</string>
 	<string name="layer_all">
 		Alle
 	</string>
@@ -93,52 +96,52 @@
 				<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"/>
+					<item label="Aus Datei laden" name="Load from file" value="Aus Datei laden"/>
+					<item label="Generieren" 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"/>
+					<item label="Dreiecklimit" name="Triangle Limit" value="Dreiecklimit"/>
+					<item label="Fehlerschwelle" 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"/>
+					<item label="Aus Datei laden" name="Load from file" value="Aus Datei laden"/>
+					<item label="Generieren" name="Generate" value="Generieren"/>
+					<item label="Detailstufe oben verwenden" 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"/>
+					<item label="Dreiecklimit" name="Triangle Limit" value="Dreiecklimit"/>
+					<item label="Fehlerschwelle" 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"/>
+					<item label="Aus Datei laden" name="Load from file" value="Aus Datei laden"/>
+					<item label="Generieren" name="Generate" value="Generieren"/>
+					<item label="Detailstufe oben verwenden" 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"/>
+					<item label="Dreiecklimit" name="Triangle Limit" value="Dreiecklimit"/>
+					<item label="Fehlerschwelle" 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"/>
+					<item label="Aus Datei laden" name="Load from file" value="Aus Datei laden"/>
+					<item label="Generieren" name="Generate" value="Generieren"/>
+					<item label="Detailstufe oben verwenden" 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"/>
+					<item label="Dreiecklimit" name="Triangle Limit" value="Dreiecklimit"/>
+					<item label="Fehlerschwelle" 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"/>
diff --git a/indra/newview/skins/default/xui/de/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/de/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000..3e98ca482e
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="BENACHRICHTIGUNGEN">
+	<floater.string name="system_tab_title">
+		System ([COUNT])
+	</floater.string>
+	<floater.string name="transactions_tab_title">
+		Transaktionen ([COUNT])
+	</floater.string>
+	<floater.string name="group_invitations_tab_title">
+		Einladungen ([COUNT])
+	</floater.string>
+	<floater.string name="group_notices_tab_title">
+		Gruppe ([COUNT])
+	</floater.string>
+	<string name="title_notification_tabbed_window">
+		BENACHRICHTIGUNGEN
+	</string>
+	<layout_stack name="TabButtonsStack">
+		<layout_panel name="TabButtonsLayoutPanel">
+			<tab_container name="notifications_tab_container">
+				<panel label="System (0)" name="system_notification_list_tab"/>
+				<panel label="Transaktionen (0)" name="transaction_notifications_tab"/>
+				<panel label="Einladungen (0)" name="group_invite_notifications_tab"/>
+				<panel label="Gruppe (0)" name="group_notice_notifications_tab"/>
+			</tab_container>
+			<layout_stack name="ButtonsStack">
+				<layout_panel name="CondenseAllButtonPanel">
+					<button label="Alle schließen" name="collapse_all_button"/>
+				</layout_panel>
+				<layout_panel name="GapLayoutPanel">
+					<panel label="Lückenbedienfeld" name="GapPanel"/>
+				</layout_panel>
+				<layout_panel name="DeleteAllButtonPanel">
+					<button label="Alle löschen" name="delete_all_button"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</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
index 7096dbc156..b50a7bb6ec 100644
--- a/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
 	<floater.string name="character_owner_group">
 		[Gruppe]
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_chars_main">
 		<scroll_list name="objects_scroll_list">
 			<scroll_list.columns label="Name" name="name"/>
 			<scroll_list.columns label="Beschreibung" name="description"/>
@@ -42,7 +42,7 @@
 		<button label="Alle auswählen" name="select_all_objects"/>
 		<button label="Keine auswählen" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_chars_actions">
 		<text name="actions_label">
 			Aktionen für ausgewählte Figuren:
 		</text>
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
index ebf8f01632..27c6b73967 100644
--- a/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
 	<floater.string name="pathing_error">
 		Fehler bei der Pfaderstellung aufgetreten.
 	</floater.string>
+	<panel name="pathfinding_console_main">
+		<text name="viewer_status_label">
+			Viewer-Status
+		</text>
+	</panel>
+	<panel name="pathfinding_console_simulator">
+		<text name="simulator_status_label">
+			Simulator-Status
+		</text>
+	</panel>
 	<tab_container name="view_test_tab_container">
 		<panel label="Anzeigen" name="view_panel">
 			<text name="show_label">
diff --git a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml
index 0d3ba59efb..f80bc1da8d 100644
--- a/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/de/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
 	<floater.string name="linkset_choose_use">
 		Linkset-Nutzung auswählen...
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_linksets_main">
+		<text name="linksets_filter_label">
+			Filtern nach:
+		</text>
+		<text name="linksets_name_label">
+			Name
+		</text>
+		<text name="linksets_desc_label">
+			Beschreibung
+		</text>
 		<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"/>
@@ -103,7 +112,7 @@
 		<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="Name(Hauptprim)" name="name"/>
 			<scroll_list.columns label="Beschreibung (Hauptprim)" name="description"/>
 			<scroll_list.columns label="Eigentümer" name="owner"/>
 			<scroll_list.columns label="Geskriptet" name="scripted"/>
@@ -120,9 +129,12 @@
 		</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"/>
+		<button label="Nichts auswählen" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_actions">
+		<text name="linksets_actions_label">
+			Aktionen für ausgewählte Linksets (wenn ein Linkset aus der Welt entfernt wird, gehen seine Attribute u. U. verloren):
+		</text>
 		<check_box label="Beacon anzeigen" name="show_beacon"/>
 		<button label="Nehmen" name="take_objects"/>
 		<button label="Kopie nehmen" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
 		<button label="Zurückgeben" name="return_objects"/>
 		<button label="Löschen" name="delete_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_attributes">
+		<text name="linksets_attributes_label">
+			Bearbeiten Sie die Attribute ausgewählter Linksets und klicken Sie auf die Schaltfläche, um die änderungen zu übernehmen
+		</text>
 		<text name="walkability_coefficients_label">
 			Begehbarkeit:
 		</text>
@@ -150,7 +165,7 @@
 			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"/>
+		<button label="änderungen übernehmen" name="apply_edit_values"/>
 		<text name="suggested_use_a_label">
 			(Humanoid)
 		</text>
diff --git a/indra/newview/skins/default/xui/de/floater_perms_default.xml b/indra/newview/skins/default/xui/de/floater_perms_default.xml
index 6d6c89172d..6274739f70 100644
--- a/indra/newview/skins/default/xui/de/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/de/floater_perms_default.xml
@@ -1,6 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perms default" title="STANDARD-ERSTELLUNGSBERECHTIGUNGEN">
-	<panel label="Standardberechtigungen" name="default permissions"/>
+	<panel label="Standardberechtigungen" name="default permissions">
+		<text name="label_1">
+			Nächster Eigentümer:
+		</text>
+		<text name="label_2">
+			Kopie
+		</text>
+		<text name="label_3">
+			ändern
+		</text>
+		<text name="label_4">
+			übertragen
+		</text>
+		<text name="label_5">
+			Mit Gruppe teilen
+		</text>
+		<text name="label_6">
+			Kopieren allen erlauben
+		</text>
+		<text name="label_7" tool_tip="Standardberechtigungen für die Erstellung von Objekten festlegen">
+			Objekte
+		</text>
+		<text name="label_8" tool_tip="Standardberechtigungen für hochgeladene Artikel festlegen">
+			Uploads
+		</text>
+		<text name="label_9" tool_tip="Standardberechtigungen für die Erstellung von Skripts festlegen">
+			Skripts
+		</text>
+		<text name="label_10" tool_tip="Standardberechtigungen für die Erstellung von Notizkarten festlegen">
+			Notizkarten
+		</text>
+		<text name="label_11" tool_tip="Standardberechtigungen für die Erstellung von Gesten festlegen">
+			Gesten
+		</text>
+		<text name="label_12" tool_tip="Standardberechtigungen für die Erstellung von Kleidungsstücken und Körperteilen festlegen">
+			Tragbare Objekte
+		</text>
+	</panel>
 	<button label="OK" label_selected="OK" name="ok"/>
 	<button label="Abbrechen" label_selected="Abbrechen" name="cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000..2c141f616f
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="ERWEITERTE GRAFIKEINSTELLUNGEN">
+	<text name="GeneralText">
+		Allgemein
+	</text>
+	<slider label="Sichtweite:" name="DrawDistance"/>
+	<text name="DrawDistanceMeterText2">
+		m
+	</text>
+	<slider label="Max. Partikelzahl:" name="MaxParticleCount"/>
+	<slider label="Post-Processing-Qualität:" name="RenderPostProcess"/>
+	<text name="PostProcessText">
+		Niedrig
+	</text>
+	<text name="AvatarText">
+		Avatar
+	</text>
+	<slider label="Maximale Komplexität:" name="IndirectMaxComplexity" tool_tip="Bestimmt, an welchem Punkt ein visuell komplexer Avatar als „Gummibärchen“ dargestellt wird"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
+	<slider label="Max. Anzahl an voll dargestellten Avataren:" name="IndirectMaxNonImpostors"/>
+	<text name="IndirectMaxNonImpostorsText">
+		0
+	</text>
+	<slider label="Details:" name="AvatarMeshDetail"/>
+	<text name="AvatarMeshDetailText">
+		Niedrig
+	</text>
+	<slider label="Physik:" name="AvatarPhysicsDetail"/>
+	<text name="AvatarPhysicsDetailText">
+		Niedrig
+	</text>
+	<text name="ShadersText">
+		Hardware
+	</text>
+	<slider label="Texturen-Cache (MB):" name="GraphicsCardTextureMemory" tool_tip="Speicherplatz, der für Texturen zur Verfügung steht. In der Regel handelt es sich um Grafikkartenspeicher. Ein kleinerer Wert kann die Geschwindigkeit erhöhen, aber auch zu Texturunschärfen führen."/>
+	<slider label="Nebeldistanzverhältnis:" name="fog"/>
+	<slider label="Gamma:" name="gamma"/>
+	<text name="(brightness, lower is brighter)">
+		(0 = Standardhelligkeit, niedriger = heller)
+	</text>
+	<check_box label="Anisotropische Filterung (langsamer, wenn aktiviert)" name="ani"/>
+	<check_box initial_value="true" label="OpenGL Vertex-Buffer-Objekte aktivieren" name="vbo" tool_tip="Wenn Sie über moderne Grafikhardware verfügen, können Sie durch Aktivieren dieser Option die Geschwindigkeit verbessern.  Bei alter Hardware sind die VBO oft schlecht implementiert, was zu Abstürzen führen kann, wenn diese Option aktiviert ist."/>
+	<check_box initial_value="true" label="Texturkomprimierung aktivieren (Neustart erforderlich)" name="texture compression" tool_tip="Komprimiert Texturen im Videospeicher, damit höher auflösende Texturen geladen werden können (leichte Beeinträchtigung der Farbqualität)."/>
+	<text name="antialiasing label">
+		Antialiasing:
+	</text>
+	<combo_box label="Antialiasing" name="fsaa">
+		<combo_box.item label="Deaktiviert" name="FSAADisabled"/>
+		<combo_box.item label="2x" name="2x"/>
+		<combo_box.item label="4x" name="4x"/>
+		<combo_box.item label="8x" name="8x"/>
+		<combo_box.item label="16x" name="16x"/>
+	</combo_box>
+	<text name="antialiasing restart">
+		(Neustart erforderlich)
+	</text>
+	<slider label="Gitterdetails Terrain:" name="TerrainMeshDetail"/>
+	<text name="TerrainMeshDetailText">
+		Niedrig
+	</text>
+	<slider label="Bäume:" name="TreeMeshDetail"/>
+	<text name="TreeMeshDetailText">
+		Niedrig
+	</text>
+	<slider label="Objekte:" name="ObjectMeshDetail"/>
+	<text name="ObjectMeshDetailText">
+		Niedrig
+	</text>
+	<slider label="Flexiprimitiva:" name="FlexibleMeshDetail"/>
+	<text name="FlexibleMeshDetailText">
+		Niedrig
+	</text>
+	<check_box initial_value="true" label="Transparentes Wasser" name="TransparentWater"/>
+	<check_box initial_value="true" label="Bumpmapping und Glanz" name="BumpShiny"/>
+	<check_box initial_value="true" label="Lokale Lichtquellen" name="LocalLights"/>
+	<check_box initial_value="true" label="Einfache Shader" name="BasicShaders" tool_tip="Deaktivieren Sie diese Option, wenn der Grafikkartentreiber Abstürze verursacht"/>
+	<slider label="Terraindetails:" name="TerrainDetail"/>
+	<text name="TerrainDetailText">
+		Niedrig
+	</text>
+	<check_box initial_value="true" label="Hardware-Hautberechnung für Avatar" name="AvatarVertexProgram"/>
+	<check_box initial_value="true" label="Avatar-Kleidung" name="AvatarCloth"/>
+	<text name="ReflectionsText">
+		Wasserreflexionen:
+	</text>
+	<combo_box name="Reflections">
+		<combo_box.item label="Minimal" name="0"/>
+		<combo_box.item label="Terrain und Bäume" name="1"/>
+		<combo_box.item label="Alle statischen Objekte" name="2"/>
+		<combo_box.item label="Alle Avatare und Objekte" name="3"/>
+		<combo_box.item label="Alles" name="4"/>
+	</combo_box>
+	<check_box initial_value="true" label="Atmosphären-Shader" name="WindLightUseAtmosShaders"/>
+	<slider label="Himmel:" name="SkyMeshDetail"/>
+	<text name="SkyMeshDetailText">
+		Niedrig
+	</text>
+	<check_box initial_value="true" label="Erweitertes Beleuchtungsmodell" name="UseLightShaders"/>
+	<check_box initial_value="true" label="Ambient Occlusion" name="UseSSAO"/>
+	<check_box initial_value="true" label="Schärfentiefe" name="UseDoF"/>
+	<text name="RenderShadowDetailText">
+		Schatten:
+	</text>
+	<combo_box name="ShadowDetail">
+		<combo_box.item label="Keine" name="0"/>
+		<combo_box.item label="Sonne/Mond" name="1"/>
+		<combo_box.item label="Sonne/Mond + Projektoren" name="2"/>
+	</combo_box>
+	<button label="Auf empfohlene Einstellungen zurücksetzen" name="Defaults"/>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
+	<check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/de/floater_save_pref_preset.xml
new file mode 100644
index 0000000000..c9614e3615
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="BEVORZ. VOREINST. SPEICHERN">
+	<string name="title_graphic">
+		Grafikvoreinstellung speichern
+	</string>
+	<string name="title_camera">
+		Kameravoreinstellung speichern
+	</string>
+	<text name="Preset">
+		Geben Sie einen Namen für die Voreinstellung ein oder wählen Sie eine vorhandene Voreinstellung aus.
+	</text>
+	<button label="Speichern" name="save"/>
+	<button label="Abbrechen" name="cancel"/>
+</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
index 374c0fc0d2..fc5de44aeb 100644
--- a/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/de/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_import" title="Wörterbuch importieren">
+	<text name="import_dict">
+		Wörterbuch:
+	</text>
 	<button label="Durchsuchen" label_selected="Durchsuchen" name="dictionary_path_browse"/>
+	<text name="import_name">
+		Name:
+	</text>
+	<text name="import_lang">
+		Sprache:
+	</text>
 	<button label="Importieren" name="ok_btn"/>
 	<button label="Abbrechen" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/floater_tos.xml b/indra/newview/skins/default/xui/de/floater_tos.xml
index ba329371f8..0193cf619d 100644
--- a/indra/newview/skins/default/xui/de/floater_tos.xml
+++ b/indra/newview/skins/default/xui/de/floater_tos.xml
@@ -12,4 +12,7 @@
 	<text name="tos_heading">
 		Lesen Sie die folgenden Servicebedingungen und Datenbestimmungen sorgfältig durch. Sie müssen den Servicebedingungen zustimmen, um sich bei [SECOND_LIFE] anmelden zu können.
 	</text>
+	<text name="external_tos_required">
+		Sie müssen sich auf my.secondlife.com anmelden und die Servicebedingungen akzeptieren, bevor Sie fortfahren können. Vielen Dank!
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/menu_attachment_other.xml b/indra/newview/skins/default/xui/de/menu_attachment_other.xml
index 4c125c8b5d..ddb1e7b0b1 100644
--- a/indra/newview/skins/default/xui/de/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_attachment_other.xml
@@ -15,5 +15,8 @@
 	<menu_item_call label="Hineinzoomen" name="Zoom In"/>
 	<menu_item_call label="Bezahlen" name="Pay..."/>
 	<menu_item_call label="Objektprofil" name="Object Inspect"/>
+	<menu_item_check label="Normal darstellen" name="RenderNormally"/>
+	<menu_item_check label="Nicht darstellen" name="DoNotRender"/>
+	<menu_item_check label="Komplett darstellen" name="AlwaysRenderFully"/>
 	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_avatar_other.xml b/indra/newview/skins/default/xui/de/menu_avatar_other.xml
index 65dc054ed5..7242ba1495 100644
--- a/indra/newview/skins/default/xui/de/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/de/menu_avatar_other.xml
@@ -14,5 +14,8 @@
 	<menu_item_call label="XML ausgeben" name="Dump XML"/>
 	<menu_item_call label="Hineinzoomen" name="Zoom In"/>
 	<menu_item_call label="Bezahlen" name="Pay..."/>
+	<menu_item_check label="Normal darstellen" name="RenderNormally"/>
+	<menu_item_check label="Nicht darstellen" name="DoNotRender"/>
+	<menu_item_check label="Komplett darstellen" name="AlwaysRenderFully"/>
 	<menu_item_call label="Partikeleigentümer blockieren" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_login.xml b/indra/newview/skins/default/xui/de/menu_login.xml
index 329ea20179..2dc4c1d687 100644
--- a/indra/newview/skins/default/xui/de/menu_login.xml
+++ b/indra/newview/skins/default/xui/de/menu_login.xml
@@ -15,6 +15,7 @@
 		<menu_item_call label="[SECOND_LIFE]-Blogs" name="Second Life Blogs"/>
 		<menu_item_call label="Fehler melden" name="Report Bug"/>
 		<menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="Nach Updates suchen" name="Check for Updates"/>
 	</menu>
 	<menu_item_check label="Debug-Menü anzeigen" name="Show Debug Menu"/>
 	<menu label="Debug" name="Debug">
diff --git a/indra/newview/skins/default/xui/de/menu_marketplace_view.xml b/indra/newview/skins/default/xui/de/menu_marketplace_view.xml
index 41516a1e7c..5475834b3b 100644
--- a/indra/newview/skins/default/xui/de/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/de/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_marketplace_sort">
+	<menu_item_check label="Nach Namen sortieren" name="sort_by_name"/>
+	<menu_item_check label="Nach jüngsten sortieren" name="sort_by_recent"/>
 	<menu_item_check label="Nach verfügbarer Menge sortieren (niedrig bis hoch)" name="sort_by_stock_amount"/>
 	<menu_item_check label="Nur Auflistungsordner anzeigen" name="show_only_listing_folders"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_url_email.xml b/indra/newview/skins/default/xui/de/menu_url_email.xml
new file mode 100644
index 0000000000..3d8e61bc80
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+	<menu_item_call label="E-Mail in externem Client verfassen" name="email_open_external"/>
+	<menu_item_call label="E-Mail in Zwischenablage kopieren" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/de/menu_viewer.xml b/indra/newview/skins/default/xui/de/menu_viewer.xml
index 956530c990..d83a6071f6 100644
--- a/indra/newview/skins/default/xui/de/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/de/menu_viewer.xml
@@ -180,6 +180,7 @@
 		<menu_item_call label="Fehler melden" name="Report Bug"/>
 		<menu_item_call label="Rempler, Stöße &amp; Schläge" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu_item_call label="INFO ÜBER [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="Nach Updates suchen" name="Check for Updates"/>
 	</menu>
 	<menu label="Erweitert" name="Advanced">
 		<menu_item_call label="Textur neu laden" name="Rebake Texture"/>
@@ -193,7 +194,7 @@
 			<menu_item_call label="Lag-Anzeige" name="Lag Meter"/>
 			<menu_item_check label="Statistikleiste" name="Statistics Bar"/>
 			<menu_item_call label="Statistiken zum Laden von Szenen" name="Scene Load Statistics"/>
-			<menu_item_check label="Zuggewicht für Avatare anzeigen" name="Avatar Rendering Cost"/>
+			<menu_item_check label="Informationen zur Avatarkomplexität anzeigen" name="Avatar Draw Info"/>
 		</menu>
 		<menu label="Hervorhebung und Sichtbarkeit" name="Highlighting and Visibility">
 			<menu_item_check label="Pulsierender Strahl" name="Cheesy Beacon"/>
@@ -316,8 +317,6 @@
 			<menu_item_check label="Gelenke" name="Joints"/>
 			<menu_item_check label="Raycast" name="Raycast"/>
 			<menu_item_check label="Windvektoren" name="Wind Vectors"/>
-			<menu_item_check label="Komplexität beim Rendern" name="rendercomplexity"/>
-			<menu_item_check label="Byte in Anhängen" name="attachment bytes"/>
 			<menu_item_check label="Formen" name="Sculpt"/>
 			<menu label="Texturdichte" name="Texture Density">
 				<menu_item_check label="Keine" name="None"/>
@@ -417,13 +416,11 @@
 			<menu_item_check label="Fehler für sichtbare Agenten beseitigen" name="Debug Character Vis"/>
 			<menu_item_check label="Gelenkpunkte anzeigen" name="Show Collision Skeleton"/>
 			<menu_item_check label="Agent-Ziel anzeigen" name="Display Agent Target"/>
-			--&gt;
 			<menu_item_call label="Anhänge ausgeben" name="Dump Attachments"/>
 			<menu_item_call label="Fehler in Avatar-Texturen beseitigen" name="Debug Avatar Textures"/>
 			<menu_item_call label="Lokale Texturen ausgeben" name="Dump Local Textures"/>
 		</menu>
 		<menu_item_check label="HTTP-Texturen" name="HTTP Textures"/>
-		<menu_item_check label="HTTP-Inventar" name="HTTP Inventory"/>
 		<menu_item_call label="Bilder komprimieren" name="Compress Images"/>
 		<menu_item_call label="Visual Leak Detector aktivieren" name="Enable Visual Leak Detector"/>
 		<menu_item_check label="Ausgabe Fehlerbeseitigung ausgeben" name="Output Debug Minidump"/>
diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml
index fa7db0a8a3..19b488b048 100644
--- a/indra/newview/skins/default/xui/de/notifications.xml
+++ b/indra/newview/skins/default/xui/de/notifications.xml
@@ -164,6 +164,10 @@ Marktplatzinitialisierung aufgrund eines System- oder Netzwerkfehlers fehlgeschl
         „[ERROR_CODE]“
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="MerchantForceValidateListing">
+		Um Ihre Auflistung zu erstellen, haben wir die Hierarchie des Auflistungsinhalts korrigiert.
+		<usetemplate ignoretext="Warnung anzeigen, wenn beim Erstellen einer Auflistung die Hierarchie des Inhalts korrigiert wird" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmMerchantActiveChange">
 		Diese Aktion ändert den aktiven Inhalt dieser Auflistung. Möchten Sie fortfahren?
 		<usetemplate ignoretext="Vor Ändern einer aktiven Auflistung im Marktplatz bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
@@ -211,6 +215,10 @@ Marktplatzinitialisierung aufgrund eines System- oder Netzwerkfehlers fehlgeschl
 		Wir haben Ihre Auflistung entfernt, da der Bestandsordner leer ist. Um diese Auflistung wieder zu listen, müssen Sie weitere Einheiten zum Bestandsordner hinzufügen.
 		<usetemplate ignoretext="Benachrichtigen, wenn Auflistung aufgrund eines leeren Bestandsordners nicht aufgelistet wird" name="okignore" yestext="OK"/>
 	</notification>
+	<notification name="AlertMerchantVersionFolderEmpty">
+		Wir haben Ihre Auflistung entfernt, da der Versionsordner leer ist. Um diese Auflistung erneut zu listen, müssen Sie Artikel zum Versionsordner hinzufügen.
+		<usetemplate ignoretext="Benachrichtigen, wenn Auflistung aufgrund eines leeren Versionsordners nicht aufgelistet wird" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		Der Text für ein Skript konnte aus folgendem Grund nicht hochgeladen werden: [REASON]. Bitte versuchen Sie es erneut.
 	</notification>
@@ -326,6 +334,14 @@ Wenn diese Rolle nicht mehr diese Fähigkeiten haben soll, deaktivieren Sie sie
 		Sie sind dabei, [COUNT] Mitglieder aus der Gruppe hinauszuwerfen.
 		<usetemplate ignoretext="Hinauswerfen mehrerer Gruppenmitglieder bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Hinauswerfen"/>
 	</notification>
+	<notification name="BanGroupMemberWarning">
+		Sie sind dabei, [AVATAR_NAME] aus der Gruppe zu verbannen.
+		<usetemplate ignoretext="Verbannen eines Gruppenmitglieds bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Verbannen"/>
+	</notification>
+	<notification name="BanGroupMembersWarning">
+		Sie sind dabei, [COUNT] Mitglieder aus der Gruppe zu verbannen.
+		<usetemplate ignoretext="Verbannen mehrerer Gruppenmitglieder bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Verbannen"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Sie möchten Ihren Anhang wirklich fallen lassen?
 Möchten Sie fortfahren?
@@ -411,7 +427,7 @@ Objekte: [N]
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="ReturnAllTopObjects">
-		Möchten Sie alle aufgeführten Objekte ihren Eigentümern zurückgeben?
+		Möchten Sie alle aufgeführten Objekte ihren Eigentümern zurückgeben? Dadurch werden ALLE Skriptobjekte in der Region zurückgegeben.
 		<usetemplate name="okcancelbuttons" notext="Abbrechen" yestext="OK"/>
 	</notification>
 	<notification name="DisableAllTopObjects">
@@ -616,6 +632,10 @@ Das Objekt ist möglicherweise außer Reichweite oder wurde gelöscht.
 	<notification name="CannotDownloadFile">
 		Dateidownload nicht möglich
 	</notification>
+	<notification label="" name="MediaFileDownloadUnsupported">
+		Sie haben einen Datei-Download angefordert, der in [SECOND_LIFE] nicht unterstützt wird.
+		<usetemplate ignoretext="Warnung anzeigen, wenn ein Datei-Download nicht unterstützt wird" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CannotWriteFile">
 		Datei [[FILE]] kann nicht geschrieben werden
 	</notification>
@@ -1122,7 +1142,8 @@ Dies ist ein temporärer Fehler. Bitte passen Sie das Kleidungsstück in einigen
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
 		Es tut uns leid! Sie wurden von [SECOND_LIFE] abgemeldet.
-            [MESSAGE]
+
+[MESSAGE]
 		<usetemplate name="okcancelbuttons" notext="Beenden" yestext="IM &amp; Chat anzeigen"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
@@ -1371,6 +1392,13 @@ Sie können [SECOND_LIFE] normal verwenden. Andere Benutzer können Sie korrekt
 			<ignore name="ignore" text="Das Herunterladen der Kleidung dauert lange"/>
 		</form>
 	</notification>
+	<notification name="RegionAndAgentComplexity">
+		Ihre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 visuelle Komplexität] ist [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+	</notification>
+	<notification name="AgentComplexity">
+		Ihre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 visuelle Komplexität] ist [AGENT_COMPLEXITY].
+	</notification>
 	<notification name="FirstRun">
 		Installation von [APP_NAME] vollständig abgeschlossen.
 
@@ -1648,6 +1676,25 @@ Dieser experimentelle Viewer wurde durch einen [NEW_CHANNEL] Viewer ersetzt;
 weitere Infos zu diesem Update finden Sie [[INFO_URL] hier].
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="UpdateDownloadInProgress">
+		Ein Update ist verfügbar.
+Es wird im Hintergrund heruntergeladen. Wenn der Download fertig ist, werden Sie aufgefordert, den Viewer neu zu starten, damit die Installation abgeschlossen werden kann.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateDownloadComplete">
+		Ein Update wurde heruntergeladen. Es wird beim Neustart installiert.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateCheckError">
+		Beim Suchen nach einem Update ist ein Fehler aufgetreten.
+Versuchen Sie es später erneut.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateViewerUpToDate">
+		Ihr Viewer ist auf dem neuesten Stand.
+Wenn Sie die neuesten Features und Fixes ausprobieren möchten, gehen Sie zur Seite „Alternate Viewers“. http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="DeedObjectToGroup">
 		Bei Übertragung dieses Objekts erhält die Gruppe:
 * An das Objekt bezahlte L$
@@ -1752,6 +1799,14 @@ Diese Gruppe verlassen?
 		Sie haben die maximale Anzahl an Gruppen erreicht. Bitte verlassen Sie eine Gruppe bevor Sie einer neuen beitreten oder eine neue Gruppe bilden.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="GroupLimitInfo">
+		Die Gruppenbegrenzung für Basiskonten ist [MAX_BASIC]; für 
+[https://secondlife.com/premium/ Premium-]Konten ist sie [MAX_PREMIUM].
+Wenn Sie ein Downgrade Ihres Kontos durchgeführt haben, müssen Sie das Gruppenlimit unter [MAX_BASIC] bringen, bevor sich weitere Personen registrieren können.
+
+[https://secondlife.com/my/account/membership.php Noch heute upgraden!]
+		<usetemplate name="okbutton" yestext="Schließen"/>
+	</notification>
 	<notification name="KickUser">
 		Beim Hinauswerfen dieses Benutzers welche Meldung anzeigen?
 		<form name="form">
@@ -2264,6 +2319,10 @@ Inventarobjekt(e) verschieben?
 		Bestätigen Sie, dass Sie L$ [AMOUNT] an [TARGET] zahlen möchten.
 		<usetemplate ignoretext="Vor den Bezahlen bestätigen (Summen über L$ 200)" name="okcancelignore" notext="Abbrechen" yestext="Bezahlen"/>
 	</notification>
+	<notification name="PayObjectFailed">
+		Zahlung fehlgeschlagen: Objekt nicht gefunden.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="OpenObjectCannotCopy">
 		Sie haben keine Berechtigung zum Kopieren von Elementen in diesem Objekt.
 	</notification>
@@ -2295,10 +2354,9 @@ Diese Aktion kann nicht rückgängig gemacht werden.
 		[QUESTION]
 		<usetemplate ignoretext="Vor dem Löschen von Objekten bestätigen" name="okcancelignore" notext="Abbrechen" yestext="OK"/>
 	</notification>
-	<notification name="HelpReportAbuseEmailLL">
-		Mit dieser Funktion können Sie Verstöße gegen die [http://secondlife.com/corporate/tos.php Servicebedingungen (EN)] und [http://secondlife.com/corporate/cs.php Community-Standards] melden.
-
-Alle gemeldeten Verstöße werden bearbeitet.
+	<notification name="ConfirmUnlink">
+		Dies ist eine große Auswahl mit Linksets. Wenn Sie die Verknüpfung auflösen, kann sie möglicherweise nicht erneut hergestellt werden. Als Vorsichtsmaßnahme empfiehlt es sich, Kopien von Linksets in Ihr Inventar aufzunehmen.
+		<usetemplate ignoretext="Auflösen der Verknüpfung eines Linksets bestätigen" name="okcancelignore" notext="Abbrechen" yestext="Verknüpfung auflösen"/>
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		Wählen Sie eine Missbrauchskategorie aus.
@@ -2988,13 +3046,13 @@ Ist das OK?
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="NotInGroupExperienceProfileMessage">
-		Eine Änderung der Erlebnisgruppe wurde ignoriert, weil der Eigentümer nicht Mitglied der ausgewählten Gruppe ist.
+		Eine änderung der Erlebnisgruppe wurde ignoriert, weil der Eigentümer nicht Mitglied der ausgewählten Gruppe ist.
 	</notification>
 	<notification name="UneditableExperienceProfileMessage">
 		Das nicht bearbeitbare Feld „[field]“ wurde beim Aktualisieren des Erlebnisprofils ignoriert.
 	</notification>
 	<notification name="RestrictedToOwnerExperienceProfileMessage">
-		Änderungen des Felds „[field]“ ignoriert; Feld kann nur vom Eigentümer des Erlebnisses eingestellt werden.
+		änderungen des Felds „[field]“ ignoriert; Feld kann nur vom Eigentümer des Erlebnisses eingestellt werden.
 	</notification>
 	<notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
 		Sie können die Inhaltseinstufung eines Erlebnisses nicht auf eine höhere Stufe setzen als die des Eigentümers.
@@ -3226,6 +3284,12 @@ Diese werden für ein paar Sekunden sicherheitshalber gesperrt.
 	<notification name="AttachmentSaved">
 		Der Anhang wurde gespeichert.
 	</notification>
+	<notification name="PresetNotSaved">
+		Fehler beim Speichern der Voreinstellung [NAME].
+	</notification>
+	<notification name="PresetNotDeleted">
+		Fehler beim Löschen der Voreinstellung [NAME].
+	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Hilfethema für dieses Element wurde nicht gefunden.
 	</notification>
@@ -3258,9 +3322,8 @@ Die Schaltfläche wird angezeigt, wenn genügend Platz vorhanden ist.
 		Wählen Sie Einwohner aus, für die Sie das Objekt freigeben möchten.
 	</notification>
 	<notification name="MeshUploadError">
-		[LABEL] konnte nicht hochgeladen werden: [MESSAGE] [IDENTIFIER] 
-
-Details finden Sie in der Protokolldatei.
+		[LABEL] konnte nicht hochgeladen werden: [MESSAGE] [IDENTIFIER]
+[DETAILS]Details finden Sie in SecondLife.log.
 	</notification>
 	<notification name="MeshUploadPermError">
 		Fehler beim Anfordern der Berechtigungen zum Hochladen des Netzes
diff --git a/indra/newview/skins/default/xui/de/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/de/panel_experience_list_editor.xml
index b87c814485..d4e095edfe 100644
--- a/indra/newview/skins/default/xui/de/panel_experience_list_editor.xml
+++ b/indra/newview/skins/default/xui/de/panel_experience_list_editor.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="experince_list_editor">
 	<panel.string name="loading">
-		wird geladen...
+		Laden...
 	</panel.string>
 	<panel.string name="panel_allowed">
 		Zulässige Erlebnisse:
diff --git a/indra/newview/skins/default/xui/de/panel_experience_search.xml b/indra/newview/skins/default/xui/de/panel_experience_search.xml
index e556335213..a3751824e5 100644
--- a/indra/newview/skins/default/xui/de/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/de/panel_experience_search.xml
@@ -26,7 +26,7 @@
 		<icons_combo_box label="Moderat" name="maturity">
 			<icons_combo_box.item label="Adult" name="Adult" value="42"/>
 			<icons_combo_box.item label="Moderat" name="Mature" value="21"/>
-			<icons_combo_box.item label="Allgemein" name="PG" value="13"/>
+			<icons_combo_box.item label="Generell" name="PG" value="13"/>
 		</icons_combo_box>
 		<scroll_list name="search_results">
 			<columns label="Name" name="experience_name"/>
diff --git a/indra/newview/skins/default/xui/de/panel_main_inventory.xml b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
index 2f00782ef0..92bbed6b07 100644
--- a/indra/newview/skins/default/xui/de/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_main_inventory.xml
@@ -6,6 +6,9 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] Objekte [FILTER]
 	</panel.string>
+	<panel.string name="ItemcountUnknown">
+		Abgerufen: [ITEM_COUNT] Artikel [FILTER]
+	</panel.string>
 	<text name="ItemcountText">
 		Objekte:
 	</text>
@@ -16,7 +19,7 @@
 	</tab_container>
 	<layout_stack name="bottom_panel">
 		<layout_panel name="options_gear_btn_panel">
-			<button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
+			<menu_button name="options_gear_btn" tool_tip="Zusätzliche Optionen anzeigen"/>
 		</layout_panel>
 		<layout_panel name="add_btn_panel">
 			<button name="add_btn" tool_tip="Neues Objekt hinzufügen"/>
diff --git a/indra/newview/skins/default/xui/de/panel_people.xml b/indra/newview/skins/default/xui/de/panel_people.xml
index 2d56d6b7d2..1eb3d4d1b9 100644
--- a/indra/newview/skins/default/xui/de/panel_people.xml
+++ b/indra/newview/skins/default/xui/de/panel_people.xml
@@ -18,6 +18,7 @@ Sie suchen nach Leuten? Verwenden Sie die [secondlife:///app/worldmap Karte].
 	<string name="no_groups_msg" value="Suchen Sie nach Gruppen? Versuchen Sie es mit der [secondlife:///app/search/groups Suche]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Doppelklicken, um Karte zu öffnen; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Doppelklicken, um zu teleportieren; Umschalttaste gedrückt halten und ziehen, um zu schwenken)"/>
+	<string name="GroupCountWithInfo" value="Sie gehören [COUNT] Gruppen an und können [REMAINING] weiteren beitreten.  [secondlife:/// Möchten Sie noch mehr?]"/>
 	<tab_container name="tabs">
 		<panel label="IN DER NÄHE" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_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 8eb815fd1b..e9ced1a0d2 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
 		<check_box label="Inventarangebot" name="inventory_offer"/>
 	</panel>
 	<panel name="log_settings">
+		<text name="logging_label">
+			Speichern:
+		</text>
+		<combo_box name="conversation_log_combo">
+			<item label="Protokoll und Transkripte" name="log_and_transcripts" value="2"/>
+			<item label="Nur Protokoll" name="log_only" value="1"/>
+			<item label="Weder Protokoll noch Transkripte" name="no_log_or_transcript" value="0"/>
+		</combo_box>
 		<button label="Protokoll löschen..." name="clear_log"/>
 		<button label="Transkripte löschen..." name="delete_transcripts"/>
+		<text name="log_location_label">
+			Standort:
+		</text>
 		<button label="Durchsuchen..." label_selected="Durchblättern" name="log_path_button"/>
 	</panel>
 	<button label="Übersetzen..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_general.xml b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
index 2587ea0ced..201998f220 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_general.xml
@@ -6,7 +6,7 @@
 	<combo_box name="language_combobox">
 		<combo_box.item label="Systemvorgabe" name="System Default Language"/>
 		<combo_box.item label="English (Englisch)" name="English"/>
-		<combo_box.item label="Danks (Dänisch) - Beta" name="Danish"/>
+		<combo_box.item label="Dansk (Dänisch) - Beta" name="Danish"/>
 		<combo_box.item label="Deutsch - Beta" name="Deutsch(German)"/>
 		<combo_box.item label="Español (Spanisch) - Beta" name="Spanish"/>
 		<combo_box.item label="Français (Französisch) - Beta" name="French"/>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
index f3746a7c82..06fd22141f 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Grafik" name="Display panel">
+	<text name="preset_text">
+		(Keine)
+	</text>
 	<text name="QualitySpeed">
 		Qualität und Geschwindigkeit:
 	</text>
-	<text name="FasterText">
-		Schneller
-	</text>
-	<text name="BetterText">
-		Besser
-	</text>
 	<text name="ShadersPrefText">
 		Niedrig
 	</text>
@@ -21,94 +18,17 @@
 	<text name="ShadersPrefText4">
 		Ultra
 	</text>
-	<panel label="CustomGraphics" name="CustomGraphics Panel">
-		<text name="ShadersText">
-			Shader:
-		</text>
-		<check_box initial_value="true" label="Transparentes Wasser" name="TransparentWater"/>
-		<check_box initial_value="true" label="Bumpmapping und Glanz" name="BumpShiny"/>
-		<check_box initial_value="true" label="Lokale Lichtquellen" name="LocalLights"/>
-		<check_box initial_value="true" label="Einfache Shader" name="BasicShaders" tool_tip="Deaktivieren Sie diese Option, wenn der Grafikkartentreiber Abstürze verursacht"/>
-		<check_box initial_value="true" label="Atmosphären-Shader" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Erweitertes Beleuchtungsmodell" name="UseLightShaders"/>
-		<check_box initial_value="true" label="Ambient Occlusion" name="UseSSAO"/>
-		<check_box initial_value="true" label="Schärfentiefe" name="UseDoF"/>
-		<text name="shadows_label">
-			Schatten:
-		</text>
-		<combo_box name="ShadowDetail">
-			<combo_box.item label="Keine" name="0"/>
-			<combo_box.item label="Sonne/Mond" name="1"/>
-			<combo_box.item label="Sonne/Mond + Projektoren" name="2"/>
-		</combo_box>
-		<text name="reflection_label">
-			Wasserreflexionen:
-		</text>
-		<combo_box initial_value="true" label="Wasserreflexionen" name="Reflections">
-			<combo_box.item label="Minimal" name="0"/>
-			<combo_box.item label="Terrain und Bäume" name="1"/>
-			<combo_box.item label="Alle statischen Objekte" name="2"/>
-			<combo_box.item label="Alle Avatare und Objekte" name="3"/>
-			<combo_box.item label="Alles" name="4"/>
-		</combo_box>
-		<slider label="Avatar-Physik:" name="AvatarPhysicsDetail"/>
-		<text name="AvatarPhysicsDetailText">
-			Niedrig
-		</text>
-		<slider label="Sichtweite:" name="DrawDistance"/>
-		<text name="DrawDistanceMeterText2">
-			m
-		</text>
-		<slider label="Max. Partikelzahl:" name="MaxParticleCount"/>
-		<slider label="Max. Anzahl an voll dargestellten Avataren:" label_width="230" name="MaxNumberAvatarDrawn" width="315"/>
-		<slider label="Post-Processing-Qualität:" name="RenderPostProcess"/>
-		<text name="MeshDetailText">
-			Darstellungsgrad:
-		</text>
-		<slider label="   Objekte:" name="ObjectMeshDetail"/>
-		<slider label="   Flexiprimitiva:" name="FlexibleMeshDetail"/>
-		<slider label="   Bäume:" name="TreeMeshDetail"/>
-		<slider label="   Avatare:" name="AvatarMeshDetail"/>
-		<slider label="   Terrain:" name="TerrainMeshDetail"/>
-		<slider label="   Himmel:" name="SkyMeshDetail"/>
-		<text name="PostProcessText">
-			Niedrig
-		</text>
-		<text name="ObjectMeshDetailText">
-			Niedrig
-		</text>
-		<text name="FlexibleMeshDetailText">
-			Niedrig
-		</text>
-		<text name="TreeMeshDetailText">
-			Niedrig
-		</text>
-		<text name="AvatarMeshDetailText">
-			Niedrig
-		</text>
-		<text name="TerrainMeshDetailText">
-			Niedrig
-		</text>
-		<text name="SkyMeshDetailText">
-			Niedrig
-		</text>
-		<text name="AvatarRenderingText">
-			Avatar-Darstellung:
-		</text>
-		<check_box initial_value="true" label="Vereinfachte Avatardarstellung" name="AvatarImpostors"/>
-		<check_box initial_value="true" label="Hardware-Hautberechnung" name="AvatarVertexProgram"/>
-		<check_box initial_value="true" label="Avatar-Kleidung" name="AvatarCloth"/>
-		<text name="TerrainDetailText">
-			Terraindetails:
-		</text>
-		<radio_group name="TerrainDetailRadio">
-			<radio_item label="Niedrig" name="0"/>
-			<radio_item label="Hoch" name="2"/>
-		</radio_group>
-		--&gt;
-	</panel>
-	<button label="Übernehmen" label_selected="Übernehmen" name="Apply"/>
-	<button label="Zurücksetzen" name="Defaults"/>
-	<button label="Erweitert" name="Advanced"/>
-	<button label="Hardware" label_selected="Hardware" name="GraphicsHardwareButton"/>
+	<text name="FasterText">
+		Schneller
+	</text>
+	<text name="BetterText">
+		Besser
+	</text>
+	<check_box initial_value="true" label="Atmosphären-Shader" name="WindLightUseAtmosShaders"/>
+	<check_box initial_value="true" label="Erweitertes Beleuchtungsmodell" name="UseLightShaders"/>
+	<button label="Einstellungen als Voreinstellung speichern..." name="PrefSaveButton"/>
+	<button label="Voreinstellung laden..." name="PrefLoadButton"/>
+	<button label="Voreinstellung löschen..." name="PrefDeleteButton"/>
+	<button label="Auf empfohlene Einstellungen zurücksetzen" name="Defaults"/>
+	<button label="Erweiterte Einstellungen..." name="AdvancedSettings"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
index e6c90f21d1..dc456e2281 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
 	<radio_group name="preferred_browser_behavior">
 		<radio_item label="Meinen Browser (Chrome, Firefox, IE) für alle Links verwenden" name="internal" tool_tip="Standard-Browser für Hilfe, Weblinks usw. verwenden. Im Vollbildmodus nicht empfohlen." value="0"/>
 		<radio_item label="Integrierten Browser nur für Linden Lab-/Second Life-Links verwenden" name="external" tool_tip="Verwenden Sie den Standard-Webbrowser Ihres Systems für Hilfe, Weblinks usw. Der integrierte Browser wird nur für Linden Lab-/Second Life-Links verwendet." value="1"/>
+		<radio_item label="Integrierten Browser für alle Links verwenden" name="external_all" tool_tip="Integrierten Browser für Hilfe, Internetlinks, usw. verwenden. Der Browser wird als eigenständiges Fenster in [APP_NAME] geöffnet." value="2"/>
 	</radio_group>
 	<check_box initial_value="true" label="Plugins aktivieren" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Cookies annehmen" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Javascript aktivieren" name="browser_javascript_enabled"/>
-	<check_box initial_value="false" label="Medienbrowser-Popups aktivieren" name="media_popup_enabled"/>
 	<text name="Software updates:">
 		Softwareupdates:
 	</text>
 	<combo_box name="updater_service_combobox">
 		<combo_box.item label="Automatisch installieren" name="Install_automatically"/>
-		<combo_box.item label="Updates manuell herunterladen und installieren" name="Install_manual"/>
+		<combo_box.item label="Ich werde Updates manuell herunterladen und installieren" name="Install_manual"/>
 	</combo_box>
 	<check_box label="Bereit, Release-Kandidaten zu verwenden" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/de/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/de/panel_presets_pulldown.xml
new file mode 100644
index 0000000000..ad68087ecb
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+	<text name="Graphic Presets">
+		Grafikvoreinstellungen
+	</text>
+	<button label="Grafikeinstellungen öffnen" name="open_prefs_btn" tool_tip="Grafikeinstellungen anzeigen"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
index c85f2762b1..a4fa9b5e6a 100644
--- a/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/de/panel_prim_media_controls.xml
@@ -39,12 +39,9 @@
 		<layout_panel name="media_address">
 			<line_editor name="media_address_url" tool_tip="Medien URL"/>
 			<layout_stack name="media_address_url_icons">
-				<layout_panel>
+				<layout_panel name="media_address_url_icons_wl">
 					<icon name="media_whitelist_flag" tool_tip="Whitelist aktiviert"/>
 				</layout_panel>
-				<layout_panel>
-					<icon name="media_secure_lock_flag" tool_tip="Sicheres Browsen"/>
-				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 		<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/de/panel_region_experiences.xml b/indra/newview/skins/default/xui/de/panel_region_experiences.xml
index 6e193aba19..ec1d761962 100644
--- a/indra/newview/skins/default/xui/de/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/de/panel_region_experiences.xml
@@ -18,7 +18,7 @@ Zulässige Erlebnisse können in diesem Grundbesitz ausgeführt werden.
 Blockierte Erlebnisse können in diesem Grundbesitz nicht ausgeführt werden.
 	</panel.string>
 	<panel.string name="estate_caption">
-		Änderungen wirken sich auf alle Regionen des Grundbesitzes aus.
+		änderungen wirken sich auf alle Regionen des Grundbesitzes aus.
 	</panel.string>
 	<panel.string name="allowed_parcel_text">
 		Nur Erlebnisse mit Landumfang können zulässig sein.
diff --git a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
index 2b8c4e6cd1..602424821f 100644
--- a/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
@@ -7,6 +7,7 @@
 		<combo_box.item label="Klein (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Mittel (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Groß (512x512)" name="Large(512x512)"/>
+		<combo_box.item label="Aktuelles Fenster (512x512)" name="CurrentWindow"/>
 		<combo_box.item label="Benutzerdefiniert" name="Custom"/>
 	</combo_box>
 	<spinner label="Breite x Höhe" name="inventory_snapshot_width"/>
diff --git a/indra/newview/skins/default/xui/de/panel_tools_texture.xml b/indra/newview/skins/default/xui/de/panel_tools_texture.xml
index 18517d7a7d..3314c0c7b6 100644
--- a/indra/newview/skins/default/xui/de/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/de/panel_tools_texture.xml
@@ -21,11 +21,11 @@
 		<combo_box.item label="Material" name="Materials"/>
 		<combo_box.item label="Medien" name="Media"/>
 	</combo_box>
-	<combo_box name="combobox mattype">
-		<combo_box.item label="Textur (diffus)" name="Texture (diffuse)"/>
-		<combo_box.item label="Unebenheit (normal)" name="Bumpiness (normal)"/>
-		<combo_box.item label="Glanzlicht (Spiegel)" name="Shininess (specular)"/>
-	</combo_box>
+	<radio_group name="radio_material_type">
+		<radio_item label="Textur (diffus)" name="Texture (diffuse)" value="0"/>
+		<radio_item label="Unebenheit (normal)" name="Bumpiness (normal)" value="1"/>
+		<radio_item label="Glanzlicht (Spiegel)" name="Shininess (specular)" value="2"/>
+	</radio_group>
 	<texture_picker label="Textur" name="texture control" tool_tip="Klicken, um ein Bild zu wählen"/>
 	<text name="label alphamode">
 		Alpha-Modus
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index 8ff9a3969a..60226087ac 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -67,7 +67,7 @@ Grafikkarte: [GRAPHICS_CARD]
 libcurl-Version: [LIBCURL_VERSION]
 J2C-Decoderversion: [J2C_VERSION]
 Audiotreiberversion: [AUDIO_DRIVER_VERSION]
-Qt-Webkit-Version: [QT_WEBKIT_VERSION]
+LLCEFLib/CEF-Version: [LLCEFLIB_VERSION]
 Voice-Server-Version: [VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">
@@ -178,6 +178,12 @@ Voice-Server-Version: [VOICE_VERSION]
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="AgniGridLabel">
+		Second Life Main Grid (Agni)
+	</string>
+	<string name="AditiGridLabel">
+		Second Life Beta Test Grid (Aditi)
+	</string>
 	<string name="ViewerDownloadURL">
 		http://secondlife.com/download
 	</string>
@@ -453,6 +459,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 		Sie können keinen Ordner tragen, der mehr als [AMOUNT] Elemente enthält.  Sie können diesen Höchstwert unter „Erweitert“ &gt; „Debug-Einstellungen anzeigen“ &gt; „WearFolderLimit“ ändern.
 	</string>
 	<string name="TooltipPrice" value="[AMOUNT] L$"/>
+	<string name="TooltipSLIcon">
+		Führt zu einer Seite in der offiziellen Domäne SecondLife.com oder LindenLab.com.
+	</string>
 	<string name="TooltipOutboxDragToWorld">
 		Sie können keine Objekte aus dem Marktplatz-Auflistungsordner rezzen
 	</string>
@@ -472,7 +481,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 		Anzahl von Bestandsobjekten überschreitet [AMOUNT].
 	</string>
 	<string name="TooltipOutboxCannotDropOnRoot">
-		Sie können Objekte oder Ordner nur in der Registerkarte „Alle“ ablegen. Wählen Sie diese Registerkarte aus und verschieben Sie Ihre Objekte bzw. Ordner noch einmal.
+		Sie können Objekte oder Ordner nur in der Registerkarte „ALLE“ oder „NICHT VERKNüPFT“ ablegen. Klicken Sie auf eine dieser Registerkarten und versuchen Sie dann erneut, Ihre Objekte bzw. Ordner zu verschieben.
 	</string>
 	<string name="TooltipOutboxNoTransfer">
 		Mindestens eines dieser Objekte kann nicht verkauft oder übertragen werden
@@ -556,6 +565,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 		Anklicken, um Befehl secondlife:// auszuführen
 	</string>
 	<string name="CurrentURL" value=" CurrentURL: [CurrentURL]"/>
+	<string name="TooltipEmail">
+		Klicken, um eine E-Mail zu verfassen
+	</string>
 	<string name="SLurlLabelTeleport">
 		Teleportieren nach
 	</string>
@@ -1081,7 +1093,7 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="AgentNameSubst">
 		(Sie)
 	</string>
-	<string name="JoinAnExperience"/><!-- intentionally blank -->
+	<string name="JoinAnExperience"/>
 	<string name="SilentlyManageEstateAccess">
 		Beim Verwalten von Grundbesitzzugangslisten Warnhinweise unterdrücken
 	</string>
@@ -1860,6 +1872,21 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="TodayOld">
 		Seit heute Mitglied
 	</string>
+	<string name="av_render_everyone_now">
+		Jetzt kann jeder Sie sehen.
+	</string>
+	<string name="av_render_not_everyone">
+		Sie sind u. U. nicht für alle Leute in Ihrer Nähe sichtbar.
+	</string>
+	<string name="av_render_over_half">
+		Sie sind u. U. für mehr als die Hälfte der Leute in Ihrer Nähe nicht sichtbar.
+	</string>
+	<string name="av_render_most_of">
+		Sie sind u. U. für die meisten Leuten in Ihrer Nähe nicht sichtbar.
+	</string>
+	<string name="av_render_anyone">
+		Sie sind u. U. für niemanden in Ihrer Nähe sichtbar.
+	</string>
 	<string name="AgeYearsA">
 		[COUNT] Jahr
 	</string>
@@ -1977,6 +2004,9 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="CompileQueueUnknownFailure">
 		Unbekannter Fehler beim Herunterladen
 	</string>
+	<string name="CompileNoExperiencePerm">
+		Skript „[SCRIPT]“ mit Erlebnis „[EXPERIENCE]“ wird übersprungen.
+	</string>
 	<string name="CompileQueueTitle">
 		Rekompilierung
 	</string>
@@ -2022,9 +2052,6 @@ Warten Sie kurz und versuchen Sie dann noch einmal, sich anzumelden.
 	<string name="GroupsNone">
 		keine
 	</string>
-	<string name="CompileNoExperiencePerm">
-		Skript „[SCRIPT]“ mit Erlebnis „[EXPERIENCE]“ wird übersprungen.
-	</string>
 	<string name="Group" value=" (Gruppe)"/>
 	<string name="Unknown">
 		(unbekannt)
@@ -5380,18 +5407,6 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="UserDictionary">
 		[Benutzer]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Unterhaltungen werden nicht protokolliert. Um ein Protokoll zu starten, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Es werden keine Unterhaltungen mehr protokolliert. Um weiterhin ein Protokoll zu führen, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Keine protokollierten Unterhaltungen verfügbar. Hier erscheint ein Protokolleintrag, wenn Sie eine Person kontaktieren oder von einer Person kontaktiert werden.
-	</string>
-	<string name="loading_chat_logs">
-		Laden...
-	</string>
 	<string name="experience_tools_experience">
 		Erlebnis
 	</string>
@@ -5408,7 +5423,7 @@ Setzen Sie den Editorpfad in Anführungszeichen
 		Gridumfang
 	</string>
 	<string name="Allowed_Experiences_Tab">
-		ZULÄSSIG
+		ZULäSSIG
 	</string>
 	<string name="Blocked_Experiences_Tab">
 		BLOCKIERT
@@ -5473,4 +5488,37 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="ExperiencePermissionShort12">
 		Berechtigung
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Unterhaltungen werden nicht protokolliert. Um ein Protokoll zu starten, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Es werden keine Unterhaltungen mehr protokolliert. Um weiterhin ein Protokoll zu führen, wählen Sie „Speichern: nur Protokoll“ oder „Speichern: Protokoll und Transkripte“ unter „Einstellungen“ &gt; „Chat“.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Keine protokollierten Unterhaltungen verfügbar. Hier erscheint ein Protokolleintrag, wenn Sie eine Person kontaktieren oder von einer Person kontaktiert werden.
+	</string>
+	<string name="loading_chat_logs">
+		Laden...
+	</string>
+	<string name="preset_combo_label">
+		-Leere Liste-
+	</string>
+	<string name="Default">
+		Standard
+	</string>
+	<string name="none_paren_cap">
+		(Keine)
+	</string>
+	<string name="no_limit">
+		Keine Begrenzung
+	</string>
+	<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+		Die Physikform enthält Dreiecke, die zu klein sind. Versuchen Sie, das Physikmodell zu vereinfachen.
+	</string>
+	<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+		Die Physikform enthält ungültige Bestätigungsdaten. Versuchen Sie, das Physikmodell zu korrigieren.
+	</string>
+	<string name="Mav_Details_MAV_UNKNOWN_VERSION">
+		Die Physikform hat keine korrekte Version. Legen Sie die korrekte Version für das Physikmodell fest.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 9bf485ce40..8f143cf072 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -3,6 +3,7 @@
 	<tab_container name="about_tab">
 		<panel label="Información" name="support_panel">
 			<button label="Copiar al portapapeles" name="copy_btn" width="165"/>
+			<button label="Buscar actualizaciones" name="update_btn"/>
 		</panel>
 		<panel label="Créditos" name="credits_panel">
 			<text name="linden_intro">Second Life ofrecido por los Lindens, 
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 79493d3885..39426b2aaf 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -10,13 +10,13 @@
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
 	<floater.string name="Minutes">
-		[MINUTES] minutos
+		[MINUTES] min.
 	</floater.string>
 	<floater.string name="Minute">
-		minuto
+		min.
 	</floater.string>
 	<floater.string name="Seconds">
-		[SECONDS] segundos
+		[SECONDS] seg.
 	</floater.string>
 	<floater.string name="Remaining">
 		restantes
@@ -356,7 +356,7 @@ Sólo las parcelas más grandes pueden listarse en la búsqueda.
 			<text name="allow_label5" top="170">
 				Los avatares de otras parcelas pueden ver a los avatares de esta parcela y chatear con ellos
 			</text>
-			<check_box label="Ver los avatares" name="SeeAvatarsCheck" top="170" tool_tip="Permite que los avatares de otras parcelas vean a los avatares de ésta y chateen con ellos, y también que tú puedas verles y chatear con ellos."/>
+			<check_box label="Ver los avatares" name="SeeAvatarsCheck" tool_tip="Permite que los avatares de otras parcelas vean a los avatares de ésta y chateen con ellos, y también que tú puedas verles y chatear con ellos." top="170"/>
 			<text name="landing_point">
 				Punto de llegada: [LANDING]
 			</text>
@@ -451,7 +451,7 @@ los media:
 			<spinner label="Horas de acceso:" name="HoursSpin"/>
 			<panel name="Allowed_layout_panel">
 				<text label="Always Allow" name="AllowedText">
-					Residentes autorizados
+					Residentes permitidos ([COUNT])
 				</text>
 				<name_list name="AccessList" tool_tip="([LISTED] listados de un máx. de [MAX])"/>
 				<button label="Añadir" name="add_allowed"/>
@@ -459,7 +459,7 @@ los media:
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Ban" name="BanCheck">
-					Residentes con el acceso prohibido
+					Residentes no admitidos ([COUNT])
 				</text>
 				<name_list name="BannedList" tool_tip="([LISTED] listados de un máx. de [MAX])"/>
 				<button label="Añadir" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/es/floater_autoreplace.xml b/indra/newview/skins/default/xui/es/floater_autoreplace.xml
index 15abccc376..744a8b1ea3 100644
--- a/indra/newview/skins/default/xui/es/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/es/floater_autoreplace.xml
@@ -13,6 +13,12 @@
 	</scroll_list>
 	<button label="Añadir..." name="autoreplace_add_entry"/>
 	<button label="Eliminar" name="autoreplace_delete_entry"/>
+	<text name="autoreplace_keyword_txt">
+		Palabra clave:
+	</text>
+	<text name="autoreplace_replacement_txt">
+		Reemplazo:
+	</text>
 	<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."/>
diff --git a/indra/newview/skins/default/xui/es/floater_bumps.xml b/indra/newview/skins/default/xui/es/floater_bumps.xml
index 6d4196ca7c..d95bda301c 100644
--- a/indra/newview/skins/default/xui/es/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/es/floater_bumps.xml
@@ -19,6 +19,6 @@
 		[TIME]  [NAME] te ha golpeado con un objeto físico
 	</floater.string>
 	<floater.string name="timeStr">
-		[[hour,datetime,slt]:[min,datetime,slt]]
+		[[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
 	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/es/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000..614f59f356
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="ELIMINAR VALOR PREDEFINIDO PREF">
+	<string name="title_graphic">
+		Eliminar valor predefinido gráfico
+	</string>
+	<string name="title_camera">
+		Eliminar valor predefinido de cámara
+	</string>
+	<text name="Preset">
+		Seleccionar un valor predefinido
+	</text>
+	<button label="Eliminar" name="delete"/>
+	<button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_experienceprofile.xml b/indra/newview/skins/default/xui/es/floater_experienceprofile.xml
index c37208647a..aa81343872 100644
--- a/indra/newview/skins/default/xui/es/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/es/floater_experienceprofile.xml
@@ -63,7 +63,7 @@
 					<text name="edit_ContentRating">
 						Calificación:
 					</text>
-					<icons_combo_box label="Moderado" name="edit_ContentRatingText" tool_tip="Al aumentar el nivel de calificación de una experiencia se restablecen los permisos de todos los residentes que han permitido la experiencia.">
+					<icons_combo_box label="Moderado" name="edit_ContentRatingText" tool_tip="Al aumentar la calificación de contenido de una experiencia se restablecen los permisos de todos los residentes que han permitido la experiencia.">
 						<icons_combo_box.item label="Adulto" name="Adult" value="42"/>
 						<icons_combo_box.item label="Moderado" name="Mature" value="21"/>
 						<icons_combo_box.item label="General" name="PG" value="13"/>
@@ -75,7 +75,7 @@
 					<button label="Borrar lugar" name="clear_btn"/>
 					<check_box label="Habilitar experiencia" name="edit_enable_btn" tool_tip=""/>
 					<check_box label="Ocultar en la búsqueda" name="edit_private_btn"/>
-					<text name="changes" value="Los cambios de una experiencia pueden tardar varios minutos en mostrarse en todas las regiones.+"/>
+					<text name="changes" value="Los cambios de una experiencia pueden tardar varios minutos en mostrarse en todas las regiones."/>
 					<button label="Anterior" name="cancel_btn"/>
 					<button label="Guardar" name="save_btn"/>
 				</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_fast_timers.xml b/indra/newview/skins/default/xui/es/floater_fast_timers.xml
index eeb39583ef..6a01ee6613 100644
--- a/indra/newview/skins/default/xui/es/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/es/floater_fast_timers.xml
@@ -6,5 +6,16 @@
 	<string name="run">
 		Correr
 	</string>
+	<combo_box name="time_scale_combo">
+		<item label="Valor medio × 2" name="2x Average"/>
+		<item label="Máx." name="Max"/>
+		<item label="Máx. reciente" name="Recent Max"/>
+		<item label="100 ms" name="100ms"/>
+	</combo_box>
+	<combo_box name="metric_combo">
+		<item label="Hora" name="Time"/>
+		<item label="Cantidad de visitas" name="Number of Calls"/>
+		<item label="Hz" name="Hz"/>
+	</combo_box>
 	<button label="Pausa" name="pause_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
index 5d16ccd271..0485154fec 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
 		<radio_item label="Anteriores a" name="older"/>
 	</radio_group>
 	<spinner label="horas atrás" name="spin_hours_ago"/>
+	<text name="label_hours">
+		Horas
+	</text>
 	<spinner label="días atrás" name="spin_days_ago"/>
+	<text name="label_days">
+		Días
+	</text>
 	<button bottom_delta="-30" label="Cerrar" label_selected="Cerrar" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/es/floater_load_pref_preset.xml
new file mode 100644
index 0000000000..233e0ffc7e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="CARGAR VALOR PREDEFINIDO PREF">
+	<string name="title_graphic">
+		Cargar valor predefinido gráfico
+	</string>
+	<string name="title_camera">
+		Cargar valor predefinido de cámara
+	</string>
+	<text name="Preset">
+		Seleccionar un valor predefinido
+	</text>
+	<button label="OK" name="ok"/>
+	<button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
index a7c17fc136..b74c5fca5c 100644
--- a/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/es/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
 	<string name="OutboxInitializing">
 		Inicializando...
 	</string>
-	<panel label="">
-		<panel>
+	<panel label="" name="panel_1">
+		<panel name="panel_2">
 			<panel name="outbox_inventory_placeholder_panel">
 				<text name="outbox_inventory_placeholder_title">
 					Cargando...
 				</text>
 			</panel>
 		</panel>
-		<panel>
+		<panel name="panel_3">
+			<panel name="outbox_generic_drag_target">
+				<text name="text_1">
+					Arrastra aquí artículos para crear carpetas
+				</text>
+			</panel>
 			<button label="Enviar al Mercado" name="outbox_import_btn" tool_tip="Poner en el escaparate de Mi Mercado"/>
 		</panel>
 	</panel>
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 e2313bce99..a5229cd48c 100644
--- a/indra/newview/skins/default/xui/es/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_model_preview.xml
@@ -55,6 +55,9 @@
 	<string name="mesh_status_invalid_material_list">
 		Los materiales con niveles de detalle no son un subconjunto del modelo de referencia.
 	</string>
+	<string name="phys_status_vertex_limit_exceeded">
+		Algunas apariencias físicas sobrepasan las limitaciones de vértices.
+	</string>
 	<string name="layer_all">
 		Todo
 	</string>
@@ -93,52 +96,52 @@
 				<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"/>
+					<item label="Cargar desde archivo" name="Load from file" value="Cargar desde archivo"/>
+					<item label="Generar" 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"/>
+					<item label="Límite de triángulo" name="Triangle Limit" value="Límite de triángulo"/>
+					<item label="Margen de error" 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"/>
+					<item label="Cargar desde archivo" name="Load from file" value="Cargar desde archivo"/>
+					<item label="Generar" name="Generate" value="Generar"/>
+					<item label="Usar nivel de detalle superior" 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"/>
+					<item label="Límite de triángulo" name="Triangle Limit" value="Límite de triángulo"/>
+					<item label="Margen de error" 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"/>
+					<item label="Cargar desde archivo" name="Load from file" value="Cargar desde archivo"/>
+					<item label="Generar" name="Generate" value="Generar"/>
+					<item label="Usar nivel de detalle superior" 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"/>
+					<item label="Límite de triángulo" name="Triangle Limit" value="Límite de triángulo"/>
+					<item label="Margen de error" 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"/>
+					<item label="Cargar desde archivo" name="Load from file" value="Cargar desde archivo"/>
+					<item label="Generar" name="Generate" value="Generar"/>
+					<item label="Usar nivel de detalle superior" 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"/>
+					<item label="Límite de triángulo" name="Triangle Limit" value="Límite de triángulo"/>
+					<item label="Margen de error" 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"/>
diff --git a/indra/newview/skins/default/xui/es/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/es/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000..2325448c0a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="NOTIFICACIONES">
+	<floater.string name="system_tab_title">
+		Sistema ([COUNT])
+	</floater.string>
+	<floater.string name="transactions_tab_title">
+		Transacciones ([COUNT])
+	</floater.string>
+	<floater.string name="group_invitations_tab_title">
+		Invitaciones ([COUNT])
+	</floater.string>
+	<floater.string name="group_notices_tab_title">
+		Grupo ([COUNT])
+	</floater.string>
+	<string name="title_notification_tabbed_window">
+		NOTIFICACIONES
+	</string>
+	<layout_stack name="TabButtonsStack">
+		<layout_panel name="TabButtonsLayoutPanel">
+			<tab_container name="notifications_tab_container">
+				<panel label="Sistema (0)" name="system_notification_list_tab"/>
+				<panel label="Transacciones (0)" name="transaction_notifications_tab"/>
+				<panel label="Invitaciones (0)" name="group_invite_notifications_tab"/>
+				<panel label="Grupo (0)" name="group_notice_notifications_tab"/>
+			</tab_container>
+			<layout_stack name="ButtonsStack">
+				<layout_panel name="CondenseAllButtonPanel">
+					<button label="Cerrar todo" name="collapse_all_button"/>
+				</layout_panel>
+				<layout_panel name="GapLayoutPanel">
+					<panel label="Panel de espacios" name="GapPanel"/>
+				</layout_panel>
+				<layout_panel name="DeleteAllButtonPanel">
+					<button label="Eliminar todo" name="delete_all_button"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</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
index e3ee0563d2..255668e3c6 100644
--- a/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
 	<floater.string name="character_owner_group">
 		[grupo]
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_chars_main">
 		<scroll_list name="objects_scroll_list">
 			<scroll_list.columns label="Nombre" name="name"/>
 			<scroll_list.columns label="Descripción" name="description"/>
@@ -42,7 +42,7 @@
 		<button label="Seleccionar todo" name="select_all_objects"/>
 		<button label="No seleccionar ninguno" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_chars_actions">
 		<text name="actions_label">
 			Acciones en los personajes seleccionados:
 		</text>
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
index e93ecc9e10..4489213f44 100644
--- a/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
 	<floater.string name="pathing_error">
 		Error durante la generación de la ruta.
 	</floater.string>
+	<panel name="pathfinding_console_main">
+		<text name="viewer_status_label">
+			Estado del visor
+		</text>
+	</panel>
+	<panel name="pathfinding_console_simulator">
+		<text name="simulator_status_label">
+			Estado del simulador
+		</text>
+	</panel>
 	<tab_container name="view_test_tab_container">
 		<panel label="Vista" name="view_panel">
 			<text name="show_label">
diff --git a/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml
index e6f864eef5..58ddd6b621 100644
--- a/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/es/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
 	<floater.string name="linkset_choose_use">
 		Elegir la utilización del linkset...
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_linksets_main">
+		<text name="linksets_filter_label">
+			Filtrar por:
+		</text>
+		<text name="linksets_name_label">
+			Nombre
+		</text>
+		<text name="linksets_desc_label">
+			Descripción
+		</text>
 		<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"/>
@@ -122,7 +131,10 @@
 		<button label="Seleccionar todo" name="select_all_objects"/>
 		<button label="No seleccionar ninguno" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_actions">
+		<text name="linksets_actions_label">
+			Acciones aplicadas a los linksets seleccionados (si se elimina un linkset de Second Life, podrían perderse sus atributos):
+		</text>
 		<check_box label="Mostrar baliza" name="show_beacon"/>
 		<button label="Tomar" name="take_objects"/>
 		<button label="Tomar una copia" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
 		<button label="Devolver" name="return_objects"/>
 		<button label="Eliminar" name="delete_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_attributes">
+		<text name="linksets_attributes_label">
+			Modifica los atributos de los linksets seleccionados y pulsa el botón para aplicar los cambios
+		</text>
 		<text name="walkability_coefficients_label">
 			Transitabilidad:
 		</text>
diff --git a/indra/newview/skins/default/xui/es/floater_perms_default.xml b/indra/newview/skins/default/xui/es/floater_perms_default.xml
index 71c3f239ea..97e5390931 100644
--- a/indra/newview/skins/default/xui/es/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/es/floater_perms_default.xml
@@ -1,6 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perms default" title="PERMISOS DE CREACIÓN PREDETERMINADOS">
-	<panel label="Permisos predeterminados" name="default permissions"/>
+	<panel label="Permisos predeterminados" name="default permissions">
+		<text name="label_1">
+			Próximo propietario:
+		</text>
+		<text name="label_2">
+			Copiar
+		</text>
+		<text name="label_3">
+			Modificarlo
+		</text>
+		<text name="label_4">
+			Transferencias
+		</text>
+		<text name="label_5">
+			Compartir con el grupo
+		</text>
+		<text name="label_6">
+			Permitir copiar a cualquiera
+		</text>
+		<text name="label_7" tool_tip="Definir los permisos predeterminados para la creación de objetos">
+			Objetos
+		</text>
+		<text name="label_8" tool_tip="Definir los permisos predeterminados para los elementos subidos">
+			Subidas
+		</text>
+		<text name="label_9" tool_tip="Definir los permisos predeterminados para la creación de scripts">
+			Scripts
+		</text>
+		<text name="label_10" tool_tip="Definir los permisos predeterminados para la creación de notas">
+			Notas
+		</text>
+		<text name="label_11" tool_tip="Definir los permisos predeterminados para la creación de gestos">
+			Gestos
+		</text>
+		<text name="label_12" tool_tip="Definir los permisos predeterminados para la creación de ropa o partes del cuerpo">
+			Artículos de vestir
+		</text>
+	</panel>
 	<button label="OK" label_selected="OK" name="ok"/>
 	<button label="Cancelar" label_selected="Cancelar" name="cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000..dda95ad070
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="PREFERENCIAS DE GRÁFICOS AVANZADAS">
+	<text name="GeneralText">
+		General
+	</text>
+	<slider label="Distancia de dibujo:" name="DrawDistance"/>
+	<text name="DrawDistanceMeterText2">
+		m
+	</text>
+	<slider label="Cant. máx. de partículas:" name="MaxParticleCount"/>
+	<slider label="Calidad del procesamiento:" name="RenderPostProcess"/>
+	<text name="PostProcessText">
+		Bajo
+	</text>
+	<text name="AvatarText">
+		Avatar
+	</text>
+	<slider label="Complejidad máxima:" name="IndirectMaxComplexity" tool_tip="Controla en qué momento un avatar visualmente complejo se dibuja como una sombra de color sólido"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
+	<slider label="N.º máx. de avatares no simulados:" name="IndirectMaxNonImpostors"/>
+	<text name="IndirectMaxNonImpostorsText">
+		0
+	</text>
+	<slider label="Detalle:" name="AvatarMeshDetail"/>
+	<text name="AvatarMeshDetailText">
+		Bajo
+	</text>
+	<slider label="Física:" name="AvatarPhysicsDetail"/>
+	<text name="AvatarPhysicsDetailText">
+		Bajo
+	</text>
+	<text name="ShadersText">
+		Hardware
+	</text>
+	<slider label="Memoria para texturas (MB):" name="GraphicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vídeo. Reducir esta cantidad puede mejorar el rendimiento, pero también hacer que las texturas se vean borrosas."/>
+	<slider label="Intensidad de la niebla:" name="fog"/>
+	<slider label="Gamma:" name="gamma"/>
+	<text name="(brightness, lower is brighter)">
+		(0 = brillo por defecto, más bajo = más brillo)
+	</text>
+	<check_box label="Filtrado anisotrópico (enlentece el dibujo)" name="ani"/>
+	<check_box initial_value="true" label="Habilitar objetos de búfer de vértices OpenGL" name="vbo" tool_tip="Su activación en un hardware moderno aumenta el rendimiento. No obstante, la ejecución poco eficiente de los VBO en los equipos antiguos puede hacer que se bloquee la aplicación."/>
+	<check_box initial_value="true" label="Activar la compresión de texturas (requiere reiniciar)" name="texture compression" tool_tip="Comprime las texturas en la memoria de vídeo, lo cual permite cargar texturas de una resolución más alta, pero con una cierta pérdida de calidad del color."/>
+	<text name="antialiasing label">
+		Antialiasing:
+	</text>
+	<combo_box label="Antialiasing" name="fsaa">
+		<combo_box.item label="Inhabilitado" name="FSAADisabled"/>
+		<combo_box.item label="× 2" name="2x"/>
+		<combo_box.item label="× 4" name="4x"/>
+		<combo_box.item label="× 8" name="8x"/>
+		<combo_box.item label="× 16" name="16x"/>
+	</combo_box>
+	<text name="antialiasing restart">
+		(requiere reiniciar)
+	</text>
+	<slider label="Detalle de la malla del terreno:" name="TerrainMeshDetail"/>
+	<text name="TerrainMeshDetailText">
+		Bajo
+	</text>
+	<slider label="Árboles:" name="TreeMeshDetail"/>
+	<text name="TreeMeshDetailText">
+		Bajo
+	</text>
+	<slider label="Objetos:" name="ObjectMeshDetail"/>
+	<text name="ObjectMeshDetailText">
+		Bajo
+	</text>
+	<slider label="Prims flexibles:" name="FlexibleMeshDetail"/>
+	<text name="FlexibleMeshDetailText">
+		Bajo
+	</text>
+	<check_box initial_value="true" label="Agua transparente" name="TransparentWater"/>
+	<check_box initial_value="true" label="Efecto de relieve y brillo" name="BumpShiny"/>
+	<check_box initial_value="true" label="Puntos de luz locales" name="LocalLights"/>
+	<check_box initial_value="true" label="Shaders básicos" name="BasicShaders" tool_tip="Desactivar esta opción puede evitar que se bloqueen los controladores de algunas tarjetas gráficas"/>
+	<slider label="Nivel de detalle del terreno:" name="TerrainDetail"/>
+	<text name="TerrainDetailText">
+		Bajo
+	</text>
+	<check_box initial_value="true" label="Renderizado de avatares por hardware" name="AvatarVertexProgram"/>
+	<check_box initial_value="true" label="Ropas del avatar" name="AvatarCloth"/>
+	<text name="ReflectionsText">
+		Reflejos en el agua:
+	</text>
+	<combo_box name="Reflections">
+		<combo_box.item label="Mínimo" name="0"/>
+		<combo_box.item label="Terreno y árboles" name="1"/>
+		<combo_box.item label="Todos los objetos estáticos" name="2"/>
+		<combo_box.item label="Todos los avatares y objetos" name="3"/>
+		<combo_box.item label="Todo" name="4"/>
+	</combo_box>
+	<check_box initial_value="true" label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/>
+	<slider label="Cielo:" name="SkyMeshDetail"/>
+	<text name="SkyMeshDetailText">
+		Bajo
+	</text>
+	<check_box initial_value="true" label="Modelo de iluminación avanzado" name="UseLightShaders"/>
+	<check_box initial_value="true" label="Oclusión ambiental" name="UseSSAO"/>
+	<check_box initial_value="true" label="Profundidad de campo" name="UseDoF"/>
+	<text name="RenderShadowDetailText">
+		Sombras:
+	</text>
+	<combo_box name="ShadowDetail">
+		<combo_box.item label="Ninguno" name="0"/>
+		<combo_box.item label="Sol/Luna" name="1"/>
+		<combo_box.item label="Sol/Luna + Proyectores" name="2"/>
+	</combo_box>
+	<button label="Restablecer la configuración recomendada" name="Defaults"/>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/es/floater_save_pref_preset.xml
new file mode 100644
index 0000000000..d053b9096e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="GUARDAR VALOR PREDEFINIDO PREF">
+	<string name="title_graphic">
+		Guardar valor predefinido gráfico
+	</string>
+	<string name="title_camera">
+		Guardar valor predefinido de cámara
+	</string>
+	<text name="Preset">
+		Escribe el nombre del valor predefinido o elige un valor predefinido ya existente.
+	</text>
+	<button label="Guardar" name="save"/>
+	<button label="Cancelar" name="cancel"/>
+</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
index bd86ed00da..a860aaa50c 100644
--- a/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/es/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_import" title="Importar diccionario">
+	<text name="import_dict">
+		Diccionario:
+	</text>
 	<button label="Examinar" label_selected="Examinar" name="dictionary_path_browse"/>
+	<text name="import_name">
+		Nombre:
+	</text>
+	<text name="import_lang">
+		Idioma:
+	</text>
 	<button label="Importar" name="ok_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml
index 89092201d9..d1cd912f87 100644
--- a/indra/newview/skins/default/xui/es/floater_tos.xml
+++ b/indra/newview/skins/default/xui/es/floater_tos.xml
@@ -12,4 +12,7 @@
 	<text name="tos_heading">
 		Por favor, lee detenidamente las siguientes Condiciones del servicio y Política de privacidad. Debes aceptar el acuerdo para poder iniciar sesión en [SECOND_LIFE].
 	</text>
+	<text name="external_tos_required">
+		Para poder proseguir, debes iniciar sesión en my.secondlife.com y aceptar las Condiciones del servicio. Gracias.
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/menu_attachment_other.xml b/indra/newview/skins/default/xui/es/menu_attachment_other.xml
index 7698348c00..772b27c9ba 100644
--- a/indra/newview/skins/default/xui/es/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_attachment_other.xml
@@ -15,5 +15,8 @@
 	<menu_item_call label="Acercar el zoom" name="Zoom In"/>
 	<menu_item_call label="Pagar" name="Pay..."/>
 	<menu_item_call label="Perfil del objeto" name="Object Inspect"/>
+	<menu_item_check label="Renderizar normalmente" name="RenderNormally"/>
+	<menu_item_check label="No renderizar" name="DoNotRender"/>
+	<menu_item_check label="Renderizar completamente" name="AlwaysRenderFully"/>
 	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_avatar_other.xml b/indra/newview/skins/default/xui/es/menu_avatar_other.xml
index 244099214a..75cbf5a022 100644
--- a/indra/newview/skins/default/xui/es/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/es/menu_avatar_other.xml
@@ -14,5 +14,8 @@
 	<menu_item_call label="Volcar XML" name="Dump XML"/>
 	<menu_item_call label="Acercar el zoom" name="Zoom In"/>
 	<menu_item_call label="Pagar" name="Pay..."/>
+	<menu_item_check label="Renderizar normalmente" name="RenderNormally"/>
+	<menu_item_check label="No renderizar" name="DoNotRender"/>
+	<menu_item_check label="Renderizar completamente" name="AlwaysRenderFully"/>
 	<menu_item_call label="Ignorar al propietario de la partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml
index 336572f0cb..44e8f3ffeb 100644
--- a/indra/newview/skins/default/xui/es/menu_login.xml
+++ b/indra/newview/skins/default/xui/es/menu_login.xml
@@ -15,6 +15,7 @@
 		<menu_item_call label="Blogs de [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Informar de un fallo" name="Report Bug"/>
 		<menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="Buscar actualizaciones" name="Check for Updates"/>
 	</menu>
 	<menu_item_check label="Mostrar el menú &apos;Debug&apos;" name="Show Debug Menu"/>
 	<menu label="Depurar" name="Debug">
diff --git a/indra/newview/skins/default/xui/es/menu_marketplace_view.xml b/indra/newview/skins/default/xui/es/menu_marketplace_view.xml
index c46a9f490e..a16b51bcc9 100644
--- a/indra/newview/skins/default/xui/es/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/es/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_marketplace_sort">
+	<menu_item_check label="Ordenar alfabéticamente" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por más reciente" name="sort_by_recent"/>
 	<menu_item_check label="Ordenar por cantidad en stock (de baja a alta)" name="sort_by_stock_amount"/>
 	<menu_item_check label="Mostrar solamente las carpetas de artículos" name="show_only_listing_folders"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_url_email.xml b/indra/newview/skins/default/xui/es/menu_url_email.xml
new file mode 100644
index 0000000000..fa9c740775
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+	<menu_item_call label="Redactar el correo electrónico en un cliente externo" name="email_open_external"/>
+	<menu_item_call label="Copiar el correo electrónico al portapapeles" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index f6ebb498ec..fd248116b8 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -179,6 +179,7 @@
 		<menu_item_call label="Informar de un fallo" name="Report Bug"/>
 		<menu_item_call label="Bumps, Pushes &amp; Hits" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu_item_call label="Acerca de [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="Buscar actualizaciones" name="Check for Updates"/>
 	</menu>
 	<menu label="Avanzado" name="Advanced">
 		<menu_item_call label="Recargar las texturas" name="Rebake Texture"/>
@@ -192,7 +193,7 @@
 			<menu_item_call label="Medidor de lag" name="Lag Meter"/>
 			<menu_item_check label="Estadísticas" name="Statistics Bar"/>
 			<menu_item_call label="Estadísticas de carga de escenas" name="Scene Load Statistics"/>
-			<menu_item_check label="Mostrar el peso del dibujo de los avatares" name="Avatar Rendering Cost"/>
+			<menu_item_check label="Mostrar información de complejidad del avatar" name="Avatar Draw Info"/>
 		</menu>
 		<menu label="Realzado y Visibilidad" name="Highlighting and Visibility">
 			<menu_item_check label="Baliza con destellos" name="Cheesy Beacon"/>
@@ -297,8 +298,6 @@
 			<menu_item_check label="Partículas" name="Particles"/>
 			<menu_item_check label="Articulaciones" name="Joints"/>
 			<menu_item_check label="Vectores de viento" name="Wind Vectors"/>
-			<menu_item_check label="Complejidad del renderizado" name="rendercomplexity"/>
-			<menu_item_check label="Bytes de adjunto" name="attachment bytes"/>
 			<menu_item_check label="Esculpir" name="Sculpt"/>
 			<menu label="Densidad de textura" name="Texture Density">
 				<menu_item_check label="Ninguna" name="None"/>
@@ -372,7 +371,6 @@
 			<menu_item_call label="Debug Avatar Textures" name="Debug Avatar Textures"/>
 		</menu>
 		<menu_item_check label="HTTP Textures" name="HTTP Textures"/>
-		<menu_item_check label="Inventario HTTP" name="HTTP Inventory"/>
 		<menu_item_check label="Console Window on next Run" name="Console Window"/>
 		<menu label="Configurar el nivel de registro" name="Set Logging Level"/>
 		<menu_item_call label="Request Admin Status" name="Request Admin Options"/>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index 1e367b33fc..98df7fa694 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -164,6 +164,10 @@ La inicialización del mercado ha fallado por un error del sistema o de la red.
         &apos;[ERROR_CODE]&apos;
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="MerchantForceValidateListing">
+		Para crear tu lista de artículos, hemos corregido la jerarquía del contenido de la lista.
+		<usetemplate ignoretext="Recordarme que al crear una lista de artículos se modifica la jerarquía del contenido" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmMerchantActiveChange">
 		Esta acción cambiará el contenido activo de esta lista de artículos. ¿Quieres continuar?
 		<usetemplate ignoretext="Confirmar antes de que cambie una lista de artículos activa en el Mercado" name="okcancelignore" notext="Cancelar" yestext="OK"/>
@@ -211,6 +215,10 @@ La inicialización del mercado ha fallado por un error del sistema o de la red.
 		Hemos retirado tu lista de artículos porque el stock está vacío. Para volver a publicar tus artículos, añade más unidades a la carpeta de stock.
 		<usetemplate ignoretext="Mostrar alerta cuando una lista de artículos se retire porque la carpeta de stock está vacía" name="okignore" yestext="OK"/>
 	</notification>
+	<notification name="AlertMerchantVersionFolderEmpty">
+		Hemos retirado tu lista de artículos porque la carpeta de versión está vacía. Para volver a publicar tus artículos, añade artículos a la carpeta de versión.
+		<usetemplate ignoretext="Mostrar una alerta cuando una lista de artículos se retire porque la carpeta de versión está vacía" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		Hubo un problema al subir el texto de un script por la siguiente razón: [REASON]. Por favor, inténtalo más tarde.
 	</notification>
@@ -316,6 +324,14 @@ Si no quieres que este rol siga teniendo dichas capacidades, deshabilítalas inm
 		Estás a punto de expulsar a [COUNT] miembros del grupo.
 		<usetemplate ignoretext="Confirmar la expulsión de varios miembros del grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
 	</notification>
+	<notification name="BanGroupMemberWarning">
+		Te dispones a expulsar a [AVATAR_NAME] del grupo.
+		<usetemplate ignoretext="Confirma la expulsión de un participante del grupo" name="okcancelignore" notext="Cancelar" yestext="Prohibir el acceso"/>
+	</notification>
+	<notification name="BanGroupMembersWarning">
+		Te dispones a expulsar a [COUNT] miembros del grupo.
+		<usetemplate ignoretext="Confirma la expulsión de varios miembros del grupo" name="okcancelignore" notext="Cancelar" yestext="Prohibir el acceso"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Vas a soltar tu anexado.
     ¿Estás seguro de que quieres continuar?
@@ -400,7 +416,7 @@ Objetos: [N]
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="ReturnAllTopObjects">
-		¿Estás seguro de que quieres devolver al inventario de su propietario todos los objetos de la lista?
+		¿Estás seguro de que deseas devolver todos los objetos enumerados al inventario de sus propietarios? ¡Se devolverán TODOS los objetos programados de la región!
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
 	</notification>
 	<notification name="DisableAllTopObjects">
@@ -604,6 +620,10 @@ El objeto debe de haber sido borrado o estar fuera de rango (&apos;out of range&
 	<notification name="CannotDownloadFile">
 		No se ha podido descargar el archivo.
 	</notification>
+	<notification label="" name="MediaFileDownloadUnsupported">
+		Has solicitado descargar un archivo, pero [SECOND_LIFE] no lo admite.
+		<usetemplate ignoretext="Avisarme si las descargas de archivos no se admiten" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CannotWriteFile">
 		No se ha podido escribir el archivo [[FILE]]
 	</notification>
@@ -1110,8 +1130,9 @@ Deberás reconfigurar el nombre y las opciones de la nueva parcela.
 Generalmente, esto es un fallo pasajero. Por favor, personaliza y guarda el ítem de aquí a unos minutos.
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		Vaya, se ha cerrado tu sesión en [SECOND_LIFE].
-            [MESSAGE]
+		Vaya, has sido desconectado de [SECOND_LIFE].
+
+[MESSAGE]
 		<usetemplate name="okcancelbuttons" notext="Salir" yestext="Ver MI y Chat"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
@@ -1361,6 +1382,13 @@ Puedes usar [SECOND_LIFE] de forma normal; los demás residentes te verán corre
 			<ignore name="ignore" text="La ropa está tardando mucho en descargarse"/>
 		</form>
 	</notification>
+	<notification name="RegionAndAgentComplexity">
+		Tu [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complejidad visual] es [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+	</notification>
+	<notification name="AgentComplexity">
+		Tu [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complejidad visual] es [AGENT_COMPLEXITY].
+	</notification>
 	<notification name="FirstRun">
 		Se ha completado la instalación de [SECOND_LIFE].
 
@@ -1642,6 +1670,25 @@ Este visor experimental se ha sustituido por un visor de [NEW_CHANNEL].
 Consulta [[INFO_URL] Información sobre esta actualización].
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="UpdateDownloadInProgress">
+		Está disponible una actualización.
+Se está descargando en segundo plano y, en cuanto esté lista, te pediremos que reinicies el visor para terminar de instalarla.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateDownloadComplete">
+		Se ha descargado una actualización. Se instalará durante el reinicio.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateCheckError">
+		Ha ocurrido un error al comprobar si hay actualizaciones.
+Repite la operación más adelante.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateViewerUpToDate">
+		El visor está actualizado.
+Si estás impaciente por probar las nuevas funciones y correcciones, lee la página sobre los visores alternativos. http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="DeedObjectToGroup">
 		Transferir este objeto al grupo hará que:
 * Reciba los L$ pagados en el objeto
@@ -1747,6 +1794,14 @@ Consulta [[INFO_URL] Información sobre esta actualización].
 		Has superado tu número máximo de grupos. Por favor, sal de al menos uno de ellos antes de crear uno nuevo o entrar en alguno.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="GroupLimitInfo">
+		El límite de grupos para las cuentas básicas es de [MAX_BASIC], y para
+las cuentas [https://secondlife.com/premium/ Premium] es de [MAX_PREMIUM].
+Si has bajado la categoría de tu cuenta, tendrás que estar por debajo del límite de [MAX_BASIC] grupos para poder apuntarte a más grupos.
+
+[https://secondlife.com/my/account/membership.php Cámbiate hoy a Premium]
+		<usetemplate name="okbutton" yestext="Cerrar"/>
+	</notification>
 	<notification name="KickUser">
 		¿Con qué mensaje quieres expulsar a este Residente?
 		<form name="form">
@@ -2258,6 +2313,10 @@ Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar u
 		Confirma que deseas pagar L$[AMOUNT] a [TARGET].
 		<usetemplate ignoretext="Confirmar antes de pagar (sumas mayores de 200 L$)" name="okcancelignore" notext="Cancelar" yestext="Pagar"/>
 	</notification>
+	<notification name="PayObjectFailed">
+		Error en el pago: no se encuentra el objeto.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="OpenObjectCannotCopy">
 		En este objeto, no hay ítems que estés autorizado a copiar.
 	</notification>
@@ -2289,10 +2348,9 @@ Esta acción no se puede deshacer.
 		[QUESTION]
 		<usetemplate ignoretext="Confirmar antes de eliminar elementos" name="okcancelignore" notext="Cancelar" yestext="OK"/>
 	</notification>
-	<notification name="HelpReportAbuseEmailLL">
-		Usa esta herramienta para denunciar violaciones de las [http://secondlife.com/corporate/tos.php Condiciones del Servicio] o las [http://secondlife.com/corporate/cs.php Normas de la Comunidad].
-
-Se investigan y resuelven todas las infracciones denunciadas.
+	<notification name="ConfirmUnlink">
+		La selección es grande y contiene linksets. Si la desenlazas, quizás no puedas volver establecer los vínculos. Puede ser conveniente guardar copias de los linksets como medida de precaución.
+		<usetemplate ignoretext="Confirmar que desenlazas un linkset" name="okcancelignore" notext="Cancelar" yestext="Desenlazar"/>
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		Por favor, elige una categoría para esta denuncia de infracción.
@@ -2991,19 +3049,19 @@ Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME]
 		Cambios omitidos en el campo &apos;[field]&apos; que solo puede configurar el propietario de la experiencia.
 	</notification>
 	<notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
-		No puedes definir un nivel de calificación de una experiencia superior al establecido por el propietario.
+		No puedes definir una calificación de contenido de una experiencia con un nivel superior al del propietario.
 	</notification>
 	<notification name="RestrictedTermExperienceProfileMessage">
 		Las condiciones siguientes han impedido la actualización del nombre o la descripción del perfil de la experiencia: [extra_info]
 	</notification>
 	<notification name="TeleportedHomeExperienceRemoved">
-		Te has teleportado desde la región [region_name] porque al quitar la experiencia secondlife:///app/experience/[public_id]/profile ya no tienes permiso para entrar en la región.
+		Has sido teleportado desde la región [region_name] porque al quitar la experiencia secondlife:///app/experience/[public_id]/profile ya no tienes permiso para entrar en la región.
 		<form name="form">
 			<ignore name="ignore" text="Expulsado de la región por quitar una experiencia"/>
 		</form>
 	</notification>
 	<notification name="TrustedExperienceEntry">
-		La participación en la experiencia clave secondlife:///app/experience/[public_id]/profile te otorga permiso para entrar en la región [region_name]. Si quitas esta experiencia, puede que te expulsen de la región.
+		La participación en la experiencia clave secondlife:///app/experience/[public_id]/profile te otorga permiso para entrar en la región [region_name]. Si quitas esta experiencia, puede que seas expulsado de la región.
 		<form name="form">
 			<ignore name="ignore" text="Admitido en una región por una experiencia"/>
 		</form>
@@ -3016,13 +3074,13 @@ Del objeto: &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, propietario: [NAME]
 Pueden estar disponibles otras experiencias clave.
 	</notification>
 	<notification name="ExperienceEvent">
-		La experiencia secondlife:///app/experience/[public_id]/profile permitió la siguiente operación con un objeto: [EventType].
+		La experiencia secondlife:///app/experience/[public_id]/profile permitió un objeto de [EventType].
     Propietario: secondlife:///app/agent/[OwnerID]/inspect
     Nombre del objeto: [ObjectName]
     Nombre de la parcela: [ParcelName]
 	</notification>
 	<notification name="ExperienceEventAttachment">
-		La experiencia secondlife:///app/experience/[public_id]/profile permitió la siguiente operación con un anexo: [EventType].
+		La experiencia secondlife:///app/experience/[public_id]/profile permitió un anexo de [EventType].
     Propietario: secondlife:///app/agent/[OwnerID]/inspect
 	</notification>
 	<notification name="ScriptQuestionExperience">
@@ -3212,6 +3270,12 @@ Por tu seguridad, serán bloqueadas durante unos segundos.
 	<notification name="AttachmentSaved">
 		Se ha guardado el adjunto.
 	</notification>
+	<notification name="PresetNotSaved">
+		Error al guardar el valor predefinido [NAME].
+	</notification>
+	<notification name="PresetNotDeleted">
+		Error al eliminar el valor predefinido [NAME].
+	</notification>
 	<notification name="UnableToFindHelpTopic">
 		No se ha podido encontrar un tema de ayuda para este elemento.
 	</notification>
@@ -3244,9 +3308,8 @@ Se mostrará cuando haya suficiente espacio.
 		Selecciona los residentes con quienes deseas compartir.
 	</notification>
 	<notification name="MeshUploadError">
-		[LABEL] no se pudo subir: [MESSAGE] [IDENTIFIER] 
-
-Consulta los detalles en el archivo de registro.
+		[LABEL] no se pudo subir: [MESSAGE] [IDENTIFIER]
+[DETAILS]Consulta los detalles en SecondLife.log
 	</notification>
 	<notification name="MeshUploadPermError">
 		Error al solicitar los permisos para subir la malla.
diff --git a/indra/newview/skins/default/xui/es/panel_experience_info.xml b/indra/newview/skins/default/xui/es/panel_experience_info.xml
index 85fc94ebdc..3e0637580d 100644
--- a/indra/newview/skins/default/xui/es/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/es/panel_experience_info.xml
@@ -14,7 +14,7 @@
 					<text name="LocationTextText">
 						algún lugar
 					</text>
-					<button label="Teleportarte" name="teleport_btn"/>
+					<button label="Teleporte" name="teleport_btn"/>
 					<button label="Mapa" name="map_btn"/>
 				</layout_panel>
 				<layout_panel name="marketplace panel">
diff --git a/indra/newview/skins/default/xui/es/panel_main_inventory.xml b/indra/newview/skins/default/xui/es/panel_main_inventory.xml
index 7e318a150b..894943265c 100644
--- a/indra/newview/skins/default/xui/es/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_main_inventory.xml
@@ -6,6 +6,9 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] ítems [FILTER]
 	</panel.string>
+	<panel.string name="ItemcountUnknown">
+		Obtenidos [ITEM_COUNT] ítems [FILTER]
+	</panel.string>
 	<text name="ItemcountText">
 		Ítems:
 	</text>
@@ -16,7 +19,7 @@
 	</tab_container>
 	<layout_stack name="bottom_panel">
 		<layout_panel name="options_gear_btn_panel">
-			<button name="options_gear_btn" tool_tip="Ver más opciones"/>
+			<menu_button name="options_gear_btn" tool_tip="Ver más opciones"/>
 		</layout_panel>
 		<layout_panel name="add_btn_panel">
 			<button name="add_btn" tool_tip="Añadir un ítem nuevo"/>
diff --git a/indra/newview/skins/default/xui/es/panel_people.xml b/indra/newview/skins/default/xui/es/panel_people.xml
index 06150f7619..909743c325 100644
--- a/indra/newview/skins/default/xui/es/panel_people.xml
+++ b/indra/newview/skins/default/xui/es/panel_people.xml
@@ -18,6 +18,7 @@
 	<string name="no_groups_msg" value="¿Buscas grupos en que participar? Prueba la [secondlife:///app/search/groups Búsqueda]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Pulsa dos veces para abrir el mapa, pulsa mayús y arrastra para obtener una panorámica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Pulsa dos veces para teleportarte, pulsa mayús y arrastra para obtener una panorámica)"/>
+	<string name="GroupCountWithInfo" value="Perteneces a [COUNT] grupos y puedes unirte a [REMAINING] más.  [secondlife:/// ¿Quieres más?]"/>
 	<tab_container name="tabs">
 		<panel label="CERCANA" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
index 2599d951d7..efa003c17e 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
 	<check_box label="Permitir el acceso de varios usuarios" name="allow_multiple_viewer_check"/>
 	<check_box label="Mostrar la selección de cuadrícula al iniciar sesión" name="show_grid_selection_check"/>
 	<check_box label="Mostrar el menú Avanzado" name="show_advanced_menu_check"/>
-	<check_box label="Mostrar el menú Develop" name="show_develop_menu_check"/>
+	<check_box label="Mostrar el menú Desarrollar" name="show_develop_menu_check"/>
 	<button label="Permisos de creación predeterminados" name="default_creation_permissions"/>
 </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 7feff9005c..778a483bcc 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
 		<check_box label="Oferta de inventario" name="inventory_offer"/>
 	</panel>
 	<panel name="log_settings">
+		<text name="logging_label">
+			Guardar:
+		</text>
+		<combo_box name="conversation_log_combo">
+			<item label="Registro y transcripciones" name="log_and_transcripts" value="2"/>
+			<item label="Solo registro" name="log_only" value="1"/>
+			<item label="Ni el registro ni las transcripciones" name="no_log_or_transcript" value="0"/>
+		</combo_box>
 		<button label="Borrar registro..." name="clear_log"/>
 		<button label="Borrar grabaciones..." name="delete_transcripts"/>
+		<text name="log_location_label">
+			Ubicación:
+		</text>
 		<button label="Examinar..." label_selected="Examinar" name="log_path_button"/>
 	</panel>
 	<button label="Traducción…" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index e68faf6e99..7d3c33a781 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -6,12 +6,12 @@
 	<combo_box name="language_combobox">
 		<combo_box.item label="Predeterminado del sistema" name="System Default Language"/>
 		<combo_box.item label="English (Inglés)" name="English"/>
-		<combo_box.item label="Dansk (Danés) - Beta" name="Danish"/>
+		<combo_box.item label="Dansk (danés) - Beta" name="Danish"/>
 		<combo_box.item label="Deutsch (Alemán) - Beta" name="Deutsch(German)"/>
 		<combo_box.item label="Español - Beta" name="Spanish"/>
 		<combo_box.item label="Français (Francés) - Beta" name="French"/>
 		<combo_box.item label="Italiano - Beta" name="Italian"/>
-		<combo_box.item label="Polski (Polaco) - Beta" name="Polish"/>
+		<combo_box.item label="Polski (polaco) - Beta" name="Polish"/>
 		<combo_box.item label="Português (portugués) - Beta" name="Portugese"/>
 		<combo_box.item label="Русский (Ruso) - Beta" name="Russian"/>
 		<combo_box.item label="Türkçe (Turco) - Beta" name="Turkish"/>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
index a9eab74e2b..f7fb8ab70d 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Gráficos" name="Display panel">
+	<text name="preset_text">
+		(ninguno)
+	</text>
 	<text name="QualitySpeed">
 		Calidad y velocidad:
 	</text>
-	<text name="FasterText">
-		Más rápido
-	</text>
-	<text name="BetterText">
-		Más calidad
-	</text>
 	<text name="ShadersPrefText">
 		Bajo
 	</text>
@@ -21,94 +18,17 @@
 	<text name="ShadersPrefText4">
 		Ultra
 	</text>
-	<panel label="CustomGraphics" name="CustomGraphics Panel">
-		<text name="ShadersText">
-			Shaders:
-		</text>
-		<check_box initial_value="true" label="Agua transparente" name="TransparentWater"/>
-		<check_box initial_value="true" label="Efecto de relieve y brillo" name="BumpShiny"/>
-		<check_box initial_value="true" label="Luces locales" name="LocalLights"/>
-		<check_box initial_value="true" label="Shaders básicos" name="BasicShaders" tool_tip="Desactivando esta opción puede prevenir fallos en algunos controladores de la tarjeta gráfica."/>
-		<check_box initial_value="true" label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Modelo de iluminación avanzado" name="UseLightShaders"/>
-		<check_box initial_value="true" label="Oclusión del ambiente" name="UseSSAO"/>
-		<check_box initial_value="true" label="Profundidad del campo" name="UseDoF"/>
-		<text name="shadows_label">
-			Sombras:
-		</text>
-		<combo_box name="ShadowDetail">
-			<combo_box.item label="Ninguno" name="0"/>
-			<combo_box.item label="Sol/luna" name="1"/>
-			<combo_box.item label="Sol/luna + proyectores" name="2"/>
-		</combo_box>
-		<text name="reflection_label">
-			Reflejos en el agua:
-		</text>
-		<combo_box initial_value="true" label="Reflejos en el agua" name="Reflections">
-			<combo_box.item label="Mínimo" name="0"/>
-			<combo_box.item label="Terreno y árboles" name="1"/>
-			<combo_box.item label="Todos los objetos estáticos" name="2"/>
-			<combo_box.item label="Todos los avatares y objetos" name="3"/>
-			<combo_box.item label="Todo" name="4"/>
-		</combo_box>
-		<slider label="Física del avatar:" name="AvatarPhysicsDetail"/>
-		<text name="AvatarPhysicsDetailText">
-			Bajo
-		</text>
-		<slider label="Distancia de dibujo:" name="DrawDistance"/>
-		<text name="DrawDistanceMeterText2">
-			m
-		</text>
-		<slider label="Núm. máx. de partículas:" name="MaxParticleCount"/>
-		<slider label="Nº máx. de avats. no impostores:" name="MaxNumberAvatarDrawn"/>
-		<slider label="Calidad de procesamiento:" name="RenderPostProcess"/>
-		<text name="MeshDetailText">
-			Detalle de la malla:
-		</text>
-		<slider label="  Objetos:" name="ObjectMeshDetail"/>
-		<slider label="  Prims flexibles:" name="FlexibleMeshDetail"/>
-		<slider label="  Árboles:" name="TreeMeshDetail"/>
-		<slider label="  Avatares:" name="AvatarMeshDetail"/>
-		<slider label="  Terreno:" name="TerrainMeshDetail"/>
-		<slider label="  Cielo:" name="SkyMeshDetail"/>
-		<text name="PostProcessText">
-			Baja
-		</text>
-		<text name="ObjectMeshDetailText">
-			Bajo
-		</text>
-		<text name="FlexibleMeshDetailText">
-			Bajo
-		</text>
-		<text name="TreeMeshDetailText">
-			Bajo
-		</text>
-		<text name="AvatarMeshDetailText">
-			Bajo
-		</text>
-		<text name="TerrainMeshDetailText">
-			Bajo
-		</text>
-		<text name="SkyMeshDetailText">
-			Bajo
-		</text>
-		<text name="AvatarRenderingText">
-			Renderización del avatar:
-		</text>
-		<check_box initial_value="true" label="Avatares simulados" name="AvatarImpostors"/>
-		<check_box initial_value="true" label="Renderizado por hardware" name="AvatarVertexProgram"/>
-		<check_box initial_value="true" label="Ropas del avatar" name="AvatarCloth"/>
-		<text left="402" name="TerrainDetailText">
-			Detalle del terreno:
-		</text>
-		<radio_group name="TerrainDetailRadio">
-			<radio_item label="Bajo" name="0"/>
-			<radio_item label="Alto" name="2"/>
-		</radio_group>
-		--&gt;
-	</panel>
-	<button label="Aplicar" label_selected="Aplicar" name="Apply"/>
-	<button label="Por defecto" name="Defaults"/>
-	<button label="Avanzado" name="Advanced"/>
-	<button label="Hardware" label_selected="Hardware" left="315" name="GraphicsHardwareButton"/>
+	<text name="FasterText">
+		Más rápido
+	</text>
+	<text name="BetterText">
+		Más calidad
+	</text>
+	<check_box initial_value="true" label="Shaders de la atmósfera" name="WindLightUseAtmosShaders"/>
+	<check_box initial_value="true" label="Modelo de iluminación avanzado" name="UseLightShaders"/>
+	<button label="Guardar configuración como valor predefinido..." name="PrefSaveButton"/>
+	<button label="Cargar predefinido..." name="PrefLoadButton"/>
+	<button label="Eliminar predefinido..." name="PrefDeleteButton"/>
+	<button label="Restablecer la configuración recomendada" name="Defaults"/>
+	<button label="Configuración avanzada..." name="AdvancedSettings"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
index 7ccad84b55..4fc973614b 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
 	<radio_group name="preferred_browser_behavior">
 		<radio_item label="Usar mi navegador (Chrome, Firefox, IE) para todos los enlaces" name="internal" tool_tip="Usa el navegador predeterminado para obtener ayuda, visitar enlaces web, etc. No es aconsejable si estás a pantalla completa." value="0"/>
 		<radio_item label="Usar el navegador integrado solo para los enlaces de Second Life" name="external" tool_tip="Usa el navegador predeterminado del sistema para obtener ayuda, visitar enlaces web, etc. El navegador integrado solo se utilizará para los enlaces de LindenLab/SecondLife." value="1"/>
+		<radio_item label="Usar el navegador incorporado para todos los vínculos" name="external_all" tool_tip="Usa el navegador incorporado para ayuda, enlaces web, etc. Este navegador se abre en una nueva ventana dentro de [APP_NAME]." value="2"/>
 	</radio_group>
 	<check_box initial_value="true" label="Activar plugins" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Aceptar las &apos;cookies&apos;" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Activar Javascript" name="browser_javascript_enabled"/>
-	<check_box initial_value="false" label="Permitir las ventanas emergentes en el navegador" name="media_popup_enabled"/>
 	<text name="Software updates:">
 		Actualizaciones de software:
 	</text>
 	<combo_box name="updater_service_combobox">
 		<combo_box.item label="Instalar automáticamente" name="Install_automatically"/>
-		<combo_box.item label="Descargar e instalar actualizaciones manualmente" name="Install_manual"/>
+		<combo_box.item label="Descargaré e instalaré manualmente las actualizaciones" name="Install_manual"/>
 	</combo_box>
 	<check_box label="Admitir candidatos a la versión comercial a la hora de realizar actualizaciones" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/es/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/es/panel_presets_pulldown.xml
new file mode 100644
index 0000000000..35e9236be1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+	<text name="Graphic Presets">
+		Valores predefinidos gráficos
+	</text>
+	<button label="Abrir las preferencias de gráficos" name="open_prefs_btn" tool_tip="Abre las preferencias de gráficos"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
index 90b9e475e7..e954e7d604 100644
--- a/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
@@ -45,12 +45,9 @@
 		<layout_panel name="media_address">
 			<line_editor name="media_address_url" tool_tip="URL de los media"/>
 			<layout_stack name="media_address_url_icons">
-				<layout_panel>
+				<layout_panel name="media_address_url_icons_wl">
 					<icon name="media_whitelist_flag" tool_tip="Lista Blanca activada"/>
 				</layout_panel>
-				<layout_panel>
-					<icon name="media_secure_lock_flag" tool_tip="Navegación segura"/>
-				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 		<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/es/panel_region_experiences.xml b/indra/newview/skins/default/xui/es/panel_region_experiences.xml
index 4b7f82d3fb..2af4981255 100644
--- a/indra/newview/skins/default/xui/es/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_experiences.xml
@@ -18,7 +18,7 @@ Las experiencias permitidas tienen permiso de ejecución en este estado.
 Las experiencias bloqueadas no pueden ejecutarse en este estado.
 	</panel.string>
 	<panel.string name="estate_caption">
-		En esta pestaña, los cambios en la configuración afectarán a todas las regiones del estado.
+		Las opciones de configuración que cambies en esta pestaña afectarán a todas las regiones del estado.
 	</panel.string>
 	<panel.string name="allowed_parcel_text">
 		Solo se permiten las experiencias activas en el terreno.
@@ -28,6 +28,6 @@ Las experiencias permitidas tienen permiso de ejecución en esta parcela si no l
 	<panel.string name="blocked_parcel_text">
 		Puede bloquearse cualquier experiencia de los residentes.
       
-Las experiencias bloqueadas no pueden ejecutarse en esta parcela.
+Puede que las experiencias bloqueadas no se ejecuten en esta parcela.
 	</panel.string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
index c9eea9a58e..b5cf57ade7 100644
--- a/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/es/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Guardar una imagen en el inventario cuesta [UPLOAD_COST] L$. Para guardar una imagen como una textura, selecciona uno de los formatos cuadrados.
 	</text>
 	<combo_box label="Resolución" name="texture_size_combo">
-		<combo_box.item label="Ventana actual" name="CurrentWindow"/>
+		<combo_box.item label="Ventana actual (512 × 512)" name="CurrentWindow"/>
 		<combo_box.item label="Pequeña (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Mediana (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/es/panel_tools_texture.xml b/indra/newview/skins/default/xui/es/panel_tools_texture.xml
index b820880e60..d5ff5b7f2c 100644
--- a/indra/newview/skins/default/xui/es/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/es/panel_tools_texture.xml
@@ -21,11 +21,11 @@
 		<combo_box.item label="Materiales" name="Materials"/>
 		<combo_box.item label="Media" name="Media"/>
 	</combo_box>
-	<combo_box name="combobox mattype">
-		<combo_box.item label="Textura (difuminar)" name="Texture (diffuse)"/>
-		<combo_box.item label="Rugosidad (normal)" name="Bumpiness (normal)"/>
-		<combo_box.item label="Brillo (efecto espejo)" name="Shininess (specular)"/>
-	</combo_box>
+	<radio_group name="radio_material_type">
+		<radio_item label="Textura (difusa)" name="Texture (diffuse)" value="0"/>
+		<radio_item label="Relieve (normal)" name="Bumpiness (normal)" value="1"/>
+		<radio_item label="Brillantez (especular)" name="Shininess (specular)" value="2"/>
+	</radio_group>
 	<texture_picker label="Textura" name="texture control" tool_tip="Pulsa para elegir una imagen"/>
 	<text name="label alphamode">
 		Modo alfa
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index bda88fad7c..a9c0a12262 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -58,7 +58,7 @@ Tarjeta gráfica: [GRAPHICS_CARD]
 Versión de libcurl: [LIBCURL_VERSION]
 Versión de J2C Decoder: [J2C_VERSION]
 Versión de Audio Driver: [AUDIO_DRIVER_VERSION]
-Versión de Qt Webkit: [QT_WEBKIT_VERSION]
+Versión de LLCEFLib/CEF: [LLCEFLIB_VERSION]
 Versión del servidor de voz: [VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">
@@ -169,6 +169,12 @@ Versión del servidor de voz: [VOICE_VERSION]
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="AgniGridLabel">
+		Grid principal de Second Life (Agni)
+	</string>
+	<string name="AditiGridLabel">
+		Grid de prueba beta de Second Life (Aditi)
+	</string>
 	<string name="ViewerDownloadURL">
 		http://secondlife.com/download.
 	</string>
@@ -444,6 +450,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 		No puedes tener una carpeta de prendas que contenga más de [AMOUNT] elementos.  Puedes cambiar este límite en Avanzado &gt; Mostrar las configuraciones del depurador &gt; WearFolderLimit.
 	</string>
 	<string name="TooltipPrice" value="[AMOUNT] L$:"/>
+	<string name="TooltipSLIcon">
+		Esto crea un vínculo a una página del dominio oficial SecondLife.com o LindenLab.com.
+	</string>
 	<string name="TooltipOutboxDragToWorld">
 		No se pueden mostrar artículos desde la carpeta Artículos del mercado
 	</string>
@@ -463,7 +472,7 @@ Intenta iniciar sesión de nuevo en unos instantes.
 		La cantidad de artículos en stock excede de [AMOUNT].
 	</string>
 	<string name="TooltipOutboxCannotDropOnRoot">
-		Solo se pueden soltar artículos o carpetas en la pestaña TODOS. Selecciona esta pestaña y mueve otra vez los artículos o carpetas.
+		Solo se pueden soltar artículos o carpetas en las pestañas TODOS o SIN ASOCIAR. Selecciona una de estas pestañas y mueve otra vez los artículos o carpetas.
 	</string>
 	<string name="TooltipOutboxNoTransfer">
 		Uno o varios de estos objetos no se pueden vender o transferir
@@ -547,6 +556,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 		Pulsa para ejecutar el comando secondlife://
 	</string>
 	<string name="CurrentURL" value="URL actual: [CurrentURL]"/>
+	<string name="TooltipEmail">
+		Haz clic para redactar un correo electrónico
+	</string>
 	<string name="SLurlLabelTeleport">
 		Teleportarse a
 	</string>
@@ -1063,7 +1075,7 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="AgentNameSubst">
 		(Tú)
 	</string>
-	<string name="JoinAnExperience"/><!-- intentionally blank -->
+	<string name="JoinAnExperience"/>
 	<string name="SilentlyManageEstateAccess">
 		Suprimir alertas al gestionar las listas de acceso a un estado
 	</string>
@@ -1836,6 +1848,21 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="TodayOld">
 		Registrado hoy
 	</string>
+	<string name="av_render_everyone_now">
+		Ahora todos pueden verte.
+	</string>
+	<string name="av_render_not_everyone">
+		Es posible que no todos los que están próximos puedan renderizarte.
+	</string>
+	<string name="av_render_over_half">
+		Es posible que más de la mitad de los que están próximos no puedan renderizarte.
+	</string>
+	<string name="av_render_most_of">
+		Es posible que la mayoría de los que están próximos no puedan renderizarte.
+	</string>
+	<string name="av_render_anyone">
+		Es posible que ninguno de los que están próximos pueda renderizarte.
+	</string>
 	<string name="AgeYearsA">
 		[COUNT] año
 	</string>
@@ -1953,6 +1980,9 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="CompileQueueUnknownFailure">
 		Fallo desconocido en la descarga
 	</string>
+	<string name="CompileNoExperiencePerm">
+		Omitiendo el script [SCRIPT] con la experiencia [EXPERIENCE].
+	</string>
 	<string name="CompileQueueTitle">
 		Recompilando
 	</string>
@@ -1998,9 +2028,6 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="GroupsNone">
 		ninguno
 	</string>
-	<string name="CompileNoExperiencePerm">
-		Omitiendo el script [SCRIPT] con la experiencia [EXPERIENCE].
-	</string>
 	<string name="Group" value="(grupo)"/>
 	<string name="Unknown">
 		(Desconocido)
@@ -5290,18 +5317,6 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 	<string name="UserDictionary">
 		[Usuario]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		No se están registrando las conversaciones. Para empezar a grabar un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		No se registrarán más conversaciones. Para reanudar la grabación de un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		No hay conversaciones grabadas. Después de contactar con una persona, o de que alguien contacte contigo, aquí se mostrará una entrada de registro.
-	</string>
-	<string name="loading_chat_logs">
-		Cargando...
-	</string>
 	<string name="experience_tools_experience">
 		Experiencia
 	</string>
@@ -5360,7 +5375,7 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 		aceptar automáticamente permisos de experiencias
 	</string>
 	<string name="ExperiencePermissionShortUnknown">
-		ha realizado una operación desconocida: [Permission]
+		realizar una operación desconocida: [Permission]
 	</string>
 	<string name="ExperiencePermissionShort1">
 		Ponerte al mando
@@ -5378,9 +5393,42 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas
 		Controlar la cámara
 	</string>
 	<string name="ExperiencePermissionShort11">
-		Teleportarte
+		Teleporte
 	</string>
 	<string name="ExperiencePermissionShort12">
 		Otorgar permisos
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		No se están registrando las conversaciones. Para empezar a grabar un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		No se registrarán más conversaciones. Para reanudar la grabación de un registro, elige &quot;Guardar: Solo registro&quot; o &quot;Guardar: Registro y transcripciones&quot; en Preferencias &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		No hay conversaciones grabadas. Después de contactar con una persona, o de que alguien contacte contigo, aquí se mostrará una entrada de registro.
+	</string>
+	<string name="loading_chat_logs">
+		Cargando...
+	</string>
+	<string name="preset_combo_label">
+		-Lista vacía-
+	</string>
+	<string name="Default">
+		Predeterminado
+	</string>
+	<string name="none_paren_cap">
+		(ninguno)
+	</string>
+	<string name="no_limit">
+		Sin límite
+	</string>
+	<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+		La forma física contiene triángulos demasiado pequeños. Intenta simplificar el modelo físico.
+	</string>
+	<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+		La forma física contiene datos de confirmación erróneos. Intenta corregir el modelo físico.
+	</string>
+	<string name="Mav_Details_MAV_UNKNOWN_VERSION">
+		La versión de la forma física no es correcta. Configura la versión correcta del modelo físico.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index 08f26e60b4..1e2a14ab3e 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -3,6 +3,7 @@
 	<tab_container name="about_tab">
 		<panel label="Infos" name="support_panel">
 			<button label="Copier dans le presse-papiers" name="copy_btn"/>
+			<button label="Rechercher des mises à jour" name="update_btn"/>
 		</panel>
 		<panel label="Remerciements" name="credits_panel">
 			<text name="linden_intro">Second Life vous est proposé par les Linden, 
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 3de282e8d5..6aea44e650 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -10,13 +10,13 @@
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
 	<floater.string name="Minutes">
-		[MINUTES] minutes
+		[MINUTES] min
 	</floater.string>
 	<floater.string name="Minute">
-		minute
+		lmin
 	</floater.string>
 	<floater.string name="Seconds">
-		[SECONDS] secondes
+		[SECONDS] s
 	</floater.string>
 	<floater.string name="Remaining">
 		restantes
@@ -456,7 +456,7 @@ musique :
 			<spinner label="Durée en heures :" name="HoursSpin"/>
 			<panel name="Allowed_layout_panel">
 				<text label="Toujours autoriser" name="AllowedText">
-					Résidents autorisés
+					Résidents autorisés ([COUNT])
 				</text>
 				<name_list name="AccessList" tool_tip="([LISTED] dans la liste, [MAX] max.)"/>
 				<button label="Ajouter" name="add_allowed"/>
@@ -464,7 +464,7 @@ musique :
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Bannir" name="BanCheck">
-					Résidents bannis
+					Résidents bannis ([COUNT])
 				</text>
 				<name_list name="BannedList" tool_tip="([LISTED] dans la liste, [MAX] max.)"/>
 				<button label="Ajouter" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_autoreplace.xml b/indra/newview/skins/default/xui/fr/floater_autoreplace.xml
index 1d19181692..fa842ae830 100644
--- a/indra/newview/skins/default/xui/fr/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/fr/floater_autoreplace.xml
@@ -13,6 +13,12 @@
 	</scroll_list>
 	<button label="Ajouter..." name="autoreplace_add_entry"/>
 	<button label="Supprimer" name="autoreplace_delete_entry"/>
+	<text name="autoreplace_keyword_txt">
+		Mot-clé :
+	</text>
+	<text name="autoreplace_replacement_txt">
+		Remplacement :
+	</text>
 	<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."/>
diff --git a/indra/newview/skins/default/xui/fr/floater_bumps.xml b/indra/newview/skins/default/xui/fr/floater_bumps.xml
index 32714ea09c..e2f3178420 100644
--- a/indra/newview/skins/default/xui/fr/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/fr/floater_bumps.xml
@@ -19,6 +19,6 @@
 		[TIME]  [NAME] vous a donné un coup avec un objet physique.
 	</floater.string>
 	<floater.string name="timeStr">
-		[[hour,datetime,slt]:[min,datetime,slt]]
+		[[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
 	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/fr/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000..d276c89302
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="SUPPRIMER LE PRÉRÉGLAGE PRÉF.">
+	<string name="title_graphic">
+		Supprimer le préréglage de graphique
+	</string>
+	<string name="title_camera">
+		Supprimer le préréglage de caméra
+	</string>
+	<text name="Preset">
+		Sélectionner un préréglage
+	</text>
+	<button label="Supprimer" name="delete"/>
+	<button label="Annuler" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_experienceprofile.xml b/indra/newview/skins/default/xui/fr/floater_experienceprofile.xml
index 080c6e4dde..38d3e0fb81 100644
--- a/indra/newview/skins/default/xui/fr/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/fr/floater_experienceprofile.xml
@@ -12,7 +12,7 @@
 	<floater.string name="maturity_icon_adult">
 		&quot;Parcel_R_Light&quot;
 	</floater.string>
-	<text name="edit_title" value="Profil de l&apos;expérience"/>
+	<text name="edit_title" value="Profil de l’expérience"/>
 	<tab_container name="tab_container">
 		<panel name="panel_experience_info">
 			<scroll_container name="xp_scroll">
@@ -63,7 +63,7 @@
 					<text name="edit_ContentRating">
 						Catégorie :
 					</text>
-					<icons_combo_box label="Modéré" name="edit_ContentRatingText" tool_tip="Si vous augmentez la catégorie de contenu pour une expérience, les permissions seront réinitialisées pour tous les résidents ayant autorisé l&apos;expérience.">
+					<icons_combo_box label="Modéré" name="edit_ContentRatingText" tool_tip="Si vous augmentez la catégorie de contenu pour une expérience, les permissions seront réinitialisées pour tous les résidents ayant autorisé l’expérience.">
 						<icons_combo_box.item label="Adulte" name="Adult" value="42"/>
 						<icons_combo_box.item label="Modéré" name="Mature" value="21"/>
 						<icons_combo_box.item label="Général" name="PG" value="13"/>
@@ -71,11 +71,11 @@
 					<text name="edit_Location">
 						Endroit :
 					</text>
-					<button label="Définir sur l&apos;emplacement actuel" name="location_btn"/>
-					<button label="Effacer l&apos;emplacement" name="clear_btn"/>
-					<check_box label="Activer l&apos;expérience" name="edit_enable_btn" tool_tip=""/>
+					<button label="Définir sur l’emplacement actuel" name="location_btn"/>
+					<button label="Effacer l’emplacement" name="clear_btn"/>
+					<check_box label="Activer l’expérience" name="edit_enable_btn" tool_tip=""/>
 					<check_box label="Cacher dans les résultats de recherche" name="edit_private_btn"/>
-					<text name="changes" value="Il peut falloir plusieurs minutes pour que l&apos;expérience soit visible dans toutes les régions."/>
+					<text name="changes" value="Il peut falloir plusieurs minutes pour que l’expérience soit visible dans toutes les régions."/>
 					<button label="Retour" name="cancel_btn"/>
 					<button label="Enregistrer" name="save_btn"/>
 				</panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_fast_timers.xml b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
index 0100b10557..c64b7a8c00 100644
--- a/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/fr/floater_fast_timers.xml
@@ -6,5 +6,16 @@
 	<string name="run">
 		Courir
 	</string>
+	<combo_box name="time_scale_combo">
+		<item label="2x valeur moy." name="2x Average"/>
+		<item label="Max." name="Max"/>
+		<item label="Max. récent" name="Recent Max"/>
+		<item label="100 ms" name="100ms"/>
+	</combo_box>
+	<combo_box name="metric_combo">
+		<item label="Durée" name="Time"/>
+		<item label="Nombre d’appels" name="Number of Calls"/>
+		<item label="Hz" name="Hz"/>
+	</combo_box>
 	<button label="Pauser" name="pause_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
index fdc4000746..8e4afce406 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
 		<radio_item label="Antérieure à" name="older"/>
 	</radio_group>
 	<spinner label="Heures" name="spin_hours_ago"/>
+	<text name="label_hours">
+		Heures
+	</text>
 	<spinner label="Jours" name="spin_days_ago"/>
+	<text name="label_days">
+		Jours
+	</text>
 	<button label="Fermer" label_selected="Fermer" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
index d69c311a8e..a0d1197ea7 100644
--- a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
@@ -10,16 +10,16 @@
 		SCRIPT : [NAME]
 	</floater.string>
 	<floater.string name="experience_enabled">
-		Supprimer la coche pour supprimer l&apos;expérience actuelle
+		Supprimer la coche pour supprimer l’expérience actuelle
 	</floater.string>
 	<floater.string name="no_experiences">
-		Vous n&apos;êtes autorisé(e) pour aucune expérience.
+		Vous n’êtes autorisé(e) pour aucune expérience.
 	</floater.string>
 	<floater.string name="add_experiences">
 		Sélectionner pour ajouter une expérience
 	</floater.string>
 	<floater.string name="show_experience_profile">
-		Cliquer pour afficher le profil de l&apos;expérience
+		Cliquer pour afficher le profil de l’expérience
 	</floater.string>
 	<floater.string name="loading">
 		Chargement...
diff --git a/indra/newview/skins/default/xui/fr/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/fr/floater_load_pref_preset.xml
new file mode 100644
index 0000000000..6fcd830ae8
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="CHARGER LE PRÉRÉGLAGE PRÉF.">
+	<string name="title_graphic">
+		Charger le préréglage de graphique
+	</string>
+	<string name="title_camera">
+		Charger le préréglage de caméra
+	</string>
+	<text name="Preset">
+		Sélectionner un préréglage
+	</text>
+	<button label="OK" name="ok"/>
+	<button label="Annuler" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml
index b491dd6aed..0f657e9e5b 100644
--- a/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/fr/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
 	<string name="OutboxInitializing">
 		Initialisation...
 	</string>
-	<panel label="">
-		<panel>
+	<panel label="" name="panel_1">
+		<panel name="panel_2">
 			<panel name="outbox_inventory_placeholder_panel">
 				<text name="outbox_inventory_placeholder_title">
 					Chargement...
 				</text>
 			</panel>
 		</panel>
-		<panel>
+		<panel name="panel_3">
+			<panel name="outbox_generic_drag_target">
+				<text name="text_1">
+					Faites glisser des éléments ici pour créer des dossiers
+				</text>
+			</panel>
 			<button label="Envoyer vers la Place du marché" name="outbox_import_btn" tool_tip="Vers ma vitrine de la Place du marché"/>
 		</panel>
 	</panel>
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 bd3dae6599..d3d941ff5c 100644
--- a/indra/newview/skins/default/xui/fr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_model_preview.xml
@@ -55,6 +55,9 @@
 	<string name="mesh_status_invalid_material_list">
 		Les options du niveau de détail ne sont pas une sous-ensemble d&apos;un modèle de référence.
 	</string>
+	<string name="phys_status_vertex_limit_exceeded">
+		Certaines enveloppes physiques dépassent les limites de sommets.
+	</string>
 	<string name="layer_all">
 		Tout
 	</string>
@@ -93,52 +96,52 @@
 				<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"/>
+					<item label="Depuis un fichier" name="Load from file" value="Depuis un fichier"/>
+					<item label="Génération" 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"/>
+					<item label="Triangles max" name="Triangle Limit" value="Triangles max"/>
+					<item label="Seuil d’erreur" 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"/>
+					<item label="Depuis un fichier" name="Load from file" value="Depuis un fichier"/>
+					<item label="Génération" name="Generate" value="Génération"/>
+					<item label="Niveau de détail du dessus" 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"/>
+					<item label="Triangles max" name="Triangle Limit" value="Triangles max"/>
+					<item label="Seuil d’erreur" 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"/>
+					<item label="Depuis un fichier" name="Load from file" value="Depuis un fichier"/>
+					<item label="Génération" name="Generate" value="Génération"/>
+					<item label="Niveau de détail du dessus" 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"/>
+					<item label="Triangles max" name="Triangle Limit" value="Triangles max"/>
+					<item label="Seuil d’erreur" 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"/>
+					<item label="Depuis un fichier" name="Load from file" value="Depuis un fichier"/>
+					<item label="Génération" name="Generate" value="Génération"/>
+					<item label="Niveau de détail du dessus" 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"/>
+					<item label="Triangles max" name="Triangle Limit" value="Triangles max"/>
+					<item label="Seuil d’erreur" 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"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/fr/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000..ac34291a57
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="NOTIFICATIONS">
+	<floater.string name="system_tab_title">
+		Système ([COUNT])
+	</floater.string>
+	<floater.string name="transactions_tab_title">
+		Transactions ([COUNT])
+	</floater.string>
+	<floater.string name="group_invitations_tab_title">
+		Invitations ([COUNT])
+	</floater.string>
+	<floater.string name="group_notices_tab_title">
+		Groupe ([COUNT])
+	</floater.string>
+	<string name="title_notification_tabbed_window">
+		NOTIFICATIONS
+	</string>
+	<layout_stack name="TabButtonsStack">
+		<layout_panel name="TabButtonsLayoutPanel">
+			<tab_container name="notifications_tab_container">
+				<panel label="Système (0)" name="system_notification_list_tab"/>
+				<panel label="Transactions (0)" name="transaction_notifications_tab"/>
+				<panel label="Invitations (0)" name="group_invite_notifications_tab"/>
+				<panel label="Groupe (0)" name="group_notice_notifications_tab"/>
+			</tab_container>
+			<layout_stack name="ButtonsStack">
+				<layout_panel name="CondenseAllButtonPanel">
+					<button label="Tout réduire" name="collapse_all_button"/>
+				</layout_panel>
+				<layout_panel name="GapLayoutPanel">
+					<panel label="Panneau de contrôle des interstices" name="GapPanel"/>
+				</layout_panel>
+				<layout_panel name="DeleteAllButtonPanel">
+					<button label="Tout supprimer" name="delete_all_button"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</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
index 7c9109c011..65105e77c5 100644
--- a/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
 	<floater.string name="character_owner_group">
 		[Groupe]
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_chars_main">
 		<scroll_list name="objects_scroll_list">
 			<scroll_list.columns label="Nom" name="name"/>
 			<scroll_list.columns label="Description" name="description"/>
@@ -42,7 +42,7 @@
 		<button label="Tout sélectionner" name="select_all_objects"/>
 		<button label="Ne rien sélectionner" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_chars_actions">
 		<text name="actions_label">
 			Actions sur les personnages sélectionnés :
 		</text>
@@ -50,8 +50,8 @@
 		<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="M’y téléporter" name="teleport_me_to_object" tool_tip="Activé uniquement lorsqu’un personnage est sélectionné."/>
+		<button label="Retour" 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
index 02d969dc08..d1ad5b3bdb 100644
--- a/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
 	<floater.string name="pathing_error">
 		Erreur lors de la génération du chemin.
 	</floater.string>
+	<panel name="pathfinding_console_main">
+		<text name="viewer_status_label">
+			Statut du client
+		</text>
+	</panel>
+	<panel name="pathfinding_console_simulator">
+		<text name="simulator_status_label">
+			Statut du simulateur
+		</text>
+	</panel>
 	<tab_container name="view_test_tab_container">
 		<panel label="Vue" name="view_panel">
 			<text name="show_label">
diff --git a/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml
index 894ec6dd9c..148fbdb063 100644
--- a/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pathfinding_linksets.xml
@@ -90,14 +90,23 @@
 	<floater.string name="linkset_choose_use">
 		Choisir un usage de groupe de liens...
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_linksets_main">
+		<text name="linksets_filter_label">
+			Filtrer par :
+		</text>
+		<text name="linksets_name_label">
+			Nom
+		</text>
+		<text name="linksets_desc_label">
+			Description
+		</text>
 		<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="Volume d’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"/>
@@ -122,15 +131,21 @@
 		<button label="Tout sélectionner" name="select_all_objects"/>
 		<button label="Ne rien sélectionner" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_actions">
+		<text name="linksets_actions_label">
+			Actions sur les groupes de liens sélectionnés (si un groupe de liens est supprimé du monde, ses attributs risquent d’être perdus) :
+		</text>
 		<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="M’y téléporter" name="teleport_me_to_object"/>
+		<button label="Retour" name="return_objects"/>
 		<button label="Supprimer" name="delete_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_attributes">
+		<text name="linksets_attributes_label">
+			Modifier les attributs des groupes de liens sélectionnés et appuyer sur le bouton pour appliquer les modifications
+		</text>
 		<text name="walkability_coefficients_label">
 			Marche possible :
 		</text>
diff --git a/indra/newview/skins/default/xui/fr/floater_perms_default.xml b/indra/newview/skins/default/xui/fr/floater_perms_default.xml
index 005daf7ec1..1cea8e55cc 100644
--- a/indra/newview/skins/default/xui/fr/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/fr/floater_perms_default.xml
@@ -1,6 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perms default" title="PERMISSIONS DE CRÉATION PAR DÉFAUT">
-	<panel label="Permissions par défaut" name="default permissions"/>
+	<panel label="Permissions par défaut" name="default permissions">
+		<text name="label_1">
+			Prochain propr. :
+		</text>
+		<text name="label_2">
+			Copier
+		</text>
+		<text name="label_3">
+			Modifier
+		</text>
+		<text name="label_4">
+			Transférer
+		</text>
+		<text name="label_5">
+			Partager avec le groupe
+		</text>
+		<text name="label_6">
+			Autoriser tout le monde à copier
+		</text>
+		<text name="label_7" tool_tip="Définir les droits par défaut pour la création d’objets">
+			Objets
+		</text>
+		<text name="label_8" tool_tip="Définir les droits par défaut pour les articles chargés">
+			Chargements
+		</text>
+		<text name="label_9" tool_tip="Définir les droits par défaut pour la création de scripts">
+			Scripts
+		</text>
+		<text name="label_10" tool_tip="Définir les droits par défaut pour la création de notes">
+			Notes
+		</text>
+		<text name="label_11" tool_tip="Définir les droits par défaut pour la création de gestes">
+			Gestes
+		</text>
+		<text name="label_12" tool_tip="Définir les droits par défaut pour la création d’habits ou de parties de corps">
+			Articles à porter
+		</text>
+	</panel>
 	<button label="OK" label_selected="OK" name="ok"/>
 	<button label="Annuler" label_selected="Annuler" name="cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000..73d6546a80
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="PRÉFÉRENCES GRAPHIQUES AVANCÉES">
+	<text name="GeneralText">
+		Général
+	</text>
+	<slider label="Limite d’affichage :" name="DrawDistance"/>
+	<text name="DrawDistanceMeterText2">
+		m
+	</text>
+	<slider label="Nb max. de particules :" name="MaxParticleCount"/>
+	<slider label="Qualité post-traitement :" name="RenderPostProcess"/>
+	<text name="PostProcessText">
+		Faible
+	</text>
+	<text name="AvatarText">
+		Avatar
+	</text>
+	<slider label="Complexité max. :" name="IndirectMaxComplexity" tool_tip="Contrôle à quel moment un avatar complexe est représenté comme un « jelly baby » (forme de couleur unie)"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
+	<slider label="Avatars max. non éloignés en 2D :" name="IndirectMaxNonImpostors"/>
+	<text name="IndirectMaxNonImpostorsText">
+		0
+	</text>
+	<slider label="Détail :" name="AvatarMeshDetail"/>
+	<text name="AvatarMeshDetailText">
+		Faible
+	</text>
+	<slider label="Propriétés physiques :" name="AvatarPhysicsDetail"/>
+	<text name="AvatarPhysicsDetailText">
+		Faible
+	</text>
+	<text name="ShadersText">
+		Matériel
+	</text>
+	<slider label="Mémoire textures (Mo) :" name="GraphicsCardTextureMemory" tool_tip="Quantité de mémoire à affecter aux textures. Utilise la mémoire de la carte vidéo par défaut. Si vous réduisez ce paramètre, cela peut améliorer les performances, mais les textures risquent d’être floues."/>
+	<slider label="Indice du brouillard :" name="fog"/>
+	<slider label="Gamma :" name="gamma"/>
+	<text name="(brightness, lower is brighter)">
+		(0 = défaut, valeur faible = plus lumineux)
+	</text>
+	<check_box label="Filtre anisotrope (plus lent quand activé)" name="ani"/>
+	<check_box initial_value="true" label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="L’activation de cette option sur le matériel récent permet un gain de performance.  Cependant, les implémentations VBO pour le matériel plus ancien sont souvent médiocres et votre système risque de se planter quand cette option est activée."/>
+	<check_box initial_value="true" label="Activer la compression des textures (redémarrage requis)" name="texture compression" tool_tip="Comprime les textures en mémoire vidéo afin de permettre de charger des textures de résolution plus élevée au prix d’une certaine qualité de couleur."/>
+	<text name="antialiasing label">
+		Anti-aliasing :
+	</text>
+	<combo_box label="Anti-aliasing" name="fsaa">
+		<combo_box.item label="Désactivé" name="FSAADisabled"/>
+		<combo_box.item label="2x" name="2x"/>
+		<combo_box.item label="4x" name="4x"/>
+		<combo_box.item label="8x" name="8x"/>
+		<combo_box.item label="16x" name="16x"/>
+	</combo_box>
+	<text name="antialiasing restart">
+		(redémarrage requis)
+	</text>
+	<slider label="Détails des rendus des terrains :" name="TerrainMeshDetail"/>
+	<text name="TerrainMeshDetailText">
+		Faible
+	</text>
+	<slider label="Arbres :" name="TreeMeshDetail"/>
+	<text name="TreeMeshDetailText">
+		Faible
+	</text>
+	<slider label="Objets :" name="ObjectMeshDetail"/>
+	<text name="ObjectMeshDetailText">
+		Faible
+	</text>
+	<slider label="Flexiprims :" name="FlexibleMeshDetail"/>
+	<text name="FlexibleMeshDetailText">
+		Faible
+	</text>
+	<check_box initial_value="true" label="Eau transparente" name="TransparentWater"/>
+	<check_box initial_value="true" label="Placage de relief et brillance" name="BumpShiny"/>
+	<check_box initial_value="true" label="Lumières locales" name="LocalLights"/>
+	<check_box initial_value="true" label="Effets de base" name="BasicShaders" tool_tip="La désactivation de cette option peut éviter le plantage de certains pilotes de cartes graphiques"/>
+	<slider label="Rendu du terrain :" name="TerrainDetail"/>
+	<text name="TerrainDetailText">
+		Faible
+	</text>
+	<check_box initial_value="true" label="Accélération du rendu des avatars" name="AvatarVertexProgram"/>
+	<check_box initial_value="true" label="Mouvement des habits" name="AvatarCloth"/>
+	<text name="ReflectionsText">
+		Reflets dans l’eau :
+	</text>
+	<combo_box name="Reflections">
+		<combo_box.item label="Minimes" name="0"/>
+		<combo_box.item label="Terrain et arbres" name="1"/>
+		<combo_box.item label="Tous les objets statiques" name="2"/>
+		<combo_box.item label="Tous les objets et avatars" name="3"/>
+		<combo_box.item label="Tout" name="4"/>
+	</combo_box>
+	<check_box initial_value="true" label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
+	<slider label="Ciel :" name="SkyMeshDetail"/>
+	<text name="SkyMeshDetailText">
+		Faible
+	</text>
+	<check_box initial_value="true" label="Modèle d’éclairage avancé" name="UseLightShaders"/>
+	<check_box initial_value="true" label="Occlusion ambiante" name="UseSSAO"/>
+	<check_box initial_value="true" label="Profondeur de champ" name="UseDoF"/>
+	<text name="RenderShadowDetailText">
+		Ombres :
+	</text>
+	<combo_box name="ShadowDetail">
+		<combo_box.item label="Aucun(e)" name="0"/>
+		<combo_box.item label="Soleil/Lune" name="1"/>
+		<combo_box.item label="Soleil/Lune + Projecteurs" name="2"/>
+	</combo_box>
+	<button label="Réinitialiser les paramètres recommandés" name="Defaults"/>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+	<check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/fr/floater_save_pref_preset.xml
new file mode 100644
index 0000000000..92e05a121f
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="ENREGISTRER LE PRÉRÉGLAGE PRÉF.">
+	<string name="title_graphic">
+		Enregistrer le préréglage de graphique
+	</string>
+	<string name="title_camera">
+		Enregistrer le préréglage de caméra
+	</string>
+	<text name="Preset">
+		Tapez un nom pour le préréglage ou choisissez un préréglage existant.
+	</text>
+	<button label="Enregistrer" name="save"/>
+	<button label="Annuler" name="cancel"/>
+</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
index c8c76c672d..e305519488 100644
--- a/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/fr/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_import" title="Importation d&apos;un dictionnaire">
+	<text name="import_dict">
+		Dictionnaire :
+	</text>
 	<button label="Parcourir" label_selected="Parcourir" name="dictionary_path_browse"/>
+	<text name="import_name">
+		Nom :
+	</text>
+	<text name="import_lang">
+		Langue :
+	</text>
 	<button label="Importer" name="ok_btn"/>
 	<button label="Annuler" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_tos.xml b/indra/newview/skins/default/xui/fr/floater_tos.xml
index 6d58cf77ca..c43139ce0f 100644
--- a/indra/newview/skins/default/xui/fr/floater_tos.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tos.xml
@@ -12,4 +12,7 @@
 	<text name="tos_heading">
 		Veuillez lire attentivement les Conditions d&apos;utilisation et le Règlement sur le respect de la vie privée suivants. Vous devez les accepter pour pouvoir vous connecter à [SECOND_LIFE].
 	</text>
+	<text name="external_tos_required">
+		Vous devez vous rendre sur my.secondlife.com et vous connecter pour accepter les Conditions d’utilisation avant de pouvoir continuer. Merci !
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
index 0450be28e0..20de34250a 100644
--- a/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_attachment_other.xml
@@ -15,5 +15,8 @@
 	<menu_item_call label="Zoomer en avant" name="Zoom In"/>
 	<menu_item_call label="Payer" name="Pay..."/>
 	<menu_item_call label="Profil de l&apos;objet" name="Object Inspect"/>
+	<menu_item_check label="Effectuer le rendu normalement" name="RenderNormally"/>
+	<menu_item_check label="Ne pas effectuer le rendu" name="DoNotRender"/>
+	<menu_item_check label="Effectuer le rendu total" name="AlwaysRenderFully"/>
 	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
index 1f5c1724f8..d31f205efb 100644
--- a/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/fr/menu_avatar_other.xml
@@ -14,5 +14,8 @@
 	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Zoomer en avant" name="Zoom In"/>
 	<menu_item_call label="Payer" name="Pay..."/>
+	<menu_item_check label="Effectuer le rendu normalement" name="RenderNormally"/>
+	<menu_item_check label="Ne pas effectuer le rendu" name="DoNotRender"/>
+	<menu_item_check label="Effectuer le rendu total" name="AlwaysRenderFully"/>
 	<menu_item_call label="Ignorer le propriétaire des particules" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
index 5e9969627d..c425e6cee7 100644
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -15,6 +15,7 @@
 		<menu_item_call label="Blogs [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Signaler un bug" name="Report Bug"/>
 		<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="Rechercher des mises à jour" name="Check for Updates"/>
 	</menu>
 	<menu_item_check label="Afficher le menu de débogage" name="Show Debug Menu"/>
 	<menu label="Débogage" name="Debug">
diff --git a/indra/newview/skins/default/xui/fr/menu_marketplace_view.xml b/indra/newview/skins/default/xui/fr/menu_marketplace_view.xml
index a63e2082b7..dacb407383 100644
--- a/indra/newview/skins/default/xui/fr/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/fr/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_marketplace_sort">
+	<menu_item_check label="Trier par nom" name="sort_by_name"/>
+	<menu_item_check label="Trier en commençant par le plus récent" name="sort_by_recent"/>
 	<menu_item_check label="Trier par volume de stock (de bas à élevé)" name="sort_by_stock_amount"/>
 	<menu_item_check label="Afficher uniquement les dossiers d&apos;annonces" name="show_only_listing_folders"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_url_email.xml b/indra/newview/skins/default/xui/fr/menu_url_email.xml
new file mode 100644
index 0000000000..a86128bc04
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+	<menu_item_call label="Composer le message dans un client externe" name="email_open_external"/>
+	<menu_item_call label="Copier le message dans le presse-papiers" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 788cdbf856..9b1f195391 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -180,6 +180,7 @@
 		<menu_item_call label="Signaler un bug" name="Report Bug"/>
 		<menu_item_call label="Collisions, coups et bousculades" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu_item_call label="À propos de [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="Rechercher des mises à jour" name="Check for Updates"/>
 	</menu>
 	<menu label="Avancé" name="Advanced">
 		<menu_item_call label="Refixer les textures" name="Rebake Texture"/>
@@ -193,7 +194,7 @@
 			<menu_item_call label="Mesure du lag" name="Lag Meter"/>
 			<menu_item_check label="Barre de statistiques" name="Statistics Bar"/>
 			<menu_item_call label="Statistiques de chargement de scène" name="Scene Load Statistics"/>
-			<menu_item_check label="Afficher le poids de dessin pour les avatars" name="Avatar Rendering Cost"/>
+			<menu_item_check label="Afficher les informations de complexité de l’avatar" name="Avatar Draw Info"/>
 		</menu>
 		<menu label="Surbrillance et visibilité" name="Highlighting and Visibility">
 			<menu_item_check label="Balise animée" name="Cheesy Beacon"/>
@@ -316,8 +317,6 @@
 			<menu_item_check label="Articulations" name="Joints"/>
 			<menu_item_check label="Rayons" name="Raycast"/>
 			<menu_item_check label="Vecteurs de vent" name="Wind Vectors"/>
-			<menu_item_check label="Complexité du rendu" name="rendercomplexity"/>
-			<menu_item_check label="Octets d&apos;éléments attachés" name="attachment bytes"/>
 			<menu_item_check label="Sculpture" name="Sculpt"/>
 			<menu label="Densité des textures" name="Texture Density">
 				<menu_item_check label="Aucune" name="None"/>
@@ -423,13 +422,11 @@
 			<menu_item_check label="Debogage Character Vis" name="Debug Character Vis"/>
 			<menu_item_check label="Afficher le squelette de collision" name="Show Collision Skeleton"/>
 			<menu_item_check label="Afficher la cible de l&apos;avatar" name="Display Agent Target"/>
-			--&gt;
 			<menu_item_call label="Dump Attachments" name="Dump Attachments"/>
 			<menu_item_call label="Débogage des textures des avatars" name="Debug Avatar Textures"/>
 			<menu_item_call label="Dump Local Textures" name="Dump Local Textures"/>
 		</menu>
 		<menu_item_check label="Textures HTTP" name="HTTP Textures"/>
-		<menu_item_check label="Inventaire HTTP" name="HTTP Inventory"/>
 		<menu_item_call label="Compresser les images" name="Compress Images"/>
 		<menu_item_call label="Activer Visual Leak Detector" name="Enable Visual Leak Detector"/>
 		<menu_item_check label="Output Debug Minidump" name="Output Debug Minidump"/>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 29e6fe1979..4e369bdad1 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -164,6 +164,10 @@ L&apos;initialisation de la Place du marché a échoué en raison d&apos;une err
         &apos;[ERROR_CODE]&apos;
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="MerchantForceValidateListing">
+		Pour créer votre annonce, nous avons corrigé la hiérarchie de votre contenu d’annonces.
+		<usetemplate ignoretext="M’avertir que la création d’une annonce corrige la hiérarchie du contenu" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmMerchantActiveChange">
 		Cette action va modifier le contenu actif de cette annonce. Voulez-vous continuer ?
 		<usetemplate ignoretext="Confirmer avant que je ne modifie une annonce active sur la Place du marché" name="okcancelignore" notext="Annuler" yestext="OK"/>
@@ -211,6 +215,10 @@ L&apos;initialisation de la Place du marché a échoué en raison d&apos;une err
 		Nous avons retiré votre annonce car le stock est vide. Vous devez ajouter plus d&apos;unités au dossier de stock pour publier à nouveau l&apos;annonce.
 		<usetemplate ignoretext="Alerter lorsqu&apos;une annonce n&apos;est pas publiée parce que le dossier de stock est vide" name="okignore" yestext="OK"/>
 	</notification>
+	<notification name="AlertMerchantVersionFolderEmpty">
+		Nous avons supprimé votre annonce car le dossier de version est vide. Vous devez ajouter des articles au dossier de version si vous voulez republier votre annonce.
+		<usetemplate ignoretext="Alerte quand une annonce est supprimée car le dossier de version est vide" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		Une erreur est survenue lors du chargement du texte pour un script, suite au problème suivant : [REASON]. Veuillez réessayer ultérieurement.
 	</notification>
@@ -319,6 +327,14 @@ Si vous ne voulez plus que ce rôle dispose de ces pouvoirs, désactivez-les imm
 		Vous allez expulser [COUNT] membres du groupe.
 		<usetemplate ignoretext="Confirmer l&apos;expulsion de plusieurs membres du groupe" name="okcancelignore" notext="Annuler" yestext="Expulser"/>
 	</notification>
+	<notification name="BanGroupMemberWarning">
+		Vous allez bannir [AVATAR_NAME] du groupe.
+		<usetemplate ignoretext="Confirmer le bannissement d’un membre du groupe" name="okcancelignore" notext="Annuler" yestext="Bannir"/>
+	</notification>
+	<notification name="BanGroupMembersWarning">
+		Vous allez bannir [COUNT] membres du groupe.
+		<usetemplate ignoretext="Confirmer le bannissement de plusieurs membres du groupe" name="okcancelignore" notext="Annuler" yestext="Bannir"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Vous êtes sur le point d&apos;abandonner l&apos;élément joint.
 Voulez-vous vraiment continuer ?
@@ -403,7 +419,7 @@ Objets : [N]
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="ReturnAllTopObjects">
-		Êtes-vous certain de vouloir renvoyer tous les objets de la liste dans l&apos;inventaire de leur propriétaire ?
+		Êtes-vous certain de vouloir renvoyer tous les objets de la liste dans l’inventaire de leur propriétaire ? Cela renverra TOUS les objets scriptés dans la région !
 		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
 	</notification>
 	<notification name="DisableAllTopObjects">
@@ -608,6 +624,10 @@ L&apos;objet est peut-être inaccessible ou a peut-être été supprimé.
 	<notification name="CannotDownloadFile">
 		Impossible de télécharger le fichier
 	</notification>
+	<notification label="" name="MediaFileDownloadUnsupported">
+		Vous avez demandé un téléchargement de fichier, qui n’est pas pris en charge dans [SECOND_LIFE].
+		<usetemplate ignoretext="M’avertir des téléchargements de fichiers non pris en charge" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CannotWriteFile">
 		Impossible d&apos;écrire le fichier [[FILE]]
 	</notification>
@@ -1109,8 +1129,9 @@ Fusionner le terrain ?
 Cette erreur est généralement temporaire. Veuillez modifier et sauvegarder l&apos;élément endossable à nouveau d&apos;ici quelques minutes.
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		Zut. Vous avez été déconnecté(e) de [SECOND_LIFE]
-            [MESSAGE]
+		Zut. Vous avez été déconnecté(e) de [SECOND_LIFE].
+
+[MESSAGE]
 		<usetemplate name="okcancelbuttons" notext="Quitter" yestext="Afficher IM et chat"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
@@ -1352,6 +1373,13 @@ Vous pouvez utiliser [SECOND_LIFE] normalement, les autres résidents vous voien
 			<ignore name="ignore" text="Vos habits prennent du temps à télécharger"/>
 		</form>
 	</notification>
+	<notification name="RegionAndAgentComplexity">
+		Votre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexité visuelle] est [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+	</notification>
+	<notification name="AgentComplexity">
+		Votre [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexité visuelle] est [AGENT_COMPLEXITY].
+	</notification>
 	<notification name="FirstRun">
 		L&apos;installation de [APP_NAME] est terminée.
 
@@ -1633,6 +1661,25 @@ Le client expérimental a été remplacé par un nouveau client [NEW_CHANNEL] ;
 consultez [Informations au sujet de cette mise à jour [INFO_URL]]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="UpdateDownloadInProgress">
+		Une mise à jour est disponible.
+Elle est en cours de téléchargement en arrière-plan et nous vous inviterons à redémarrer votre client pour terminer son installation dès qu’elle est prête.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateDownloadComplete">
+		Une mise à jour a été téléchargée. Elle sera installée au redémarrage.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateCheckError">
+		Une erreur est survenue lors de la recherche de mises à jour.
+Veuillez réessayer ultérieurement.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateViewerUpToDate">
+		Votre client est à jour.
+Si vous êtes impatients de découvrir les dernières fonctionnalités et corrections, consultez la page Autres clients. http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="DeedObjectToGroup">
 		Si vous cédez cet objet, le groupe :
 * recevra les L$ versés pour l&apos;objet ;
@@ -1737,6 +1784,14 @@ Quitter le groupe ?
 		Vous avez atteint le nombre de groupes maximum. Vous devez en quitter un avant d&apos;en rejoindre ou d&apos;en créer un nouveau.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="GroupLimitInfo">
+		Le nombre de groupes maximum est [MAX_BASIC] pour les comptes basiques et
+[MAX_PREMIUM] pour les comptes [https://secondlife.com/premium/ premium].
+Si vous avez rétrogradé votre compte, vous devez réduire votre nombre de groupes pour passer sous le nombre de groupes maximum ([MAX_BASIC]) avant de pouvoir en rejoindre d’autres.
+
+[https://secondlife.com/my/account/membership.php Mettez à niveau dès aujourd’hui !]
+		<usetemplate name="okbutton" yestext="Fermer"/>
+	</notification>
 	<notification name="KickUser">
 		Éjecter ce résident avec quel message ?
 		<form name="form">
@@ -2248,6 +2303,10 @@ Déplacer les objets de l&apos;inventaire ?
 		Confirmez que vous voulez payer [AMOUNT] L$ à [TARGET].
 		<usetemplate ignoretext="Confirmez avant de payer (sommes supérieures à 200 L$)" name="okcancelignore" notext="Annuler" yestext="Payer"/>
 	</notification>
+	<notification name="PayObjectFailed">
+		Échec de paiement : objet introuvable.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="OpenObjectCannotCopy">
 		Vous n&apos;êtes autorisé à copier aucun élément dans cet objet.
 	</notification>
@@ -2279,10 +2338,9 @@ Vous ne pouvez pas l&apos;annuler.
 		[QUESTION]
 		<usetemplate ignoretext="Confirmer avant de supprimer des articles" name="okcancelignore" notext="Annuler" yestext="OK"/>
 	</notification>
-	<notification name="HelpReportAbuseEmailLL">
-		Utilisez cet outil pour signaler des infractions aux [http://secondlife.com/corporate/tos.php Conditions d’utilisation] et aux [http://secondlife.com/corporate/cs.php Règles communautaires].
-
-Lorsqu&apos;elles sont signalées, toutes les infractions font l&apos;objet d&apos;une enquête et sont résolues.
+	<notification name="ConfirmUnlink">
+		C’est une vaste sélection avec des groupes de liens. Si vous annulez les liens, vous risquez de ne pas pouvoir les rétablir. Vous devriez peut-être faire des copies des groupes de liens dans votre inventaire par mesure de précaution.
+		<usetemplate ignoretext="Confirmer l’annulation des liens d’un groupe de liens" name="okcancelignore" notext="Annuler" yestext="Annuler le lien"/>
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		Veuillez choisir une catégorie pour ce rapport d&apos;infraction.
@@ -2969,67 +3027,67 @@ Acceptez-vous ?
 		</form>
 	</notification>
 	<notification name="ExperienceAcquireFailed">
-		Impossible d&apos;acquérir une nouvelle expérience :
+		Impossible d’acquérir une nouvelle expérience :
     [ERROR_MESSAGE]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
 	<notification name="NotInGroupExperienceProfileMessage">
-		Une modification du groupe de l&apos;expérience a été ignorée, car le propriétaire n&apos;est pas membre du groupe sélectionné.
+		Une modification du groupe de l’expérience a été ignorée, car le propriétaire n’est pas membre du groupe sélectionné.
 	</notification>
 	<notification name="UneditableExperienceProfileMessage">
-		Le champ non modifiable « [field] » a été ignoré lors de la mise à jour du profil de l&apos;expérience.
+		Le champ non modifiable « [field] » a été ignoré lors de la mise à jour du profil de l’expérience.
 	</notification>
 	<notification name="RestrictedToOwnerExperienceProfileMessage">
-		Modifications du champ « [field] » ignorées, car il ne peut être défini que par le propriétaire de l&apos;expérience.
+		Modifications du champ « [field] » ignorées, car il ne peut être défini que par le propriétaire de l’expérience.
 	</notification>
 	<notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
 		Vous ne pouvez pas définir une catégorie de contenu plus élevée pour une expérience que pour son propriétaire.
 	</notification>
 	<notification name="RestrictedTermExperienceProfileMessage">
-		Les termes suivants ont empêché la mise à jour du nom et/ou de la description du profil de l&apos;expérience : [extra_info]
+		Les termes suivants ont empêché la mise à jour du nom et/ou de la description du profil de l’expérience : [extra_info]
 	</notification>
 	<notification name="TeleportedHomeExperienceRemoved">
-		Vous avez été téléporté(e) hors de la région [region_name], car vous avez supprimé l&apos;expérience secondlife:///app/experience/[public_id]/profile et n&apos;êtes plus autorisé(e) dans cette région.
+		Vous avez été téléporté(e) hors de la région [region_name], car vous avez supprimé l’expérience secondlife:///app/experience/[public_id]/profile et n’êtes plus autorisé(e) dans cette région.
 		<form name="form">
-			<ignore name="ignore" text="Éjecté(e) de la région pour cause de suppression d&apos;une expérience"/>
+			<ignore name="ignore" text="Éjecté(e) de la région pour cause de suppression d’une expérience"/>
 		</form>
 	</notification>
 	<notification name="TrustedExperienceEntry">
-		Vous avez été autorisé(e) à pénétrer dans la région [region_name] en participant à l&apos;expérience avec clé secondlife:///app/experience/[public_id]/profile. Si vous supprimez cette expérience, vous risquez d&apos;être éjecté(e) de cette région.
+		Vous avez été autorisé(e) à pénétrer dans la région [region_name] en participant à l’expérience avec clé secondlife:///app/experience/[public_id]/profile. Si vous supprimez cette expérience, vous risquez d’être éjecté(e) de cette région.
 		<form name="form">
 			<ignore name="ignore" text="Autorisé(e) dans une région par une expérience"/>
 		</form>
 	</notification>
 	<notification name="TrustedExperiencesAvailable">
-		Vous n&apos;avez pas accès à cette destination. Vous pouvez être autorisé(e) à pénétrer dans la région en acceptant une expérience ci-dessous :
+		Vous n’avez pas accès à cette destination. Vous pouvez être autorisé(e) à pénétrer dans la région en acceptant une expérience ci-dessous :
 
 [EXPERIENCE_LIST]
 
-Il est possible que d&apos;autres expériences avec clé soient disponibles.
+Il est possible que d’autres expériences avec clé soient disponibles.
 	</notification>
 	<notification name="ExperienceEvent">
-		Un objet a été autorisé à [EventType] par l&apos;expérience secondlife:///app/experience/[public_id]/profile.
+		Un objet a été autorisé à [EventType] par l’expérience secondlife:///app/experience/[public_id]/profile.
     Propriétaire : secondlife:///app/agent/[OwnerID]/inspect
-    Nom de l&apos;objet : [ObjectName]
+    Nom de l’objet : [ObjectName]
     Nom de la parcelle : [ParcelName]
 	</notification>
 	<notification name="ExperienceEventAttachment">
-		Une pièce jointe a été autorisée à [EventType] par l&apos;expérience secondlife:///app/experience/[public_id]/profile.
+		Une pièce jointe a été autorisée à [EventType] par l’expérience secondlife:///app/experience/[public_id]/profile.
     Propriétaire : secondlife:///app/agent/[OwnerID]/inspect
 	</notification>
 	<notification name="ScriptQuestionExperience">
-		« &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt; », un objet appartenant à « [NAME] », demande votre participation à l&apos;expérience [GRID_WIDE] :
+		« &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt; », un objet appartenant à « [NAME] », demande votre participation à l’expérience [GRID_WIDE] :
 
 [EXPERIENCE]
 
-Une fois l&apos;autorisation accordée, vous ne verrez plus ce message pour cette expérience, sauf si elle est révoquée dans le profil de l&apos;expérience.
+Une fois l’autorisation accordée, vous ne verrez plus ce message pour cette expérience, sauf si elle est révoquée dans le profil de l’expérience.
 
-Les scripts associés à cette expérience pourront effectuer les actions suivantes dans les régions dans lesquelles l&apos;expérience est active : 
+Les scripts associés à cette expérience pourront effectuer les actions suivantes dans les régions dans lesquelles l’expérience est active : 
 
 [QUESTIONS]Acceptez-vous ?
 		<form name="form">
-			<button name="BlockExperience" text="Bloquer l&apos;expérience"/>
-			<button name="Mute" text="Ignorer l&apos;objet"/>
+			<button name="BlockExperience" text="Bloquer l’expérience"/>
+			<button name="Mute" text="Ignorer l’objet"/>
 			<button name="Yes" text="Oui"/>
 			<button name="No" text="Non"/>
 		</form>
@@ -3211,6 +3269,12 @@ Elles vont être bloquées pendant quelques secondes pour votre sécurité.
 	<notification name="AttachmentSaved">
 		L&apos;élément joint a été sauvegardé.
 	</notification>
+	<notification name="PresetNotSaved">
+		Erreur d’enregistrement du préréglage [NAME].
+	</notification>
+	<notification name="PresetNotDeleted">
+		Erreur de suppression du préréglage [NAME].
+	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Impossible de trouver l&apos;aide.
 	</notification>
@@ -3243,9 +3307,8 @@ Le bouton sera affiché quand il y aura suffisamment de place.
 		Sélectionnez les résidents avec lesquels partager l&apos;élément.
 	</notification>
 	<notification name="MeshUploadError">
-		Échec de chargement de [LABEL] : [MESSAGE] [IDENTIFIER] 
-
-Voir le fichier journal pour plus de détails.
+		Échec de chargement de [LABEL] : [MESSAGE] [IDENTIFIER]
+[DETAILS]Consultez SecondLife.log pour de plus amples détails
 	</notification>
 	<notification name="MeshUploadPermError">
 		Erreur lors de la demande des autorisations de chargement de maillage.
diff --git a/indra/newview/skins/default/xui/fr/panel_experience_info.xml b/indra/newview/skins/default/xui/fr/panel_experience_info.xml
index e830ce1ba6..58368c1212 100644
--- a/indra/newview/skins/default/xui/fr/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/fr/panel_experience_info.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="panel_experience_info">
-	<text name="title" value="Profil de l&apos;expérience"/>
+	<text name="title" value="Profil de l’expérience"/>
 	<scroll_container name="xp_scroll">
 		<panel name="scrolling_panel">
 			<layout_stack>
 				<layout_panel>
-					<text name="experience_title" value="Kyle&apos;s Superhero RPG"/>
+					<text name="experience_title" value="Kyle’s Superhero RPG"/>
 				</layout_panel>
 				<layout_panel name="location panel">
 					<text name="Location">
@@ -14,7 +14,7 @@
 					<text name="LocationTextText">
 						quelque part
 					</text>
-					<button label="Téléporter" name="teleport_btn"/>
+					<button label="Téléportation" name="teleport_btn"/>
 					<button label="Carte" name="map_btn"/>
 				</layout_panel>
 				<layout_panel name="marketplace panel">
diff --git a/indra/newview/skins/default/xui/fr/panel_experience_search.xml b/indra/newview/skins/default/xui/fr/panel_experience_search.xml
index 13495057d4..ec0cb25a50 100644
--- a/indra/newview/skins/default/xui/fr/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/fr/panel_experience_search.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="SEARCH">
 	<string name="not_found">
-		&apos;[TEXT]&apos; introuvable
+		’[TEXT]’ introuvable
 	</string>
 	<string name="no_results">
 		Aucun résultat
diff --git a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
index db7d254b7a..a4d087cd20 100644
--- a/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_main_inventory.xml
@@ -6,6 +6,9 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] articles [FILTER]
 	</panel.string>
+	<panel.string name="ItemcountUnknown">
+		[ITEM_COUNT] articles [FILTER] récupérés
+	</panel.string>
 	<text name="ItemcountText">
 		Articles :
 	</text>
@@ -16,7 +19,7 @@
 	</tab_container>
 	<layout_stack name="bottom_panel">
 		<layout_panel name="options_gear_btn_panel">
-			<button name="options_gear_btn" tool_tip="Afficher d&apos;autres options"/>
+			<menu_button name="options_gear_btn" tool_tip="Afficher d&apos;autres options"/>
 		</layout_panel>
 		<layout_panel name="add_btn_panel">
 			<button name="add_btn" tool_tip="Ajouter un nouvel article"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_people.xml b/indra/newview/skins/default/xui/fr/panel_people.xml
index e306a00183..95cd13eb94 100644
--- a/indra/newview/skins/default/xui/fr/panel_people.xml
+++ b/indra/newview/skins/default/xui/fr/panel_people.xml
@@ -18,6 +18,7 @@ Pour rechercher des résidents avec qui passer du temps, utilisez [secondlife://
 	<string name="no_groups_msg" value="Vous souhaitez trouver des groupes à rejoindre ? Utilisez [secondlife:///app/search/groups Rechercher]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Carte : double-clic ; Panoramique : Maj + faire glisser)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Téléportation : double-clic ; Panoramique : Maj + faire glisser)"/>
+	<string name="GroupCountWithInfo" value="Vous appartenez à [COUNT] groupes, et pouvez en rejoindre [REMAINING] autres.  [secondlife:/// Vous en voulez plus ?]"/>
 	<tab_container name="tabs">
 		<panel label="PRÈS DE VOUS" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
index 67bcfb0879..f61dc5aa35 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
 	<check_box label="Clients multiples autorisés" name="allow_multiple_viewer_check"/>
 	<check_box label="Liste de sélection de grille affichée à la connexion" name="show_grid_selection_check"/>
 	<check_box label="Menu Avancé affiché" name="show_advanced_menu_check"/>
-	<check_box label="Menu Développeurs affiché" name="show_develop_menu_check"/>
+	<check_box label="Afficher le menu Développeurs" name="show_develop_menu_check"/>
 	<button label="Permissions de création par défaut" name="default_creation_permissions"/>
 </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 52c6ed24b9..c948b4f9b5 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
 		<check_box label="Offre d&apos;inventaire" name="inventory_offer"/>
 	</panel>
 	<panel name="log_settings">
+		<text name="logging_label">
+			Enregistrer :
+		</text>
+		<combo_box name="conversation_log_combo">
+			<item label="Journal et transcriptions" name="log_and_transcripts" value="2"/>
+			<item label="Journal uniquement" name="log_only" value="1"/>
+			<item label="Pas de journal ni de transcriptions" name="no_log_or_transcript" value="0"/>
+		</combo_box>
 		<button label="Effacer le journal..." name="clear_log"/>
 		<button label="Supprimer les transcriptions..." name="delete_transcripts"/>
+		<text name="log_location_label">
+			Endroit :
+		</text>
 		<button label="Parcourir..." label_selected="Parcourir" name="log_path_button"/>
 	</panel>
 	<button label="Traduction..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index 4946b09814..01d89f03f8 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Graphiques" name="Display panel">
-	<text name="QualitySpeed">
-		Qualité et vitesse :
-	</text>
-	<text name="FasterText">
-		Plus rapide
+	<text name="preset_text">
+		(Aucun/Aucune)
 	</text>
-	<text name="BetterText">
-		Meilleure
+	<text name="QualitySpeed">
+		Qualité et vitesse :
 	</text>
 	<text name="ShadersPrefText">
 		Faible
@@ -21,94 +18,17 @@
 	<text name="ShadersPrefText4">
 		Ultra
 	</text>
-	<panel label="Graphiques personnalisés" name="CustomGraphics Panel">
-		<text name="ShadersText">
-			Effets :
-		</text>
-		<check_box initial_value="true" label="Eau transparente" name="TransparentWater"/>
-		<check_box initial_value="true" label="Placage de relief et brillance" name="BumpShiny"/>
-		<check_box initial_value="true" label="Lumières locales" name="LocalLights"/>
-		<check_box initial_value="true" label="Effets de base" name="BasicShaders" tool_tip="La désactivation de cette option peut éviter le plantage de certains pilotes de cartes graphiques"/>
-		<check_box initial_value="true" label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Modèle d&apos;éclairage avancé" name="UseLightShaders"/>
-		<check_box initial_value="true" label="Occlusion ambiante" name="UseSSAO"/>
-		<check_box initial_value="true" label="Profondeur de champ" name="UseDoF"/>
-		<text name="shadows_label">
-			Ombres :
-		</text>
-		<combo_box name="ShadowDetail">
-			<combo_box.item label="Aucune" name="0"/>
-			<combo_box.item label="Soleil/Lune" name="1"/>
-			<combo_box.item label="Soleil/Lune + Projecteurs" name="2"/>
-		</combo_box>
-		<text name="reflection_label">
-			Reflets dans l&apos;eau :
-		</text>
-		<combo_box initial_value="true" label="Reflets dans l&apos;eau" name="Reflections">
-			<combo_box.item label="Minimes" name="0"/>
-			<combo_box.item label="Terrain et arbres" name="1"/>
-			<combo_box.item label="Tous les objets statiques" name="2"/>
-			<combo_box.item label="Tous les objets et avatars" name="3"/>
-			<combo_box.item label="Tout" name="4"/>
-		</combo_box>
-		<slider label="Prop. physiques avatar :" name="AvatarPhysicsDetail"/>
-		<text name="AvatarPhysicsDetailText">
-			Faible
-		</text>
-		<slider label="Limite d&apos;affichage :" name="DrawDistance"/>
-		<text name="DrawDistanceMeterText2">
-			m
-		</text>
-		<slider label="Nb max. de particules :" label_width="147" name="MaxParticleCount"/>
-		<slider label="Avatars max. non éloignés en 2D :" name="MaxNumberAvatarDrawn"/>
-		<slider label="Qualité post-traitement :" name="RenderPostProcess"/>
-		<text name="MeshDetailText">
-			Détails des rendus :
-		</text>
-		<slider label="  Objets :" name="ObjectMeshDetail"/>
-		<slider label="  Flexiprims :" name="FlexibleMeshDetail"/>
-		<slider label="  Arbres :" name="TreeMeshDetail"/>
-		<slider label="  Avatars :" name="AvatarMeshDetail"/>
-		<slider label="  Relief :" name="TerrainMeshDetail"/>
-		<slider label="  Ciel :" name="SkyMeshDetail"/>
-		<text name="PostProcessText">
-			Faible
-		</text>
-		<text name="ObjectMeshDetailText">
-			Faible
-		</text>
-		<text name="FlexibleMeshDetailText">
-			Faible
-		</text>
-		<text name="TreeMeshDetailText">
-			Faible
-		</text>
-		<text name="AvatarMeshDetailText">
-			Faible
-		</text>
-		<text name="TerrainMeshDetailText">
-			Faible
-		</text>
-		<text name="SkyMeshDetailText">
-			Faible
-		</text>
-		<text name="AvatarRenderingText">
-			Rendu de l&apos;avatar :
-		</text>
-		<check_box initial_value="true" label="Avatars éloignés en 2D" name="AvatarImpostors"/>
-		<check_box initial_value="true" label="Accélération du rendu" name="AvatarVertexProgram"/>
-		<check_box initial_value="true" label="Mouvement des habits" name="AvatarCloth"/>
-		<text left="380" name="TerrainDetailText">
-			Rendu du terrain :
-		</text>
-		<radio_group name="TerrainDetailRadio">
-			<radio_item label="Faible" name="0"/>
-			<radio_item label="Élevé" name="2"/>
-		</radio_group>
-		--&gt;
-	</panel>
-	<button label="Appliquer" label_selected="Appliquer" name="Apply"/>
-	<button label="Réinitialiser" name="Defaults"/>
-	<button label="Avancé" name="Advanced"/>
-	<button label="Matériel" label_selected="Matériel" name="GraphicsHardwareButton"/>
+	<text name="FasterText">
+		Plus rapide
+	</text>
+	<text name="BetterText">
+		Meilleure
+	</text>
+	<check_box initial_value="true" label="Effets atmosphériques" name="WindLightUseAtmosShaders"/>
+	<check_box initial_value="true" label="Modèle d’éclairage avancé" name="UseLightShaders"/>
+	<button label="Enregistrer les paramètres comme préréglage..." name="PrefSaveButton"/>
+	<button label="Charger un préréglage..." name="PrefLoadButton"/>
+	<button label="Supprimer un préréglage..." name="PrefDeleteButton"/>
+	<button label="Réinitialiser les paramètres recommandés" name="Defaults"/>
+	<button label="Paramètres avancés" name="AdvancedSettings"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
index e2f9b9567c..bd21f9782d 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
 	<radio_group name="preferred_browser_behavior">
 		<radio_item label="Utiliser mon navigateur (Chrome, Firefox, IE) pour tous les liens" name="internal" tool_tip="Utiliser le navigateur web système par défaut pour l&apos;aide, les liens, etc. Non recommandé en mode plein écran." value="0"/>
 		<radio_item label="Utiliser le navigateur intégré pour les liens Second Life uniquement" name="external" tool_tip="Utilisez le navigateur web système par défaut pour l&apos;aide, les liens Web, etc. Le navigateur intégré sera uniquement utilisé pour les liens LindenLab/SecondLife." value="1"/>
+		<radio_item label="Utiliser le navigateur intégré pour tous les liens" name="external_all" tool_tip="Utilisez le navigateur intégré pour obtenir de l’aide, ouvrir des liens etc. Ce navigateur s’ouvre dans [APP_NAME]." value="2"/>
 	</radio_group>
 	<check_box initial_value="true" label="Activer les plugins" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Accepter les cookies" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Activer Javascript" name="browser_javascript_enabled"/>
-	<check_box initial_value="false" label="Activer les fenêtres popup de navigateur de médias" name="media_popup_enabled"/>
 	<text name="Software updates:">
 		Mises à jour logicielles :
 	</text>
 	<combo_box name="updater_service_combobox">
 		<combo_box.item label="Installation automatique" name="Install_automatically"/>
-		<combo_box.item label="Téléchargement et installation manuels" name="Install_manual"/>
+		<combo_box.item label="Je téléchargerai et installerai les mises à jour manuellement" name="Install_manual"/>
 	</combo_box>
 	<check_box label="Accepte de passer aux versions avant sortie officielle" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/fr/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/fr/panel_presets_pulldown.xml
new file mode 100644
index 0000000000..124eea0716
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+	<text name="Graphic Presets">
+		Préréglages graphiques
+	</text>
+	<button label="Ouvrir les préférences graphiques" name="open_prefs_btn" tool_tip="Ouvrir les préférences de graphiques"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
index ad744b7760..2715249957 100644
--- a/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
@@ -39,12 +39,9 @@
 		<layout_panel name="media_address">
 			<line_editor name="media_address_url" tool_tip="URL du média"/>
 			<layout_stack name="media_address_url_icons">
-				<layout_panel>
+				<layout_panel name="media_address_url_icons_wl">
 					<icon name="media_whitelist_flag" tool_tip="Liste blanche activée"/>
 				</layout_panel>
-				<layout_panel>
-					<icon name="media_secure_lock_flag" tool_tip="Navigation sécurisée"/>
-				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 		<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/fr/panel_region_experiences.xml b/indra/newview/skins/default/xui/fr/panel_region_experiences.xml
index be9c99b009..12dd77ba2b 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_experiences.xml
@@ -3,31 +3,31 @@
 	<panel.string name="trusted_estate_text">
 		Toute expérience peut être une expérience avec clé.
 
-Les expériences avec clé peuvent s&apos;exécuter dans ce domaine.
+Les expériences avec clé peuvent s’exécuter dans ce domaine.
 
-En outre, si le domaine n&apos;autorise pas l&apos;accès public, les résidents participant à une expérience avec clé peuvent pénétrer dans ce domaine et y rester tant qu&apos;ils participent à ladite expérience.
+En outre, si le domaine n’autorise pas l’accès public, les résidents participant à une expérience avec clé peuvent pénétrer dans ce domaine et y rester tant qu’ils participent à ladite expérience.
 	</panel.string>
 	<panel.string name="allowed_estate_text">
-		Seules les expériences à l&apos;échelle des terrains peuvent être autorisées.
+		Seules les expériences à l’échelle des terrains peuvent être autorisées.
 
-Les expériences autorisées peuvent s&apos;exécuter dans ce domaine.
+Les expériences autorisées peuvent s’exécuter dans ce domaine.
 	</panel.string>
 	<panel.string name="blocked_estate_text">
-		Seules les expériences à l&apos;échelle de la grille peuvent être bloquées.
+		Seules les expériences à l’échelle de la grille peuvent être bloquées.
       
-Les expériences bloquées ne peuvent pas s&apos;exécuter dans ce domaine.
+Les expériences bloquées ne peuvent pas s’exécuter dans ce domaine.
 	</panel.string>
 	<panel.string name="estate_caption">
 		Les modifications des paramètres de cet onglet affecteront toutes les régions du domaine.
 	</panel.string>
 	<panel.string name="allowed_parcel_text">
-		Seules les expériences à l&apos;échelle des terrains peuvent être autorisées.
+		Seules les expériences à l’échelle des terrains peuvent être autorisées.
       
-Les expériences autorisées peuvent s&apos;exécuter sur cette parcelle si elles ne sont pas bloquées par le domaine.
+Les expériences autorisées peuvent s’exécuter sur cette parcelle si elles ne sont pas bloquées par le domaine.
 	</panel.string>
 	<panel.string name="blocked_parcel_text">
 		Toute expérience de résident peut être bloquée.
       
-Les expériences bloquées ne peuvent pas s&apos;exécuter dans cette parcelle.
+Les expériences bloquées ne peuvent pas s’exécuter dans cette parcelle.
 	</panel.string>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
index a560ff8d5e..3cf64583d2 100644
--- a/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		L&apos;enregistrement d&apos;une image dans l&apos;inventaire coûte [UPLOAD_COST] L$. Pour enregistrer votre image sous forme de texture, sélectionnez un format carré.
 	</text>
 	<combo_box label="Résolution" name="texture_size_combo">
-		<combo_box.item label="Fenêtre actuelle" name="CurrentWindow"/>
+		<combo_box.item label="Fenêtre actuelle (512x512)" name="CurrentWindow"/>
 		<combo_box.item label="Petite (128 x 128)" name="Small(128x128)"/>
 		<combo_box.item label="Moyenne (256 x 256)" name="Medium(256x256)"/>
 		<combo_box.item label="Grande (512 x 512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
index c69cb61a92..de210f8b15 100644
--- a/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/fr/panel_tools_texture.xml
@@ -21,11 +21,11 @@
 		<combo_box.item label="Matériaux" name="Materials"/>
 		<combo_box.item label="Médias" name="Media"/>
 	</combo_box>
-	<combo_box name="combobox mattype">
-		<combo_box.item label="Texture (diffuse)" name="Texture (diffuse)"/>
-		<combo_box.item label="Relief (normal)" name="Bumpiness (normal)"/>
-		<combo_box.item label="Brillance (spéculaire)" name="Shininess (specular)"/>
-	</combo_box>
+	<radio_group name="radio_material_type">
+		<radio_item label="Texture (diffuse)" name="Texture (diffuse)" value="0"/>
+		<radio_item label="Relief (normal)" name="Bumpiness (normal)" value="1"/>
+		<radio_item label="Brillance (spéculaire)" name="Shininess (specular)" value="2"/>
+	</radio_group>
 	<texture_picker label="Texture" name="texture control" tool_tip="Cliquer pour sélectionner une image."/>
 	<text name="label alphamode">
 		Mode alpha
diff --git a/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml
index 966e3440e5..a52d4be1fb 100644
--- a/indra/newview/skins/default/xui/fr/role_actions.xml
+++ b/indra/newview/skins/default/xui/fr/role_actions.xml
@@ -72,7 +72,7 @@
 		<action description="Modérer les chats" longdescription="Contrôlez l&apos;accès et la participation aux chats de groupe écrits et vocaux." name="moderate group chat" value="37"/>
 	</action_set>
 	<action_set description="Ces pouvoirs incluent la possibilité de modifier les expériences appartenant à ce groupe." name="experience_tools_experience">
-		<action description="Administrateur des expériences" longdescription="Les membres dotés d&apos;un rôle avec ce pouvoir peuvent modifier les métadonnées pour cette expérience." name="experience admin" value="49"/>
-		<action description="Contributeur aux expériences" longdescription="Les membres dotés d&apos;un rôle avec ce pouvoir peuvent contribuer des scripts pour une expérience." name="experience contributor" value="50"/>
+		<action description="Administrateur des expériences" longdescription="Les membres dotés d’un rôle avec ce pouvoir peuvent modifier les métadonnées pour cette expérience." name="experience admin" value="49"/>
+		<action description="Contributeur aux expériences" longdescription="Les membres dotés d’un rôle avec ce pouvoir peuvent contribuer des scripts pour une expérience." name="experience contributor" value="50"/>
 	</action_set>
 </role_actions>
diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index 7b8a262a05..c23fad5e7f 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -67,7 +67,7 @@ Carte graphique : [GRAPHICS_CARD]
 Version libcurl : [LIBCURL_VERSION]
 Version J2C Decoder : [J2C_VERSION]
 Version Audio Driver : [AUDIO_DRIVER_VERSION]
-Version Qt Webkit : [QT_WEBKIT_VERSION]
+Version LLCEFLib/CEF : [LLCEFLIB_VERSION]
 Version serveur vocal : [VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">
@@ -178,6 +178,12 @@ Version serveur vocal : [VOICE_VERSION]
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="AgniGridLabel">
+		Grille principale de Second Life (Agni)
+	</string>
+	<string name="AditiGridLabel">
+		Grille de test bêta Second Life (Aditi)
+	</string>
 	<string name="ViewerDownloadURL">
 		http://secondlife.com/download
 	</string>
@@ -453,6 +459,9 @@ Veuillez réessayer de vous connecter dans une minute.
 		Vous ne pouvez pas porter un dossier contenant plus de [AMOUNT] articles.  Vous pouvez modifier cette limite dans Avancé &gt; Afficher les paramètres de débogage &gt; WearFolderLimit.
 	</string>
 	<string name="TooltipPrice" value="[AMOUNT] L$ :"/>
+	<string name="TooltipSLIcon">
+		Il s’agit d’un lien vers une page dans le domaine officiel SecondLife.com ou LindenLab.com.
+	</string>
 	<string name="TooltipOutboxDragToWorld">
 		Vous ne pouvez pas rezzer (charger) des articles du dossier Annonces de la Place de marché
 	</string>
@@ -472,7 +481,7 @@ Veuillez réessayer de vous connecter dans une minute.
 		Le nombre d&apos;articles de stock dépasse [AMOUNT].
 	</string>
 	<string name="TooltipOutboxCannotDropOnRoot">
-		Vous ne pouvez déposer des articles ou des dossiers que dans l&apos;onglet TOUT. Veuillez activer cet onglet et déplacer à nouveau article(s) et dossier(s).
+		Vous pouvez uniquement déposer des articles ou des dossiers dans les onglets TOUS ou NON ASSOCIÉS. Sélectionnez l’un de ces onglets et déplacez à nouveau votre ou vos article ou dossiers.
 	</string>
 	<string name="TooltipOutboxNoTransfer">
 		Impossible de vendre ou de transférer un ou plusieurs de ces objets
@@ -556,6 +565,9 @@ Veuillez réessayer de vous connecter dans une minute.
 		Cliquez pour exécuter la commande secondlife://
 	</string>
 	<string name="CurrentURL" value=" URL actuelle : [CurrentURL]"/>
+	<string name="TooltipEmail">
+		Cliquez pour composer un message
+	</string>
 	<string name="SLurlLabelTeleport">
 		Me téléporter vers
 	</string>
@@ -1081,7 +1093,7 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="AgentNameSubst">
 		(Vous)
 	</string>
-	<string name="JoinAnExperience"/><!-- intentionally blank -->
+	<string name="JoinAnExperience"/>
 	<string name="SilentlyManageEstateAccess">
 		Supprimer les alertes lors de la gestion des listes d&apos;accès aux domaines
 	</string>
@@ -1860,6 +1872,21 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="TodayOld">
 		Inscrit aujourd&apos;hui
 	</string>
+	<string name="av_render_everyone_now">
+		Désormais, tout le monde peut vous voir.
+	</string>
+	<string name="av_render_not_everyone">
+		Vous risquez de ne pas être rendu par tous les gens qui vous entourent.
+	</string>
+	<string name="av_render_over_half">
+		Vous risquez de ne pas être rendu par plus de la moitié des gens qui vous entourent.
+	</string>
+	<string name="av_render_most_of">
+		Vous risquez de ne pas être rendu par la plupart des gens qui vous entourent.
+	</string>
+	<string name="av_render_anyone">
+		Vous risquez de n’être rendu par aucune des personnes qui vous entourent.
+	</string>
 	<string name="AgeYearsA">
 		[COUNT] an
 	</string>
@@ -1977,6 +2004,9 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="CompileQueueUnknownFailure">
 		Échec du téléchargement, erreur inconnue
 	</string>
+	<string name="CompileNoExperiencePerm">
+		En train d’ignorer le script [SCRIPT] avec l’expérience [EXPERIENCE].
+	</string>
 	<string name="CompileQueueTitle">
 		Recompilation - progrès
 	</string>
@@ -2022,9 +2052,6 @@ Veuillez réessayer de vous connecter dans une minute.
 	<string name="GroupsNone">
 		aucun
 	</string>
-	<string name="CompileNoExperiencePerm">
-		En train d&apos;ignorer le script [SCRIPT] avec l&apos;expérience [EXPERIENCE].
-	</string>
 	<string name="Group" value=" (groupe)"/>
 	<string name="Unknown">
 		(Inconnu)
@@ -5380,18 +5407,6 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Les conversations ne sont pas archivées. Pour commencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Aucune conversation ne sera plus enregistrée. Pour recommencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Il n&apos;y a aucune conversation enregistrée. Quand quelqu&apos;un vous contacte ou quand vous contactez quelqu&apos;un, une entrée de journal s&apos;affiche ici.
-	</string>
-	<string name="loading_chat_logs">
-		Chargement...
-	</string>
 	<string name="experience_tools_experience">
 		Expérience
 	</string>
@@ -5402,10 +5417,10 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 		(expérience sans titre)
 	</string>
 	<string name="Land-Scope">
-		À l&apos;échelle des terrains
+		À l’échelle des terrains
 	</string>
 	<string name="Grid-Scope">
-		À l&apos;échelle de la grille
+		À l’échelle de la grille
 	</string>
 	<string name="Allowed_Experiences_Tab">
 		AUTORISÉE
@@ -5447,7 +5462,7 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 		vous téléporter
 	</string>
 	<string name="ExperiencePermission12">
-		accepter automatiquement les permissions d&apos;expérience
+		accepter automatiquement les permissions d’expérience
 	</string>
 	<string name="ExperiencePermissionShortUnknown">
 		a effectué une opération inconnue : [Permission]
@@ -5468,9 +5483,42 @@ Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
 		Contrôler la caméra
 	</string>
 	<string name="ExperiencePermissionShort11">
-		Téléporter
+		Téléportation
 	</string>
 	<string name="ExperiencePermissionShort12">
 		Permission
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Les conversations ne sont pas archivées. Pour commencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Aucune conversation ne sera plus enregistrée. Pour recommencer à tenir un journal, choisissez Enregistrer : Journal seul ou Enregistrer : Journal et transcriptions sous Préférences &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Il n&apos;y a aucune conversation enregistrée. Quand quelqu&apos;un vous contacte ou quand vous contactez quelqu&apos;un, une entrée de journal s&apos;affiche ici.
+	</string>
+	<string name="loading_chat_logs">
+		Chargement...
+	</string>
+	<string name="preset_combo_label">
+		-Liste vide-
+	</string>
+	<string name="Default">
+		Valeur par défaut
+	</string>
+	<string name="none_paren_cap">
+		(Aucun/Aucune)
+	</string>
+	<string name="no_limit">
+		Aucune limite
+	</string>
+	<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+		La forme physique contient des triangles trop petits. Essayez de simplifier le modèle physique.
+	</string>
+	<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+		La forme physique contient de mauvaises données de confirmation. Essayez de corriger le modèle physique.
+	</string>
+	<string name="Mav_Details_MAV_UNKNOWN_VERSION">
+		La forme physique n’a pas la version correcte. Configurez la version correcte pour le modèle physique.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/it/floater_about.xml b/indra/newview/skins/default/xui/it/floater_about.xml
index f3b7effdaa..9603238b66 100644
--- a/indra/newview/skins/default/xui/it/floater_about.xml
+++ b/indra/newview/skins/default/xui/it/floater_about.xml
@@ -3,6 +3,7 @@
 	<tab_container name="about_tab">
 		<panel label="Informazioni" name="support_panel">
 			<button label="Copia negli appunti" name="copy_btn"/>
+			<button label="Cerca aggiornamenti" name="update_btn"/>
 		</panel>
 		<panel label="Ringraziamenti" name="credits_panel">
 			<text name="linden_intro">Second Life vi è offerto dai Linden, 
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 0c0d05308b..62960d8755 100644
--- a/indra/newview/skins/default/xui/it/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/it/floater_about_land.xml
@@ -10,13 +10,13 @@
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
 	<floater.string name="Minutes">
-		[MINUTES] minuti
+		[MINUTES] min
 	</floater.string>
 	<floater.string name="Minute">
-		minuto
+		min
 	</floater.string>
 	<floater.string name="Seconds">
-		[SECONDS] secondi
+		[SECONDS] s
 	</floater.string>
 	<floater.string name="Remaining">
 		rimanenti
@@ -456,7 +456,7 @@ Media:
 			<spinner label="Ore di accesso:" name="HoursSpin"/>
 			<panel name="Allowed_layout_panel">
 				<text label="Consenti sempre" name="AllowedText">
-					Residenti consentiti
+					Residenti consentiti ([COUNT])
 				</text>
 				<name_list name="AccessList" tool_tip="([LISTED] in lista, [MAX] max)"/>
 				<button label="Aggiungi" name="add_allowed"/>
@@ -464,7 +464,7 @@ Media:
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Espelli" name="BanCheck">
-					Residenti con divieto
+					Residenti espulsi ([COUNT])
 				</text>
 				<name_list name="BannedList" tool_tip="([LISTED] in lista, [MAX] max)"/>
 				<button label="Aggiungi" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/it/floater_autoreplace.xml b/indra/newview/skins/default/xui/it/floater_autoreplace.xml
index 559a42cfae..0f0afcc612 100644
--- a/indra/newview/skins/default/xui/it/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/it/floater_autoreplace.xml
@@ -13,6 +13,12 @@
 	</scroll_list>
 	<button label="Aggiungi..." name="autoreplace_add_entry"/>
 	<button label="Rimuovi" name="autoreplace_delete_entry"/>
+	<text name="autoreplace_keyword_txt">
+		Parola chiave:
+	</text>
+	<text name="autoreplace_replacement_txt">
+		Sostituzione:
+	</text>
 	<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."/>
diff --git a/indra/newview/skins/default/xui/it/floater_bumps.xml b/indra/newview/skins/default/xui/it/floater_bumps.xml
index ae66148659..eacb7cfb6e 100644
--- a/indra/newview/skins/default/xui/it/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/it/floater_bumps.xml
@@ -19,6 +19,6 @@
 		[TIME]  [NAME] ti ha colpito con un oggetto fisico
 	</floater.string>
 	<floater.string name="timeStr">
-		[[hour,datetime,slt]:[min,datetime,slt]]
+		[[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
 	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/it/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000..0876a6c7f4
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="ELIMINA VALORE PREDEFINITO PREFERENZA">
+	<string name="title_graphic">
+		Elimina valore predefinito grafica
+	</string>
+	<string name="title_camera">
+		Elimina valore predefinito videocamera
+	</string>
+	<text name="Preset">
+		Seleziona un valore predefinito
+	</text>
+	<button label="Elimina" name="delete"/>
+	<button label="Annulla" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_experienceprofile.xml b/indra/newview/skins/default/xui/it/floater_experienceprofile.xml
index 031900825d..c3e14fa1e1 100644
--- a/indra/newview/skins/default/xui/it/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/it/floater_experienceprofile.xml
@@ -28,7 +28,7 @@
 						</layout_panel>
 						<layout_panel name="location panel">
 							<text name="Location">
-								Luogo:
+								Posizione:
 							</text>
 						</layout_panel>
 						<layout_panel>
@@ -66,10 +66,10 @@
 					<icons_combo_box label="Moderato" name="edit_ContentRatingText" tool_tip="Se si aumenta la categoria di accesso di un&apos;esperienza, vengono ripristinate le autorizzazioni per tutti i residenti che hanno consentito l&apos;esperienza.">
 						<icons_combo_box.item label="Adulti" name="Adult" value="42"/>
 						<icons_combo_box.item label="Moderato" name="Mature" value="21"/>
-						<icons_combo_box.item label="Generale" name="PG" value="13"/>
+						<icons_combo_box.item label="Generali" name="PG" value="13"/>
 					</icons_combo_box>
 					<text name="edit_Location">
-						Luogo:
+						Posizione:
 					</text>
 					<button label="Imposta come attuale" name="location_btn"/>
 					<button label="Cancella luogo" name="clear_btn"/>
diff --git a/indra/newview/skins/default/xui/it/floater_fast_timers.xml b/indra/newview/skins/default/xui/it/floater_fast_timers.xml
index 52ab6b0c3d..921155df9b 100644
--- a/indra/newview/skins/default/xui/it/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/it/floater_fast_timers.xml
@@ -6,5 +6,16 @@
 	<string name="run">
 		Correre
 	</string>
+	<combo_box name="time_scale_combo">
+		<item label="Doppio della media" name="2x Average"/>
+		<item label="Massimo" name="Max"/>
+		<item label="Massimo recente" name="Recent Max"/>
+		<item label="100 ms" name="100ms"/>
+	</combo_box>
+	<combo_box name="metric_combo">
+		<item label="Giorno/ora" name="Time"/>
+		<item label="Numero di chiamate" name="Number of Calls"/>
+		<item label="Hz" name="Hz"/>
+	</combo_box>
 	<button label="Pausa" name="pause_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
index e5543c741f..97cf9d122c 100644
--- a/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/it/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
 		<radio_item label="Precedenti al" name="older"/>
 	</radio_group>
 	<spinner label="Ore fa" name="spin_hours_ago"/>
+	<text name="label_hours">
+		Ore
+	</text>
 	<spinner label="Giorni fa" name="spin_days_ago"/>
+	<text name="label_days">
+		Giorni
+	</text>
 	<button label="Chiudi" label_selected="Chiudi" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/it/floater_load_pref_preset.xml
new file mode 100644
index 0000000000..8bce7a45e3
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="CARICA VALORE PREDEFINITO PREFERENZA">
+	<string name="title_graphic">
+		Carica valore predefinito grafica
+	</string>
+	<string name="title_camera">
+		Carica valore predefinito videocamera
+	</string>
+	<text name="Preset">
+		Seleziona un valore predefinito
+	</text>
+	<button label="OK" name="ok"/>
+	<button label="Annulla" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml
index 02f257d466..7a1f7f0a0c 100644
--- a/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/it/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
 	<string name="OutboxInitializing">
 		Inizializzazione...
 	</string>
-	<panel label="">
-		<panel>
+	<panel label="" name="panel_1">
+		<panel name="panel_2">
 			<panel name="outbox_inventory_placeholder_panel">
 				<text name="outbox_inventory_placeholder_title">
-					Caricamento...
+					Caricamento in corso...
 				</text>
 			</panel>
 		</panel>
-		<panel>
+		<panel name="panel_3">
+			<panel name="outbox_generic_drag_target">
+				<text name="text_1">
+					Trascina elementi qui per creare cartelle
+				</text>
+			</panel>
 			<button label="Invia a Marketplace" name="outbox_import_btn" tool_tip="Push su negozio Marketplace"/>
 		</panel>
 	</panel>
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 e8df4d2d4b..1fe2659e4b 100644
--- a/indra/newview/skins/default/xui/it/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/it/floater_model_preview.xml
@@ -55,6 +55,9 @@
 	<string name="mesh_status_invalid_material_list">
 		I materiali per il livello di dettaglio non sono un sottoinsieme  del modello di riferimento.
 	</string>
+	<string name="phys_status_vertex_limit_exceeded">
+		Alcuni scafi fisici superano i limiti relativi ai vertici.
+	</string>
 	<string name="layer_all">
 		Tutto
 	</string>
@@ -93,52 +96,52 @@
 				<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"/>
+					<item label="Carica da file" name="Load from file" value="Carica da file"/>
+					<item label="Genera" 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"/>
+					<item label="Limite triangoli" name="Triangle Limit" value="Limite triangoli"/>
+					<item label="Limite errori" 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"/>
+					<item label="Carica da file" name="Load from file" value="Carica da file"/>
+					<item label="Genera" name="Generate" value="Genera"/>
+					<item label="Usa livello di dettaglio indicato in precedenza" 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"/>
+					<item label="Limite triangoli" name="Triangle Limit" value="Limite triangoli"/>
+					<item label="Limite errori" 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"/>
+					<item label="Carica da file" name="Load from file" value="Carica da file"/>
+					<item label="Genera" name="Generate" value="Genera"/>
+					<item label="Usa livello di dettaglio indicato in precedenza" 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"/>
+					<item label="Limite triangoli" name="Triangle Limit" value="Limite triangoli"/>
+					<item label="Limite errori" 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"/>
+					<item label="Carica da file" name="Load from file" value="Carica da file"/>
+					<item label="Genera" name="Generate" value="Genera"/>
+					<item label="Usa livello di dettaglio indicato in precedenza" 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"/>
+					<item label="Limite triangoli" name="Triangle Limit" value="Limite triangoli"/>
+					<item label="Limite errori" 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"/>
diff --git a/indra/newview/skins/default/xui/it/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/it/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000..6db1669bfd
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="AVVISI">
+	<floater.string name="system_tab_title">
+		Sistema ([COUNT])
+	</floater.string>
+	<floater.string name="transactions_tab_title">
+		Transazioni ([COUNT])
+	</floater.string>
+	<floater.string name="group_invitations_tab_title">
+		Inviti ([COUNT])
+	</floater.string>
+	<floater.string name="group_notices_tab_title">
+		Gruppo ([COUNT])
+	</floater.string>
+	<string name="title_notification_tabbed_window">
+		AVVISI
+	</string>
+	<layout_stack name="TabButtonsStack">
+		<layout_panel name="TabButtonsLayoutPanel">
+			<tab_container name="notifications_tab_container">
+				<panel label="Sistema (0)" name="system_notification_list_tab"/>
+				<panel label="Transazioni (0)" name="transaction_notifications_tab"/>
+				<panel label="Inviti (0)" name="group_invite_notifications_tab"/>
+				<panel label="Gruppo (0)" name="group_notice_notifications_tab"/>
+			</tab_container>
+			<layout_stack name="ButtonsStack">
+				<layout_panel name="CondenseAllButtonPanel">
+					<button label="Compatta tutti" name="collapse_all_button"/>
+				</layout_panel>
+				<layout_panel name="GapLayoutPanel">
+					<panel label="Pannello spaziatura" name="GapPanel"/>
+				</layout_panel>
+				<layout_panel name="DeleteAllButtonPanel">
+					<button label="Elimina tutti" name="delete_all_button"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</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
index 5122954edb..4b512cdd5b 100644
--- a/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
 	<floater.string name="character_owner_group">
 		[gruppo]
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_chars_main">
 		<scroll_list name="objects_scroll_list">
 			<scroll_list.columns label="Nome" name="name"/>
 			<scroll_list.columns label="Descrizione" name="description"/>
@@ -42,7 +42,7 @@
 		<button label="Seleziona tutto" name="select_all_objects"/>
 		<button label="Non selezionare nessuno" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_chars_actions">
 		<text name="actions_label">
 			Azioni per i personaggi selezionati:
 		</text>
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
index 77be220a2a..b7e0cbc595 100644
--- a/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
 	<floater.string name="pathing_error">
 		Si è verificato un errore durante la generazione del percorso.
 	</floater.string>
+	<panel name="pathfinding_console_main">
+		<text name="viewer_status_label">
+			Stato del Viewer
+		</text>
+	</panel>
+	<panel name="pathfinding_console_simulator">
+		<text name="simulator_status_label">
+			Stato del simulatore
+		</text>
+	</panel>
 	<tab_container name="view_test_tab_container">
 		<panel label="Visuale" name="view_panel">
 			<text name="show_label">
diff --git a/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml
index 7edac3ff46..32a27157f7 100644
--- a/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/it/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
 	<floater.string name="linkset_choose_use">
 		Seleziona uso set collegati...
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_linksets_main">
+		<text name="linksets_filter_label">
+			Filtra per:
+		</text>
+		<text name="linksets_name_label">
+			Nome
+		</text>
+		<text name="linksets_desc_label">
+			Descrizione
+		</text>
 		<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"/>
@@ -122,7 +131,10 @@
 		<button label="Seleziona tutto" name="select_all_objects"/>
 		<button label="Non selezionare nessuno" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_actions">
+		<text name="linksets_actions_label">
+			Azioni sui set collegati selezionati (se si rimuove un set collegato dal mondo, si potrebbero perdere i relativi attributi):
+		</text>
 		<check_box label="Mostra marcatore" name="show_beacon"/>
 		<button label="Prendi" name="take_objects"/>
 		<button label="Prendi copia" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
 		<button label="Restituisci" name="return_objects"/>
 		<button label="Elimina" name="delete_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_attributes">
+		<text name="linksets_attributes_label">
+			Modifica gli attributi dei set collegati selezionati e premi il pulsante per applicare le modifiche
+		</text>
 		<text name="walkability_coefficients_label">
 			Camminabilità:
 		</text>
diff --git a/indra/newview/skins/default/xui/it/floater_perms_default.xml b/indra/newview/skins/default/xui/it/floater_perms_default.xml
index 3d1fd94b69..9a88f53d47 100644
--- a/indra/newview/skins/default/xui/it/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/it/floater_perms_default.xml
@@ -1,6 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perms default" title="DIRITTI DI CREAZIONE PREDEFINITI">
-	<panel label="Diritti predefiniti" name="default permissions"/>
+	<panel label="Diritti predefiniti" name="default permissions">
+		<text name="label_1">
+			Proprietario successivo:
+		</text>
+		<text name="label_2">
+			Copia
+		</text>
+		<text name="label_3">
+			Modifica
+		</text>
+		<text name="label_4">
+			Trasferisci
+		</text>
+		<text name="label_5">
+			Condividi con il gruppo
+		</text>
+		<text name="label_6">
+			Consenti a chiunque di copiare
+		</text>
+		<text name="label_7" tool_tip="Imposta autorizzazioni predefinite per la creazione degli oggetti">
+			Oggetti
+		</text>
+		<text name="label_8" tool_tip="Imposta autorizzazioni predefinite per gli elementi caricati">
+			Caricamenti
+		</text>
+		<text name="label_9" tool_tip="Imposta autorizzazioni predefinite per la creazione degli script">
+			Script
+		</text>
+		<text name="label_10" tool_tip="Imposta autorizzazioni predefinite per la creazione dei biglietti">
+			Biglietti
+		</text>
+		<text name="label_11" tool_tip="Imposta autorizzazioni predefinite per la creazione delle gesture">
+			Gesture
+		</text>
+		<text name="label_12" tool_tip="Imposta autorizzazioni predefinite per la creazione di vestiti o parti del corpo">
+			Indossabili
+		</text>
+	</panel>
 	<button label="OK" label_selected="OK" name="ok"/>
 	<button label="Annulla" label_selected="Annulla" name="cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000..5baba9fced
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="PREFERENZE AVANZATE GRAFICA">
+	<text name="GeneralText">
+		Generali
+	</text>
+	<slider label="Distanza visualizzazione:" name="DrawDistance"/>
+	<text name="DrawDistanceMeterText2">
+		m
+	</text>
+	<slider label="Numero massimo particelle:" name="MaxParticleCount"/>
+	<slider label="Qualità dopo l&apos;elaborazione:" name="RenderPostProcess"/>
+	<text name="PostProcessText">
+		Basso
+	</text>
+	<text name="AvatarText">
+		Avatar
+	</text>
+	<slider label="Complessità massima:" name="IndirectMaxComplexity" tool_tip="Definisce il punto in cui un avatar dall&apos;aspetto complesso viene visualizzato come una forma senza dettagli"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
+	<slider label="N. max di non impostori:" name="IndirectMaxNonImpostors"/>
+	<text name="IndirectMaxNonImpostorsText">
+		0
+	</text>
+	<slider label="Dettagli:" name="AvatarMeshDetail"/>
+	<text name="AvatarMeshDetailText">
+		Basso
+	</text>
+	<slider label="Fisica:" name="AvatarPhysicsDetail"/>
+	<text name="AvatarPhysicsDetailText">
+		Basso
+	</text>
+	<text name="ShadersText">
+		Hardware
+	</text>
+	<slider label="Memoria texture (MB):" name="GraphicsCardTextureMemory" tool_tip="Spazio di memoria da assegnare alle texture. Utilizza la memoria della scheda video come impostazione predefinita. La riduzione di questa impostazione potrebbe migliorare il rendimento ma potrebbe anche rendere le texture poco definite."/>
+	<slider label="Rapporto distanza nebbia:" name="fog"/>
+	<slider label="Gamma:" name="gamma"/>
+	<text name="(brightness, lower is brighter)">
+		(0 = luminosità predefinita, più basso = più luminoso)
+	</text>
+	<check_box label="Filtro anisotropico (rallenta quando è attivato)" name="ani"/>
+	<check_box initial_value="true" label="Attiva oggetti buffer vertici OpenGL" name="vbo" tool_tip="Se si attiva questa impostazione su hardware più recente si migliorano le prestazioni. Con la funzione attiva, l&apos;hardware meno recente potrebbe implementare VBO in maniera errata, causando interruzioni."/>
+	<check_box initial_value="true" label="Attiva compressione texture (richiede riavvio)" name="texture compression" tool_tip="Comprime le texture nella memoria video, consentendo il caricamento di texture a risoluzione maggiore al prezzo di una perdita di qualità del colore."/>
+	<text name="antialiasing label">
+		Antialiasing:
+	</text>
+	<combo_box label="Antialiasing" name="fsaa">
+		<combo_box.item label="Disattivato" name="FSAADisabled"/>
+		<combo_box.item label="2x" name="2x"/>
+		<combo_box.item label="4x" name="4x"/>
+		<combo_box.item label="8x" name="8x"/>
+		<combo_box.item label="16x" name="16x"/>
+	</combo_box>
+	<text name="antialiasing restart">
+		(richiede il riavvio)
+	</text>
+	<slider label="Dettagli mesh terreno:" name="TerrainMeshDetail"/>
+	<text name="TerrainMeshDetailText">
+		Basso
+	</text>
+	<slider label="Alberi:" name="TreeMeshDetail"/>
+	<text name="TreeMeshDetailText">
+		Basso
+	</text>
+	<slider label="Oggetti:" name="ObjectMeshDetail"/>
+	<text name="ObjectMeshDetailText">
+		Basso
+	</text>
+	<slider label="Prim flessibili:" name="FlexibleMeshDetail"/>
+	<text name="FlexibleMeshDetailText">
+		Basso
+	</text>
+	<check_box initial_value="true" label="Acqua trasparente" name="TransparentWater"/>
+	<check_box initial_value="true" label="Mappatura urti e brillantezza" name="BumpShiny"/>
+	<check_box initial_value="true" label="Luci locali" name="LocalLights"/>
+	<check_box initial_value="true" label="Shader di base" name="BasicShaders" tool_tip="Se si disattiva questa opzione, si possono evitare interruzioni nei driver di alcune schede grafiche"/>
+	<slider label="Dettagli terreno:" name="TerrainDetail"/>
+	<text name="TerrainDetailText">
+		Basso
+	</text>
+	<check_box initial_value="true" label="Hardware skinning avatar" name="AvatarVertexProgram"/>
+	<check_box initial_value="true" label="Stoffa avatar" name="AvatarCloth"/>
+	<text name="ReflectionsText">
+		Riflessi nell’acqua:
+	</text>
+	<combo_box name="Reflections">
+		<combo_box.item label="Minimo" name="0"/>
+		<combo_box.item label="Terreno e alberi" name="1"/>
+		<combo_box.item label="Tutti gli oggetti statici" name="2"/>
+		<combo_box.item label="Tutti gli avatar e gli oggetti" name="3"/>
+		<combo_box.item label="Tutto" name="4"/>
+	</combo_box>
+	<check_box initial_value="true" label="Shader atmosfera" name="WindLightUseAtmosShaders"/>
+	<slider label="Cielo:" name="SkyMeshDetail"/>
+	<text name="SkyMeshDetailText">
+		Basso
+	</text>
+	<check_box initial_value="true" label="Modello illuminazione avanzato" name="UseLightShaders"/>
+	<check_box initial_value="true" label="Occlusione ambientale" name="UseSSAO"/>
+	<check_box initial_value="true" label="Profondità di campo" name="UseDoF"/>
+	<text name="RenderShadowDetailText">
+		Ombre:
+	</text>
+	<combo_box name="ShadowDetail">
+		<combo_box.item label="Nessuno" name="0"/>
+		<combo_box.item label="Sole/Luna" name="1"/>
+		<combo_box.item label="Sole/Luna + Proiettori" name="2"/>
+	</combo_box>
+	<button label="Ripristina impostazioni consigliate" name="Defaults"/>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
+	<check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/it/floater_save_pref_preset.xml
new file mode 100644
index 0000000000..2a5f599aa2
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="SALVA VALORE PREDEFINITO PREFERENZA">
+	<string name="title_graphic">
+		Salva valore predefinito grafica
+	</string>
+	<string name="title_camera">
+		Salva valore predefinito videocamera
+	</string>
+	<text name="Preset">
+		Digita un nome per il valore predefinito o selezionane uno esistente.
+	</text>
+	<button label="Salva" name="save"/>
+	<button label="Annulla" name="cancel"/>
+</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
index c04fc249a7..60324270e0 100644
--- a/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/it/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_import" title="Imposta dizionario">
+	<text name="import_dict">
+		Dizionario:
+	</text>
 	<button label="Sfoglia" label_selected="Sfoglia" name="dictionary_path_browse"/>
+	<text name="import_name">
+		Nome:
+	</text>
+	<text name="import_lang">
+		Lingua:
+	</text>
 	<button label="Importa" name="ok_btn"/>
 	<button label="Annulla" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/floater_tos.xml b/indra/newview/skins/default/xui/it/floater_tos.xml
index 28a2dfdda2..0dd116d613 100644
--- a/indra/newview/skins/default/xui/it/floater_tos.xml
+++ b/indra/newview/skins/default/xui/it/floater_tos.xml
@@ -12,4 +12,7 @@
 	<text name="tos_heading">
 		Sei pregato di leggere attentamente i Termini del servizio e le Regole sulla privacy di seguito. Per continuare l&apos;accesso a [SECOND_LIFE], devi accettare le condizioni.
 	</text>
+	<text name="external_tos_required">
+		Per continuare, visita my.secondlife.com e accedi per accettare i Termini del servizio. Grazie.
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/menu_attachment_other.xml b/indra/newview/skins/default/xui/it/menu_attachment_other.xml
index d4ce25e6a5..60cdd2a91d 100644
--- a/indra/newview/skins/default/xui/it/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_attachment_other.xml
@@ -15,5 +15,8 @@
 	<menu_item_call label="Zoom avanti" name="Zoom In"/>
 	<menu_item_call label="Paga" name="Pay..."/>
 	<menu_item_call label="Profilo dell&apos;oggetto" name="Object Inspect"/>
+	<menu_item_check label="Esegui il rendering normalmente" name="RenderNormally"/>
+	<menu_item_check label="Non eseguire il rendering" name="DoNotRender"/>
+	<menu_item_check label="Esegui il rendering completamente" name="AlwaysRenderFully"/>
 	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_avatar_other.xml b/indra/newview/skins/default/xui/it/menu_avatar_other.xml
index a2b864b3e1..7042e52943 100644
--- a/indra/newview/skins/default/xui/it/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/it/menu_avatar_other.xml
@@ -14,5 +14,8 @@
 	<menu_item_call label="Dump XML" name="Dump XML"/>
 	<menu_item_call label="Zoom avanti" name="Zoom In"/>
 	<menu_item_call label="Paga" name="Pay..."/>
+	<menu_item_check label="Esegui il rendering normalmente" name="RenderNormally"/>
+	<menu_item_check label="Non eseguire il rendering" name="DoNotRender"/>
+	<menu_item_check label="Esegui il rendering completamente" name="AlwaysRenderFully"/>
 	<menu_item_call label="Blocca proprietario particella" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index 126089aa6a..33fa25cd38 100644
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -15,6 +15,7 @@
 		<menu_item_call label="[SECOND_LIFE] Blog" name="Second Life Blogs"/>
 		<menu_item_call label="Segnala bug" name="Report Bug"/>
 		<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="Cerca aggiornamenti" name="Check for Updates"/>
 	</menu>
 	<menu_item_check label="Mostra menu Debug" name="Show Debug Menu"/>
 	<menu label="Debug" name="Debug">
diff --git a/indra/newview/skins/default/xui/it/menu_marketplace_view.xml b/indra/newview/skins/default/xui/it/menu_marketplace_view.xml
index 63f0b7fc50..bd808f588f 100644
--- a/indra/newview/skins/default/xui/it/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/it/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_marketplace_sort">
+	<menu_item_check label="Ordina in base al nome" name="sort_by_name"/>
+	<menu_item_check label="Mostra prima i più recenti" name="sort_by_recent"/>
 	<menu_item_check label="Ordina per quantità in magazzino (da bassa ad alta)" name="sort_by_stock_amount"/>
 	<menu_item_check label="Mostra solo cartelle annunci" name="show_only_listing_folders"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_url_email.xml b/indra/newview/skins/default/xui/it/menu_url_email.xml
new file mode 100644
index 0000000000..a8ef2cde93
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+	<menu_item_call label="Componi un&apos;email in un client esterno" name="email_open_external"/>
+	<menu_item_call label="Copia email negli Appunti" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index 18ddad5ee8..d52b022c49 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -64,7 +64,7 @@
 		<menu_item_call label="Istantanea" name="Take Snapshot"/>
 		<menu_item_call label="Profilo del luogo" name="Place Profile"/>
 		<menu_item_call label="Informazioni sul terreno" name="About Land"/>
-		<menu_item_call label="Regione/proprietà immobiliare" name="RegionEstate"/>
+		<menu_item_call label="Regione / proprietà immobiliare" name="RegionEstate"/>
 		<menu_item_call label="Terreni posseduti..." name="My Land"/>
 		<menu_item_call label="Acquista questo terreno" name="Buy Land"/>
 		<menu label="Mostra" name="LandShow">
@@ -180,6 +180,7 @@
 		<menu_item_call label="Segnala bug" name="Report Bug"/>
 		<menu_item_call label="Urti, spinte e contatti" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu_item_call label="Informazioni su [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="Cerca aggiornamenti" name="Check for Updates"/>
 	</menu>
 	<menu label="Avanzate" name="Advanced">
 		<menu_item_call label="Ridisegna le texture" name="Rebake Texture"/>
@@ -193,7 +194,7 @@
 			<menu_item_call label="Misuratore lag" name="Lag Meter"/>
 			<menu_item_check label="Barra statistiche" name="Statistics Bar"/>
 			<menu_item_call label="Statistiche caricamento scena" name="Scene Load Statistics"/>
-			<menu_item_check label="Mostra peso visualizzazione per avatar" name="Avatar Rendering Cost"/>
+			<menu_item_check label="Mostra informazioni sulla complessità dell&apos;avatar" name="Avatar Draw Info"/>
 		</menu>
 		<menu label="Evidenziazione e visibilità" name="Highlighting and Visibility">
 			<menu_item_check label="Effetto marcatore lampeggiante" name="Cheesy Beacon"/>
@@ -298,8 +299,6 @@
 			<menu_item_check label="Particelle" name="Particles"/>
 			<menu_item_check label="Giunti" name="Joints"/>
 			<menu_item_check label="Vettori vento" name="Wind Vectors"/>
-			<menu_item_check label="Complessità rendering" name="rendercomplexity"/>
-			<menu_item_check label="Byte collegamento" name="attachment bytes"/>
 			<menu_item_check label="Scolpisci" name="Sculpt"/>
 			<menu label="Densità texture" name="Texture Density">
 				<menu_item_check label="Nessuna" name="None"/>
@@ -373,7 +372,6 @@
 			<menu_item_call label="Debug texture dell&apos;avatar" name="Debug Avatar Textures"/>
 		</menu>
 		<menu_item_check label="Texture HTTP" name="HTTP Textures"/>
-		<menu_item_check label="Inventario HTTP" name="HTTP Inventory"/>
 		<menu_item_call label="Attiva Visual Leak Detector" name="Enable Visual Leak Detector"/>
 		<menu_item_check label="Finestra Console al prossimo lancio" name="Console Window"/>
 		<menu label="Imposta livello di registrazione" name="Set Logging Level">
diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml
index 61131b09c3..00435e6d9d 100644
--- a/indra/newview/skins/default/xui/it/notifications.xml
+++ b/indra/newview/skins/default/xui/it/notifications.xml
@@ -164,6 +164,10 @@ L&apos;inizializzazione con il Marketplace non ha avuto successo a causa di un e
         &apos;[ERROR_CODE]&apos;
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="MerchantForceValidateListing">
+		Per creare l&apos;annuncio, abbiamo corretto la gerarchia dei contenuti dell&apos;annuncio.
+		<usetemplate ignoretext="Avvisami se la gerarchia del contenuto viene corretta per creare un annuncio" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmMerchantActiveChange">
 		Questa azione cambierà il contenuto attivo di questo annuncio. Vuoi continuare?
 		<usetemplate ignoretext="Conferma prima di modificare un annuncio attivo su Marketplace" name="okcancelignore" notext="Annulla" yestext="OK"/>
@@ -211,6 +215,10 @@ L&apos;inizializzazione con il Marketplace non ha avuto successo a causa di un e
 		L&apos;annuncio è stato rimosso perché il magazzino è esaurito. Aggiungi altre unità alla cartella di magazzino prima di pubblicare nuovamente l&apos;annuncio.
 		<usetemplate ignoretext="Avverti quando un annuncio viene rimosso perché la cartella di magazzino è vuota" name="okignore" yestext="OK"/>
 	</notification>
+	<notification name="AlertMerchantVersionFolderEmpty">
+		L&apos;annuncio è stato rimosso perché la cartella della versione è vuota. Aggiungi elementi alla cartella della versione prima di pubblicare nuovamente l&apos;annuncio.
+		<usetemplate ignoretext="Avverti quando un annuncio non è elencato perché la cartella della versione è vuota" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		C&apos;è stato un problema importando il testo di uno script per la seguente ragione: [REASON]. Riprova più tardi.
 	</notification>
@@ -320,6 +328,14 @@ Se non desideri che queste abilità siano assegnate a questo ruolo, disattivale
 		Stai per espellere [COUNT] membri dal gruppo.
 		<usetemplate ignoretext="Conferma l&apos;espulsione di vari partecipanti dal gruppo" name="okcancelignore" notext="Annulla" yestext="Espelli"/>
 	</notification>
+	<notification name="BanGroupMemberWarning">
+		Stai per espellere [AVATAR_NAME] dal gruppo.
+		<usetemplate ignoretext="Conferma di voler espellere un partecipante dal gruppo" name="okcancelignore" notext="Annulla" yestext="Espelli"/>
+	</notification>
+	<notification name="BanGroupMembersWarning">
+		Stai per espellere [COUNT] membri dal gruppo.
+		<usetemplate ignoretext="Conferma l&apos;espulsione di vari partecipanti dal gruppo" name="okcancelignore" notext="Annulla" yestext="Espelli"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Stai per abbandonare il tuo accessorio.
     Vuoi continuare?
@@ -404,7 +420,7 @@ Oggetti: [N]
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="ReturnAllTopObjects">
-		Confermi di volere restituire tutti gli oggetti elencati nell&apos;inventario dei loro proprietari?
+		Restituisci tutti gli oggetti elencati all&apos;inventario del proprietario? Verranno restituiti TUTTI gli oggetti scriptati nella regione.
 		<usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/>
 	</notification>
 	<notification name="DisableAllTopObjects">
@@ -606,6 +622,10 @@ L&apos;oggetto potrebbe essere troppo lontano oppure essere stato cancellato.
 	<notification name="CannotDownloadFile">
 		Non è stato possibile scaricare il file
 	</notification>
+	<notification label="" name="MediaFileDownloadUnsupported">
+		Hai richiesto il download di un file, cosa che non è supportata in [SECOND_LIFE].
+		<usetemplate ignoretext="Avvisa in caso di download di file non supportati" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CannotWriteFile">
 		Non è stato possibile scrivere il file [[FILE]]
 	</notification>
@@ -1107,8 +1127,9 @@ Unisci il terreno?
 In genere si tratta di un problema temporaneo. Attendi alcuni minuti per modificare e salvare nuovamente gli elementi indossabili.
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		Sei stato scollegato da [SECOND_LIFE].
-            [MESSAGE]
+		Accidenti. Sei stato scollegato da [SECOND_LIFE].
+
+[MESSAGE]
 		<usetemplate name="okcancelbuttons" notext="Esci" yestext="Vedi IM &amp; Chat"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
@@ -1357,6 +1378,13 @@ Puoi comunque usare [SECOND_LIFE] normalmente e gli altri residenti ti vedranno
 			<ignore name="ignore" text="Lo scaricamento sta richiedendo parecchio tempo"/>
 		</form>
 	</notification>
+	<notification name="RegionAndAgentComplexity">
+		La tua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complessità visiva] è [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+	</notification>
+	<notification name="AgentComplexity">
+		La tua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complessità visiva] è [AGENT_COMPLEXITY].
+	</notification>
 	<notification name="FirstRun">
 		L&apos;installazione di [APP_NAME] è terminata.
 
@@ -1637,6 +1665,25 @@ Questo viewer sperimentale è stato sostituito con un viewer [NEW_CHANNEL];
 vedi [[INFO_URL] Informazioni su questo aggiornamento]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="UpdateDownloadInProgress">
+		È disponibile un aggiornamento.
+È in fase di download. Al termine ti verrà chiesto di riavviare il computer per completare l&apos;installazione.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateDownloadComplete">
+		È stato scaricato un aggiornamento. Verrà installato durante il riavvio.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateCheckError">
+		Si è verificato un errore durante la ricerca dell&apos;aggiornamento.
+Riprova più tardi.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateViewerUpToDate">
+		Il Viewer è aggiornato.
+Per provare le funzioni e modifiche più recenti, visita la pagina Alternate Viewers. http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="DeedObjectToGroup">
 		La cessione di questo oggetto farà in modo che il gruppo:
 * Riceva i L$ pagati all&apos;oggetto
@@ -1742,6 +1789,14 @@ Vuoi cancellare quell&apos;elemento?
 		Hai raggiunto il numero massimo di gruppi. Per favore abbandona almeno un gruppo prima di aderire o crearne uno nuovo.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="GroupLimitInfo">
+		Il numero massimo di gruppi per gli account Basic è [MAX_BASIC] e
+per gli account [https://secondlife.com/premium/ Premium] è [MAX_PREMIUM].
+Se hai ridotto il livello del tuo account, dovrai essere iscritto a meno di [MAX_BASIC] gruppi prima di poter iscriverti a un nuovo gruppo.
+
+[https://secondlife.com/my/account/membership.php Passa a un livello superiore oggi stesso!]
+		<usetemplate name="okbutton" yestext="Chiudi"/>
+	</notification>
 	<notification name="KickUser">
 		Espelli questo residente con quale messaggio?
 		<form name="form">
@@ -1943,7 +1998,7 @@ Cambierà migliaia di regioni e produrrà seri problemi ai vari server.
 		<usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà immobiliari" yestext="Questa proprietà immobiliare"/>
 	</notification>
 	<notification label="Seleziona proprietà immobiliare" name="EstateTrustedExperienceRemove">
-		Rimuovi dall&apos;elenco di elementi chiave per questa proprietà immobiliare oppure per [ALL_ESTATES]?
+		Rimuovi dall&apos;elenco di elementi chiave solo per questa proprietà immobiliare oppure per [ALL_ESTATES]?
 		<usetemplate canceltext="Annulla" name="yesnocancelbuttons" notext="Tutte le proprietà immobiliari" yestext="Questa proprietà immobiliare"/>
 	</notification>
 	<notification label="Conferma espulsione" name="EstateKickUser">
@@ -2254,6 +2309,10 @@ Trasferisci gli elementi nell&apos;inventario?
 		Conferma che desideri pagare [AMOUNT] L$ a [TARGET].
 		<usetemplate ignoretext="Conferma prima di pagare (somme superiori a 200 L$)" name="okcancelignore" notext="Annulla" yestext="Paga"/>
 	</notification>
+	<notification name="PayObjectFailed">
+		Pagamento non riuscito: oggetto non trovato.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="OpenObjectCannotCopy">
 		Non ci sono elementi in questo oggetto che tu possa copiare.
 	</notification>
@@ -2285,10 +2344,9 @@ Questa azione non può essere ripristinata
 		[QUESTION]
 		<usetemplate ignoretext="Conferma prima di cancellare gli elementi" name="okcancelignore" notext="Annulla" yestext="OK"/>
 	</notification>
-	<notification name="HelpReportAbuseEmailLL">
-		Usa questo strumento per segnalare violazioni a [http://secondlife.com/corporate/tos.php Terms of Service] e [http://secondlife.com/corporate/cs.php Community Standards].
-
-Ogni abuso segnalato verrà esaminato e risolto.
+	<notification name="ConfirmUnlink">
+		Questa è una selezione di grandi dimensioni con set collegati. Se viene scollegata, potrebbe non essere possibile ricollegarla. Come precauzione ti consigliamo di salvare copie dei set collegati nel tuo inventario.
+		<usetemplate ignoretext="Conferma per scollegare un set collegato" name="okcancelignore" notext="Annulla" yestext="Scollega"/>
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		Scegli una categoria per questa segnalazione di abuso.
@@ -3010,10 +3068,10 @@ OK?
 
 [EXPERIENCE_LIST]
 
-Potrebbero essere disponibili altre esperienze chiave.
+Possono essere disponibili altre esperienze chiave.
 	</notification>
 	<notification name="ExperienceEvent">
-		L&apos;esperienza secondlife:///app/experience/[public_id]/profile ha consentito un oggetto la seguente azione: [EventType].
+		L&apos;esperienza secondlife:///app/experience/[public_id]/profile ha consentito a un oggetto la seguente azione: [EventType].
     Proprietario: secondlife:///app/agent/[OwnerID]/inspect
     Nome oggetto: [ObjectName]
     Nome lotto: [ParcelName]
@@ -3216,6 +3274,12 @@ Per sicurezza, verranno bloccati per alcuni secondi.
 	<notification name="AttachmentSaved">
 		L&apos;elemento da collegare è stato salvato.
 	</notification>
+	<notification name="PresetNotSaved">
+		Errore durante il salvataggio del valore predefinito [NAME].
+	</notification>
+	<notification name="PresetNotDeleted">
+		Errore durante l&apos;eliminazione del valore predefinito [NAME].
+	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Impossibile trovare l&apos;argomento nell&apos;aiuto per questo elemento.
 	</notification>
@@ -3248,9 +3312,8 @@ Il pulsante verrà visualizzato quando lo spazio sarà sufficiente.
 		Scegli i residenti con i quali condividere.
 	</notification>
 	<notification name="MeshUploadError">
-		[LABEL] non è stato caricato: [MESSAGE] [IDENTIFIER] 
-
-Per informazioni dettagliate, vedi il file del registro.
+		[LABEL] non è stato caricato: [MESSAGE] [IDENTIFIER]
+[DETAILS]Consulta SecondLife.log per informazioni dettagliate
 	</notification>
 	<notification name="MeshUploadPermError">
 		Errore durante la richiesta di autorizzazione al caricamento del reticolo.
diff --git a/indra/newview/skins/default/xui/it/panel_experience_info.xml b/indra/newview/skins/default/xui/it/panel_experience_info.xml
index 706f139bcc..23ba5fb32e 100644
--- a/indra/newview/skins/default/xui/it/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/it/panel_experience_info.xml
@@ -9,7 +9,7 @@
 				</layout_panel>
 				<layout_panel name="location panel">
 					<text name="Location">
-						Luogo:
+						Posizione:
 					</text>
 					<text name="LocationTextText">
 						in qualche posto
diff --git a/indra/newview/skins/default/xui/it/panel_experience_search.xml b/indra/newview/skins/default/xui/it/panel_experience_search.xml
index 124b060f20..997639b6eb 100644
--- a/indra/newview/skins/default/xui/it/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/it/panel_experience_search.xml
@@ -26,7 +26,7 @@
 		<icons_combo_box label="Moderato" name="maturity">
 			<icons_combo_box.item label="Adulti" name="Adult" value="42"/>
 			<icons_combo_box.item label="Moderato" name="Mature" value="21"/>
-			<icons_combo_box.item label="Generale" name="PG" value="13"/>
+			<icons_combo_box.item label="Generali" name="PG" value="13"/>
 		</icons_combo_box>
 		<scroll_list name="search_results">
 			<columns label="Nome" name="experience_name"/>
diff --git a/indra/newview/skins/default/xui/it/panel_main_inventory.xml b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
index 446b51ffa3..6a6c7f4226 100644
--- a/indra/newview/skins/default/xui/it/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_main_inventory.xml
@@ -6,6 +6,9 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] oggetti [FILTER]
 	</panel.string>
+	<panel.string name="ItemcountUnknown">
+		Recuperati [ITEM_COUNT] elementi [FILTER]
+	</panel.string>
 	<text name="ItemcountText">
 		Oggetti:
 	</text>
@@ -16,7 +19,7 @@
 	</tab_container>
 	<layout_stack name="bottom_panel">
 		<layout_panel name="options_gear_btn_panel">
-			<button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/>
+			<menu_button name="options_gear_btn" tool_tip="Mostra opzioni addizionali"/>
 		</layout_panel>
 		<layout_panel name="add_btn_panel">
 			<button name="add_btn" tool_tip="Aggiungi nuovo elemento"/>
diff --git a/indra/newview/skins/default/xui/it/panel_people.xml b/indra/newview/skins/default/xui/it/panel_people.xml
index 2f40d4bdc4..38a03fb4d2 100644
--- a/indra/newview/skins/default/xui/it/panel_people.xml
+++ b/indra/newview/skins/default/xui/it/panel_people.xml
@@ -18,6 +18,7 @@ Stai cercando persone da frequentare? Prova la [secondlife:///app/worldmap Mappa
 	<string name="no_groups_msg" value="Stai cercando gruppi di cui far parte? Prova [secondlife:///app/search/groups Cerca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Fai doppio clic per aprire la Mappa, premi il tasto Maiusc e trascina per la panoramica)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Fai doppio clic per teleportarti, premi il tasto Maiusc e trascina per la panoramica)"/>
+	<string name="GroupCountWithInfo" value="Fai parte di [COUNT] gruppi e puoi iscriverti a [REMAINING] altri. [secondlife:/// Ne vuoi altri?]"/>
 	<tab_container name="tabs">
 		<panel label="NELLE VICINANZE" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
index ccca27cbfd..85cbfb92ef 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
 	<check_box label="Consenti più Viewer" name="allow_multiple_viewer_check"/>
 	<check_box label="Mostra selezione griglia all&apos;accesso" name="show_grid_selection_check"/>
 	<check_box label="Mostra menu Avanzato" name="show_advanced_menu_check"/>
-	<check_box label="Mostra menu Sviluppatore" name="show_develop_menu_check"/>
+	<check_box label="Mostra menu sviluppo" name="show_develop_menu_check"/>
 	<button label="Diritti di creazione predefiniti" name="default_creation_permissions"/>
 </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 09d7c96370..0dfd97d5f8 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
 		<check_box label="Offerta inventario" name="inventory_offer"/>
 	</panel>
 	<panel name="log_settings">
+		<text name="logging_label">
+			Salva:
+		</text>
+		<combo_box name="conversation_log_combo">
+			<item label="Registrazione e trascrizioni" name="log_and_transcripts" value="2"/>
+			<item label="Solo registrazione" name="log_only" value="1"/>
+			<item label="Nessuna registrazione o trascrizione" name="no_log_or_transcript" value="0"/>
+		</combo_box>
 		<button label="Cancella registro..." name="clear_log"/>
 		<button label="Cancella trascrizioni..." name="delete_transcripts"/>
+		<text name="log_location_label">
+			Posizione:
+		</text>
 		<button label="Sfoglia..." label_selected="Sfoglia" name="log_path_button"/>
 	</panel>
 	<button label="Traduzione..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
index 2978c48db6..a042c43431 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Grafica" name="Display panel">
+	<text name="preset_text">
+		(Nulla)
+	</text>
 	<text name="QualitySpeed">
 		Qualità e velocità:
 	</text>
-	<text name="FasterText">
-		Più veloce
-	</text>
-	<text name="BetterText">
-		Migliore
-	</text>
 	<text name="ShadersPrefText">
 		Basso
 	</text>
@@ -21,94 +18,17 @@
 	<text name="ShadersPrefText4">
 		Ultra
 	</text>
-	<panel label="CustomGraphics" name="CustomGraphics Panel">
-		<text name="ShadersText">
-			Effetti grafici:
-		</text>
-		<check_box initial_value="true" label="Acqua trasparente" name="TransparentWater"/>
-		<check_box initial_value="true" label="Piccoli rilievi e scintillii" name="BumpShiny"/>
-		<check_box initial_value="true" label="Luci locali" name="LocalLights"/>
-		<check_box initial_value="true" label="Effetti grafici base" name="BasicShaders" tool_tip="Disabilitare questa opzione può evitare che qualche scheda grafica vada in crash."/>
-		<check_box initial_value="true" label="Effetti grafici atmosferici" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Modello illuminazione avanzato" name="UseLightShaders"/>
-		<check_box initial_value="true" label="Occlusione ambientale" name="UseSSAO"/>
-		<check_box initial_value="true" label="Profondità di campo" name="UseDoF"/>
-		<text name="shadows_label">
-			Ombre:
-		</text>
-		<combo_box name="ShadowDetail">
-			<combo_box.item label="Nessuno" name="0"/>
-			<combo_box.item label="Sole/Luna" name="1"/>
-			<combo_box.item label="Sole/Luna + Proiettori" name="2"/>
-		</combo_box>
-		<text name="reflection_label">
-			Riflessi nell’acqua:
-		</text>
-		<combo_box initial_value="true" label="Riflessi dell&apos;acqua" name="Reflections">
-			<combo_box.item label="Minimo" name="0"/>
-			<combo_box.item label="Terreno e alberi" name="1"/>
-			<combo_box.item label="Tutti gli oggetti statici" name="2"/>
-			<combo_box.item label="Tutti gli avatar e gli oggetti" name="3"/>
-			<combo_box.item label="Tutto" name="4"/>
-		</combo_box>
-		<slider label="Fisica avatar:" name="AvatarPhysicsDetail"/>
-		<text name="AvatarPhysicsDetailText">
-			Basso
-		</text>
-		<slider label="Distanza di disegno:" name="DrawDistance"/>
-		<text name="DrawDistanceMeterText2">
-			m
-		</text>
-		<slider label="Conteggio massimo particelle:" name="MaxParticleCount"/>
-		<slider label="N. max di avatar non impostori:" name="MaxNumberAvatarDrawn"/>
-		<slider label="Qualità in post-produzione:" name="RenderPostProcess"/>
-		<text name="MeshDetailText">
-			Dettagli reticolo:
-		</text>
-		<slider label="  Oggetti:" name="ObjectMeshDetail"/>
-		<slider label="  Prims flessibili:" name="FlexibleMeshDetail"/>
-		<slider label="  Alberi:" name="TreeMeshDetail"/>
-		<slider label="  Avatar:" name="AvatarMeshDetail"/>
-		<slider label="  Terreno:" name="TerrainMeshDetail"/>
-		<slider label="  Cielo:" name="SkyMeshDetail"/>
-		<text name="PostProcessText">
-			Basso
-		</text>
-		<text name="ObjectMeshDetailText">
-			Basso
-		</text>
-		<text name="FlexibleMeshDetailText">
-			Basso
-		</text>
-		<text name="TreeMeshDetailText">
-			Basso
-		</text>
-		<text name="AvatarMeshDetailText">
-			Basso
-		</text>
-		<text name="TerrainMeshDetailText">
-			Basso
-		</text>
-		<text name="SkyMeshDetailText">
-			Basso
-		</text>
-		<text name="AvatarRenderingText">
-			Rendering avatar :
-		</text>
-		<check_box initial_value="true" label="Avatar bidimensionali (Impostor)" name="AvatarImpostors"/>
-		<check_box initial_value="true" label="Hardware Skinning" name="AvatarVertexProgram"/>
-		<check_box initial_value="true" label="Abiti dell&apos;avatar" name="AvatarCloth"/>
-		<text name="TerrainDetailText">
-			Dettagli terreno:
-		</text>
-		<radio_group name="TerrainDetailRadio">
-			<radio_item label="Basso" name="0"/>
-			<radio_item label="Alto" name="2"/>
-		</radio_group>
-		--&gt;
-	</panel>
-	<button label="Applica" label_selected="Applica" name="Apply"/>
-	<button label="Reimposta" name="Defaults"/>
-	<button label="Avanzate" name="Advanced"/>
-	<button label="Hardware" label_selected="Hardware" name="GraphicsHardwareButton"/>
+	<text name="FasterText">
+		Più veloce
+	</text>
+	<text name="BetterText">
+		Migliore
+	</text>
+	<check_box initial_value="true" label="Shader atmosfera..." name="WindLightUseAtmosShaders"/>
+	<check_box initial_value="true" label="Modello illuminazione avanzato" name="UseLightShaders"/>
+	<button label="Salva impostazioni come valori predefiniti..." name="PrefSaveButton"/>
+	<button label="Carica valore predefinito..." name="PrefLoadButton"/>
+	<button label="Elimina valore predefinito..." name="PrefDeleteButton"/>
+	<button label="Ripristina impostazioni consigliate" name="Defaults"/>
+	<button label="Impostazioni avanzate..." name="AdvancedSettings"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
index e204d70b03..093f7fc411 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_setup.xml
@@ -17,11 +17,11 @@
 	<radio_group name="preferred_browser_behavior">
 		<radio_item label="Usa il mio browser (Chrome, Firefox, IE) per tutti i link" name="internal" tool_tip="Utilizza il browser Web predefinito di sistema per l&apos;aiuto, per i link Web e così via. Sconsigliato durante l&apos;esecuzione a tutto schermo." value="0"/>
 		<radio_item label="Usa il browser incorporato solo per i link di Second Life" name="external" tool_tip="Utilizza il browser Web predefinito di sistema per l&apos;aiuto, per i link Web e così via. Il browser incorporato verrà usato solo per i link LindenLab/SecondLife." value="1"/>
+		<radio_item label="Usa il browser incorporato per tutti i link" name="external_all" tool_tip="Utilizza il browser Web integrato per l&apos;aiuto, per i link Web e così via. Questo browser si apre in una nuova finestra in [APP_NAME]." value="2"/>
 	</radio_group>
 	<check_box initial_value="true" label="Abilita plugin" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Accetta cookie" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Abilita Javascript" name="browser_javascript_enabled"/>
-	<check_box initial_value="false" label="Consenti pop-up nel browser media" name="media_popup_enabled"/>
 	<text name="Software updates:">
 		Aggiornamenti software:
 	</text>
diff --git a/indra/newview/skins/default/xui/it/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/it/panel_presets_pulldown.xml
new file mode 100644
index 0000000000..9a3732269e
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+	<text name="Graphic Presets">
+		Valori predefiniti grafica
+	</text>
+	<button label="Apri preferenze grafica" name="open_prefs_btn" tool_tip="Accedi alle preferenze della grafica"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
index 4620d72977..f69ffa734a 100644
--- a/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
@@ -45,12 +45,9 @@
 		<layout_panel name="media_address">
 			<line_editor name="media_address_url" tool_tip="URL multimedia"/>
 			<layout_stack name="media_address_url_icons">
-				<layout_panel>
+				<layout_panel name="media_address_url_icons_wl">
 					<icon name="media_whitelist_flag" tool_tip="Lista bianca attivata"/>
 				</layout_panel>
-				<layout_panel>
-					<icon name="media_secure_lock_flag" tool_tip="Navigazione sicura"/>
-				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 		<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
index e6fba8e3bf..75b5d64660 100644
--- a/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Salvare un&apos;immagine nell&apos;inventario costa L$[UPLOAD_COST]. Per salvare l&apos;immagine come texture, selezionare uno dei formati quadrati.
 	</text>
 	<combo_box label="Risoluzione" name="texture_size_combo">
-		<combo_box.item label="Finestra attuale" name="CurrentWindow"/>
+		<combo_box.item label="Finestra corrente (512x512)" name="CurrentWindow"/>
 		<combo_box.item label="Piccola (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Media (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/it/panel_tools_texture.xml b/indra/newview/skins/default/xui/it/panel_tools_texture.xml
index 36ad2980cb..f707871dd3 100644
--- a/indra/newview/skins/default/xui/it/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/it/panel_tools_texture.xml
@@ -21,11 +21,11 @@
 		<combo_box.item label="Materiali" name="Materials"/>
 		<combo_box.item label="Multimedia" name="Media"/>
 	</combo_box>
-	<combo_box name="combobox mattype">
-		<combo_box.item label="Texture (diffusa)" name="Texture (diffuse)"/>
-		<combo_box.item label="Irregolarità (normale)" name="Bumpiness (normal)"/>
-		<combo_box.item label="Lucentezza (speculare)" name="Shininess (specular)"/>
-	</combo_box>
+	<radio_group name="radio_material_type">
+		<radio_item label="Texture (diffusa)" name="Texture (diffuse)" value="0"/>
+		<radio_item label="Irregolarità (normale)" name="Bumpiness (normal)" value="1"/>
+		<radio_item label="Lucentezza (speculare)" name="Shininess (specular)" value="2"/>
+	</radio_group>
 	<texture_picker label="Texture" name="texture control" tool_tip="Clicca per scegliere una fotografia"/>
 	<text name="label alphamode">
 		Modalità Alfa
diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml
index 78028127b2..5047ca326d 100644
--- a/indra/newview/skins/default/xui/it/strings.xml
+++ b/indra/newview/skins/default/xui/it/strings.xml
@@ -64,8 +64,8 @@ Scheda grafica: [GRAPHICS_CARD]
 Versione libcurl: [LIBCURL_VERSION]
 Versione J2C Decoder: [J2C_VERSION]
 Versione Driver audio: [AUDIO_DRIVER_VERSION]
-Versione Qt Webkit: [QT_WEBKIT_VERSION]
-Versione Server voice: [VOICE_VERSION]
+Versione LLCEFLib/CEF: [LLCEFLIB_VERSION]
+Versione server voce: [VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">
 		Pacchetti perduti: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%)
@@ -175,6 +175,12 @@ Versione Server voice: [VOICE_VERSION]
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="AgniGridLabel">
+		Griglia principale di Second Life (Agni)
+	</string>
+	<string name="AditiGridLabel">
+		Griglia per beta test di Second Life (Aditi)
+	</string>
 	<string name="ViewerDownloadURL">
 		http://secondlife.com/download.
 	</string>
@@ -450,6 +456,9 @@ Prova ad accedere nuovamente tra un minuto.
 		Non puoi indossare una cartella che contiene più di [AMOUNT] elementi. Per modificare questo limite, accedi ad Avanzate &gt; Mostra impostazioni di debug &gt; WearFolderLimit.
 	</string>
 	<string name="TooltipPrice" value="L$ [AMOUNT]:"/>
+	<string name="TooltipSLIcon">
+		Questo link porta a una pagina nel dominio ufficiale SecondLife.com o LindenLab.com.
+	</string>
 	<string name="TooltipOutboxDragToWorld">
 		Non puoi rezzare articoli dalla cartella degli annunci di Marketplace
 	</string>
@@ -469,7 +478,7 @@ Prova ad accedere nuovamente tra un minuto.
 		Il numero di articoli in magazzino è maggiore di [AMOUNT].
 	</string>
 	<string name="TooltipOutboxCannotDropOnRoot">
-		Puoi trascinare articoli o cartelle solo nella scheda TUTTI. Seleziona la scheda e sposta nuovamente gli articoli o le cartelle.
+		Puoi trascinare elementi o cartelle solo nelle schede TUTTI o NON ASSOCIATO. Seleziona una di quelle schede e sposta nuovamente gli elementi o le cartelle.
 	</string>
 	<string name="TooltipOutboxNoTransfer">
 		Almeno uno di questi oggetti non può essere venduto o trasferito
@@ -553,6 +562,9 @@ Prova ad accedere nuovamente tra un minuto.
 		Clicca per avviare il comando secondlife://
 	</string>
 	<string name="CurrentURL" value="URL attuale: [CurrentURL]"/>
+	<string name="TooltipEmail">
+		Fai clic per comporre un&apos;email
+	</string>
 	<string name="SLurlLabelTeleport">
 		Teleportati a
 	</string>
@@ -1072,7 +1084,7 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="AgentNameSubst">
 		(Tu)
 	</string>
-	<string name="JoinAnExperience"/><!-- intentionally blank -->
+	<string name="JoinAnExperience"/>
 	<string name="SilentlyManageEstateAccess">
 		Omette gli avvisi durante la gestione degli elenchi di accesso alle proprietà immobiliari
 	</string>
@@ -1845,6 +1857,21 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="TodayOld">
 		Iscritto oggi
 	</string>
+	<string name="av_render_everyone_now">
+		Ora ti possono vedere tutti.
+	</string>
+	<string name="av_render_not_everyone">
+		Alcune persone vicine a te potrebbero non eseguire il tuo rendering.
+	</string>
+	<string name="av_render_over_half">
+		La maggioranza delle persone vicine a te potrebbe non eseguire il tuo rendering.
+	</string>
+	<string name="av_render_most_of">
+		La gran parte delle persone vicine a te potrebbe non eseguire il tuo rendering.
+	</string>
+	<string name="av_render_anyone">
+		Tutte le persone vicine a te potrebbero non eseguire il tuo rendering.
+	</string>
 	<string name="AgeYearsA">
 		[COUNT] anno
 	</string>
@@ -1962,6 +1989,9 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="CompileQueueUnknownFailure">
 		Errore di dowload sconosciuto
 	</string>
+	<string name="CompileNoExperiencePerm">
+		Saltato lo script [SCRIPT] con l&apos;esperienza [EXPERIENCE].
+	</string>
 	<string name="CompileQueueTitle">
 		Avanzamento ricompilazione
 	</string>
@@ -2007,9 +2037,6 @@ Prova ad accedere nuovamente tra un minuto.
 	<string name="GroupsNone">
 		nessuno
 	</string>
-	<string name="CompileNoExperiencePerm">
-		Saltato lo script [SCRIPT] con l&apos;esperienza [EXPERIENCE].
-	</string>
 	<string name="Group" value="(gruppo)"/>
 	<string name="Unknown">
 		(Sconosciuto)
@@ -5293,18 +5320,6 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Le conversazioni non vengono registrate. Per iniziare a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Non verranno registrate più le conversazioni. Per riprendere a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Nessuna conversazione in registro. Dopo che hai contattato qualcuno o se qualcuno ti contatta, una voce del registro verrà mostrata qui.
-	</string>
-	<string name="loading_chat_logs">
-		Caricamento in corso...
-	</string>
 	<string name="experience_tools_experience">
 		Esperienza
 	</string>
@@ -5360,7 +5375,7 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 		ti teletrasporta
 	</string>
 	<string name="ExperiencePermission12">
-		accettazione automaticamente delle autorizzazioni per le esperienze
+		accettazione automatica delle autorizzazioni per le esperienze
 	</string>
 	<string name="ExperiencePermissionShortUnknown">
 		ha eseguito un&apos;operazione sconosciuta: [Permission]
@@ -5386,4 +5401,37 @@ Prova a racchiudere il percorso dell&apos;editor in doppie virgolette.
 	<string name="ExperiencePermissionShort12">
 		Autorizzazione
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Le conversazioni non vengono registrate. Per iniziare a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Non verranno registrate più le conversazioni. Per riprendere a registrare, seleziona &quot;Salva: Solo registro&quot; oppure &quot;Salva: Registri e trascrizioni&quot; in Preferenze &gt; Chat.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Nessuna conversazione in registro. Dopo che hai contattato qualcuno o se qualcuno ti contatta, una voce del registro verrà mostrata qui.
+	</string>
+	<string name="loading_chat_logs">
+		Caricamento in corso...
+	</string>
+	<string name="preset_combo_label">
+		-Lista vuota-
+	</string>
+	<string name="Default">
+		Predefinita
+	</string>
+	<string name="none_paren_cap">
+		(Nulla)
+	</string>
+	<string name="no_limit">
+		Senza limite
+	</string>
+	<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+		La forma della fisica contiene triangoli troppo piccoli. Prova a semplificare il modello della fisica.
+	</string>
+	<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+		La forma della fisica contiene dati di conferma errati. Prova a correggere il modello della fisica.
+	</string>
+	<string name="Mav_Details_MAV_UNKNOWN_VERSION">
+		La versione della forma fisica non è corretta. Imposta la versione corretta per il modello della fisica.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ja/floater_about.xml b/indra/newview/skins/default/xui/ja/floater_about.xml
index 91a61ab225..cf5e97bd8d 100644
--- a/indra/newview/skins/default/xui/ja/floater_about.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about.xml
@@ -3,6 +3,7 @@
 	<tab_container name="about_tab">
 		<panel label="情報" name="support_panel">
 			<button label="クリップボードにコピー" name="copy_btn"/>
+			<button label="アップデートを確認" name="update_btn"/>
 		</panel>
 		<panel label="クレジット" name="credits_panel">
 			<text name="linden_intro">Second Life の提供元： Lindens の、 
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 fc1ed5554a..8614335690 100644
--- a/indra/newview/skins/default/xui/ja/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml
@@ -450,7 +450,7 @@
 			<spinner label="アクセス時間：" name="HoursSpin"/>
 			<panel name="Allowed_layout_panel">
 				<text label="常に許可" name="AllowedText">
-					立入を許可された住人
+					立入を許可された住人 ([COUNT])
 				</text>
 				<name_list name="AccessList" tool_tip="(合計[LISTED] 人、最大 [MAX] 人）"/>
 				<button label="追加" name="add_allowed"/>
@@ -458,13 +458,13 @@
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="禁止" name="BanCheck">
-					立入を禁止された住人
+					立入を禁止された住人 ([COUNT])
 				</text>
 				<name_list name="BannedList" tool_tip="(合計 [LISTED] 人、最大 [MAX] 人）"/>
 				<button label="追加" name="add_banned"/>
 				<button label="削除" label_selected="削除" name="remove_banned"/>
 			</panel>
 		</panel>
-		<panel label="経験" name="land_experiences_panel"/>
+		<panel label="体験" name="land_experiences_panel"/>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
index 21abf59160..cf75fa3372 100644
--- a/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/ja/floater_autoreplace.xml
@@ -13,6 +13,12 @@
 	</scroll_list>
 	<button label="追加..." name="autoreplace_add_entry"/>
 	<button label="削除" name="autoreplace_delete_entry"/>
+	<text name="autoreplace_keyword_txt">
+		キーワード：
+	</text>
+	<text name="autoreplace_replacement_txt">
+		置換：
+	</text>
 	<button label="エントリを保存" name="autoreplace_save_entry" tool_tip="このエントリを保存します。"/>
 	<button label="変更を保存" name="autoreplace_save_changes" tool_tip="変更をすべて保存します。"/>
 	<button label="取り消し" name="autoreplace_cancel" tool_tip="変更をすべて破棄します。"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_bumps.xml b/indra/newview/skins/default/xui/ja/floater_bumps.xml
index fd12a9e69a..62f8a0669e 100644
--- a/indra/newview/skins/default/xui/ja/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/ja/floater_bumps.xml
@@ -19,6 +19,6 @@
 		[TIME]  [NAME] が物理的オブジェクトであなたをたたきました
 	</floater.string>
 	<floater.string name="timeStr">
-		[[hour,datetime,slt]:[min,datetime,slt]]
+		[[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
 	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000..50e508ad40
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="優先プリセットを削除">
+	<string name="title_graphic">
+		グラフィックプリセットを削除
+	</string>
+	<string name="title_camera">
+		カメラプリセットを削除
+	</string>
+	<text name="Preset">
+		プリセットを選択
+	</text>
+	<button label="削除" name="delete"/>
+	<button label="取り消し" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
index 7819b887db..be9cfd8c01 100644
--- a/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/ja/floater_experienceprofile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater title="EXPERIENCE PROFILE">
 	<floater.string name="empty_slurl">
-		（なし）
+		(なし)
 	</floater.string>
 	<floater.string name="maturity_icon_general">
 		&quot;Parcel_PG_Light&quot;
diff --git a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
index 5f538ecdb0..b226dfbfe1 100644
--- a/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/ja/floater_fast_timers.xml
@@ -6,5 +6,16 @@
 	<string name="run">
 		走る
 	</string>
+	<combo_box name="time_scale_combo">
+		<item label="2x 平均" name="2x Average"/>
+		<item label="最大" name="Max"/>
+		<item label="最近の最大" name="Recent Max"/>
+		<item label="100ms" name="100ms"/>
+	</combo_box>
+	<combo_box name="metric_combo">
+		<item label="時間" name="Time"/>
+		<item label="通話数" name="Number of Calls"/>
+		<item label="Hz" name="Hz"/>
+	</combo_box>
 	<button label="一時停止" name="pause_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
index 19d767ab57..e6b105e0dc 100644
--- a/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ja/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
 		<radio_item label="より古い" name="older"/>
 	</radio_group>
 	<spinner label="経過時間" name="spin_hours_ago"/>
+	<text name="label_hours">
+		時間
+	</text>
 	<spinner label="経過日数" name="spin_days_ago"/>
+	<text name="label_days">
+		日間
+	</text>
 	<button label="閉じる" label_selected="閉じる" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
index 864feef8cc..f48cc642ee 100644
--- a/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/ja/floater_live_lsleditor.xml
@@ -27,6 +27,6 @@
 	<button label="リセット" label_selected="リセット" name="Reset"/>
 	<check_box initial_value="true" label="実行中" name="running"/>
 	<check_box initial_value="true" label="Mono" name="mono"/>
-	<check_box label="次の体験を使用：" name="enable_xp"/>
+	<check_box label="体験を使用：" name="enable_xp"/>
 	<button label="&gt;" name="view_profile"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
new file mode 100644
index 0000000000..351d8507cc
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="優先プリセットをロード">
+	<string name="title_graphic">
+		グラフィックプリセットをロード
+	</string>
+	<string name="title_camera">
+		カメラプリセットをロード
+	</string>
+	<text name="Preset">
+		プリセットを選択
+	</text>
+	<button label="OK" name="ok"/>
+	<button label="取り消し" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
index c59a3dc0ab..2edb3c624c 100644
--- a/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/ja/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
 	<string name="OutboxInitializing">
 		初期化中...
 	</string>
-	<panel label="">
-		<panel>
+	<panel label="" name="panel_1">
+		<panel name="panel_2">
 			<panel name="outbox_inventory_placeholder_panel">
 				<text name="outbox_inventory_placeholder_title">
 					ロード中...
 				</text>
 			</panel>
 		</panel>
-		<panel>
+		<panel name="panel_3">
+			<panel name="outbox_generic_drag_target">
+				<text name="text_1">
+					ここにアイテムをドラッグして、フォルダを作成する
+				</text>
+			</panel>
 			<button label="マーケットプレイスに送信" name="outbox_import_btn" tool_tip="自分のマーケットプレイス店頭に移動"/>
 		</panel>
 	</panel>
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 942cc91317..108892dd6d 100644
--- a/indra/newview/skins/default/xui/ja/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ja/floater_model_preview.xml
@@ -55,6 +55,9 @@
 	<string name="mesh_status_invalid_material_list">
 		LOD 付きの材料は参考モデルのサブセットではありません。
 	</string>
+	<string name="phys_status_vertex_limit_exceeded">
+		一部の物理的な外殻構造が頂点の制限を超えます。
+	</string>
 	<string name="layer_all">
 		全て
 	</string>
@@ -93,52 +96,52 @@
 				<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="生成"/>
+					<item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
+					<item label="生成" 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="エラーしきい値"/>
+					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
+					<item label="エラーしきい値" 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 を使用"/>
+					<item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
+					<item label="生成" name="Generate" value="生成"/>
+					<item label="上記の LoD を使用" 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="エラーしきい値"/>
+					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
+					<item label="エラーしきい値" 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 を使用"/>
+					<item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
+					<item label="生成" name="Generate" value="生成"/>
+					<item label="上記の LoD を使用" 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="エラーしきい値"/>
+					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
+					<item label="エラーしきい値" 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 を使用"/>
+					<item label="ファイルからロード" name="Load from file" value="ファイルからロード"/>
+					<item label="生成" name="Generate" value="生成"/>
+					<item label="上記の LoD を使用" 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="エラーしきい値"/>
+					<item label="三角形の限度数" name="Triangle Limit" value="三角形の限度数"/>
+					<item label="エラーしきい値" name="Error Threshold" value="エラーしきい値"/>
 				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000..feac052d6c
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="通知">
+	<floater.string name="system_tab_title">
+		システム ([COUNT])
+	</floater.string>
+	<floater.string name="transactions_tab_title">
+		取引 ([COUNT])
+	</floater.string>
+	<floater.string name="group_invitations_tab_title">
+		招待 ([COUNT])
+	</floater.string>
+	<floater.string name="group_notices_tab_title">
+		グループ ([COUNT])
+	</floater.string>
+	<string name="title_notification_tabbed_window">
+		通知
+	</string>
+	<layout_stack name="TabButtonsStack">
+		<layout_panel name="TabButtonsLayoutPanel">
+			<tab_container name="notifications_tab_container">
+				<panel label="システム (0)" name="system_notification_list_tab"/>
+				<panel label="取引 (0)" name="transaction_notifications_tab"/>
+				<panel label="招待 (0)" name="group_invite_notifications_tab"/>
+				<panel label="グループ (0)" name="group_notice_notifications_tab"/>
+			</tab_container>
+			<layout_stack name="ButtonsStack">
+				<layout_panel name="CondenseAllButtonPanel">
+					<button label="全て折り畳む" name="collapse_all_button"/>
+				</layout_panel>
+				<layout_panel name="GapLayoutPanel">
+					<panel label="ギャップパネル" name="GapPanel"/>
+				</layout_panel>
+				<layout_panel name="DeleteAllButtonPanel">
+					<button label="全て削除" name="delete_all_button"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</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
index ada96b5b62..0e72b40dc6 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
 	<floater.string name="character_owner_group">
 		[group]
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_chars_main">
 		<scroll_list name="objects_scroll_list">
 			<scroll_list.columns label="名前" name="name"/>
 			<scroll_list.columns label="説明" name="description"/>
@@ -36,15 +36,15 @@
 			<scroll_list.columns label="高度" name="altitude"/>
 		</scroll_list>
 		<text name="messaging_status">
-			キャラクター:
+			キャラクター：
 		</text>
-		<button label="リストを更新" name="refresh_objects_list"/>
+		<button label="リスト更新" name="refresh_objects_list"/>
 		<button label="すべて選択" name="select_all_objects"/>
 		<button label="何も選択しない" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_chars_actions">
 		<text name="actions_label">
-			選択したキャラクターに対するアクション:
+			選択したキャラクターに対するアクション：
 		</text>
 		<check_box label="ビーコンを表示" name="show_beacon"/>
 		<check_box label="物理効果カプセルを表示" name="show_physics_capsule"/>
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
index ec107f3e6b..d531d588f7 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
 	<floater.string name="pathing_error">
 		パスの生成中にエラーが発生しました。
 	</floater.string>
+	<panel name="pathfinding_console_main">
+		<text name="viewer_status_label">
+			ビューワステータス
+		</text>
+	</panel>
+	<panel name="pathfinding_console_simulator">
+		<text name="simulator_status_label">
+			シミュレータステータス
+		</text>
+	</panel>
 	<tab_container name="view_test_tab_container">
 		<panel label="表示" name="view_panel">
 			<text name="show_label">
diff --git a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
index 4441d5e738..b65207a025 100644
--- a/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
 	<floater.string name="linkset_choose_use">
 		リンクセットの用途を選択...
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_linksets_main">
+		<text name="linksets_filter_label">
+			フィルター：
+		</text>
+		<text name="linksets_name_label">
+			名前
+		</text>
+		<text name="linksets_desc_label">
+			説明
+		</text>
 		<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"/>
@@ -103,8 +112,8 @@
 		<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="name"/>
+			<scroll_list.columns label="説明 (ルートプリム)" name="description"/>
 			<scroll_list.columns label="所有者" name="owner"/>
 			<scroll_list.columns label="スクリプト" name="scripted"/>
 			<scroll_list.columns label="負荷" name="land_impact"/>
@@ -116,13 +125,16 @@
 			<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>
+	<panel name="pathfinding_linksets_actions">
+		<text name="linksets_actions_label">
+			選択したリンクセットに対するアクション (リンクセットがワールドから削除されると、その属性が失われる場合があります)：
+		</text>
 		<check_box label="ビーコンを表示" name="show_beacon"/>
 		<button label="取る" name="take_objects"/>
 		<button label="コピーを取る" name="take_copy_objects"/>
@@ -130,9 +142,12 @@
 		<button label="返却" name="return_objects"/>
 		<button label="削除" name="delete_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_attributes">
+		<text name="linksets_attributes_label">
+			選択したリンクセットの属性を編集し、ボタンを押して変更を適用します
+		</text>
 		<text name="walkability_coefficients_label">
-			歩行可能性:
+			歩行可能性：
 		</text>
 		<text name="edit_a_label">
 			A
diff --git a/indra/newview/skins/default/xui/ja/floater_perms_default.xml b/indra/newview/skins/default/xui/ja/floater_perms_default.xml
index 1eac6b9e35..0dfc75014e 100644
--- a/indra/newview/skins/default/xui/ja/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/ja/floater_perms_default.xml
@@ -1,6 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perms default" title="デフォルトの作成権限">
-	<panel label="デフォルト権限" name="default permissions"/>
+	<panel label="デフォルト権限" name="default permissions">
+		<text name="label_1">
+			次の所有者：
+		</text>
+		<text name="label_2">
+			コピー
+		</text>
+		<text name="label_3">
+			修正
+		</text>
+		<text name="label_4">
+			再販・プレゼント
+		</text>
+		<text name="label_5">
+			グループで共同管理
+		</text>
+		<text name="label_6">
+			誰に対してもコピーを許可
+		</text>
+		<text name="label_7" tool_tip="オブジェクトを作成するときにデフォルトの権限を設定する">
+			オブジェクト
+		</text>
+		<text name="label_8" tool_tip="アップロードしたアイテムにデフォルトの権限を設定する">
+			アップロード
+		</text>
+		<text name="label_9" tool_tip="スクリプトを作成するときにデフォルトの権限を設定する">
+			スクリプト
+		</text>
+		<text name="label_10" tool_tip="ノートカードを作成するときにデフォルトの権限を設定する">
+			ノートカード
+		</text>
+		<text name="label_11" tool_tip="ジェスチャーを作成するときにデフォルトの権限を設定する">
+			ジェスチャー
+		</text>
+		<text name="label_12" tool_tip="衣服またはボディパーツを作成するときにデフォルトの権限を設定する">
+			着用物
+		</text>
+	</panel>
 	<button label="OK" label_selected="OK" name="ok"/>
 	<button label="取り消し" label_selected="取り消し" name="cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000..a95c45c275
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="詳細グラフィックス設定">
+	<text name="GeneralText">
+		全般
+	</text>
+	<slider label="描画距離：" name="DrawDistance"/>
+	<text name="DrawDistanceMeterText2">
+		m
+	</text>
+	<slider label="最大パーティクル数：" name="MaxParticleCount"/>
+	<slider label="ポストプロセス品質：" name="RenderPostProcess"/>
+	<text name="PostProcessText">
+		低
+	</text>
+	<text name="AvatarText">
+		アバター
+	</text>
+	<slider label="最大の複雑さ：" name="IndirectMaxComplexity" tool_tip="どの時点で複雑な表示のアバターをベタ色の人形として表示するかを管理します"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
+	<slider label="簡略化せずに描画する最大数：" name="IndirectMaxNonImpostors"/>
+	<text name="IndirectMaxNonImpostorsText">
+		0
+	</text>
+	<slider label="詳細：" name="AvatarMeshDetail"/>
+	<text name="AvatarMeshDetailText">
+		低
+	</text>
+	<slider label="物理演算：" name="AvatarPhysicsDetail"/>
+	<text name="AvatarPhysicsDetailText">
+		低
+	</text>
+	<text name="ShadersText">
+		ハードウェア
+	</text>
+	<slider label="テクスチャメモリ (MB)：" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てられたメモリの量。ビデオカードのメモリに既定。数値を下げるとパフォーマンスが向上しますが、テクスチャの精度が落ちることがあります。"/>
+	<slider label="フォグの距離比率：" name="fog"/>
+	<slider label="ガンマ：" name="gamma"/>
+	<text name="(brightness, lower is brighter)">
+		(0 でデフォルト、低いほど明るい)
+	</text>
+	<check_box label="異方的フィルタリング (有効にすると速度が低下)" name="ani"/>
+	<check_box initial_value="true" label="OpenGL Vertex Buffer Objects を有効化" name="vbo" tool_tip="最新のハードウェアでこのオプションを有効にするとパフォーマンスが向上します。ただし、古いハードウェアでは VBO の実装が貧弱なため、このオプションを有効にするとクラッシュする場合があります。"/>
+	<check_box initial_value="true" label="テクスチャ圧縮の有効化 (再起動後に反映)" name="texture compression" tool_tip="ビデオメモリでテクスチャを圧縮すると、一部のカラー品質を犠牲にして、高解像度のテクスチャをロードできます。"/>
+	<text name="antialiasing label">
+		アンチエイリアシング：
+	</text>
+	<combo_box label="アンチエイリアシング" name="fsaa">
+		<combo_box.item label="無効" name="FSAADisabled"/>
+		<combo_box.item label="2x" name="2x"/>
+		<combo_box.item label="4x" name="4x"/>
+		<combo_box.item label="8x" name="8x"/>
+		<combo_box.item label="16x" name="16x"/>
+	</combo_box>
+	<text name="antialiasing restart">
+		(再起動後に反映)
+	</text>
+	<slider label="地形のメッシュの詳細：" name="TerrainMeshDetail"/>
+	<text name="TerrainMeshDetailText">
+		低
+	</text>
+	<slider label="木：" name="TreeMeshDetail"/>
+	<text name="TreeMeshDetailText">
+		低
+	</text>
+	<slider label="オブジェクト：" name="ObjectMeshDetail"/>
+	<text name="ObjectMeshDetailText">
+		低
+	</text>
+	<slider label="フレキシプリム：" name="FlexibleMeshDetail"/>
+	<text name="FlexibleMeshDetailText">
+		低
+	</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="このオプションを無効にすると、グラフィックカードのドライバの種類によっては、クラッシュするのを防ぎます。"/>
+	<slider label="地形詳細：" name="TerrainDetail"/>
+	<text name="TerrainDetailText">
+		低
+	</text>
+	<check_box initial_value="true" label="アバターハードウェアスキﾆﾝｸﾞ" name="AvatarVertexProgram"/>
+	<check_box initial_value="true" label="アバターの布" name="AvatarCloth"/>
+	<text name="ReflectionsText">
+		水の反射：
+	</text>
+	<combo_box name="Reflections">
+		<combo_box.item label="最小" name="0"/>
+		<combo_box.item label="地形と樹木" name="1"/>
+		<combo_box.item label="すべての静止オブジェクト" name="2"/>
+		<combo_box.item label="すべてのアバターとオブジェクト" name="3"/>
+		<combo_box.item label="すべて" name="4"/>
+	</combo_box>
+	<check_box initial_value="true" label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders"/>
+	<slider label="空：" name="SkyMeshDetail"/>
+	<text name="SkyMeshDetailText">
+		低
+	</text>
+	<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="RenderShadowDetailText">
+		影：
+	</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>
+	<button label="推奨設定にリセット" name="Defaults"/>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
+	<check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
new file mode 100644
index 0000000000..cdc67b3148
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="優先プリセットを保存">
+	<string name="title_graphic">
+		グラフィックプリセットを保存
+	</string>
+	<string name="title_camera">
+		カメラプリセットを保存
+	</string>
+	<text name="Preset">
+		プリセットの名前を入力するか、既存のプリセットを選択します。
+	</text>
+	<button label="保存" name="save"/>
+	<button label="取り消し" name="cancel"/>
+</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
index febe153d25..81bfbe15f5 100644
--- a/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/ja/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_import" title="辞書をインポート">
+	<text name="import_dict">
+		辞書：
+	</text>
 	<button label="参照" label_selected="参照" name="dictionary_path_browse"/>
+	<text name="import_name">
+		名前：
+	</text>
+	<text name="import_lang">
+		言語：
+	</text>
 	<button label="インポート" name="ok_btn"/>
 	<button label="取り消し" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_tos.xml b/indra/newview/skins/default/xui/ja/floater_tos.xml
index ae064724c0..dc7165b1ed 100644
--- a/indra/newview/skins/default/xui/ja/floater_tos.xml
+++ b/indra/newview/skins/default/xui/ja/floater_tos.xml
@@ -12,4 +12,7 @@
 	<text name="tos_heading">
 		次の利用規約とプライバシーポリシーをよくお読みください。 [SECOND_LIFE] へのログインを続けるには、規約に同意する必要があります。
 	</text>
+	<text name="external_tos_required">
+		操作を続けるには、my.secondlife.com に移動して、ログインし、利用規約を承諾する必要があります。ありがとうございました。
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
index 930af10692..7705dd9090 100644
--- a/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_attachment_other.xml
@@ -15,5 +15,8 @@
 	<menu_item_call label="ズームイン" name="Zoom In"/>
 	<menu_item_call label="支払う" name="Pay..."/>
 	<menu_item_call label="オブジェクトのプロフィール" name="Object Inspect"/>
+	<menu_item_check label="通常表示" name="RenderNormally"/>
+	<menu_item_check label="表示しない" name="DoNotRender"/>
+	<menu_item_check label="完全表示" name="AlwaysRenderFully"/>
 	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
index f9cadc36ac..482f2bdaa5 100644
--- a/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ja/menu_avatar_other.xml
@@ -14,5 +14,8 @@
 	<menu_item_call label="ダンプ XML" name="Dump XML"/>
 	<menu_item_call label="ズームイン" name="Zoom In"/>
 	<menu_item_call label="支払う" name="Pay..."/>
+	<menu_item_check label="通常表示" name="RenderNormally"/>
+	<menu_item_check label="表示しない" name="DoNotRender"/>
+	<menu_item_check label="完全表示" name="AlwaysRenderFully"/>
 	<menu_item_call label="パーティクル所有者をブロック" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_login.xml b/indra/newview/skins/default/xui/ja/menu_login.xml
index cd8bd52f91..abf7bce067 100644
--- a/indra/newview/skins/default/xui/ja/menu_login.xml
+++ b/indra/newview/skins/default/xui/ja/menu_login.xml
@@ -15,6 +15,7 @@
 		<menu_item_call label="[SECOND_LIFE] ブログ" name="Second Life Blogs"/>
 		<menu_item_call label="バグを報告する" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
+		<menu_item_call label="アップデートを確認" name="Check for Updates"/>
 	</menu>
 	<menu_item_check label="デバッグメニューを表示する" name="Show Debug Menu"/>
 	<menu label="デバッグ" name="Debug">
diff --git a/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
index ad36aa3f77..bf38075556 100644
--- a/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/ja/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_marketplace_sort">
+	<menu_item_check label="名前による並べ替え" name="sort_by_name"/>
+	<menu_item_check label="新しい順に並べ替え" name="sort_by_recent"/>
 	<menu_item_check label="在庫高順に並べ替え (低から高へ)" name="sort_by_stock_amount"/>
 	<menu_item_check label="リストフォルダのみ表示" name="show_only_listing_folders"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_url_email.xml b/indra/newview/skins/default/xui/ja/menu_url_email.xml
new file mode 100644
index 0000000000..6c41d759fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+	<menu_item_call label="外部クライアントで電子メールを作成" name="email_open_external"/>
+	<menu_item_call label="電子メールをクリップボードにコピー" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ja/menu_viewer.xml b/indra/newview/skins/default/xui/ja/menu_viewer.xml
index 0384dc1efc..3c2e294868 100644
--- a/indra/newview/skins/default/xui/ja/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ja/menu_viewer.xml
@@ -180,6 +180,7 @@
 		<menu_item_call label="バグを報告する" name="Report Bug"/>
 		<menu_item_call label="衝突・プッシュ・打撃" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu_item_call label="[APP_NAME] について" name="About Second Life"/>
+		<menu_item_call label="アップデートを確認" name="Check for Updates"/>
 	</menu>
 	<menu label="アドバンス" name="Advanced">
 		<menu_item_call label="テクスチャのリベークをする" name="Rebake Texture"/>
@@ -193,7 +194,7 @@
 			<menu_item_call label="ラグ計測器" name="Lag Meter"/>
 			<menu_item_check label="統計バー" name="Statistics Bar"/>
 			<menu_item_call label="シーン ロード統計情報" name="Scene Load Statistics"/>
-			<menu_item_check label="アバターの描画ウェイトを表示" name="Avatar Rendering Cost"/>
+			<menu_item_check label="アバターの複雑さ情報を表示" name="Avatar Draw Info"/>
 		</menu>
 		<menu label="ハイライトと目に見えるもの" name="Highlighting and Visibility">
 			<menu_item_check label="チージービーコン" name="Cheesy Beacon"/>
@@ -316,8 +317,6 @@
 			<menu_item_check label="ジョイント" name="Joints"/>
 			<menu_item_check label="レイキャスト" name="Raycast"/>
 			<menu_item_check label="風のベクトル" name="Wind Vectors"/>
-			<menu_item_check label="描画の詳細度" name="rendercomplexity"/>
-			<menu_item_check label="添付アイテムのバイト数" name="attachment bytes"/>
 			<menu_item_check label="スカルプト" name="Sculpt"/>
 			<menu label="テクスチャの密度" name="Texture Density">
 				<menu_item_check label="なし" name="None"/>
@@ -423,13 +422,11 @@
 			<menu_item_check label="キャラクター Vis のデバッグ" name="Debug Character Vis"/>
 			<menu_item_check label="骨組みの衝突判定を表示する" name="Show Collision Skeleton"/>
 			<menu_item_check label="エージェントのターゲットを表示する" name="Display Agent Target"/>
-			--&gt;
 			<menu_item_call label="アタッチメントをダンプ" name="Dump Attachments"/>
 			<menu_item_call label="アバターテクスチャをデバッグ" name="Debug Avatar Textures"/>
 			<menu_item_call label="ローカルテクスチャをダンプ" name="Dump Local Textures"/>
 		</menu>
 		<menu_item_check label="HTTP Texture" name="HTTP Textures"/>
-		<menu_item_check label="HTTP インベントリ" name="HTTP Inventory"/>
 		<menu_item_call label="圧縮画像" name="Compress Images"/>
 		<menu_item_call label="Visual Leak Detector を有効にする" name="Enable Visual Leak Detector"/>
 		<menu_item_check label="デバッグ用のミニダンプを出力する" name="Output Debug Minidump"/>
diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml
index 5f0ce7a73b..b97899bb9b 100644
--- a/indra/newview/skins/default/xui/ja/notifications.xml
+++ b/indra/newview/skins/default/xui/ja/notifications.xml
@@ -163,6 +163,10 @@
 &apos;[ERROR_CODE]&apos;
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="MerchantForceValidateListing">
+		リストを作成するために、リストするコンテンツの階層を固定しました。
+		<usetemplate ignoretext="リストの作成によりコンテンツの階層が修正されることを警告する" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmMerchantActiveChange">
 		この操作により、このリストの有効な内容が変更されます。続けますか？
 		<usetemplate ignoretext="マーケットプレイスで有効なリストを変更する前に確認する" name="okcancelignore" notext="取り消し" yestext="OK"/>
@@ -210,6 +214,10 @@
 		在庫が空のため、リストを削除しました。もう一度リストを表示するには、在庫フォルダにユニットを追加する必要があります。
 		<usetemplate ignoretext="在庫フォルダが空のためにリストが表示されないと警告が表示されます" name="okignore" yestext="OK"/>
 	</notification>
+	<notification name="AlertMerchantVersionFolderEmpty">
+		バージョンフォルダが空のため、リストを削除しました。もう一度リストを表示するには、バージョンフォルダにアイテムを追加する必要があります。
+		<usetemplate ignoretext="バージョンフォルダが空のためにリストが表示されないと警告が表示されます" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		次の理由で、スクリプト用テキストのアップロード時に問題が起こりました。
 [REASON]
@@ -331,6 +339,14 @@
 		[COUNT] 名のメンバーをグループから追放しようとしています。
 		<usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="取り消し" yestext="追放"/>
 	</notification>
+	<notification name="BanGroupMemberWarning">
+		[AVATAR_NAME] をグループから追放しようとしています。
+		<usetemplate ignoretext="グループからの参加者の追放を確認します" name="okcancelignore" notext="取り消し" yestext="禁止"/>
+	</notification>
+	<notification name="BanGroupMembersWarning">
+		[COUNT] 名のメンバーをグループから追放しようとしています。
+		<usetemplate ignoretext="グループからの複数のメンバーの追放を確認します" name="okcancelignore" notext="取り消し" yestext="禁止"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		アタッチメントを下に置こうとしています。
 続けますか？
@@ -425,7 +441,7 @@ L$ が不足しているのでこのグループに参加することができ�
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
 	<notification name="ReturnAllTopObjects">
-		全てのリストされたオブジェクトを所有者に本当に返却しますか？
+		リストされた全てのオブジェクトを所有者の持ち物に戻しますか?これによりすべてのスクリプト化されたオブジェクトがリージョンに戻ります!
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="OK"/>
 	</notification>
 	<notification name="DisableAllTopObjects">
@@ -631,6 +647,10 @@ L$ が不足しているのでこのグループに参加することができ�
 	<notification name="CannotDownloadFile">
 		ファイルをダウンロードできません。
 	</notification>
+	<notification label="" name="MediaFileDownloadUnsupported">
+		[SECOND_LIFE] でサポートされていないファイルのダウンロードを要求しました。
+		<usetemplate ignoretext="サポートされていないファイルのダウンロードを警告する" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CannotWriteFile">
 		ファイル [[FILE]] を書き込めません。
 	</notification>
@@ -1139,8 +1159,9 @@ L$ は返金されません。
 通常これは一時的なエラーです。 数分後にもう一度着用物をカスタマイズ・保存してください。
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		しまった、 [SECOND_LIFE] からログアウトされてしまいました。
-            [MESSAGE]
+		しまった、[SECOND_LIFE] からログアウトされてしまいました。
+
+[MESSAGE]
 		<usetemplate name="okcancelbuttons" notext="終了" yestext="IMとチャットを表示"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
@@ -1390,6 +1411,13 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries を参照してく
 			<ignore name="ignore" text="衣類がダウンロードされるまで時間がかかっているとき"/>
 		</form>
 	</notification>
+	<notification name="RegionAndAgentComplexity">
+		ご使用の [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 表示の複雑さ] は [AGENT_COMPLEXITY] です。
+[OVERLIMIT_MSG]
+	</notification>
+	<notification name="AgentComplexity">
+		ご使用の [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 表示の複雑さ] は [AGENT_COMPLEXITY] です。
+	</notification>
 	<notification name="FirstRun">
 		[APP_NAME] のインストールが完了しました。
 
@@ -1669,6 +1697,25 @@ http://secondlife.com/download から最新バージョンをダウンロード�
 [[INFO_URL] このアップデートに関する情報] を参照
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="UpdateDownloadInProgress">
+		アップデートを利用できます。
+バックグラウンドでアップデートをダウンロードしています。準備ができ次第、インストールを完了するために、ビューワを再起動するように求めるメッセージが表示されます。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateDownloadComplete">
+		アップデートがダウンロードされました。再起動中にインストールされます。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateCheckError">
+		アップデートの確認中にエラーが発生しました。
+あとでもう一度お試しください。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateViewerUpToDate">
+		ご利用のビューワは最新です!
+最新の機能と修正を今すぐ試したい場合は、代替ビューワページ (http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers) をチェックしてください。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="DeedObjectToGroup">
 		このオブジェクトを譲渡するとグループは以下のことが可能です：
 * オブジェクトに支払われた L$ を受領します。
@@ -1776,6 +1823,14 @@ http://secondlife.com/download から最新バージョンをダウンロード�
 		加入できるグループの最大限に達しました。 新しくグループに参加、または作成する前に、どれかグループから抜けてください。
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="GroupLimitInfo">
+		ベースアカウントのグループ制限は [MAX_BASIC]、[https://secondlife.com/premium/ プレミアム] アカウントの
+グループ制限は [MAX_PREMIUM] です。
+アカウントをダウングレードした場合、さらにグループに参加する前に、下の [MAX_BASIC] グループ制限を取得する必要があります。
+
+[https://secondlife.com/my/account/membership.php 今すぐアップグレード!]
+		<usetemplate name="okbutton" yestext="閉じる"/>
+	</notification>
 	<notification name="KickUser">
 		どのようなメッセージを添えてこの住人を追い出しますか？
 		<form name="form">
@@ -1973,11 +2028,11 @@ http://wiki.secondlife.com/wiki/Setting_your_display_name を参照してくだ�
 		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
 	</notification>
 	<notification label="不動産を選択" name="EstateTrustedExperienceAdd">
-		この不動産のキー体験リストにのみ追加しますか、それとも [ALL_ESTATES] のキー体験リストに追加しますか?
+		この不動産のキー リストにのみ追加しますか、それとも [ALL_ESTATES] のキー リストに追加しますか?
 		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
 	</notification>
 	<notification label="不動産を選択" name="EstateTrustedExperienceRemove">
-		この不動産の信頼済み体験リストからのみ削除しますか、それとも [ALL_ESTATES] の信頼済みリストから削除しますか?
+		この不動産のキーリストからのみ削除しますか、それとも [ALL_ESTATES] のキーリストから削除しますか?
 		<usetemplate canceltext="取り消し" name="yesnocancelbuttons" notext="すべての不動産" yestext="この不動産"/>
 	</notification>
 	<notification label="キックを確認" name="EstateKickUser">
@@ -2291,6 +2346,10 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します�
 		L$[AMOUNT] を [TARGET] に支払うことを確認してください。
 		<usetemplate ignoretext="支払い前に確認 (合計金額が L$200 以上の場合)" name="okcancelignore" notext="取り消し" yestext="支払い"/>
 	</notification>
+	<notification name="PayObjectFailed">
+		支払いが失敗しました： オブジェクトが見つかりませんでした。
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="OpenObjectCannotCopy">
 		このオブジェクトには、あなたがコピーできるアイテムはありません。
 	</notification>
@@ -2322,10 +2381,9 @@ L$ [AMOUNT] で、このクラシファイド広告を今すぐ公開します�
 		[QUESTION]
 		<usetemplate ignoretext="アイテムを削除する前の確認" name="okcancelignore" notext="取り消し" yestext="OK"/>
 	</notification>
-	<notification name="HelpReportAbuseEmailLL">
-		このツールを利用して [http://secondlife.com/corporate/tos.php 利用規約] や [http://jp.secondlife.com/corporate/cs.php コミュニティスタンダード] の違反を報告してください。
-
-報告された嫌がらせはすべて調査・解決されます。
+	<notification name="ConfirmUnlink">
+		これは、リンクセットによる広範囲の選択です。リンクを解除すると、もう一度リンクできなくなる可能性があります。そのような場合に備えて、リンクセットを自分の持ち物にコピーできます。
+		<usetemplate ignoretext="リンクセットのリンクを解除するときに確認する" name="okcancelignore" notext="取り消し" yestext="リンクを外す"/>
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		嫌がらせ報告のカテゴリを選択してください。
@@ -3034,7 +3092,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		所有者のレーティング区分より高いレーティング区分の体験を設定できません。
 	</notification>
 	<notification name="RestrictedTermExperienceProfileMessage">
-		次の条件により、体験プロフィール名および説明の更新ができませんでした: [extra_info]
+		次の条件により、体験プロフィール名および説明の更新ができませんでした： [extra_info]
 	</notification>
 	<notification name="TeleportedHomeExperienceRemoved">
 		体験 secondlife:///app/experience/[public_id]/profile を削除するために、[region_name] リージョンからテレポートされ、このリージョンに入ることはできなくなりました。
@@ -3049,7 +3107,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 		</form>
 	</notification>
 	<notification name="TrustedExperiencesAvailable">
-		この目的地へのアクセス権がありません。下の体験を受け入れることにより、このリージョンに入ることができます:
+		この目的地へのアクセス権がありません。下の体験を受け入れることにより、このリージョンに入ることができます：
 
 [EXPERIENCE_LIST]
 
@@ -3058,7 +3116,7 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 	<notification name="ExperienceEvent">
 		[EventType] by the secondlife:///app/experience/[public_id]/profile experience により、オブジェクトでアクション ([EventType]) を実行することが許可されました。
 所有者：secondlife:///app/agent/[OwnerID]/inspect
-オブジェクト名:[ObjectName]
+オブジェクト名：[ObjectName]
 区画名：[ParcelName]
 	</notification>
 	<notification name="ExperienceEventAttachment">
@@ -3072,9 +3130,9 @@ Web ページにリンクすると、他人がこの場所に簡単にアクセ�
 
 権限が許可されると、体験プロフィールから呼び出さない限り、この体験にこのメッセージが再び表示されることはありません。
 
-この体験に関連付けられたスクリプトにより、この体験が有効なリージョンで以下のことを実行できます: 
+この体験に関連付けられたスクリプトにより、この体験が有効なリージョンで以下のことを実行できます：  
 
-[QUESTIONS]よろしいですか？
+[QUESTIONS] よろしいですか？
 		<form name="form">
 			<button name="BlockExperience" text="体験をブロック"/>
 			<button name="Mute" text="オブジェクトをブロックする"/>
@@ -3256,6 +3314,12 @@ M キーを押して変更します。
 	<notification name="AttachmentSaved">
 		アタッチメントが保存されました。
 	</notification>
+	<notification name="PresetNotSaved">
+		プリセット [NAME] の保存中にエラーが発生しました。
+	</notification>
+	<notification name="PresetNotDeleted">
+		プリセット [NAME] の削除中にエラーが発生しました。
+	</notification>
 	<notification name="UnableToFindHelpTopic">
 		ヘルプトピックが見つかりませんでした。
 	</notification>
@@ -3288,9 +3352,8 @@ M キーを押して変更します。
 		共有する住人を選択します。
 	</notification>
 	<notification name="MeshUploadError">
-		[LABEL] をアップロードできませんでした：[MESSAGE] [IDENTIFIER] 
-
-詳細についてはログをご覧ください。
+		[LABEL] をアップロードできませんでした：[MESSAGE] [IDENTIFIER]
+[DETAILS] 詳しくは、SecondLife.log をご覧ください。
 	</notification>
 	<notification name="MeshUploadPermError">
 		メッシュのアップロード許可をリクエスト中にエラーが発生しました。
diff --git a/indra/newview/skins/default/xui/ja/panel_experience_log.xml b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
index 39e0e27b05..16976df035 100644
--- a/indra/newview/skins/default/xui/ja/panel_experience_log.xml
+++ b/indra/newview/skins/default/xui/ja/panel_experience_log.xml
@@ -15,7 +15,7 @@
 			<button label="報告" name="btn_report_xp"/>
 		</layout_panel>
 		<layout_panel name="button_panel">
-			<check_box label="すべてのイベントを通知   日数" name="notify_all"/>
+			<check_box label="すべてのイベント   日数を通知" name="notify_all"/>
 			<button label="クリア" name="btn_clear"/>
 			<button label="&lt;" name="btn_prev"/>
 			<button label="&gt;" name="btn_next"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
index f908262f4f..1e7c260061 100644
--- a/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_main_inventory.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="もの" name="main inventory panel">
 	<panel.string name="ItemcountFetching">
 		[ITEM_COUNT] 個のアイテムを取得中です... [FILTER]
@@ -6,6 +6,9 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] 個のアイテム　[FILTER]
 	</panel.string>
+	<panel.string name="ItemcountUnknown">
+		[ITEM_COUNT] 個の取得アイテム　[FILTER]
+	</panel.string>
 	<text name="ItemcountText">
 		アイテム：
 	</text>
@@ -16,7 +19,7 @@
 	</tab_container>
 	<layout_stack name="bottom_panel">
 		<layout_panel name="options_gear_btn_panel">
-			<button name="options_gear_btn" tool_tip="オプションを表示します"/>
+			<menu_button name="options_gear_btn" tool_tip="オプションを表示します"/>
 		</layout_panel>
 		<layout_panel name="add_btn_panel">
 			<button name="add_btn" tool_tip="新しいアイテムを追加します"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_people.xml b/indra/newview/skins/default/xui/ja/panel_people.xml
index dd8fd41681..5fc4b57a08 100644
--- a/indra/newview/skins/default/xui/ja/panel_people.xml
+++ b/indra/newview/skins/default/xui/ja/panel_people.xml
@@ -18,6 +18,7 @@
 	<string name="no_groups_msg" value="グループをお探しですか？ [secondlife:///app/search/groups 検索] をお試しください。"/>
 	<string name="MiniMapToolTipMsg" value="[地域]（ダブルクリックで地図を開く。Shift‐ドラッグで水平・垂直移動）"/>
 	<string name="AltMiniMapToolTipMsg" value="[地域]（ダブルクリックでテレポート。Shift‐ドラッグで水平・垂直移動）"/>
+	<string name="GroupCountWithInfo" value="あなたは [COUNT] グループに属しているので、まだ [REMAINING] 参加できます。[secondlife:/// 詳細]"/>
 	<tab_container name="tabs">
 		<panel label="近く" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
index 6e8797ec5e..62b8daeb4e 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
 	<check_box label="複数のビューワを許可" name="allow_multiple_viewer_check"/>
 	<check_box label="ログイン時にグリッド選択を表示" name="show_grid_selection_check"/>
 	<check_box label="アドバンスメニューを表示" name="show_advanced_menu_check"/>
-	<check_box label="デベロッパーメニューを表示" name="show_develop_menu_check"/>
+	<check_box label="開発メニューを表示" name="show_develop_menu_check"/>
 	<button label="デフォルト作成許可" name="default_creation_permissions"/>
 </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 1c3204ea04..1473281502 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
 		<check_box label="インベントリを送る" name="inventory_offer"/>
 	</panel>
 	<panel name="log_settings">
+		<text name="logging_label">
+			保存：
+		</text>
+		<combo_box name="conversation_log_combo">
+			<item label="ログおよびテキストチャット" name="log_and_transcripts" value="2"/>
+			<item label="ログのみ" name="log_only" value="1"/>
+			<item label="ログまたはテキストチャットなし" name="no_log_or_transcript" value="0"/>
+		</combo_box>
 		<button label="ログを消去..." name="clear_log"/>
 		<button label="テキストチャットを削除..." name="delete_transcripts"/>
+		<text name="log_location_label">
+			場所：
+		</text>
 		<button label="参照..." label_selected="参照" name="log_path_button"/>
 	</panel>
 	<button label="他の言語..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
index 39bc05c845..e2b74354fa 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_general.xml
@@ -6,12 +6,12 @@
 	<combo_box name="language_combobox">
 		<combo_box.item label="システムデフォルト" name="System Default Language"/>
 		<combo_box.item label="English （英語）" name="English"/>
-		<combo_box.item label="Dansk （デンマーク語） – ベータ" name="Danish"/>
+		<combo_box.item label="Dansk (デンマーク語) - ベータ" name="Danish"/>
 		<combo_box.item label="Deutsch （ドイツ語） – ベータ" name="Deutsch(German)"/>
 		<combo_box.item label="Español （スペイン語） – ベータ" name="Spanish"/>
 		<combo_box.item label="Français （フランス語） – ベータ" name="French"/>
 		<combo_box.item label="Italiano （イタリア語） - ベータ" name="Italian"/>
-		<combo_box.item label="Polski （ポーランド語） - ベータ" name="Polish"/>
+		<combo_box.item label="Polski (ポーランド語) - ベータ" name="Polish"/>
 		<combo_box.item label="Português（ポルトガル語） - ベータ" name="Portugese"/>
 		<combo_box.item label="Русский （ロシア語） - ベータ" name="Russian"/>
 		<combo_box.item label="Türkçe （トルコ語） - ベータ" name="Turkish"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
index 15017e330e..8fbe9b56b9 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="表示" name="Display panel">
+	<text name="preset_text">
+		(なし)
+	</text>
 	<text name="QualitySpeed">
 		クオリティとスピード：
 	</text>
-	<text name="FasterText">
-		速い
-	</text>
-	<text name="BetterText">
-		遅い
-	</text>
 	<text name="ShadersPrefText">
 		低
 	</text>
@@ -21,94 +18,17 @@
 	<text name="ShadersPrefText4">
 		超高
 	</text>
-	<panel label="カスタムグラフィック" name="CustomGraphics Panel">
-		<text name="ShadersText">
-			シェーダー：
-		</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>
-		<combo_box initial_value="true" label="水の反射" name="Reflections">
-			<combo_box.item label="最小" name="0"/>
-			<combo_box.item label="地形と樹木" name="1"/>
-			<combo_box.item label="すべての静止オブジェクト" name="2"/>
-			<combo_box.item label="すべてのアバターとオブジェクト" name="3"/>
-			<combo_box.item label="すべて" name="4"/>
-		</combo_box>
-		<slider label="アバターの物理作用：" name="AvatarPhysicsDetail"/>
-		<text name="AvatarPhysicsDetailText">
-			低
-		</text>
-		<slider label="描画距離：" name="DrawDistance"/>
-		<text name="DrawDistanceMeterText2">
-			m
-		</text>
-		<slider label="最大パーティクル数：" name="MaxParticleCount"/>
-		<slider label="簡略化せずに描画するアバターの最大数：" name="MaxNumberAvatarDrawn"/>
-		<slider label="ポストプロセス品質：" name="RenderPostProcess"/>
-		<text name="MeshDetailText">
-			メッシュ詳細：
-		</text>
-		<slider label="  オブジェクト：" name="ObjectMeshDetail"/>
-		<slider label="  フレキシプリム：" name="FlexibleMeshDetail"/>
-		<slider label="  樹木：" name="TreeMeshDetail"/>
-		<slider label="  アバター：" name="AvatarMeshDetail"/>
-		<slider label="  地形：" name="TerrainMeshDetail"/>
-		<slider label="  空：" name="SkyMeshDetail"/>
-		<text name="PostProcessText">
-			低
-		</text>
-		<text name="ObjectMeshDetailText">
-			低
-		</text>
-		<text name="FlexibleMeshDetailText">
-			低
-		</text>
-		<text name="TreeMeshDetailText">
-			低
-		</text>
-		<text name="AvatarMeshDetailText">
-			低
-		</text>
-		<text name="TerrainMeshDetailText">
-			低
-		</text>
-		<text name="SkyMeshDetailText">
-			低
-		</text>
-		<text name="AvatarRenderingText">
-			アバターレンダリング：
-		</text>
-		<check_box initial_value="true" label="アバターの描画を簡略化" name="AvatarImpostors"/>
-		<check_box initial_value="true" label="ハードウェアスキニング" name="AvatarVertexProgram"/>
-		<check_box initial_value="true" label="アバターの布" name="AvatarCloth"/>
-		<text name="TerrainDetailText">
-			地形詳細：
-		</text>
-		<radio_group name="TerrainDetailRadio">
-			<radio_item label="低" name="0"/>
-			<radio_item label="高" name="2"/>
-		</radio_group>
-		--&gt;
-	</panel>
-	<button label="適用" label_selected="適用" name="Apply"/>
-	<button label="リセット" name="Defaults"/>
-	<button label="詳しい設定" name="Advanced"/>
-	<button label="ハードウェア" label_selected="ハードウェア" name="GraphicsHardwareButton"/>
+	<text name="FasterText">
+		速い
+	</text>
+	<text name="BetterText">
+		遅い
+	</text>
+	<check_box initial_value="true" label="周囲 (大気) シェーダー" name="WindLightUseAtmosShaders"/>
+	<check_box initial_value="true" label="高度なライティングモデル" name="UseLightShaders"/>
+	<button label="設定をプリセットとして保存..." name="PrefSaveButton"/>
+	<button label="プリセットをロード..." name="PrefLoadButton"/>
+	<button label="事前設定を削除..." name="PrefDeleteButton"/>
+	<button label="推奨設定にリセット" name="Defaults"/>
+	<button label="詳細設定..." name="AdvancedSettings"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
index c1ddf08465..be823938a2 100644
--- a/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ja/panel_preferences_setup.xml
@@ -16,19 +16,18 @@
 	</text>
 	<radio_group name="preferred_browser_behavior">
 		<radio_item label="すべてのリンクにマイ ブラウザ (Chrome、Firefox、IE) を使用" name="internal" tool_tip="デフォルトのシステム Web ブラウザでヘルプや Web リンク先などを見ます。全画面で起動中にはおすすめしません。" value="0"/>
-		<radio_item label="Second Life リンクにのみ内蔵ブラウザを使用" name="external" tool_tip="ヘルプ、Web リンクなどにはデフォルトシステムのブラウザを使用します。
-内蔵ブラウザは LindenLab/SecondLife リンクにのみ使用されます。" value="1"/>
+		<radio_item label="Second Life リンクにのみ内蔵ブラウザを使用" name="external" tool_tip="ヘルプ、Web リンクなどにはデフォルトシステムのブラウザを使用します。 内蔵ブラウザは LindenLab/SecondLife リンクにのみ使用されます。" value="1"/>
+		<radio_item label="すべてのリンクに内蔵ブラウザを使用" name="external_all" tool_tip="内蔵ブラウザでヘルプや Web リンクなどを見ます。[APP_NAME] 内に新しいウィンドウでこのブラウザが開きます。" value="2"/>
 	</radio_group>
 	<check_box initial_value="true" label="プラグインを有効にする" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Cookie を受け入れる" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Javascript を有効にする" name="browser_javascript_enabled"/>
-	<check_box initial_value="false" label="メディアブラウザのポップアップを有効にする" name="media_popup_enabled"/>
 	<text name="Software updates:">
 		ソフトウェアアップデート：
 	</text>
 	<combo_box name="updater_service_combobox">
 		<combo_box.item label="自動的にインストール" name="Install_automatically"/>
-		<combo_box.item label="手動でアップデートをダウンロード&amp;インストール" name="Install_manual"/>
+		<combo_box.item label="更新を手動でダウンロードしてインストールします" name="Install_manual"/>
 	</combo_box>
 	<check_box label="release candidate にアップグレードします" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
new file mode 100644
index 0000000000..422ed01cbb
--- /dev/null
+++ b/indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+	<text name="Graphic Presets">
+		グラフィックプリセット
+	</text>
+	<button label="グラフィックス設定を開く" name="open_prefs_btn" tool_tip="グラフィックス設定を開きます"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
index 5506373eb0..6e9d7341a0 100644
--- a/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml
@@ -39,12 +39,9 @@
 		<layout_panel name="media_address">
 			<line_editor name="media_address_url" tool_tip="メディア URL"/>
 			<layout_stack name="media_address_url_icons">
-				<layout_panel>
+				<layout_panel name="media_address_url_icons_wl">
 					<icon name="media_whitelist_flag" tool_tip="ホワイトリスト有効"/>
 				</layout_panel>
-				<layout_panel>
-					<icon name="media_secure_lock_flag" tool_tip="安全な閲覧"/>
-				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 		<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/ja/panel_region_experiences.xml b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
index f13c7bea4d..711b8e7291 100644
--- a/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/ja/panel_region_experiences.xml
@@ -3,7 +3,7 @@
 	<panel.string name="trusted_estate_text">
 		どんな体験でもキーになる可能性があります。
 
-キー体験には、この不動産で動作する権限があります。
+キー体験には、この不動産で実行する権限があります。
 
 さらに、不動産でパブリックアクセスが許可されない場合、キー体験に参加する住人は不動産に入って、キー体験にいる間滞在することができます。
 	</panel.string>
diff --git a/indra/newview/skins/default/xui/ja/panel_script_experience.xml b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
index 1c5ea2958b..eb8a510b20 100644
--- a/indra/newview/skins/default/xui/ja/panel_script_experience.xml
+++ b/indra/newview/skins/default/xui/ja/panel_script_experience.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <panel name="script_experience" title="体験">
 	<button label="体験" name="Expand Experience"/>
-	<check_box label="次の体験を使用：" name="enable_xp"/>
+	<check_box label="体験を使用" name="enable_xp"/>
 	<layout_stack name="xp_details">
 		<layout_panel>
 			<combo_box label="体験を選択..." name="Experiences..."/>
diff --git a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
index a42dd12a9c..32aeca0026 100644
--- a/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		画像をインベントリに保存するには L$[UPLOAD_COST] の費用がかかります。画像をテクスチャとして保存するには平方形式の 1 つを選択してください。
 	</text>
 	<combo_box label="解像度" name="texture_size_combo">
-		<combo_box.item label="現在のウィンドウ" name="CurrentWindow"/>
+		<combo_box.item label="現在のウィンドウ (512x512)" name="CurrentWindow"/>
 		<combo_box.item label="小（128x128）" name="Small(128x128)"/>
 		<combo_box.item label="中（256x256）" name="Medium(256x256)"/>
 		<combo_box.item label="大（512x512）" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
index 34763f78c1..1c55992336 100644
--- a/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/ja/panel_tools_texture.xml
@@ -21,11 +21,11 @@
 		<combo_box.item label="材質" name="Materials"/>
 		<combo_box.item label="メディア" name="Media"/>
 	</combo_box>
-	<combo_box name="combobox mattype">
-		<combo_box.item label="テクスチャ (拡散)" name="Texture (diffuse)"/>
-		<combo_box.item label="凹凸 (標準)" name="Bumpiness (normal)"/>
-		<combo_box.item label="輝き (反射)" name="Shininess (specular)"/>
-	</combo_box>
+	<radio_group name="radio_material_type">
+		<radio_item label="テクスチャ (拡散)" name="Texture (diffuse)" value="0"/>
+		<radio_item label="凹凸 (標準)" name="Bumpiness (normal)" value="1"/>
+		<radio_item label="輝き (反射)" name="Shininess (specular)" value="2"/>
+	</radio_group>
 	<texture_picker label="テクスチャ" name="texture control" tool_tip="クリックして写真を選択します"/>
 	<text name="label alphamode">
 		アルファモード
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 d888470846..35e9b66bc8 100644
--- a/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
+++ b/indra/newview/skins/default/xui/ja/sidepanel_item_info.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="item properties" title="アイテムのプロフィール">
 	<panel.string name="loading_experience">
-		（ローディング）
+		(ローディング)
 	</panel.string>
 	<panel.string name="unknown">
 		（不明）
diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml
index c294158d74..2fd6f6f03b 100644
--- a/indra/newview/skins/default/xui/ja/strings.xml
+++ b/indra/newview/skins/default/xui/ja/strings.xml
@@ -66,8 +66,8 @@ OS バージョン：[OS_VERSION]
 libcurl バージョン：[LIBCURL_VERSION]
 J2C デコーダバージョン：[J2C_VERSION]
 オーディオドライババージョン：[AUDIO_DRIVER_VERSION]
-Qt Webkit バージョン：[QT_WEBKIT_VERSION]
-ボイスサーバーバージョン:[VOICE_VERSION]
+LLCEFLib/CEF バージョン： [LLCEFLIB_VERSION]
+ボイスサーバーバージョン： [VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">
 		パケットロス：[PACKETS_LOST,number,0]/[PACKETS_IN,number,0] （[PACKETS_PCT,number,1]%）
@@ -177,6 +177,12 @@ Qt Webkit バージョン：[QT_WEBKIT_VERSION]
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="AgniGridLabel">
+		Second Life メイングリッド (Agni)
+	</string>
+	<string name="AditiGridLabel">
+		Second Life ベータテストグリッド (Aditi)
+	</string>
 	<string name="ViewerDownloadURL">
 		http://secondlife.com/download
 	</string>
@@ -452,6 +458,9 @@ support@secondlife.com にお問い合わせください。
 		[AMOUNT] 以上のアイテムを含むフォルダを装着できません。「詳細設定」 &gt; 「デバッグ設定を表示」 &gt; 「WearFolderLimit」でこの制限を変更できます。
 	</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]："/>
+	<string name="TooltipSLIcon">
+		これは、SecondLife.com または LindenLab.com の公式ドメイン上のページにリンクします。
+	</string>
 	<string name="TooltipOutboxDragToWorld">
 		マーケットプレイスのリストフォルダからアイテムを Rez できません
 	</string>
@@ -471,7 +480,7 @@ support@secondlife.com にお問い合わせください。
 		在庫アイテム数が [AMOUNT] 個を超えています。
 	</string>
 	<string name="TooltipOutboxCannotDropOnRoot">
-		アイテムまたはフォルダは「すべて」タブによってのみドロップできます。このタブを選択してから、もう一度アイテムまたはフォルダを選択してください。
+		アイテムまたはフォルダは「すべて」または「関連付けされていない」タブによってのみドロップできます。これらのタブのいずれかを選択してから、もう一度アイテムまたはフォルダを選択してください。
 	</string>
 	<string name="TooltipOutboxNoTransfer">
 		これらのオブジェクトの 1 つまたは複数は売り渡したり譲渡したりできないものです
@@ -555,6 +564,9 @@ support@secondlife.com にお問い合わせください。
 		クリックして secondlife:// コマンドを出します
 	</string>
 	<string name="CurrentURL" value=" 現在の URL： [CurrentURL]"/>
+	<string name="TooltipEmail">
+		クリックして電子メールを作成
+	</string>
 	<string name="SLurlLabelTeleport">
 		テレポート
 	</string>
@@ -1080,7 +1092,7 @@ support@secondlife.com にお問い合わせください。
 	<string name="AgentNameSubst">
 		(あなた)
 	</string>
-	<string name="JoinAnExperience"/><!-- intentionally blank -->
+	<string name="JoinAnExperience"/>
 	<string name="SilentlyManageEstateAccess">
 		土地のアクセスリストを管理するときにアラートを表示しない
 	</string>
@@ -1859,6 +1871,21 @@ support@secondlife.com にお問い合わせください。
 	<string name="TodayOld">
 		今日参加
 	</string>
+	<string name="av_render_everyone_now">
+		全員にあなたが見えるようになりました。
+	</string>
+	<string name="av_render_not_everyone">
+		あなたのまわりの一部の人には、あなたが見えない可能性があります。
+	</string>
+	<string name="av_render_over_half">
+		あなたの周囲の半分以上の人に、あなたが表示されない可能性があります。
+	</string>
+	<string name="av_render_most_of">
+		あなたのまわりのほとんどの人に、あなたが見えない可能性があります。
+	</string>
+	<string name="av_render_anyone">
+		あなたのまわりの誰にもあなたが見えない可能性があります。
+	</string>
 	<string name="AgeYearsA">
 		[COUNT] 年
 	</string>
@@ -1976,6 +2003,9 @@ support@secondlife.com にお問い合わせください。
 	<string name="CompileQueueUnknownFailure">
 		原因不明の失敗によりダウンロードができません
 	</string>
+	<string name="CompileNoExperiencePerm">
+		[EXPERIENCE] 体験による [SCRIPT] スクリプトのスキップ。
+	</string>
 	<string name="CompileQueueTitle">
 		リコンパイル進行
 	</string>
@@ -2021,9 +2051,6 @@ support@secondlife.com にお問い合わせください。
 	<string name="GroupsNone">
 		なし
 	</string>
-	<string name="CompileNoExperiencePerm">
-		[EXPERIENCE] 体験による [SCRIPT] スクリプトのスキップ。
-	</string>
 	<string name="Group" value=" （グループ）"/>
 	<string name="Unknown">
 		（不明）
@@ -5379,23 +5406,11 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		会話はログに記録されていません。ログの記録を開始するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		これ以上の会話は記録されません。ログの記録を再開するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。
-	</string>
-	<string name="loading_chat_logs">
-		ロード中...
-	</string>
 	<string name="experience_tools_experience">
 		体験
 	</string>
 	<string name="ExperienceNameNull">
-		（体験なし）
+		(体験なし)
 	</string>
 	<string name="ExperienceNameUntitled">
 		(タイトルのない体験)
@@ -5449,7 +5464,7 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 		体験の権限を自動的に承諾
 	</string>
 	<string name="ExperiencePermissionShortUnknown">
-		が不明な操作を実行しました: [Permission]
+		が不明な操作を実行しました： [Permission]
 	</string>
 	<string name="ExperiencePermissionShort1">
 		コントロールする
@@ -5472,4 +5487,37 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ�
 	<string name="ExperiencePermissionShort12">
 		権限
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		会話はログに記録されていません。ログの記録を開始するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		これ以上の会話は記録されません。ログの記録を再開するには、「環境設定」&gt;「チャット」で「保存: ログのみ」または「保存: ログと会話のテキスト」を選択します。
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		ログイン時の会話はありません。誰かにご連絡した後、または誰かがあなたに連絡した後、ログエントリがここに表示されます。
+	</string>
+	<string name="loading_chat_logs">
+		ロード中...
+	</string>
+	<string name="preset_combo_label">
+		-空リスト-
+	</string>
+	<string name="Default">
+		デフォルト
+	</string>
+	<string name="none_paren_cap">
+		(なし)
+	</string>
+	<string name="no_limit">
+		無制限
+	</string>
+	<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+		物理形状に小さすぎる三角形が含まれています。物理モデルを簡略化してください。
+	</string>
+	<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+		物理形状に不正な確認データがあります。物理モデルを修正してください。
+	</string>
+	<string name="Mav_Details_MAV_UNKNOWN_VERSION">
+		物理形状のバージョンが正しくありません。物理モデルに正しいバージョンを設定してください。
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml
index 1e2edd7a2f..65c457f822 100644
--- a/indra/newview/skins/default/xui/pt/floater_about.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about.xml
@@ -3,6 +3,7 @@
 	<tab_container name="about_tab">
 		<panel label="Info" name="support_panel">
 			<button label="Copiar" name="copy_btn"/>
+			<button label="Verificar atualizações" name="update_btn"/>
 		</panel>
 		<panel label="Créditos" name="credits_panel">
 			<text name="linden_intro">O Second Life é trazido a você pela Lindens, 
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 fee939ab46..ca8cf83e62 100644
--- a/indra/newview/skins/default/xui/pt/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml
@@ -10,13 +10,13 @@
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
 	<floater.string name="Minutes">
-		[MINUTES] minutos
+		[MINUTES] min.
 	</floater.string>
 	<floater.string name="Minute">
-		minuto
+		min.
 	</floater.string>
 	<floater.string name="Seconds">
-		[SECONDS] segundos
+		[SECONDS] seg.
 	</floater.string>
 	<floater.string name="Remaining">
 		faltam
@@ -451,7 +451,7 @@ Mídia:
 			<spinner label="Horas de acesso:" name="HoursSpin"/>
 			<panel name="Allowed_layout_panel">
 				<text label="Always Allow" name="AllowedText">
-					Residentes permitidos
+					Residentes permitidos ([COUNT])
 				</text>
 				<name_list name="AccessList" tool_tip="(Total [LISTED], máx de [MAX])"/>
 				<button label="Adicionar" name="add_allowed"/>
@@ -459,7 +459,7 @@ Mídia:
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Ban" name="BanCheck">
-					Residentes banidos
+					Residentes banidos ([COUNT])
 				</text>
 				<name_list name="BannedList" tool_tip="(Total [LISTED], máx de [MAX])"/>
 				<button label="Adicionar" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_autoreplace.xml b/indra/newview/skins/default/xui/pt/floater_autoreplace.xml
index ca813a8540..63c34578ac 100644
--- a/indra/newview/skins/default/xui/pt/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/pt/floater_autoreplace.xml
@@ -13,6 +13,12 @@
 	</scroll_list>
 	<button label="Adicionar..." name="autoreplace_add_entry"/>
 	<button label="Remover" name="autoreplace_delete_entry"/>
+	<text name="autoreplace_keyword_txt">
+		Palavra-chave:
+	</text>
+	<text name="autoreplace_replacement_txt">
+		Substituição:
+	</text>
 	<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."/>
diff --git a/indra/newview/skins/default/xui/pt/floater_bumps.xml b/indra/newview/skins/default/xui/pt/floater_bumps.xml
index 475d36c119..9567c75d3e 100644
--- a/indra/newview/skins/default/xui/pt/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/pt/floater_bumps.xml
@@ -19,6 +19,6 @@
 		[TIME]  [NAME] empurrou você com um objeto 3D
 	</floater.string>
 	<floater.string name="timeStr">
-		[[hour,datetime,slt]:[min,datetime,slt]]
+		[[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
 	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/pt/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000..1d4d168a47
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="EXCLUIR PREDEFINIÇÃO PREF">
+	<string name="title_graphic">
+		Excluir predefinição de gráficos
+	</string>
+	<string name="title_camera">
+		Excluir predefinição de câmera
+	</string>
+	<text name="Preset">
+		Selecionar uma predefinição
+	</text>
+	<button label="Excluir" name="delete"/>
+	<button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_experienceprofile.xml b/indra/newview/skins/default/xui/pt/floater_experienceprofile.xml
index 97f8576b16..24bc520863 100644
--- a/indra/newview/skins/default/xui/pt/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/pt/floater_experienceprofile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater title="EXPERIENCE PROFILE">
 	<floater.string name="empty_slurl">
-		(none)
+		(nenhum)
 	</floater.string>
 	<floater.string name="maturity_icon_general">
 		&quot;Parcel_PG_Light&quot;
@@ -46,9 +46,9 @@
 							<button label="Ignorar" name="forget_btn"/>
 							<button label="Bloquear" name="block_btn"/>
 							<text name="privileged">
-								Essa experiência está disponível para todos os residentes.
+								Essa experiência está habilitada para todos os residentes.
 							</text>
-							<button label="Denunciar abuso" name="report_btn"/>
+							<button label="Relatar abuso" name="report_btn"/>
 						</layout_panel>
 					</layout_stack>
 				</panel>
@@ -63,7 +63,7 @@
 					<text name="edit_ContentRating">
 						Classificação:
 					</text>
-					<icons_combo_box label="Moderado" name="edit_ContentRatingText" tool_tip="Aumentar a classificação de maturidade sobre uma experiência redefinirá a permissão para todos os residentes que permitiram a experiência.">
+					<icons_combo_box label="Moderado" name="edit_ContentRatingText" tool_tip="Aumentar a classificação de maturidade de uma experiência redefinirá a permissão para todos os residentes que permitiram a experiência.">
 						<icons_combo_box.item label="Adulto" name="Adult" value="42"/>
 						<icons_combo_box.item label="Moderado" name="Mature" value="21"/>
 						<icons_combo_box.item label="Geral" name="PG" value="13"/>
@@ -75,7 +75,7 @@
 					<button label="Limpar localização" name="clear_btn"/>
 					<check_box label="Ativar experiência" name="edit_enable_btn" tool_tip=""/>
 					<check_box label="Ocultar nos resultados de pesquisa" name="edit_private_btn"/>
-					<text name="changes" value="As alterações de experiência podem levar vários minutos para ser visualizadas em todas as regiões."/>
+					<text name="changes" value="As alterações de experiência podem levar vários minutos para serem visualizadas em todas as regiões."/>
 					<button label="Retornar" name="cancel_btn"/>
 					<button label="Salvar" name="save_btn"/>
 				</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_fast_timers.xml b/indra/newview/skins/default/xui/pt/floater_fast_timers.xml
index eeb39583ef..9a7062578a 100644
--- a/indra/newview/skins/default/xui/pt/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/pt/floater_fast_timers.xml
@@ -6,5 +6,16 @@
 	<string name="run">
 		Correr
 	</string>
+	<combo_box name="time_scale_combo">
+		<item label="2x média" name="2x Average"/>
+		<item label="Máx." name="Max"/>
+		<item label="Máx. recente" name="Recent Max"/>
+		<item label="100ms" name="100ms"/>
+	</combo_box>
+	<combo_box name="metric_combo">
+		<item label="Hora" name="Time"/>
+		<item label="Número de chamadas" name="Number of Calls"/>
+		<item label="Hz" name="Hz"/>
+	</combo_box>
 	<button label="Pausa" name="pause_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
index 2bb95a5605..3840b54d66 100644
--- a/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/pt/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
 		<radio_item label="Depois de" name="older"/>
 	</radio_group>
 	<spinner label="Horas Atrás" name="spin_hours_ago"/>
+	<text name="label_hours">
+		Horas
+	</text>
 	<spinner label="Dias Atrás" name="spin_days_ago"/>
+	<text name="label_days">
+		Dias
+	</text>
 	<button label="Fechar" label_selected="Fechar" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/pt/floater_load_pref_preset.xml
new file mode 100644
index 0000000000..3e9a4aa025
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="CARREGAR PREDEFINIÇÃO PREF">
+	<string name="title_graphic">
+		Carregar predefinição de gráficos
+	</string>
+	<string name="title_camera">
+		Carregar predefinição de câmera
+	</string>
+	<text name="Preset">
+		Selecionar uma predefinição
+	</text>
+	<button label="OK" name="ok"/>
+	<button label="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml
index bb6113671b..3beada1fc0 100644
--- a/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/pt/floater_merchant_outbox.xml
@@ -12,16 +12,21 @@
 	<string name="OutboxInitializing">
 		Iniciando...
 	</string>
-	<panel label="">
-		<panel>
+	<panel label="" name="panel_1">
+		<panel name="panel_2">
 			<panel name="outbox_inventory_placeholder_panel">
 				<text name="outbox_inventory_placeholder_title">
 					Carregando...
 				</text>
 			</panel>
 		</panel>
-		<panel>
-			<button label="Enviar para Mercado" name="outbox_import_btn" tool_tip="Enviar para a Frente da loja do meu Mercado"/>
+		<panel name="panel_3">
+			<panel name="outbox_generic_drag_target">
+				<text name="text_1">
+					Arraste itens para cá para criar pastas
+				</text>
+			</panel>
+			<button label="Enviar para Mercado" name="outbox_import_btn" tool_tip="Enviar para a frente da minha loja do mercado"/>
 		</panel>
 	</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 8194278b16..35cee93ad1 100644
--- a/indra/newview/skins/default/xui/pt/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/pt/floater_model_preview.xml
@@ -55,6 +55,9 @@
 	<string name="mesh_status_invalid_material_list">
 		Materiais LOD não são um subconjunto de modelo de referência.
 	</string>
+	<string name="phys_status_vertex_limit_exceeded">
+		Alguns corpos físicos excedem as limitações de vértice.
+	</string>
 	<string name="layer_all">
 		Tudo
 	</string>
@@ -93,52 +96,52 @@
 				<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"/>
+					<item label="Carregar do arquivo" name="Load from file" value="Carregar do arquivo"/>
+					<item label="Gerar" 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"/>
+					<item label="Limite de triângulos" name="Triangle Limit" value="Limite de triângulos"/>
+					<item label="Limite de erro" 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"/>
+					<item label="Carregar do arquivo" name="Load from file" value="Carregar do arquivo"/>
+					<item label="Gerar" name="Generate" value="Gerar"/>
+					<item label="Usar LoD acima" 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"/>
+					<item label="Limite de triângulos" name="Triangle Limit" value="Limite de triângulos"/>
+					<item label="Limite de erro" 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"/>
+					<item label="Carregar do arquivo" name="Load from file" value="Carregar do arquivo"/>
+					<item label="Gerar" name="Generate" value="Gerar"/>
+					<item label="Usar LoD acima" 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"/>
+					<item label="Limite de triângulos" name="Triangle Limit" value="Limite de triângulos"/>
+					<item label="Limite de erro" 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"/>
+					<item label="Carregar do arquivo" name="Load from file" value="Carregar do arquivo"/>
+					<item label="Gerar" name="Generate" value="Gerar"/>
+					<item label="Usar LoD acima" 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"/>
+					<item label="Limite de triângulos" name="Triangle Limit" value="Limite de triângulos"/>
+					<item label="Limite de erro" 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"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/pt/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000..c9a761029e
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="AVISOS">
+	<floater.string name="system_tab_title">
+		Sistema ([COUNT])
+	</floater.string>
+	<floater.string name="transactions_tab_title">
+		Transações ([COUNT])
+	</floater.string>
+	<floater.string name="group_invitations_tab_title">
+		Convites ([COUNT])
+	</floater.string>
+	<floater.string name="group_notices_tab_title">
+		Grupo ([COUNT])
+	</floater.string>
+	<string name="title_notification_tabbed_window">
+		AVISOS
+	</string>
+	<layout_stack name="TabButtonsStack">
+		<layout_panel name="TabButtonsLayoutPanel">
+			<tab_container name="notifications_tab_container">
+				<panel label="Sistema (0)" name="system_notification_list_tab"/>
+				<panel label="Transações (0)" name="transaction_notifications_tab"/>
+				<panel label="Convites (0)" name="group_invite_notifications_tab"/>
+				<panel label="Grupo (0)" name="group_notice_notifications_tab"/>
+			</tab_container>
+			<layout_stack name="ButtonsStack">
+				<layout_panel name="CondenseAllButtonPanel">
+					<button label="Recolher tudo" name="collapse_all_button"/>
+				</layout_panel>
+				<layout_panel name="GapLayoutPanel">
+					<panel label="Painel de lacunas" name="GapPanel"/>
+				</layout_panel>
+				<layout_panel name="DeleteAllButtonPanel">
+					<button label="Excluir tudo" name="delete_all_button"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</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
index 05784115e7..b2030ea479 100644
--- a/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
 	<floater.string name="character_owner_group">
 		[grupo]
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_chars_main">
 		<scroll_list name="objects_scroll_list">
 			<scroll_list.columns label="Nome" name="name"/>
 			<scroll_list.columns label="Descrição" name="description"/>
@@ -42,12 +42,12 @@
 		<button label="Selecionar tudo" name="select_all_objects"/>
 		<button label="Selecionar nenhum" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_chars_actions">
 		<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"/>
+		<check_box label="Exibir cápsula 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."/>
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
index 182f2513e0..47855656c8 100644
--- a/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
 	<floater.string name="pathing_error">
 		Ocorreu um erro durante a geração do caminho.
 	</floater.string>
+	<panel name="pathfinding_console_main">
+		<text name="viewer_status_label">
+			Status do visualizador
+		</text>
+	</panel>
+	<panel name="pathfinding_console_simulator">
+		<text name="simulator_status_label">
+			Status do simulador
+		</text>
+	</panel>
 	<tab_container name="view_test_tab_container">
 		<panel label="Visualizar" name="view_panel">
 			<text name="show_label">
diff --git a/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml
index e0c60679dd..c41e55992a 100644
--- a/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/pt/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
 	<floater.string name="linkset_choose_use">
 		Escolher uso do linkset...
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_linksets_main">
+		<text name="linksets_filter_label">
+			Filtrar por:
+		</text>
+		<text name="linksets_name_label">
+			Nome
+		</text>
+		<text name="linksets_desc_label">
+			Descrição
+		</text>
 		<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"/>
@@ -122,7 +131,10 @@
 		<button label="Selecionar tudo" name="select_all_objects"/>
 		<button label="Selecionar nenhum" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_actions">
+		<text name="linksets_actions_label">
+			Ações em linksets selecionados (se um linkset for removido de um mundo, seus atributos podem ser perdidos):
+		</text>
 		<check_box label="Exibir baliza" name="show_beacon"/>
 		<button label="Pegar" name="take_objects"/>
 		<button label="Pegar uma cópia" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
 		<button label="Devolver" name="return_objects"/>
 		<button label="Excluir" name="delete_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_attributes">
+		<text name="linksets_attributes_label">
+			Edite os atributos de linksets selecionados e pressione o botão para aplicar as alterações
+		</text>
 		<text name="walkability_coefficients_label">
 			Possibilidade de caminhar:
 		</text>
diff --git a/indra/newview/skins/default/xui/pt/floater_perms_default.xml b/indra/newview/skins/default/xui/pt/floater_perms_default.xml
index 762f8320c4..40659a353a 100644
--- a/indra/newview/skins/default/xui/pt/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/pt/floater_perms_default.xml
@@ -1,6 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perms default" title="PERMISSÕES DE CRIAÇÃO PADRÃO">
-	<panel label="Permissões padrão" name="default permissions"/>
+	<panel label="Permissões padrão" name="default permissions">
+		<text name="label_1">
+			Próximo proprietário:
+		</text>
+		<text name="label_2">
+			Copiar
+		</text>
+		<text name="label_3">
+			Modificar
+		</text>
+		<text name="label_4">
+			Transferir
+		</text>
+		<text name="label_5">
+			Dividir com o grupo
+		</text>
+		<text name="label_6">
+			Permitir que qualquer um copie
+		</text>
+		<text name="label_7" tool_tip="Definir permissões padrão para objetos criados">
+			Objetos
+		</text>
+		<text name="label_8" tool_tip="Definir permissões padrão para itens enviados">
+			Envios
+		</text>
+		<text name="label_9" tool_tip="Definir permissões padrão para scripts criados">
+			Scripts
+		</text>
+		<text name="label_10" tool_tip="Definir permissões padrão para anotações criadas">
+			Anotações
+		</text>
+		<text name="label_11" tool_tip="Definir permissões padrão para gestos criados">
+			Gestos
+		</text>
+		<text name="label_12" tool_tip="Definir permissões padrão para roupas ou partes do corpo criadas">
+			Itens de vestuário
+		</text>
+	</panel>
 	<button label="OK" label_selected="OK" name="ok"/>
 	<button label="Cancelar" label_selected="Cancelar" name="cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000..c5e19b2281
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="PREFERÊNCIAS AVANÇADAS DE GRÁFICOS">
+	<text name="GeneralText">
+		Geral
+	</text>
+	<slider label="Calcular distância:" name="DrawDistance"/>
+	<text name="DrawDistanceMeterText2">
+		m
+	</text>
+	<slider label="Máxima quantidade de partículas:" name="MaxParticleCount"/>
+	<slider label="Qualidade pós-processamento:" name="RenderPostProcess"/>
+	<text name="PostProcessText">
+		Baixo
+	</text>
+	<text name="AvatarText">
+		Avatar
+	</text>
+	<slider label="Complexidade máxima:" name="IndirectMaxComplexity" tool_tip="Controla o ponto no qual um avatar visualmente complexo é desenhado como avatar de cor sólida"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
+	<slider label="Máx. de avatares legítimos:" name="IndirectMaxNonImpostors"/>
+	<text name="IndirectMaxNonImpostorsText">
+		0
+	</text>
+	<slider label="Detalhe:" name="AvatarMeshDetail"/>
+	<text name="AvatarMeshDetailText">
+		Baixo
+	</text>
+	<slider label="Físico:" name="AvatarPhysicsDetail"/>
+	<text name="AvatarPhysicsDetailText">
+		Baixo
+	</text>
+	<text name="ShadersText">
+		Hardware
+	</text>
+	<slider label="Memória da textura (MB):" name="GraphicsCardTextureMemory" tool_tip="Quantidade de memória que deve ser alocada para texturas. O padrão é definido pela memória da placa de vídeo. Reduzir este valor pode melhorar o desempenho, mas pode deixar as texturas fora de foco."/>
+	<slider label="Raio de distância da neblina:" name="fog"/>
+	<slider label="Gama:" name="gamma"/>
+	<text name="(brightness, lower is brighter)">
+		(0 = brilho padrão, menor = mais brilho)
+	</text>
+	<check_box label="Filtro anisotrópico (mais lento quando ativado)" name="ani"/>
+	<check_box initial_value="true" label="Ativar Vertex Buffer Objects de OpenGL" name="vbo" tool_tip="Ativar isso em hardware moderno melhora o desempenho.  Entretanto, hardwares mais antigos normalmente implantam mal os VBOs. A ativação dessa configuração pode travar sua máquina."/>
+	<check_box initial_value="true" label="Habilitar compressão da textura (requer reinício)" name="texture compression" tool_tip="Comprime as texturas na memória de vídeo, permitindo o carregamento de texturas de maior resolução em detrimento da qualidade da cor."/>
+	<text name="antialiasing label">
+		Antialiasing:
+	</text>
+	<combo_box label="Antialiasing" name="fsaa">
+		<combo_box.item label="Desativado" name="FSAADisabled"/>
+		<combo_box.item label="2x" name="2x"/>
+		<combo_box.item label="4x" name="4x"/>
+		<combo_box.item label="8x" name="8x"/>
+		<combo_box.item label="16x" name="16x"/>
+	</combo_box>
+	<text name="antialiasing restart">
+		(reinicie para ativar)
+	</text>
+	<slider label="Detalhe de mesh de terreno:" name="TerrainMeshDetail"/>
+	<text name="TerrainMeshDetailText">
+		Baixo
+	</text>
+	<slider label="Árvores:" name="TreeMeshDetail"/>
+	<text name="TreeMeshDetailText">
+		Baixo
+	</text>
+	<slider label="Objetos:" name="ObjectMeshDetail"/>
+	<text name="ObjectMeshDetailText">
+		Baixo
+	</text>
+	<slider label="Prims flexíveis:" name="FlexibleMeshDetail"/>
+	<text name="FlexibleMeshDetailText">
+		Baixo
+	</text>
+	<check_box initial_value="true" label="Água transparente" name="TransparentWater"/>
+	<check_box initial_value="true" label="Mapeamento de relevo e brilho" name="BumpShiny"/>
+	<check_box initial_value="true" label="Luzes locais" name="LocalLights"/>
+	<check_box initial_value="true" label="Sombreamento simples" name="BasicShaders" tool_tip="Desativar essa opção pode evitar o travamento de alguns drivers de placas gráficas"/>
+	<slider label="Detalhes do terreno:" name="TerrainDetail"/>
+	<text name="TerrainDetailText">
+		Baixo
+	</text>
+	<check_box initial_value="true" label="Economia de hardware do avatar" name="AvatarVertexProgram"/>
+	<check_box initial_value="true" label="Vestimenta do avatar" name="AvatarCloth"/>
+	<text name="ReflectionsText">
+		Reflexos na água:
+	</text>
+	<combo_box name="Reflections">
+		<combo_box.item label="Mínimo" name="0"/>
+		<combo_box.item label="Terreno e árvores" name="1"/>
+		<combo_box.item label="Todos os objetos estáticos" name="2"/>
+		<combo_box.item label="Todos os avatares e objetos" name="3"/>
+		<combo_box.item label="Tudo" name="4"/>
+	</combo_box>
+	<check_box initial_value="true" label="Tonalidades atmosféricas" name="WindLightUseAtmosShaders"/>
+	<slider label="Céu:" name="SkyMeshDetail"/>
+	<text name="SkyMeshDetailText">
+		Baixo
+	</text>
+	<check_box initial_value="true" label="Modelo avançado de luzes" name="UseLightShaders"/>
+	<check_box initial_value="true" label="Oclusão de ambiente" name="UseSSAO"/>
+	<check_box initial_value="true" label="Profundidade do campo" name="UseDoF"/>
+	<text name="RenderShadowDetailText">
+		Sombras:
+	</text>
+	<combo_box name="ShadowDetail">
+		<combo_box.item label="Nenhum" name="0"/>
+		<combo_box.item label="Sol/lua" name="1"/>
+		<combo_box.item label="Sol/lua + projetores" name="2"/>
+	</combo_box>
+	<button label="Redefinir para configurações recomendadas" name="Defaults"/>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/pt/floater_save_pref_preset.xml
new file mode 100644
index 0000000000..b9c959488d
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="SALVAR PREDEFINIÇÃO PREF">
+	<string name="title_graphic">
+		Salvar predefinição de gráficos
+	</string>
+	<string name="title_camera">
+		Salvar predefinição da câmera
+	</string>
+	<text name="Preset">
+		Digite um nome para a predefinição ou escolha uma predefinição existente.
+	</text>
+	<button label="Salvar" name="save"/>
+	<button label="Cancelar" name="cancel"/>
+</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
index f4e95bddec..6571b40c9d 100644
--- a/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/pt/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_import" title="Importar dicionário">
+	<text name="import_dict">
+		Dicionário:
+	</text>
 	<button label="Procurar" label_selected="Procurar" name="dictionary_path_browse"/>
+	<text name="import_name">
+		Nome:
+	</text>
+	<text name="import_lang">
+		Idioma:
+	</text>
 	<button label="Importar" name="ok_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_tos.xml b/indra/newview/skins/default/xui/pt/floater_tos.xml
index c4954cb61f..a86e12fd59 100644
--- a/indra/newview/skins/default/xui/pt/floater_tos.xml
+++ b/indra/newview/skins/default/xui/pt/floater_tos.xml
@@ -12,4 +12,7 @@
 	<text name="tos_heading">
 		Leia com atenção os Termos do Serviço e a Política de Privacidade. Para continuar a entrar no [SECOND_LIFE], é preciso aceitar esses termos.
 	</text>
+	<text name="external_tos_required">
+		Antes de continuar, você precisará visitar my.secondlife.com e fazer login para aceitar os Termos de Serviço. Obrigado!
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
index 61953f9f78..031f6b605a 100644
--- a/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_attachment_other.xml
@@ -15,5 +15,8 @@
 	<menu_item_call label="Mais zoom" name="Zoom In"/>
 	<menu_item_call label="Pagar" name="Pay..."/>
 	<menu_item_call label="Perfil do objeto" name="Object Inspect"/>
+	<menu_item_check label="Renderizar normalmente" name="RenderNormally"/>
+	<menu_item_check label="Não renderizar" name="DoNotRender"/>
+	<menu_item_check label="Renderizar completamente" name="AlwaysRenderFully"/>
 	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
index 1af8d64438..e32f9059f5 100644
--- a/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/pt/menu_avatar_other.xml
@@ -14,5 +14,8 @@
 	<menu_item_call label="Descartar XML" name="Dump XML"/>
 	<menu_item_call label="Mais zoom" name="Zoom In"/>
 	<menu_item_call label="Pagar" name="Pay..."/>
+	<menu_item_check label="Renderizar normalmente" name="RenderNormally"/>
+	<menu_item_check label="Não renderizar" name="DoNotRender"/>
+	<menu_item_check label="Renderizar completamente" name="AlwaysRenderFully"/>
 	<menu_item_call label="Bloquear proprietário da partícula" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_login.xml b/indra/newview/skins/default/xui/pt/menu_login.xml
index 29dae6292a..a65dfddb05 100644
--- a/indra/newview/skins/default/xui/pt/menu_login.xml
+++ b/indra/newview/skins/default/xui/pt/menu_login.xml
@@ -15,6 +15,7 @@
 		<menu_item_call label="Blogs do [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Relatar bug" name="Report Bug"/>
 		<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="Verificar atualizações" name="Check for Updates"/>
 	</menu>
 	<menu_item_check label="Exibir menu de depuração" name="Show Debug Menu"/>
 	<menu label="Depurar" name="Debug">
diff --git a/indra/newview/skins/default/xui/pt/menu_marketplace_view.xml b/indra/newview/skins/default/xui/pt/menu_marketplace_view.xml
index 2236df5c87..0a4af6fbf0 100644
--- a/indra/newview/skins/default/xui/pt/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/pt/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_marketplace_sort">
+	<menu_item_check label="Ordenar por nome" name="sort_by_name"/>
+	<menu_item_check label="Ordenar por mais recente" name="sort_by_recent"/>
 	<menu_item_check label="Ordenar por quantidade em estoque stock (baixo a alto)" name="sort_by_stock_amount"/>
 	<menu_item_check label="Exibir apenas pastas da listagem" name="show_only_listing_folders"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_email.xml b/indra/newview/skins/default/xui/pt/menu_url_email.xml
new file mode 100644
index 0000000000..1dbb5cd994
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+	<menu_item_call label="Escrever email em cliente externo" name="email_open_external"/>
+	<menu_item_call label="Copiar email para área de transferência" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_url_experience.xml b/indra/newview/skins/default/xui/pt/menu_url_experience.xml
index 1bbc27f267..af7634b0d9 100644
--- a/indra/newview/skins/default/xui/pt/menu_url_experience.xml
+++ b/indra/newview/skins/default/xui/pt/menu_url_experience.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <context_menu name="Url Popup">
-	<menu_item_call label="Copiar SLurl para área de transferência" name="url_copy"/>
+	<menu_item_call label="Copiar SLurl para a área de transferência" name="url_copy"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml
index 3d5d9eccc6..2df78c6287 100644
--- a/indra/newview/skins/default/xui/pt/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml
@@ -64,7 +64,7 @@
 		<menu_item_call label="Foto" name="Take Snapshot"/>
 		<menu_item_call label="Perfil da região" name="Place Profile"/>
 		<menu_item_call label="Sobre terrenos" name="About Land"/>
-		<menu_item_call label="Região/Propriedade" name="RegionEstate"/>
+		<menu_item_call label="Região/terreno" name="RegionEstate"/>
 		<menu_item_call label="Meus terrenos..." name="My Land"/>
 		<menu_item_call label="Comprar este terreno" name="Buy Land"/>
 		<menu label="Mostrar" name="LandShow">
@@ -180,6 +180,7 @@
 		<menu_item_call label="Relatar bug" name="Report Bug"/>
 		<menu_item_call label="Bumps, Pushes &amp; Hits" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu_item_call label="Sobre [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="Verificar atualizações" name="Check for Updates"/>
 	</menu>
 	<menu label="Avançado" name="Advanced">
 		<menu_item_call label="Recarregar texturas" name="Rebake Texture"/>
@@ -193,7 +194,7 @@
 			<menu_item_call label="Medidor de lag" name="Lag Meter"/>
 			<menu_item_check label="Barra de estatísticas" name="Statistics Bar"/>
 			<menu_item_call label="Estatísticas de carregamento de cena" name="Scene Load Statistics"/>
-			<menu_item_check label="Mostrar peso do desenho para avatares" name="Avatar Rendering Cost"/>
+			<menu_item_check label="Exibir informações de complexidade do avatar" name="Avatar Draw Info"/>
 		</menu>
 		<menu label="Realces e visibilidade" name="Highlighting and Visibility">
 			<menu_item_check label="Efeito baliza piscando" name="Cheesy Beacon"/>
@@ -298,8 +299,6 @@
 			<menu_item_check label="Partículas" name="Particles"/>
 			<menu_item_check label="Junções" name="Joints"/>
 			<menu_item_check label="Vetores de vento" name="Wind Vectors"/>
-			<menu_item_check label="Renderizar complexidade" name="rendercomplexity"/>
-			<menu_item_check label="Bytes do anexo" name="attachment bytes"/>
 			<menu_item_check label="Esculpir" name="Sculpt"/>
 			<menu label="Densidade da textura" name="Texture Density">
 				<menu_item_check label="Nenhuma" name="None"/>
@@ -373,7 +372,6 @@
 			<menu_item_call label="Depurar texturas do avatar" name="Debug Avatar Textures"/>
 		</menu>
 		<menu_item_check label="Texturas HTTP" name="HTTP Textures"/>
-		<menu_item_check label="Inventário HTTP" name="HTTP Inventory"/>
 		<menu_item_call label="Habilitar Visual Leak Detector" name="Enable Visual Leak Detector"/>
 		<menu_item_check label="Console Window on next Run" name="Console Window"/>
 		<menu label="Configurar nível de registro em log" name="Set Logging Level">
diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml
index a264495404..db9f7fc766 100644
--- a/indra/newview/skins/default/xui/pt/notifications.xml
+++ b/indra/newview/skins/default/xui/pt/notifications.xml
@@ -163,6 +163,10 @@ Ocorreu uma falha na inicialização do Marketplace devido a um erro do sistema
         &apos;[ERROR_CODE]&apos;
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="MerchantForceValidateListing">
+		Para criar sua listagem, consertamos a hierarquia do conteúdo da sua listagem.
+		<usetemplate ignoretext="Avisar-me quando a criação de uma listagem consertar a hierarquia do conteúdo" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmMerchantActiveChange">
 		Esta ação alterará o conteúdo ativo desta listagem. Deseja continuar?
 		<usetemplate ignoretext="Confirmar antes de alterar uma listagem ativa no Marketplace" name="okcancelignore" notext="Cancelar" yestext="OK"/>
@@ -210,6 +214,10 @@ Ocorreu uma falha na inicialização do Marketplace devido a um erro do sistema
 		Removemos sua listagem porque o estoque está vazio. Você precisa adicionar mais unidades à pasta de estoque para que a listagem seja exibida novamente.
 		<usetemplate ignoretext="Alertar quando uma listagem não for listada porque a pasta de estoque está vazia" name="okignore" yestext="OK"/>
 	</notification>
+	<notification name="AlertMerchantVersionFolderEmpty">
+		Removemos sua listagem porque a pasta de versões está vazia. Você precisa adicionar itens à pasta de versões para que a listagem seja exibida novamente.
+		<usetemplate ignoretext="Alertar quando uma listagem não for listada porque a pasta de versões está vazia" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		Houve um problema com o carregamento do texto para um script devido à seguinte razão: [REASON]. Por favor, tente novamente mais tarde.
 	</notification>
@@ -319,6 +327,14 @@ Se você não quiser que essas funções sejam concedidas a esse cargo, desative
 		Você está prestes a expulsar [COUNT] membros do grupo.
 		<usetemplate ignoretext="Confirmar expulsão de diversos membros do grupo" name="okcancelignore" notext="Cancelar" yestext="Expulsar"/>
 	</notification>
+	<notification name="BanGroupMemberWarning">
+		Você está prestes a banir [AVATAR_NAME] do grupo.
+		<usetemplate ignoretext="Confirmar o banimento de um participante do grupo" name="okcancelignore" notext="Cancelar" yestext="Banir"/>
+	</notification>
+	<notification name="BanGroupMembersWarning">
+		Você está prestes a banir [COUNT] membros do grupo.
+		<usetemplate ignoretext="Confirmar banimento de diversos membros do grupo" name="okcancelignore" notext="Cancelar" yestext="Banir"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Você está prestes a largar seu anexo. 
     Tem certeza de que quer prosseguir?
@@ -402,7 +418,7 @@ Objetos: [N]
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Devolver"/>
 	</notification>
 	<notification name="ReturnAllTopObjects">
-		Você tem certeza de que deseja enviar todos os objetos listados de volta aos inventários de seus proprietários?
+		Tem certeza que deseja retornar todos os objetos listados para o inventário do proprietário? Isso retornará TODOS os objetos com script na região!
 		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Devolver"/>
 	</notification>
 	<notification name="DisableAllTopObjects">
@@ -603,6 +619,10 @@ O objeto pode estar fora de alcance ou ter sido deletado.
 	<notification name="CannotDownloadFile">
 		Não foi possível baixar o arquivo.
 	</notification>
+	<notification label="" name="MediaFileDownloadUnsupported">
+		Você solicitou o download de um arquivo que não tem suporte no [SECOND_LIFE].
+		<usetemplate ignoretext="Avisar-me sobre downloads de arquivos sem suporte" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CannotWriteFile">
 		Não foi possível escrever o arquivo [[FILE]]
 	</notification>
@@ -1102,8 +1122,9 @@ Unir os terrenos?
 Em geral, essa é uma falha técnica temporária.  Personalize e volte a salvar o item novamente dentro de alguns minutos.
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		Ah não!  O [SECOND_LIFE] teve de fechar. 
-            [MESSAGE]
+		Ah não! Você foi desconectado do [SECOND_LIFE].
+
+[MESSAGE]
 		<usetemplate name="okcancelbuttons" notext="Sair" yestext="Exibir IM &amp; bate-papo"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
@@ -1350,6 +1371,13 @@ Enquando isso, use o [SECOND_LIFE] normalmente. Seu visual será exibido correta
 			<ignore name="ignore" text="A roupa está demorando para chegar"/>
 		</form>
 	</notification>
+	<notification name="RegionAndAgentComplexity">
+		Sua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexidade visual] é [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+	</notification>
+	<notification name="AgentComplexity">
+		Sua [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 complexidade visual] é [AGENT_COMPLEXITY].
+	</notification>
 	<notification name="FirstRun">
 		A instalação do [APP_NAME] está pronta.
 
@@ -1628,6 +1656,25 @@ O visualizador experimental foi substituído por um visualizador [NEW_CHANNEL];
 consulte a informação [[INFO_URL] sobre essa atualização]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="UpdateDownloadInProgress">
+		Uma atualização está disponível!
+O download está ocorrendo em segundo plano e reiniciaremos seu visualizador automaticamente para terminar a instalação assim que ele estiver concluído.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateDownloadComplete">
+		Uma atualização foi baixada. Ela será instalada durante a reinicialização.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateCheckError">
+		Erro ao verificar atualizações.
+Tente novamente mais tarde.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateViewerUpToDate">
+		Seu visualizador está atualizado!
+Se você estiver muito ansioso para experimentar os novos recursos e correções, consulte a página de visualizadores alternativos. http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="DeedObjectToGroup">
 		Delegar este objeto causará ao grupo:
 * Receber os L$ pagos ao objeto
@@ -1731,6 +1778,14 @@ consulte a informação [[INFO_URL] sobre essa atualização]
 		Você atingiu o limite máximo de grupos. Sai de um grupo para entrar ou criar outro.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="GroupLimitInfo">
+		O limite de grupos para as contas básicas é [MAX_BASIC] e para as contas [https://secondlife.com/premium/ premium],
+é [MAX_PREMIUM].
+Se você fizer downgrade de sua conta, precisará ficar abaixo do limite de grupos [MAX_BASIC] antes de entrar em mais.
+
+[https://secondlife.com/my/account/membership.php Faça o upgrade hoje!]
+		<usetemplate name="okbutton" yestext="Fechar"/>
+	</notification>
 	<notification name="KickUser">
 		Chutar este residente com qual mensagem?
 		<form name="form">
@@ -1910,29 +1965,29 @@ Isto mudará milhares de regiões e fará o spaceserver soluçar.
 		Remover o gerente da propriedade desta propriedade apenas ou para [ALL_ESTATES]?
 		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as Propriedades" yestext="Esta Propriedade"/>
 	</notification>
-	<notification label="Selecionar propriedade" name="EstateAllowedExperienceAdd">
-		Adicionar à lista de permitidos apenas para essa propriedade ou para [ALL_ESTATES]?
-		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+	<notification label="Selecionar terreno" name="EstateAllowedExperienceAdd">
+		Adicionar à lista de permitidos para esse terreno somente ou para [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos os terrenos" yestext="Este terreno"/>
 	</notification>
-	<notification label="Selecionar propriedade" name="EstateAllowedExperienceRemove">
-		Remover da lista de permitidos apenas para essa propriedade ou para [ALL_ESTATES]?
-		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+	<notification label="Selecionar terreno" name="EstateAllowedExperienceRemove">
+		Remover da lista de permitidos para esse terreno somente ou para [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos os terrenos" yestext="Este terreno"/>
 	</notification>
-	<notification label="Selecionar propriedade" name="EstateBlockedExperienceAdd">
-		Adicionar à lista de bloqueados dessa propriedade apenas ou de [ALL_ESTATES]?
-		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+	<notification label="Selecionar terreno" name="EstateBlockedExperienceAdd">
+		Adicionar à lista de bloqueados desse terreno somente ou de [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos os terrenos" yestext="Este terreno"/>
 	</notification>
-	<notification label="Selecionar propriedade" name="EstateBlockedExperienceRemove">
-		Remover da lista de bloqueados para essa propriedade somente ou para [ALL_ESTATES]?
-		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+	<notification label="Selecionar terreno" name="EstateBlockedExperienceRemove">
+		Remover da lista de bloqueados para esse terreno somente ou para [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos os terrenos" yestext="Este terreno"/>
 	</notification>
-	<notification label="Selecionar propriedade" name="EstateTrustedExperienceAdd">
-		Adicionar à lista-chave dessa propriedade apenas ou de [ALL_ESTATES]?
-		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+	<notification label="Selecionar terreno" name="EstateTrustedExperienceAdd">
+		Adicionar à lista-chave desse terreno somente ou de [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos os terrenos" yestext="Este terreno"/>
 	</notification>
-	<notification label="Selecionar propriedade" name="EstateTrustedExperienceRemove">
-		Remover da lista-chave para essa propriedade somente ou para [ALL_ESTATES]?
-		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todas as propriedades" yestext="Esta propriedade"/>
+	<notification label="Selecionar terreno" name="EstateTrustedExperienceRemove">
+		Remover da lista-chave para esse terreno somente ou para [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos os terrenos" yestext="Este terreno"/>
 	</notification>
 	<notification label="Confirmar expulsão" name="EstateKickUser">
 		Expulsar [EVIL_USER] desta propriedade?
@@ -2241,6 +2296,10 @@ Mover para o inventário o(s) item(s)?
 		Confirme que você deseja pagar L$[AMOUNT] a [TARGET].
 		<usetemplate ignoretext="Confirmar antes de pagar (somas acima de L$ 200)" name="okcancelignore" notext="Cancelar" yestext="Pagar"/>
 	</notification>
+	<notification name="PayObjectFailed">
+		Falha no pagamento: objeto não encontrado.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="OpenObjectCannotCopy">
 		Não há itens neste objeto que você está autorizado a copiar.
 	</notification>
@@ -2272,10 +2331,9 @@ Não é possível desfazer essa ação.
 		[QUESTION]
 		<usetemplate ignoretext="Confirmar antes de excluir" name="okcancelignore" notext="Cancelar" yestext="OK"/>
 	</notification>
-	<notification name="HelpReportAbuseEmailLL">
-		Use esta ferramenta para denunciar infrações dos [http://secondlife.com/corporate/tos.php Termos do Serviço] e das [http://secondlife.com/corporate/cs.php Normas da Comunidade].
-
-Todas as denúncias de abuso são investigadas e resolvidas.
+	<notification name="ConfirmUnlink">
+		Essa é uma seleção ampla com linksets. Se você desvinculá-la, pode não ser possível vinculá-la novamente. Como precaução, pode ser interessante fazer cópias dos linksets no seu inventário.
+		<usetemplate ignoretext="Confirmar quando desvincular um linkset" name="okcancelignore" notext="Cancelar" yestext="Desvincular"/>
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		Por favor, selecione uma categoria para a reportagem deste abuso.
@@ -2980,13 +3038,13 @@ OK?
 	<notification name="TeleportedHomeExperienceRemoved">
 		Você foi teletransportado da região [region_name] por remover a experiência secondlife:///app/experience/[public_id]/profile e não tem mais permissão na região.
 		<form name="form">
-			<ignore name="ignore" text="Ejetar da região por remover uma experiência"/>
+			<ignore name="ignore" text="Ejetado da região por remover uma experiência"/>
 		</form>
 	</notification>
 	<notification name="TrustedExperienceEntry">
-		Você recebeu permissão para a região [region_name] ao participar da experiência-chave secondlife:///app/experience/[public_id]/profile Remover essa experiência pode ejetá-lo da região.
+		Você recebeu permissão para a região [region_name] ao participar da experiência-chave secondlife:///app/experience/[public_id]/profile e remover essa experiência pode ejetá-lo da região.
 		<form name="form">
-			<ignore name="ignore" text="Permitido em uma região devido a uma experiência"/>
+			<ignore name="ignore" text="Permitido em uma região por uma experiência"/>
 		</form>
 	</notification>
 	<notification name="TrustedExperiencesAvailable">
@@ -2994,13 +3052,13 @@ OK?
 
 [EXPERIENCE_LIST]
 
-Outras experiências chave podem estar disponíveis.
+Outras experiências-chave podem estar disponíveis.
 	</notification>
 	<notification name="ExperienceEvent">
 		Um objeto foi permitido para [EventType] pelo secondlife:///app/experience/[public_id]/profile experience.
     Proprietário: secondlife:///app/agent/[OwnerID]/inspect
-	Nome do objeto: [ObjectName]
-    Nome do Terreno: [ParcelName]
+    Nome do objeto: [ObjectName]
+    Nome da parcela: [ParcelName]
 	</notification>
 	<notification name="ExperienceEventAttachment">
 		Um anexo teve permissão para executar [EventType] pelo secondlife:///app/experience/[public_id]/profile experience.
@@ -3011,9 +3069,9 @@ Outras experiências chave podem estar disponíveis.
 
 [EXPERIENCE]
 
-Quando a permissão for dada, você não irá mais visualizar essa mensagem novamente a não ser que seja revogada do perfil de experiência.
+Após a permissão ser concedida, você não verá essa mensagem novamente para essa experiência, a menos que ela seja revogada do perfil da experiência.
 
-Os scripts associados a essa experiência serão capazes de realizar o seguinte nas regiões onde a experiência esteja ativa: 
+Os scripts associados a essa experiência poderão realizar o seguinte nas regiões onde a experiência esteja ativa: 
 
 [QUESTIONS]Isso está bem?
 		<form name="form">
@@ -3200,6 +3258,12 @@ Para sua segurança, os SLurls serão bloqueados por alguns instantes.
 	<notification name="AttachmentSaved">
 		Anexo salvo.
 	</notification>
+	<notification name="PresetNotSaved">
+		Erro ao salvar predefinição [NAME].
+	</notification>
+	<notification name="PresetNotDeleted">
+		Erro ao excluir a predefinição [NAME].
+	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Nenhum tópico de ajuda foi encontrado com relação a este elemento.
 	</notification>
@@ -3232,9 +3296,8 @@ O botão será exibido quando houver espaço suficente.
 		Selecione os residentes com quem compartilhar.
 	</notification>
 	<notification name="MeshUploadError">
-		[LABEL] não foi carregado: [MESSAGE] [IDENTIFIER] 
-
-Mais detalhes no log.
+		Falha no envio de [LABEL]: [MESSAGE] [IDENTIFIER]
+[DETAILS]Consulte SecondLife.log para obter mais detalhes
 	</notification>
 	<notification name="MeshUploadPermError">
 		Erro ao solicitar permissões de upload de mesh.
diff --git a/indra/newview/skins/default/xui/pt/panel_experience_info.xml b/indra/newview/skins/default/xui/pt/panel_experience_info.xml
index 7fad25dad6..f5aed0657f 100644
--- a/indra/newview/skins/default/xui/pt/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/pt/panel_experience_info.xml
@@ -19,7 +19,7 @@
 				</layout_panel>
 				<layout_panel name="marketplace panel">
 					<text name="Location">
-						Loja do Marketplace
+						Loja do Mercado
 					</text>
 					<text name="LocationTextText">
 						qualquer lugar
diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
index dbf8e4fa52..6bc6e775b1 100644
--- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml
@@ -6,6 +6,9 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] itens [FILTER]
 	</panel.string>
+	<panel.string name="ItemcountUnknown">
+		Recuperados [ITEM_COUNT] itens [FILTER]
+	</panel.string>
 	<text name="ItemcountText">
 		Itens:
 	</text>
@@ -16,7 +19,7 @@
 	</tab_container>
 	<layout_stack name="bottom_panel">
 		<layout_panel name="options_gear_btn_panel">
-			<button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
+			<menu_button name="options_gear_btn" tool_tip="Mostrar opções adicionais"/>
 		</layout_panel>
 		<layout_panel name="add_btn_panel">
 			<button name="add_btn" tool_tip="Adicionar novo item"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml
index 205fd6b97d..fce170110e 100644
--- a/indra/newview/skins/default/xui/pt/panel_people.xml
+++ b/indra/newview/skins/default/xui/pt/panel_people.xml
@@ -18,6 +18,7 @@ Em busca de alguém para conversar? Procure no [secondlife:///app/worldmap Mapa-
 	<string name="no_groups_msg" value="À procura de grupos interessantes? Tente fazer uma [secondlife:///app/search/groups Busca]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Clique duas vezes para abrir o mapa, shift+arraste para a visão pan)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Clique duas vezes para teletransportar, shift+arraste para a visão pan)"/>
+	<string name="GroupCountWithInfo" value="Você pertence a [COUNT] grupos e pode entrar em mais [REMAINING].  [secondlife:/// Quer mais?]"/>
 	<tab_container name="tabs">
 		<panel label="PROXIMIDADE" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
index 3ea592a957..15340a9a5f 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
 	<check_box label="Permitir vários visualizadores" name="allow_multiple_viewer_check"/>
 	<check_box label="Mostrar grade selecionada ao entrar" name="show_grid_selection_check"/>
 	<check_box label="Exibir menu avançado" name="show_advanced_menu_check"/>
-	<check_box label="Exibir menu desenvolvedor" name="show_develop_menu_check"/>
+	<check_box label="Exibir menu de desenvolvimento" name="show_develop_menu_check"/>
 	<button label="Permissões de criação padrão" name="default_creation_permissions"/>
 </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 89f1e07647..f3de404ef7 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
 		<check_box label="Oferta de inventário" name="inventory_offer"/>
 	</panel>
 	<panel name="log_settings">
+		<text name="logging_label">
+			Salvar:
+		</text>
+		<combo_box name="conversation_log_combo">
+			<item label="Log e transcrições" name="log_and_transcripts" value="2"/>
+			<item label="Apenas log" name="log_only" value="1"/>
+			<item label="Sem log ou transcrição" name="no_log_or_transcript" value="0"/>
+		</combo_box>
 		<button label="Limpar registro..." name="clear_log"/>
 		<button label="Excluir transcrições..." name="delete_transcripts"/>
+		<text name="log_location_label">
+			Localização:
+		</text>
 		<button label="Procurar..." label_selected="Procurar" name="log_path_button"/>
 	</panel>
 	<button label="Tradução..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
index 756e345cb8..4d3fb89b37 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_graphics1.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Gráficos" name="Display panel">
+	<text name="preset_text">
+		(nenhum)
+	</text>
 	<text name="QualitySpeed">
 		Qualidade e velocidade:
 	</text>
-	<text name="FasterText">
-		Mais 
-rápido
-	</text>
-	<text name="BetterText">
-		Melhor
-	</text>
 	<text name="ShadersPrefText">
 		Baixo
 	</text>
@@ -22,94 +18,18 @@ rápido
 	<text name="ShadersPrefText4">
 		Ultra
 	</text>
-	<panel label="CustomGraphics" name="CustomGraphics Panel">
-		<text name="ShadersText">
-			Sombreadores:
-		</text>
-		<check_box initial_value="true" label="Água transparente" name="TransparentWater"/>
-		<check_box initial_value="true" label="Bump de Mapeamento e Brilho" name="BumpShiny"/>
-		<check_box initial_value="true" label="Luzes locais" name="LocalLights"/>
-		<check_box initial_value="true" label="Sombreadores básicos" name="BasicShaders" tool_tip="Desabilitar esta opção poderá impedir que alguns drivers de placa de vídeo a travem."/>
-		<check_box initial_value="true" label="Sombreadores Atmosféricos" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Modelo avançado de luzes" name="UseLightShaders"/>
-		<check_box initial_value="true" label="Oclusão ambiental" name="UseSSAO"/>
-		<check_box initial_value="true" label="Profundidade" name="UseDoF"/>
-		<text name="shadows_label">
-			Sombras:
-		</text>
-		<combo_box name="ShadowDetail">
-			<combo_box.item label="Nenhum" name="0"/>
-			<combo_box.item label="Sol/Lua" name="1"/>
-			<combo_box.item label="Sol/Lua + Projetores" name="2"/>
-		</combo_box>
-		<text name="reflection_label">
-			Reflexo de água:
-		</text>
-		<combo_box initial_value="true" label="Reflexos de Água" name="Reflections">
-			<combo_box.item label="Mínimo" name="0"/>
-			<combo_box.item label="Terreno e árvores" name="1"/>
-			<combo_box.item label="Objetos estáticos" name="2"/>
-			<combo_box.item label="Avatares e objetos" name="3"/>
-			<combo_box.item label="Tudo" name="4"/>
-		</combo_box>
-		<slider label="Físico do avatar:" name="AvatarPhysicsDetail"/>
-		<text name="AvatarPhysicsDetailText">
-			Baixo
-		</text>
-		<slider label="Distancia de desenho:" name="DrawDistance"/>
-		<text name="DrawDistanceMeterText2">
-			m
-		</text>
-		<slider label="Contador máx. de partículas:" name="MaxParticleCount"/>
-		<slider label="Máx. de avatares legítimos:" name="MaxNumberAvatarDrawn"/>
-		<slider label="Qualidade de Pós-processamento:" name="RenderPostProcess"/>
-		<text name="MeshDetailText">
-			Detalhes de Malha:
-		</text>
-		<slider label="  Objetos:" name="ObjectMeshDetail"/>
-		<slider label="  Primitivas Flexiveis:" name="FlexibleMeshDetail"/>
-		<slider label="  Árvores:" name="TreeMeshDetail"/>
-		<slider label="  Avatares:" name="AvatarMeshDetail"/>
-		<slider label="  Terreno:" name="TerrainMeshDetail"/>
-		<slider label="  Céu:" name="SkyMeshDetail"/>
-		<text name="PostProcessText">
-			Baixo
-		</text>
-		<text name="ObjectMeshDetailText">
-			Baixo
-		</text>
-		<text name="FlexibleMeshDetailText">
-			Baixo
-		</text>
-		<text name="TreeMeshDetailText">
-			Baixo
-		</text>
-		<text name="AvatarMeshDetailText">
-			Baixo
-		</text>
-		<text name="TerrainMeshDetailText">
-			Baixo
-		</text>
-		<text name="SkyMeshDetailText">
-			Baixo
-		</text>
-		<text name="AvatarRenderingText">
-			Renderização do avatar:
-		</text>
-		<check_box initial_value="true" label="Atributos do Avatar" name="AvatarImpostors"/>
-		<check_box initial_value="true" label="Melhoria de Hardware" name="AvatarVertexProgram"/>
-		<check_box initial_value="true" label="Vestimenta do Avatar" name="AvatarCloth"/>
-		<text name="TerrainDetailText">
-			Detalhe do Terreno:
-		</text>
-		<radio_group left_delta="45" name="TerrainDetailRadio">
-			<radio_item label="Baixo" name="0"/>
-			<radio_item label="Alto" name="2"/>
-		</radio_group>
-		--&gt;
-	</panel>
-	<button label="Aplicar" label_selected="Aplicar" name="Apply"/>
-	<button label="Redefinir" left="110" name="Defaults"/>
-	<button label="Avançado" name="Advanced"/>
-	<button label="Hardware" label_selected="Hardware" name="GraphicsHardwareButton"/>
+	<text name="FasterText">
+		Mais 
+rápido
+	</text>
+	<text name="BetterText">
+		Melhor
+	</text>
+	<check_box initial_value="true" label="Tonalidades atmosféricas" name="WindLightUseAtmosShaders"/>
+	<check_box initial_value="true" label="Modelo avançado de luzes" name="UseLightShaders"/>
+	<button label="Salvar configurações como predefinição..." name="PrefSaveButton"/>
+	<button label="Carregar predefinição..." name="PrefLoadButton"/>
+	<button label="Excluir predefinição..." name="PrefDeleteButton"/>
+	<button label="Redefinir para configurações recomendadas" left="110" name="Defaults"/>
+	<button label="Configurações avançadas..." name="AdvancedSettings"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
index 87f2a9bc8f..6308d133bb 100644
--- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
 	<radio_group name="preferred_browser_behavior">
 		<radio_item label="Usar meu navegador (Chrome, Firefox, IE) para todos os links" name="internal" tool_tip="Use o navegador padrão do sistema para consultar a ajuda, abrir links da web etc. Uso em tela inteira não recomendado." value="0"/>
 		<radio_item label="Usar o navegador incorporado somente para links do SecondLife" name="external" tool_tip="Usar o navegador padrão do sistema para consultar a ajuda, abrir links da web etc. O navegador incorporado será usado somente para os links da LindenLab/SecondLife." value="1"/>
+		<radio_item label="Usar navegador incorporado para todos os links" name="external_all" tool_tip="Use este navegador para consultar a ajuda, abrir links da web, etc. A nova janela é aberta dentro do [APP_NAME]." value="2"/>
 	</radio_group>
 	<check_box initial_value="true" label="Habilitar plugins" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Aceitar cookies" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Habilitar Javascript" name="browser_javascript_enabled"/>
-	<check_box initial_value="false" label="Ativar pop-ups no navegador de mídia" name="media_popup_enabled"/>
 	<text name="Software updates:">
 		Atualizações de software:
 	</text>
 	<combo_box name="updater_service_combobox">
 		<combo_box.item label="Instalar automaticamente" name="Install_automatically"/>
-		<combo_box.item label="Baixar e instalar atualizações manualmente" name="Install_manual"/>
+		<combo_box.item label="Baixarei e instalarei as atualizações manualmente" name="Install_manual"/>
 	</combo_box>
 	<check_box label="Disposto a atualizar para candidatos da versão" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/pt/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/pt/panel_presets_pulldown.xml
new file mode 100644
index 0000000000..b7dab5b8ff
--- /dev/null
+++ b/indra/newview/skins/default/xui/pt/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+	<text name="Graphic Presets">
+		Predefinições de gráficos
+	</text>
+	<button label="Abrir preferências de gráficos" name="open_prefs_btn" tool_tip="Mostrar preferências de gráficos"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
index 9e07b6772f..f2d24e0c0e 100644
--- a/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/pt/panel_prim_media_controls.xml
@@ -45,11 +45,8 @@
 		<layout_panel name="media_address">
 			<line_editor name="media_address_url" tool_tip="URL da mídia"/>
 			<layout_stack name="media_address_url_icons">
-				<layout_panel>
-					<icon name="media_whitelist_flag" tool_tip="Lista ativada"/>
-				</layout_panel>
-				<layout_panel>
-					<icon name="media_secure_lock_flag" tool_tip="Navegação segura"/>
+				<layout_panel name="media_address_url_icons_wl">
+					<icon name="media_whitelist_flag" tool_tip="Lista de aceitação ativada"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_region_experiences.xml b/indra/newview/skins/default/xui/pt/panel_region_experiences.xml
index c7e252cd6f..c9378d373e 100644
--- a/indra/newview/skins/default/xui/pt/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/pt/panel_region_experiences.xml
@@ -3,31 +3,31 @@
 	<panel.string name="trusted_estate_text">
 		Qualquer experiência pode ser chave.
 
-Experiências-chave têm permissão para serem executadas nessa propriedade.
+Experiências-chave têm permissão para serem executadas nesse terreno.
 
-Além disso, se a propriedade não permitir acesso público, os residentes participantes de qualquer experiência-chave podem entrar e permanecer na propriedade, desde que estejam na experiência-chave.
+Além disso, se a propriedade não permitir acesso público, os residentes participantes de qualquer experiência-chave podem entrar e permanecer no terreno, desde que estejam na experiência-chave.
 	</panel.string>
 	<panel.string name="allowed_estate_text">
 		Somente experiências dentro do terreno podem ser permitidas.
 
-Experiências permitidas têm permissão para ser executadas nessa propriedade.
+Experiências permitidas têm permissão para ser executadas nesse terreno.
 	</panel.string>
 	<panel.string name="blocked_estate_text">
 		Somente experiências dentro da grade podem ser bloqueadas.
       
-É possível que as experiências bloqueadas não sejam executadas nessa propriedade.
+É possível que as experiências bloqueadas não sejam executadas nesse terreno.
 	</panel.string>
 	<panel.string name="estate_caption">
-		Mudar as opções desta guia afeta todas as regiões desta propriedade.
+		Mudar as configurações desta guia afeta todas as regiões deste terreno.
 	</panel.string>
 	<panel.string name="allowed_parcel_text">
 		Somente experiências dentro do terreno podem ser permitidas.
       
-Experiências permitidas têm permissão para ser executadas nesse terreno se não estiverem bloqueadas pela propriedade.
+Experiências permitidas têm permissão para ser executadas nesse terreno se não estiverem bloqueadas pela parcela.
 	</panel.string>
 	<panel.string name="blocked_parcel_text">
 		Qualquer experiência de residente pode ser bloqueada.
       
-É possível que as experiências bloqueadas não sejam executadas neste terreno.
+É possível que as experiências bloqueadas não sejam executadas nesta parcela.
 	</panel.string>
 </panel>
diff --git a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
index b038c628bc..f3357026d5 100644
--- a/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/pt/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Salvar uma imagem em seu inventário custa L$[UPLOAD_COST]. Para salvar sua imagem como uma textura, selecione um dos formatos quadrados.
 	</text>
 	<combo_box label="Resolução" name="texture_size_combo">
-		<combo_box.item label="Janela atual" name="CurrentWindow"/>
+		<combo_box.item label="Janela ativa (512x512)" name="CurrentWindow"/>
 		<combo_box.item label="Pequeno (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Médio (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Grande (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/pt/panel_tools_texture.xml b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml
index 03da89dd3b..f051432998 100644
--- a/indra/newview/skins/default/xui/pt/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/pt/panel_tools_texture.xml
@@ -21,11 +21,11 @@
 		<combo_box.item label="Materiais" name="Materials"/>
 		<combo_box.item label="Mídia" name="Media"/>
 	</combo_box>
-	<combo_box name="combobox mattype">
-		<combo_box.item label="Textura (difusa)" name="Texture (diffuse)"/>
-		<combo_box.item label="Relevo (normal)" name="Bumpiness (normal)"/>
-		<combo_box.item label="Brilho (especular)" name="Shininess (specular)"/>
-	</combo_box>
+	<radio_group name="radio_material_type">
+		<radio_item label="Textura (difusa)" name="Texture (diffuse)" value="0"/>
+		<radio_item label="Relevo (normal)" name="Bumpiness (normal)" value="1"/>
+		<radio_item label="Brilho (especular)" name="Shininess (specular)" value="2"/>
+	</radio_group>
 	<texture_picker label="Textura" name="texture control" tool_tip="Selecionar imagem"/>
 	<text name="label alphamode">
 		Modo alpha
diff --git a/indra/newview/skins/default/xui/pt/role_actions.xml b/indra/newview/skins/default/xui/pt/role_actions.xml
index 8d5bc061f9..1475df10c1 100644
--- a/indra/newview/skins/default/xui/pt/role_actions.xml
+++ b/indra/newview/skins/default/xui/pt/role_actions.xml
@@ -66,7 +66,7 @@
 		<action description="Enviar aviso" longdescription="Membros que exercem cargos com esta função podem enviar avisos na seção Avisos." name="notices send" value="42"/>
 		<action description="Receber novos avisos e ver os anteriores" longdescription="Membros que exercem cargos com esta função podem receber e ler avisos antigos na seção Avisos." name="notices receive" value="43"/>
 	</action_set>
-	<action_set description="Estas funções incluem o poder de modificar as experiências desse grupo." name="experience_tools_experience">
+	<action_set description="Estas habilidades incluem o poder de modificar as experiências desse grupo." name="experience_tools_experience">
 		<action description="Administrador de experiência" longdescription="Os membros em uma função com essa permissão podem editar os metadados de uma experiência." name="experience admin" value="49"/>
 		<action description="Colaborador de experiência" longdescription="Os membros em uma função com essa permissão podem contribuir com scripts para uma experiência." name="experience contributor" value="50"/>
 	</action_set>
diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml
index cab8d86a99..6fa475e145 100644
--- a/indra/newview/skins/default/xui/pt/strings.xml
+++ b/indra/newview/skins/default/xui/pt/strings.xml
@@ -53,12 +53,12 @@ Placa gráfica: [GRAPHICS_CARD]
 		Versão do driver de vídeo Windows: [GRAPHICS_CARD_VENDOR]
 	</string>
 	<string name="AboutLibs">
-		Versão OpenGL: [OPENGL_VERSION]
+		Versão do OpenGL: [OPENGL_VERSION]
 
-Versão libcurl: [LIBCURL_VERSION]
-Versão J2C Decoder: [J2C_VERSION]
+Versão do libcurl: [LIBCURL_VERSION]
+Versão do J2C Decoder: [J2C_VERSION]
 Versão do driver de áudio: [AUDIO_DRIVER_VERSION]
-Versão Qt Webkit: [QT_WEBKIT_VERSION]
+Versão de LLCEFLib/CEF: [LLCEFLIB_VERSION]
 Versão do servidor de voz: [VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">
@@ -169,6 +169,12 @@ Versão do servidor de voz: [VOICE_VERSION]
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="AgniGridLabel">
+		Grade principal do Second Life (Agni)
+	</string>
+	<string name="AditiGridLabel">
+		Grade de teste beta do Second Life (Aditi)
+	</string>
 	<string name="ViewerDownloadURL">
 		http://secondlife.com/download
 	</string>
@@ -405,6 +411,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 		Você não pode usar uma pasta que contenha mais de [AMOUNT] itens.  Você pode mudar esse limite em Avançado &gt; Mostrar configurações de depuração &gt; WearFolderLimit.
 	</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]"/>
+	<string name="TooltipSLIcon">
+		Isso contém um link para uma página no domínio oficial do SecondLife.com ou LindenLab.com.
+	</string>
 	<string name="TooltipOutboxDragToWorld">
 		Não é possível fazer rez de itens da pasta Listagens do Marketplace
 	</string>
@@ -424,7 +433,7 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 		O número de itens de estoque excede [AMOUNT].
 	</string>
 	<string name="TooltipOutboxCannotDropOnRoot">
-		Você pode soltar somente itens ou pastas na aba TUDO. Selecione essa aba e mova seus itens ou pastas novamente.
+		Você pode soltar somente itens ou pastas na aba TUDO ou NÃO ASSOCIADOS. Selecione uma dessas abas e mova seus itens ou pastas novamente.
 	</string>
 	<string name="TooltipOutboxNoTransfer">
 		Um ou mais objetos não podem ser vendidos ou transferidos
@@ -508,6 +517,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 		Clique para ativar no secondlife:// comando
 	</string>
 	<string name="CurrentURL" value="URL atual: [CurrentURL]"/>
+	<string name="TooltipEmail">
+		Clique para escrever um email
+	</string>
 	<string name="SLurlLabelTeleport">
 		Teletransportar para
 	</string>
@@ -1027,7 +1039,7 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="AgentNameSubst">
 		(Você)
 	</string>
-	<string name="JoinAnExperience"/><!-- intentionally blank -->
+	<string name="JoinAnExperience"/>
 	<string name="SilentlyManageEstateAccess">
 		Suprimir alertas ao gerenciar listas de acesso ao terreno
 	</string>
@@ -1800,6 +1812,21 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="TodayOld">
 		Cadastrado hoje
 	</string>
+	<string name="av_render_everyone_now">
+		Agora, todos podem te ver.
+	</string>
+	<string name="av_render_not_everyone">
+		Sua renderização pode não acontecer para todos ao seu redor.
+	</string>
+	<string name="av_render_over_half">
+		Sua renderização pode não acontecer para metade das pessoas ao seu redor.
+	</string>
+	<string name="av_render_most_of">
+		Sua renderização pode não acontecer para a maioria das pessoas ao seu redor.
+	</string>
+	<string name="av_render_anyone">
+		Sua renderização pode não acontecer para ninguém ao seu redor.
+	</string>
 	<string name="AgeYearsA">
 		[COUNT] ano
 	</string>
@@ -1917,6 +1944,9 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="CompileQueueUnknownFailure">
 		Falha desconhecida para download
 	</string>
+	<string name="CompileNoExperiencePerm">
+		Pulando script [SCRIPT] com experiência [EXPERIENCE]
+	</string>
 	<string name="CompileQueueTitle">
 		Progresso do recompilamento
 	</string>
@@ -1962,9 +1992,6 @@ Pessoas com contas gratuitas não poderão acessar o Second Life no momento para
 	<string name="GroupsNone">
 		nenhum
 	</string>
-	<string name="CompileNoExperiencePerm">
-		Pulando script [SCRIPT] com experiência [EXPERIENCE]
-	</string>
 	<string name="Group" value="(grupo)"/>
 	<string name="Unknown">
 		(Desconhecido)
@@ -5250,18 +5277,6 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="UserDictionary">
 		[Usuário]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		As conversas não estão sendo registradas. Para começar a manter um registro, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Nenhuma conversa será registrada. Para recomeçar a gravação de registros, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Não há conversas registradas. Depois que você entrar em contato com alguém, ou alguém entrar em contato com você, um registro será exibido aqui.
-	</string>
-	<string name="loading_chat_logs">
-		Carregando...
-	</string>
 	<string name="experience_tools_experience">
 		Experiência
 	</string>
@@ -5281,16 +5296,16 @@ Tente colocar o caminho do editor entre aspas.
 		PERMITIDO
 	</string>
 	<string name="Blocked_Experiences_Tab">
-		BLOQUEADA
+		BLOQUEADO
 	</string>
 	<string name="Contrib_Experiences_Tab">
 		COLABORADOR
 	</string>
 	<string name="Admin_Experiences_Tab">
-		ADMIN
+		ADMINISTRADOR
 	</string>
 	<string name="Recent_Experiences_Tab">
-		RECENTES
+		RECENTE
 	</string>
 	<string name="Owned_Experiences_Tab">
 		PRÓPRIAS
@@ -5302,7 +5317,7 @@ Tente colocar o caminho do editor entre aspas.
 		assumir seus controles
 	</string>
 	<string name="ExperiencePermission3">
-		botão animações no seu avatar
+		acionar animações no seu avatar
 	</string>
 	<string name="ExperiencePermission4">
 		anexar ao avatar
@@ -5326,7 +5341,7 @@ Tente colocar o caminho do editor entre aspas.
 		Assumir o controle
 	</string>
 	<string name="ExperiencePermissionShort3">
-		Botão animações
+		Acionar animações
 	</string>
 	<string name="ExperiencePermissionShort4">
 		Anexar
@@ -5335,7 +5350,7 @@ Tente colocar o caminho do editor entre aspas.
 		Rastrear câmera
 	</string>
 	<string name="ExperiencePermissionShort10">
-		Câmera de controle
+		Controlar câmera
 	</string>
 	<string name="ExperiencePermissionShort11">
 		Teletransportar
@@ -5343,4 +5358,37 @@ Tente colocar o caminho do editor entre aspas.
 	<string name="ExperiencePermissionShort12">
 		Autorização
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		As conversas não estão sendo registradas. Para começar a manter um registro, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Nenhuma conversa será registrada. Para recomeçar a gravação de registros, selecione &quot;Salvar: apenas registro&quot; ou &quot;Salvar: registro e transcrições&quot; em Preferências&gt; Bate-papo.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Não há conversas registradas. Depois que você entrar em contato com alguém, ou alguém entrar em contato com você, um registro será exibido aqui.
+	</string>
+	<string name="loading_chat_logs">
+		Carregando...
+	</string>
+	<string name="preset_combo_label">
+		-Lista vazia-
+	</string>
+	<string name="Default">
+		Padrão
+	</string>
+	<string name="none_paren_cap">
+		(nenhum)
+	</string>
+	<string name="no_limit">
+		Sem limite
+	</string>
+	<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+		A forma física contém triângulos muito pequenos. Tente simplificar o modelo físico.
+	</string>
+	<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+		A forma física contém dados de confirmação ruins. Tente consertar o modelo físico.
+	</string>
+	<string name="Mav_Details_MAV_UNKNOWN_VERSION">
+		A forma física não tem a versão correta. Defina a versão correta para o modelo físico.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
index 0f75856a91..ee9f82847d 100644
--- a/indra/newview/skins/default/xui/ru/floater_about.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about.xml
@@ -3,6 +3,7 @@
 	<tab_container name="about_tab">
 		<panel label="Данные" name="support_panel">
 			<button label="Копировать в буфер обмена" name="copy_btn"/>
+			<button label="Проверить наличие обновлений" name="update_btn"/>
 		</panel>
 		<panel label="Создатели" name="credits_panel">
 			<text name="linden_intro">Игра Second Life разработана лабораторией Lindens, 
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 86428da3ef..28d5ff6ab9 100644
--- a/indra/newview/skins/default/xui/ru/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about_land.xml
@@ -13,7 +13,7 @@
 		[MINUTES] мин
 	</floater.string>
 	<floater.string name="Minute">
-		минута
+		мин
 	</floater.string>
 	<floater.string name="Seconds">
 		[SECONDS] с
@@ -446,7 +446,7 @@
 			<spinner label="Часы доступа:" name="HoursSpin"/>
 			<panel name="Allowed_layout_panel">
 				<text label="Всегда разрешено" name="AllowedText">
-					Допущенные жители
+					Допущенные жители ([COUNT])
 				</text>
 				<name_list name="AccessList" tool_tip="([LISTED] в списке, [MAX] максимум)"/>
 				<button label="Добавить" name="add_allowed"/>
@@ -454,7 +454,7 @@
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Бан" name="BanCheck">
-					Забаненные жители
+					Забаненные жители ([COUNT])
 				</text>
 				<name_list name="BannedList" tool_tip="([LISTED] в списке, [MAX] максимум)"/>
 				<button label="Добавить" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_autoreplace.xml b/indra/newview/skins/default/xui/ru/floater_autoreplace.xml
index 6827931e5d..4bc7593790 100644
--- a/indra/newview/skins/default/xui/ru/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/ru/floater_autoreplace.xml
@@ -13,6 +13,12 @@
 	</scroll_list>
 	<button label="Добавить..." name="autoreplace_add_entry"/>
 	<button label="Удалить" name="autoreplace_delete_entry"/>
+	<text name="autoreplace_keyword_txt">
+		Ключевое слово:
+	</text>
+	<text name="autoreplace_replacement_txt">
+		Замена:
+	</text>
 	<button label="Сохранить запись" name="autoreplace_save_entry" tool_tip="Сохранить эту запись."/>
 	<button label="Сохранить изменения" name="autoreplace_save_changes" tool_tip="Сохранить все изменения."/>
 	<button label="Отмена" name="autoreplace_cancel" tool_tip="Отменить все изменения."/>
diff --git a/indra/newview/skins/default/xui/ru/floater_bumps.xml b/indra/newview/skins/default/xui/ru/floater_bumps.xml
index f81f728290..ce21920b2a 100644
--- a/indra/newview/skins/default/xui/ru/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/ru/floater_bumps.xml
@@ -19,6 +19,6 @@
 		[TIME] [NAME] ударил вас физическим объектом
 	</floater.string>
 	<floater.string name="timeStr">
-		[[hour,datetime,slt]:[min,datetime,slt]]
+		[[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
 	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/ru/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000..c1b66f0517
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="УДАЛИТЬ ПРЕСЕТ">
+	<string name="title_graphic">
+		Удалить пресет графики
+	</string>
+	<string name="title_camera">
+		Удалить пресет камеры
+	</string>
+	<text name="Preset">
+		Выберите пресет
+	</text>
+	<button label="Удалить" name="delete"/>
+	<button label="Отмена" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_experienceprofile.xml b/indra/newview/skins/default/xui/ru/floater_experienceprofile.xml
index c72d8b59b9..62c33f3b2e 100644
--- a/indra/newview/skins/default/xui/ru/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/ru/floater_experienceprofile.xml
@@ -57,7 +57,7 @@
 		<panel name="edit_panel_experience_info">
 			<scroll_container name="edit_xp_scroll">
 				<panel name="edit_scrolling_panel">
-					<text name="edit_experience_title_label" value="Название:"/>
+					<text name="edit_experience_title_label" value="Имя:"/>
 					<text name="edit_experience_desc_label" value="Описание:"/>
 					<button label="Группа" name="Group_btn"/>
 					<text name="edit_ContentRating">
diff --git a/indra/newview/skins/default/xui/ru/floater_fast_timers.xml b/indra/newview/skins/default/xui/ru/floater_fast_timers.xml
index 20936b8494..fc750402e4 100644
--- a/indra/newview/skins/default/xui/ru/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/ru/floater_fast_timers.xml
@@ -6,5 +6,16 @@
 	<string name="run">
 		Бег
 	</string>
+	<combo_box name="time_scale_combo">
+		<item label="2 x среднее" name="2x Average"/>
+		<item label="Максимум" name="Max"/>
+		<item label="Последний максимум" name="Recent Max"/>
+		<item label="100 мс" name="100ms"/>
+	</combo_box>
+	<combo_box name="metric_combo">
+		<item label="Время" name="Time"/>
+		<item label="Количество звонков" name="Number of Calls"/>
+		<item label="Гц" name="Hz"/>
+	</combo_box>
 	<button label="Пауза" name="pause_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
index aa0184fe34..40d96bb331 100644
--- a/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/ru/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
 		<radio_item label="Старше, чем" name="older"/>
 	</radio_group>
 	<spinner label="Часов назад" name="spin_hours_ago"/>
+	<text name="label_hours">
+		Часы
+	</text>
 	<spinner label="Дней назад" name="spin_days_ago"/>
+	<text name="label_days">
+		Дни
+	</text>
 	<button label="Закрыть" label_selected="Закрыть" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/ru/floater_load_pref_preset.xml
new file mode 100644
index 0000000000..ba1c463d18
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="ЗАГРУЗИТЬ ПРЕСЕТ">
+	<string name="title_graphic">
+		Загрузить пресет графики
+	</string>
+	<string name="title_camera">
+		Загрузить пресет камеры
+	</string>
+	<text name="Preset">
+		Выберите пресет
+	</text>
+	<button label="OK" name="ok"/>
+	<button label="Отмена" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml
index 332fa3b82f..1d3ff3f5ed 100644
--- a/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/ru/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
 	<string name="OutboxInitializing">
 		Инициализация...
 	</string>
-	<panel label="">
-		<panel>
+	<panel label="" name="panel_1">
+		<panel name="panel_2">
 			<panel name="outbox_inventory_placeholder_panel">
 				<text name="outbox_inventory_placeholder_title">
 					Загрузка...
 				</text>
 			</panel>
 		</panel>
-		<panel>
+		<panel name="panel_3">
+			<panel name="outbox_generic_drag_target">
+				<text name="text_1">
+					Перетаскивайте предметы для создания папок
+				</text>
+			</panel>
 			<button label="Отправить в торговый центр" name="outbox_import_btn" tool_tip="Выставить на витрину моего магазина"/>
 		</panel>
 	</panel>
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 0c6d41b4ef..d660dd97b5 100644
--- a/indra/newview/skins/default/xui/ru/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/ru/floater_model_preview.xml
@@ -55,6 +55,9 @@
 	<string name="mesh_status_invalid_material_list">
 		Материалы уровня детализации не входят в эталонную модель.
 	</string>
+	<string name="phys_status_vertex_limit_exceeded">
+		Для некоторых физических оболочек превышен лимит вершин.
+	</string>
 	<string name="layer_all">
 		Все
 	</string>
@@ -93,52 +96,52 @@
 				<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="Создать"/>
+					<item label="Загрузка из файла" name="Load from file" value="Загрузка из файла"/>
+					<item label="Создать" 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="Порог ошибки"/>
+					<item label="Предельное число треугольников" name="Triangle Limit" value="Предельное число треугольников"/>
+					<item label="Порог ошибки" 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="Использовать УД выше"/>
+					<item label="Загрузка из файла" name="Load from file" value="Загрузка из файла"/>
+					<item label="Создать" name="Generate" value="Создать"/>
+					<item label="Использовать УД выше" 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="Порог ошибки"/>
+					<item label="Предельное число треугольников" name="Triangle Limit" value="Предельное число треугольников"/>
+					<item label="Порог ошибки" 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="Использовать УД выше"/>
+					<item label="Загрузка из файла" name="Load from file" value="Загрузка из файла"/>
+					<item label="Создать" name="Generate" value="Создать"/>
+					<item label="Использовать УД выше" 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="Порог ошибки"/>
+					<item label="Предельное число треугольников" name="Triangle Limit" value="Предельное число треугольников"/>
+					<item label="Порог ошибки" 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="Использовать УД выше"/>
+					<item label="Загрузка из файла" name="Load from file" value="Загрузка из файла"/>
+					<item label="Создать" name="Generate" value="Создать"/>
+					<item label="Использовать УД выше" 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="Порог ошибки"/>
+					<item label="Предельное число треугольников" name="Triangle Limit" value="Предельное число треугольников"/>
+					<item label="Порог ошибки" name="Error Threshold" value="Порог ошибки"/>
 				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/ru/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000..88225f7c1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="УВЕДОМЛЕНИЯ">
+	<floater.string name="system_tab_title">
+		Система ([COUNT])
+	</floater.string>
+	<floater.string name="transactions_tab_title">
+		Транзакции ([COUNT])
+	</floater.string>
+	<floater.string name="group_invitations_tab_title">
+		Приглашения ([COUNT])
+	</floater.string>
+	<floater.string name="group_notices_tab_title">
+		Группа ([COUNT])
+	</floater.string>
+	<string name="title_notification_tabbed_window">
+		УВЕДОМЛЕНИЯ
+	</string>
+	<layout_stack name="TabButtonsStack">
+		<layout_panel name="TabButtonsLayoutPanel">
+			<tab_container name="notifications_tab_container">
+				<panel label="Система (0)" name="system_notification_list_tab"/>
+				<panel label="Транзакции (0)" name="transaction_notifications_tab"/>
+				<panel label="Приглашения (0)" name="group_invite_notifications_tab"/>
+				<panel label="Группа (0)" name="group_notice_notifications_tab"/>
+			</tab_container>
+			<layout_stack name="ButtonsStack">
+				<layout_panel name="CondenseAllButtonPanel">
+					<button label="Свернуть все" name="collapse_all_button"/>
+				</layout_panel>
+				<layout_panel name="GapLayoutPanel">
+					<panel label="Панель интервалов" name="GapPanel"/>
+				</layout_panel>
+				<layout_panel name="DeleteAllButtonPanel">
+					<button label="Удалить все" name="delete_all_button"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</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
index ce7ffc3d20..6476091e3b 100644
--- a/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
 	<floater.string name="character_owner_group">
 		[группа]
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_chars_main">
 		<scroll_list name="objects_scroll_list">
 			<scroll_list.columns label="Имя" name="name"/>
 			<scroll_list.columns label="Описание" name="description"/>
@@ -42,7 +42,7 @@
 		<button label="Выбрать все" name="select_all_objects"/>
 		<button label="Отменить выбор" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_chars_actions">
 		<text name="actions_label">
 			Действия с выбранными персонажами:
 		</text>
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
index fa72df04fd..9c95e71015 100644
--- a/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
 	<floater.string name="pathing_error">
 		Ошибка при создании пути.
 	</floater.string>
+	<panel name="pathfinding_console_main">
+		<text name="viewer_status_label">
+			Статус клиента
+		</text>
+	</panel>
+	<panel name="pathfinding_console_simulator">
+		<text name="simulator_status_label">
+			Статус сервера
+		</text>
+	</panel>
 	<tab_container name="view_test_tab_container">
 		<panel label="Вид" name="view_panel">
 			<text name="show_label">
diff --git a/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml
index db100fa415..debefd5f4a 100644
--- a/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/ru/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
 	<floater.string name="linkset_choose_use">
 		Выберите степень использования наборов связей...
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_linksets_main">
+		<text name="linksets_filter_label">
+			Фильтр:
+		</text>
+		<text name="linksets_name_label">
+			Имя
+		</text>
+		<text name="linksets_desc_label">
+			Описание
+		</text>
 		<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"/>
@@ -101,7 +110,7 @@
 			<combo_box.item label="Перемещаемый фантом" name="filter_by_linkset_use_dynamic_phantom"/>
 		</combo_box>
 		<button label="Применить" name="apply_filters"/>
-		<button label="Чисто" name="clear_filters"/>
+		<button label="Очистить" name="clear_filters"/>
 		<scroll_list name="objects_scroll_list">
 			<scroll_list.columns label="Имя (корневой примитив)" name="name"/>
 			<scroll_list.columns label="Описание (корневой примитив)" name="description"/>
@@ -122,7 +131,10 @@
 		<button label="Выбрать все" name="select_all_objects"/>
 		<button label="Отменить выбор" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_actions">
+		<text name="linksets_actions_label">
+			Действия с выбранными наборами связей (если атрибут удаляется из мира, его атрибуты могут быть утрачены):
+		</text>
 		<check_box label="Показать метку" name="show_beacon"/>
 		<button label="Взять" name="take_objects"/>
 		<button label="Сделать копию" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
 		<button label="Возврат" name="return_objects"/>
 		<button label="Удалить" name="delete_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_attributes">
+		<text name="linksets_attributes_label">
+			Измените атрибуты выбранных наборов связей и нажмите кнопку, чтобы применить изменения
+		</text>
 		<text name="walkability_coefficients_label">
 			Проходимость:
 		</text>
@@ -145,7 +160,7 @@
 		<text name="edit_c_label">
 			C
 		</text>
-		<line_editor name="edit_c_value" tool_tip="Проходимость для персонажей типа C.  Пример персонажа – механизм."/>
+		<line_editor name="edit_c_value" tool_tip="Проходимость для персонажей типа C. Пример персонажа – механизм."/>
 		<text name="edit_d_label">
 			D
 		</text>
diff --git a/indra/newview/skins/default/xui/ru/floater_perms_default.xml b/indra/newview/skins/default/xui/ru/floater_perms_default.xml
index 3a88788712..a33c6b40b6 100644
--- a/indra/newview/skins/default/xui/ru/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/ru/floater_perms_default.xml
@@ -1,6 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perms default" title="СТАНДАРТНЫЕ РАЗРЕШЕНИЯ НА СОЗДАНИЕ">
-	<panel label="Стандартные разрешения" name="default permissions"/>
+	<panel label="Стандартные разрешения" name="default permissions">
+		<text name="label_1">
+			Следующий владелец:
+		</text>
+		<text name="label_2">
+			Копировать
+		</text>
+		<text name="label_3">
+			Изменять
+		</text>
+		<text name="label_4">
+			Передать
+		</text>
+		<text name="label_5">
+			Поделиться с группой
+		</text>
+		<text name="label_6">
+			Разрешить всем копировать
+		</text>
+		<text name="label_7" tool_tip="Задайте стандартные разрешения для создания объектов">
+			Объекты
+		</text>
+		<text name="label_8" tool_tip="Задайте стандартные разрешения для передаваемых вещей">
+			Переданное
+		</text>
+		<text name="label_9" tool_tip="Задайте стандартные разрешения для создания скриптов">
+			Скрипты
+		</text>
+		<text name="label_10" tool_tip="Задайте стандартные разрешения для создания заметок">
+			Заметки
+		</text>
+		<text name="label_11" tool_tip="Задайте стандартные разрешения для создания жестов">
+			Жесты
+		</text>
+		<text name="label_12" tool_tip="Задайте стандартные разрешения для создания одежды или частей тела">
+			Носимые вещи
+		</text>
+	</panel>
 	<button label="OK" label_selected="OK" name="ok"/>
 	<button label="Отмена" label_selected="Отмена" name="cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000..05a02df83e
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="ДОПОЛНИТЕЛЬНЫЕ НАСТРОЙКИ ГРАФИКИ">
+	<text name="GeneralText">
+		Общие
+	</text>
+	<slider label="Дальность отрисовки:" name="DrawDistance"/>
+	<text name="DrawDistanceMeterText2">
+		м
+	</text>
+	<slider label="Макс. количество частиц:" name="MaxParticleCount"/>
+	<slider label="Качество постобработки:" name="RenderPostProcess"/>
+	<text name="PostProcessText">
+		Низкое
+	</text>
+	<text name="AvatarText">
+		Аватар
+	</text>
+	<slider label="Максимальная сложность:" name="IndirectMaxComplexity" tool_tip="Указывает расстояние, начиная с которого визуально сложный аватар рисуется как мармеладный мишка"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
+	<slider label="Макс. кол-во объемных:" name="IndirectMaxNonImpostors"/>
+	<text name="IndirectMaxNonImpostorsText">
+		0
+	</text>
+	<slider label="Детализация:" name="AvatarMeshDetail"/>
+	<text name="AvatarMeshDetailText">
+		Низкая
+	</text>
+	<slider label="Физика:" name="AvatarPhysicsDetail"/>
+	<text name="AvatarPhysicsDetailText">
+		Низкая
+	</text>
+	<text name="ShadersText">
+		Аппаратура
+	</text>
+	<slider label="Память для текстур (МБ):" name="GraphicsCardTextureMemory" tool_tip="Объем памяти, отводимый для текстур. По умолчанию – объем памяти видеокарты. Уменьшение поможет увеличить производительность, но текстуры могут стать размытыми."/>
+	<slider label="Дистанция тумана:" name="fog"/>
+	<slider label="Гамма:" name="gamma"/>
+	<text name="(brightness, lower is brighter)">
+		(чем меньше, тем ярче, 0 – яркость по умолчанию)
+	</text>
+	<check_box label="Анизотропная фильтрация (медленнее, если включено)" name="ani"/>
+	<check_box initial_value="true" label="Включить объекты вершинных буферов OpenGL" name="vbo" tool_tip="Включение этого параметра на современном оборудовании даст увеличение производительности.  Однако на старом оборудовании это может привести к сбою приложения."/>
+	<check_box initial_value="true" label="Разрешить сжатие текстур (требует перезагрузки)" name="texture compression" tool_tip="Сжатие текстур в видеопамяти, что позволяет загружать текстуры большего размера за счет некоторого падения качества цвета."/>
+	<text name="antialiasing label">
+		Сглаживание:
+	</text>
+	<combo_box label="Сглаживание" name="fsaa">
+		<combo_box.item label="Выключено" name="FSAADisabled"/>
+		<combo_box.item label="2x" name="2x"/>
+		<combo_box.item label="4x" name="4x"/>
+		<combo_box.item label="8x" name="8x"/>
+		<combo_box.item label="16x" name="16x"/>
+	</combo_box>
+	<text name="antialiasing restart">
+		(требуется перезапуск)
+	</text>
+	<slider label="Детализация меша:" name="TerrainMeshDetail"/>
+	<text name="TerrainMeshDetailText">
+		Низкая
+	</text>
+	<slider label="Деревья:" name="TreeMeshDetail"/>
+	<text name="TreeMeshDetailText">
+		Низкая
+	</text>
+	<slider label="Объекты:" name="ObjectMeshDetail"/>
+	<text name="ObjectMeshDetailText">
+		Низкая
+	</text>
+	<slider label="Гибкие примитивы:" name="FlexibleMeshDetail"/>
+	<text name="FlexibleMeshDetailText">
+		Низкая
+	</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="Отключение этого параметра может предотвратить зависание некоторых видеокарт"/>
+	<slider label="Ландшафт:" name="TerrainDetail"/>
+	<text name="TerrainDetailText">
+		Низкая
+	</text>
+	<check_box initial_value="true" label="Аппаратная отрисовка аватаров" name="AvatarVertexProgram"/>
+	<check_box initial_value="true" label="Одежда аватара" name="AvatarCloth"/>
+	<text name="ReflectionsText">
+		Вода отражает:
+	</text>
+	<combo_box name="Reflections">
+		<combo_box.item label="Минимум" name="0"/>
+		<combo_box.item label="Ландшафт и деревья" name="1"/>
+		<combo_box.item label="Все статичные объекты" name="2"/>
+		<combo_box.item label="Все аватары и объекты" name="3"/>
+		<combo_box.item label="Все" name="4"/>
+	</combo_box>
+	<check_box initial_value="true" label="Атмосферные шейдеры" name="WindLightUseAtmosShaders"/>
+	<slider label="Небо:" name="SkyMeshDetail"/>
+	<text name="SkyMeshDetailText">
+		Низкая
+	</text>
+	<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="RenderShadowDetailText">
+		Тени:
+	</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>
+	<button label="Вернуть рекомендуемые настройки" name="Defaults"/>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Отмена" label_selected="Отмена" name="Cancel"/>
+	<check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/ru/floater_save_pref_preset.xml
new file mode 100644
index 0000000000..ea981f4475
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="СОХРАНИТЬ ПРЕСЕТ">
+	<string name="title_graphic">
+		Сохранить пресет графики
+	</string>
+	<string name="title_camera">
+		Сохранить пресет камеры
+	</string>
+	<text name="Preset">
+		Введите имя пресета или выберите существующий пресет.
+	</text>
+	<button label="Сохранить" name="save"/>
+	<button label="Отмена" name="cancel"/>
+</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
index a01866db73..d6e414fb2b 100644
--- a/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/ru/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_import" title="Импорт словаря">
+	<text name="import_dict">
+		Словарь:
+	</text>
 	<button label="Обзор" label_selected="Обзор" name="dictionary_path_browse"/>
+	<text name="import_name">
+		Имя:
+	</text>
+	<text name="import_lang">
+		Язык:
+	</text>
 	<button label="Импорт" name="ok_btn"/>
 	<button label="Отмена" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_tos.xml b/indra/newview/skins/default/xui/ru/floater_tos.xml
index bd72f6b308..adadcc88f3 100644
--- a/indra/newview/skins/default/xui/ru/floater_tos.xml
+++ b/indra/newview/skins/default/xui/ru/floater_tos.xml
@@ -12,4 +12,7 @@
 	<text name="tos_heading">
 		Внимательно прочитайте Пользовательское соглашение и Политику конфиденциальности. Для входа в [SECOND_LIFE] вы должны согласиться с условиями соглашения.
 	</text>
+	<text name="external_tos_required">
+		Для продолжения перейдите на сайт my.secondlife.com, войдите и примите Условия обслуживания. Спасибо!
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
index 76acb32a64..bd1ed8d1fa 100644
--- a/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_attachment_other.xml
@@ -15,5 +15,8 @@
 	<menu_item_call label="Приблизить" name="Zoom In"/>
 	<menu_item_call label="Заплатить" name="Pay..."/>
 	<menu_item_call label="Профиль объекта" name="Object Inspect"/>
+	<menu_item_check label="Обычная прорисовка" name="RenderNormally"/>
+	<menu_item_check label="Не рисовать" name="DoNotRender"/>
+	<menu_item_check label="Полная прорисовка" name="AlwaysRenderFully"/>
 	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
index dfe3c2e701..74f1a39658 100644
--- a/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/ru/menu_avatar_other.xml
@@ -14,5 +14,8 @@
 	<menu_item_call label="Вывод XML" name="Dump XML"/>
 	<menu_item_call label="Приблизить" name="Zoom In"/>
 	<menu_item_call label="Заплатить" name="Pay..."/>
+	<menu_item_check label="Обычная прорисовка" name="RenderNormally"/>
+	<menu_item_check label="Не рисовать" name="DoNotRender"/>
+	<menu_item_check label="Полная прорисовка" name="AlwaysRenderFully"/>
 	<menu_item_call label="Блокировать владельца участка" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_login.xml b/indra/newview/skins/default/xui/ru/menu_login.xml
index 885f6195b6..2deab04d81 100644
--- a/indra/newview/skins/default/xui/ru/menu_login.xml
+++ b/indra/newview/skins/default/xui/ru/menu_login.xml
@@ -15,6 +15,7 @@
 		<menu_item_call label="Блоги [SECOND_LIFE]" name="Second Life Blogs"/>
 		<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
 		<menu_item_call label="О [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="Проверить наличие обновлений" name="Check for Updates"/>
 	</menu>
 	<menu_item_check label="Показать меню отладки" name="Show Debug Menu"/>
 	<menu label="Отладка" name="Debug">
diff --git a/indra/newview/skins/default/xui/ru/menu_marketplace_view.xml b/indra/newview/skins/default/xui/ru/menu_marketplace_view.xml
index b299c8202f..01c20a81c1 100644
--- a/indra/newview/skins/default/xui/ru/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/ru/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_marketplace_sort">
+	<menu_item_check label="Сортировать по имени" name="sort_by_name"/>
+	<menu_item_check label="Сортировать по времени" name="sort_by_recent"/>
 	<menu_item_check label="Сортировать по объему запасов (от малых к большим)" name="sort_by_stock_amount"/>
 	<menu_item_check label="Показывать только папки списков" name="show_only_listing_folders"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_url_email.xml b/indra/newview/skins/default/xui/ru/menu_url_email.xml
new file mode 100644
index 0000000000..2f32743c7a
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+	<menu_item_call label="Написать письмо во внешней программе" name="email_open_external"/>
+	<menu_item_call label="Копировать письмо в буфер обмена" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/ru/menu_viewer.xml b/indra/newview/skins/default/xui/ru/menu_viewer.xml
index d22ca845f9..2044844c58 100644
--- a/indra/newview/skins/default/xui/ru/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/ru/menu_viewer.xml
@@ -177,6 +177,7 @@
 		<menu_item_call label="Сообщить об ошибке" name="Report Bug"/>
 		<menu_item_call label="Столкновения, толчки и удары" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu_item_call label="О [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="Проверить наличие обновлений" name="Check for Updates"/>
 	</menu>
 	<menu label="Дополнительно" name="Advanced">
 		<menu_item_call label="Обновить текстуры" name="Rebake Texture"/>
@@ -190,7 +191,7 @@
 			<menu_item_call label="Запаздывание" name="Lag Meter"/>
 			<menu_item_check label="Статистика" name="Statistics Bar"/>
 			<menu_item_call label="Статистика загрузки сцен" name="Scene Load Statistics"/>
-			<menu_item_check label="Показать вес отрисовки для аватаров" name="Avatar Rendering Cost"/>
+			<menu_item_check label="Показывать информацию о сложности аватара" name="Avatar Draw Info"/>
 		</menu>
 		<menu label="Подсветка и видимость" name="Highlighting and Visibility">
 			<menu_item_check label="Мигающий маяк" name="Cheesy Beacon"/>
@@ -313,8 +314,6 @@
 			<menu_item_check label="Суставы" name="Joints"/>
 			<menu_item_check label="Лучи" name="Raycast"/>
 			<menu_item_check label="Направления ветра" name="Wind Vectors"/>
-			<menu_item_check label="Сложность визуализации" name="rendercomplexity"/>
-			<menu_item_check label="Байты присоединения" name="attachment bytes"/>
 			<menu_item_check label="Лепка" name="Sculpt"/>
 			<menu label="Плотность текстуры" name="Texture Density">
 				<menu_item_check label="Нет" name="None"/>
@@ -420,13 +419,11 @@
 			<menu_item_check label="Отладка видимости персонажа" name="Debug Character Vis"/>
 			<menu_item_check label="Показать скелет" name="Show Collision Skeleton"/>
 			<menu_item_check label="Отобразить действие агента" name="Display Agent Target"/>
-			--&gt;
 			<menu_item_call label="Вывод присоединений" name="Dump Attachments"/>
 			<menu_item_call label="Отладка текстур аватара" name="Debug Avatar Textures"/>
 			<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_call label="Включить Visual Leak Detector" name="Enable Visual Leak Detector"/>
 		<menu_item_check label="Вывод минидампа при отладке" name="Output Debug Minidump"/>
diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml
index 70b9a25590..3df0e607bd 100644
--- a/indra/newview/skins/default/xui/ru/notifications.xml
+++ b/indra/newview/skins/default/xui/ru/notifications.xml
@@ -164,6 +164,10 @@
         &apos;[ERROR_CODE]&apos;
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="MerchantForceValidateListing">
+		Для создания вашего списка была исправлена иерархия его содержимого.
+		<usetemplate ignoretext="Предупреждать об исправлении иерархии содержимого при создании списка" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="ConfirmMerchantActiveChange">
 		Это действие вызовет изменение активного содержимого данного списка. Продолжить?
 		<usetemplate ignoretext="Подтверждать смену активного списка в торговом центре" name="okcancelignore" notext="Отмена" yestext="OK"/>
@@ -211,6 +215,10 @@
 		Публикация вашего списка прекращена, так как папка запасов пуста. Добавьте предметы в папку запасов, чтобы опубликовать список снова.
 		<usetemplate ignoretext="Оповещать о неудавшейся публикации списка из-за того, что папка запасов пуста" name="okignore" yestext="OK"/>
 	</notification>
+	<notification name="AlertMerchantVersionFolderEmpty">
+		Публикация вашего списка прекращена, так как папка версии пуста. Добавьте предметы в папку версии, чтобы опубликовать список снова.
+		<usetemplate ignoretext="Оповещать о неудавшейся публикации списка из-за того, что папка версии пуста" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		Ошибка при передаче текста скрипта по следующей причине: [REASON]. Повторите попытку позже.
 	</notification>
@@ -320,6 +328,14 @@
 		Вы собираетесь исключить [COUNT] участников из группы.
 		<usetemplate ignoretext="Подтвердите исключение участников из группы" name="okcancelignore" notext="Отмена" yestext="Выкинуть"/>
 	</notification>
+	<notification name="BanGroupMemberWarning">
+		Вы собираетесь запретить игроку [AVATAR_NAME] доступ в группу.
+		<usetemplate ignoretext="Подтвердите запрет доступа участника в группу" name="okcancelignore" notext="Отмена" yestext="Бан"/>
+	</notification>
+	<notification name="BanGroupMembersWarning">
+		Вы собираетесь запретить [COUNT] участникам доступ в группу.
+		<usetemplate ignoretext="Подтвердите запрет доступа участникам в группу" name="okcancelignore" notext="Отмена" yestext="Бан"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Вы собираетесь сбросить свое присоединение.
     Продолжить?
@@ -404,7 +420,7 @@
 		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
 	</notification>
 	<notification name="ReturnAllTopObjects">
-		Вы действительно хотите вернуть все объекты из списка в инвентарь их владельцев?
+		Вы действительно хотите вернуть все объекты из списка в инвентарь их владельцев? Будут возвращены ВСЕ скриптовые объекты в регионе!
 		<usetemplate name="okcancelbuttons" notext="Отмена" yestext="OK"/>
 	</notification>
 	<notification name="DisableAllTopObjects">
@@ -609,6 +625,10 @@
 	<notification name="CannotDownloadFile">
 		Невозможно загрузить файл
 	</notification>
+	<notification label="" name="MediaFileDownloadUnsupported">
+		Вы запросили загрузку файла, который не поддерживается в [SECOND_LIFE].
+		<usetemplate ignoretext="Предупреждать о загрузке неподдерживаемых файлов" name="okignore" yestext="OK"/>
+	</notification>
 	<notification name="CannotWriteFile">
 		Невозможно записать файл [[FILE]]
 	</notification>
@@ -1108,8 +1128,9 @@
 Обычно это временная неполадка. Исправьте настройки и сохраните одежду снова через несколько минут.
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		Черт! Вас выкинуло из [SECOND_LIFE]
-            [MESSAGE]
+		Черт! Вас выкинуло из [SECOND_LIFE].
+
+[MESSAGE]
 		<usetemplate name="okcancelbuttons" notext="Выйти" yestext="Просмотреть IM и чат"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
@@ -1357,6 +1378,13 @@
 			<ignore name="ignore" text="Загрузка одежды занимает значительное время"/>
 		</form>
 	</notification>
+	<notification name="RegionAndAgentComplexity">
+		Ваша [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 визуальная сложность]: [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+	</notification>
+	<notification name="AgentComplexity">
+		Ваша [https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 визуальная сложность]: [AGENT_COMPLEXITY].
+	</notification>
 	<notification name="FirstRun">
 		Установка [APP_NAME] завершена.
 
@@ -1636,6 +1664,25 @@ http://secondlife.com/download.
 см. [[INFO_URL] Сведения об этом обновлении]
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="UpdateDownloadInProgress">
+		Появилось обновление!
+Оно сейчас загружается в фоновом режиме и, как только будет готово, вам будет предложено перезапустить клиент для завершения установки.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateDownloadComplete">
+		Обновление загружено. Оно будет установлено после перезапуска.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateCheckError">
+		При поиске обновлений произошла ошибка.
+Повторите попытку позже.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="UpdateViewerUpToDate">
+		Ваш клиент уже обновлен!
+Если вы хотите немедленно испробовать наши новейшие функции и исправления, обратитесь на страницу «Альтернативные клиенты»: http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="DeedObjectToGroup">
 		В результате передачи этого объекта группа:
 * Получит L$ в уплату за объект
@@ -1740,6 +1787,14 @@ http://secondlife.com/download.
 		Достигнуто максимальное количество групп. Выйдите из другой группы, прежде чем вступать в эту или создавать новую группу.
 		<usetemplate name="okbutton" yestext="OK"/>
 	</notification>
+	<notification name="GroupLimitInfo">
+		Максимальное число групп для пользователя базового аккаунта составляет [MAX_BASIC],
+а для [https://secondlife.com/premium/ премиум]-аккаунта – [MAX_PREMIUM].
+Чтобы вступать в новые группы после возврата к базовому аккаунту, вам придется выйти из части групп, чтобы их общее число было меньше [MAX_BASIC].
+
+[https://secondlife.com/my/account/membership.php Перейдите на премиум-членство!]
+		<usetemplate name="okbutton" yestext="Закрыть"/>
+	</notification>
 	<notification name="KickUser">
 		Выбросить этого жителя с таким сообщением?
 		<form name="form">
@@ -1939,7 +1994,7 @@ http://secondlife.com/download.
 		<usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Для всех землевладений" yestext="Для этого землевладения"/>
 	</notification>
 	<notification label="Выбрать землевладение" name="EstateTrustedExperienceRemove">
-		Удалить из ключевой список только для этого землевладения или для [ALL_ESTATES]?
+		Удалить из ключевого списка только этого землевладения или [ALL_ESTATES]?
 		<usetemplate canceltext="Отмена" name="yesnocancelbuttons" notext="Для всех землевладений" yestext="Для этого землевладения"/>
 	</notification>
 	<notification label="Подтвердить выбрасывание" name="EstateKickUser">
@@ -2248,6 +2303,10 @@ http://secondlife.com/download.
 		Подтвердите оплату L$[AMOUNT] для [TARGET].
 		<usetemplate ignoretext="Подтверждать перед оплатой (для сумм более L$200)" name="okcancelignore" notext="Отмена" yestext="Оплатить"/>
 	</notification>
+	<notification name="PayObjectFailed">
+		Не удалось выполнить оплату: объект не найден.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
 	<notification name="OpenObjectCannotCopy">
 		В этом объекте нет вещей, которые вам разрешено копировать.
 	</notification>
@@ -2279,10 +2338,9 @@ http://secondlife.com/download.
 		[QUESTION]
 		<usetemplate ignoretext="Подтверждать перед удалением предметов" name="okcancelignore" notext="Отмена" yestext="OK"/>
 	</notification>
-	<notification name="HelpReportAbuseEmailLL">
-		Этот инструмент служит для уведомления о нарушениях [http://secondlife.com/corporate/tos.php Пользовательского соглашения] и [http://secondlife.com/corporate/cs.php стандартов сообщества].
-
-Все нарушения, о которых поступили такие уведомления, расследуются и устраняются.
+	<notification name="ConfirmUnlink">
+		Это большое выделение с наборами связей. Если разъединить его, повторное соединение может отказаться невозможным. В качестве меры предосторожности попробуйте скопировать наборы связей в инвентарь.
+		<usetemplate ignoretext="Подтверждать при разъединении набора связей" name="okcancelignore" notext="Отмена" yestext="Разъединить"/>
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		Выберите категорию для этого уведомления о нарушении.
@@ -2980,7 +3038,7 @@ http://secondlife.com/download.
 		Нередактируемое поле «[field]» игнорируется при обновлении профиля приключения.
 	</notification>
 	<notification name="RestrictedToOwnerExperienceProfileMessage">
-		Игнорируются изменения в поле «[field]», которые может вносить только владелец приключения.
+		В поле «[field]» игнорируются изменения, которые может вносить только владелец приключения.
 	</notification>
 	<notification name="MaturityRatingExceedsOwnerExperienceProfileMessage">
 		Вы не можете устанавливать для приключения рейтинг зрелости выше, чем у владельца.
@@ -2989,7 +3047,7 @@ http://secondlife.com/download.
 		Следующие условия не допускают обновление названия и (или) описания профиля приключения: [extra_info]
 	</notification>
 	<notification name="TeleportedHomeExperienceRemoved">
-		Вы были телепортированы из региона [region_name] за удаление приключения secondlife:///app/experience/[public_id]/profile. Вам больше не разрешено пребывание в этом регионе.
+		Вы были телепортированы из региона [region_name] за удаление приключения secondlife:///app/experience/[public_id]/profile. Вам больше нельзя пребывать в этом регионе.
 		<form name="form">
 			<ignore name="ignore" text="Выброшен из региона за удаление приключения"/>
 		</form>
@@ -3005,7 +3063,7 @@ http://secondlife.com/download.
 
 [EXPERIENCE_LIST]
 
-Могут быть доступны следующие ключевые приключения.
+Могут быть доступны другие ключевые приключения.
 	</notification>
 	<notification name="ExperienceEvent">
 		Разрешен объект для события [EventType] приключением secondlife:///app/experience/[public_id]/profile.
@@ -3018,9 +3076,9 @@ http://secondlife.com/download.
     Владелец: secondlife:///app/agent/[OwnerID]/inspect
 	</notification>
 	<notification name="ScriptQuestionExperience">
-		Объект «&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;», владелец которого – «[NAME]», требует вашего участия в приключении [GRID_WIDE]:
+		Объекту «&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;», владелец которого – «[NAME]», требуется ваше участие в приключении [GRID_WIDE]:
 
-[EXPERIENCE]
+[ПРИКЛЮЧЕНИЕ]
 
 После получения разрешения это сообщение больше не будет отображаться для данного приключения, пока оно не будет отозвано из профиля приключения.
 
@@ -3211,6 +3269,12 @@ http://secondlife.com/download.
 	<notification name="AttachmentSaved">
 		Присоединение сохранено.
 	</notification>
+	<notification name="PresetNotSaved">
+		Ошибка при сохранении пресета [NAME].
+	</notification>
+	<notification name="PresetNotDeleted">
+		Ошибка при удалении пресета [NAME].
+	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Невозможно найти раздел справки для этого элемента.
 	</notification>
@@ -3243,9 +3307,8 @@ http://secondlife.com/download.
 		Выберите жителей, чтобы поделиться с ними.
 	</notification>
 	<notification name="MeshUploadError">
-		Не удалось передать [LABEL]: [MESSAGE] [IDENTIFIER] 
-
-Подробности см. в файле журнала.
+		Не удалось передать [LABEL]: [MESSAGE] [IDENTIFIER]
+[DETAILS]Подробности см. в файле SecondLife.log
 	</notification>
 	<notification name="MeshUploadPermError">
 		Ошибка при запросе разрешений на передачу меша.
diff --git a/indra/newview/skins/default/xui/ru/panel_experience_list_editor.xml b/indra/newview/skins/default/xui/ru/panel_experience_list_editor.xml
index fdf3ec8188..e57687069c 100644
--- a/indra/newview/skins/default/xui/ru/panel_experience_list_editor.xml
+++ b/indra/newview/skins/default/xui/ru/panel_experience_list_editor.xml
@@ -19,7 +19,7 @@
 		Список приключений
 	</text>
 	<scroll_list name="experience_list">
-		<columns label="Название" name="experience_name"/>
+		<columns label="Имя" name="experience_name"/>
 	</scroll_list>
 	<button label="Добавить..." name="btn_add"/>
 	<button label="Удалить" name="btn_remove"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_experience_search.xml b/indra/newview/skins/default/xui/ru/panel_experience_search.xml
index 38d047f509..47c5dc37b6 100644
--- a/indra/newview/skins/default/xui/ru/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/ru/panel_experience_search.xml
@@ -22,14 +22,14 @@
 		&quot;Parcel_R_Light&quot;
 	</string>
 	<panel name="search_panel">
-		<button label="Перейти" name="find"/>
+		<button label="Начать" name="find"/>
 		<icons_combo_box label="Умеренный" name="maturity">
 			<icons_combo_box.item label="Для взрослых" name="Adult" value="42"/>
 			<icons_combo_box.item label="Умеренный" name="Mature" value="21"/>
 			<icons_combo_box.item label="Общий" name="PG" value="13"/>
 		</icons_combo_box>
 		<scroll_list name="search_results">
-			<columns label="Название" name="experience_name"/>
+			<columns label="Имя" name="experience_name"/>
 			<columns label="Владелец" name="owner"/>
 		</scroll_list>
 		<button label="OK" label_selected="OK" name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
index 80a67371af..93deba6d6b 100644
--- a/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_main_inventory.xml
@@ -6,6 +6,9 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] вещей [FILTER]
 	</panel.string>
+	<panel.string name="ItemcountUnknown">
+		Извлечено [ITEM_COUNT] вещей [FILTER]
+	</panel.string>
 	<text name="ItemcountText">
 		Вещи:
 	</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_people.xml b/indra/newview/skins/default/xui/ru/panel_people.xml
index 9606f0aec1..0fdc06fb32 100644
--- a/indra/newview/skins/default/xui/ru/panel_people.xml
+++ b/indra/newview/skins/default/xui/ru/panel_people.xml
@@ -18,6 +18,7 @@
 	<string name="no_groups_msg" value="Ищете группу, чтобы присоединиться к ней? Воспользуйтесь [secondlife:///app/search/groups поиском]."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Двойной щелчок открывает карту, shift+перетягивание – обзор)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Двойной щелчок – телепортация, shift+перетягивание – обзор)"/>
+	<string name="GroupCountWithInfo" value="Вы входите в [COUNT] групп и можете присоединиться еще к [REMAINING].  [secondlife:/// Хотите еще?]"/>
 	<tab_container name="tabs">
 		<panel label="РЯДОМ" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
index 90743646fd..88bcc22414 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
 	<check_box label="Разрешить работу нескольких клиентов" name="allow_multiple_viewer_check"/>
 	<check_box label="Выбор сетки при входе" name="show_grid_selection_check"/>
 	<check_box label="Показывать расширенное меню" name="show_advanced_menu_check"/>
-	<check_box label="Показывать меню разработчика" name="show_develop_menu_check"/>
+	<check_box label="Показать меню разработчика" name="show_develop_menu_check"/>
 	<button label="Стандартные разрешения на создание" name="default_creation_permissions"/>
 </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 914426c91e..4d651c2544 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
 		<check_box label="Предложение инвентаря" name="inventory_offer"/>
 	</panel>
 	<panel name="log_settings">
+		<text name="logging_label">
+			Сохранять:
+		</text>
+		<combo_box name="conversation_log_combo">
+			<item label="Журнал и записи" name="log_and_transcripts" value="2"/>
+			<item label="Только журнал" name="log_only" value="1"/>
+			<item label="Ни журнал, ни записи" name="no_log_or_transcript" value="0"/>
+		</combo_box>
 		<button label="Очистить журнал..." name="clear_log"/>
 		<button label="Удалить записи..." name="delete_transcripts"/>
+		<text name="log_location_label">
+			Место:
+		</text>
 		<button label="Обзор..." label_selected="Обзор" name="log_path_button"/>
 	</panel>
 	<button label="Перевод..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
index c93955fcdc..31c9b2135d 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_graphics1.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Графика" name="Display panel">
+	<text name="preset_text">
+		(нет)
+	</text>
 	<text name="QualitySpeed">
 		Качество и скорость:
 	</text>
-	<text name="FasterText">
-		Быстрее
-	</text>
-	<text name="BetterText">
-		Качественней
-	</text>
 	<text name="ShadersPrefText">
 		Низко
 	</text>
@@ -21,94 +18,17 @@
 	<text name="ShadersPrefText4">
 		Ультра
 	</text>
-	<panel label="Выбор графики" name="CustomGraphics Panel">
-		<text name="ShadersText">
-			Шейдеры:
-		</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>
-		<combo_box name="Reflections">
-			<combo_box.item label="Минимум" name="0"/>
-			<combo_box.item label="Ландшафт и деревья" name="1"/>
-			<combo_box.item label="Все статичные объекты" name="2"/>
-			<combo_box.item label="Все аватары и объекты" name="3"/>
-			<combo_box.item label="Все" name="4"/>
-		</combo_box>
-		<slider label="Физика аватара:" name="AvatarPhysicsDetail"/>
-		<text name="AvatarPhysicsDetailText">
-			Низко
-		</text>
-		<slider label="Дальность отрисовки:" name="DrawDistance"/>
-		<text name="DrawDistanceMeterText2">
-			м
-		</text>
-		<slider label="Макс. количество частиц:" name="MaxParticleCount"/>
-		<slider label="Макс. количество 3D-аватаров:" name="MaxNumberAvatarDrawn"/>
-		<slider label="Качество постобработки:" name="RenderPostProcess"/>
-		<text name="MeshDetailText">
-			Детализация меша:
-		</text>
-		<slider label="Объекты:" name="ObjectMeshDetail"/>
-		<slider label="Гибкие примитивы:" name="FlexibleMeshDetail"/>
-		<slider label="Деревья:" name="TreeMeshDetail"/>
-		<slider label="Аватары:" name="AvatarMeshDetail"/>
-		<slider label="Ландшафт:" name="TerrainMeshDetail"/>
-		<slider label="Небо:" name="SkyMeshDetail"/>
-		<text name="PostProcessText">
-			Низко
-		</text>
-		<text name="ObjectMeshDetailText">
-			Низко
-		</text>
-		<text name="FlexibleMeshDetailText">
-			Низко
-		</text>
-		<text name="TreeMeshDetailText">
-			Низко
-		</text>
-		<text name="AvatarMeshDetailText">
-			Низко
-		</text>
-		<text name="TerrainMeshDetailText">
-			Низко
-		</text>
-		<text name="SkyMeshDetailText">
-			Низко
-		</text>
-		<text name="AvatarRenderingText">
-			Отрисовка аватара:
-		</text>
-		<check_box initial_value="true" label="Плоские аватары" name="AvatarImpostors"/>
-		<check_box initial_value="true" label="Аппаратная отрисовка" name="AvatarVertexProgram"/>
-		<check_box initial_value="true" label="Одежда аватара" name="AvatarCloth"/>
-		<text name="TerrainDetailText">
-			Ландшафт:
-		</text>
-		<radio_group name="TerrainDetailRadio">
-			<radio_item label="Грубо" name="0"/>
-			<radio_item label="Детально" name="2"/>
-		</radio_group>
-		--&gt;
-	</panel>
-	<button label="Применить" label_selected="Применить" name="Apply"/>
-	<button label="Сброс" name="Defaults"/>
-	<button label="Дополнительно" name="Advanced"/>
-	<button label="Аппаратура" label_selected="Аппаратура" name="GraphicsHardwareButton"/>
+	<text name="FasterText">
+		Быстрее
+	</text>
+	<text name="BetterText">
+		Качественней
+	</text>
+	<check_box initial_value="true" label="Атмосферные шейдеры" name="WindLightUseAtmosShaders"/>
+	<check_box initial_value="true" label="Расширенная модель освещения" name="UseLightShaders"/>
+	<button label="Сохранить настройки как пресет..." name="PrefSaveButton"/>
+	<button label="Загрузить пресет..." name="PrefLoadButton"/>
+	<button label="Удалить пресет..." name="PrefDeleteButton"/>
+	<button label="Вернуть рекомендуемые настройки" name="Defaults"/>
+	<button label="Расширенные настройки..." name="AdvancedSettings"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
index d00f58dbff..fd13abbe27 100644
--- a/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/ru/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
 	<radio_group name="preferred_browser_behavior">
 		<radio_item label="Использовать мой браузер (Chrome, Firefox, IE) для всех ссылок" name="internal" tool_tip="Будет использоваться браузер, заданный в системе по умолчанию. Не рекомендуется, если [APP_NAME] работает в полноэкранном режиме." value="0"/>
 		<radio_item label="Использовать встроенный браузер только для ссылок Second Life" name="external" tool_tip="Стандартный браузер системы будет использоваться для справки, ссылок Интернета и т.д. Встроенный браузер будет использоваться только для ссылок LindenLab/SecondLife." value="1"/>
+		<radio_item label="Использовать встроенный браузер для всех ссылок" name="external_all" tool_tip="Для просмотра справки, ссылок на веб-страницы и т. д. будет использоваться встроенный браузер. Этот браузер открывается как новое окно в [APP_NAME]." value="2"/>
 	</radio_group>
 	<check_box initial_value="true" label="Разрешить плагины" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Принимать файлы cookie" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Разрешить Javascript" name="browser_javascript_enabled"/>
-	<check_box initial_value="false" label="Разрешить всплывающие окна" name="media_popup_enabled"/>
 	<text name="Software updates:">
 		Обновления ПО:
 	</text>
 	<combo_box name="updater_service_combobox">
 		<combo_box.item label="Устанавливать автоматически" name="Install_automatically"/>
-		<combo_box.item label="Загружать и устанавливать обновления вручную" name="Install_manual"/>
+		<combo_box.item label="Я буду загружать и устанавливать обновления вручную" name="Install_manual"/>
 	</combo_box>
 	<check_box label="Устанавливать бета-версии" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/ru/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/ru/panel_presets_pulldown.xml
new file mode 100644
index 0000000000..8cac14dcf6
--- /dev/null
+++ b/indra/newview/skins/default/xui/ru/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+	<text name="Graphic Presets">
+		Пресеты графики
+	</text>
+	<button label="Открыть параметры графики" name="open_prefs_btn" tool_tip="Открыть настройки графики"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml
index 76bb6518e9..a08d99d0e6 100644
--- a/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/ru/panel_prim_media_controls.xml
@@ -57,12 +57,9 @@
 		<layout_panel name="media_address">
 			<line_editor name="media_address_url" tool_tip="Ссылка на медиа"/>
 			<layout_stack name="media_address_url_icons">
-				<layout_panel>
+				<layout_panel name="media_address_url_icons_wl">
 					<icon name="media_whitelist_flag" tool_tip="Включен белый список"/>
 				</layout_panel>
-				<layout_panel>
-					<icon name="media_secure_lock_flag" tool_tip="Безопасный просмотр"/>
-				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 		<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/ru/panel_region_experiences.xml b/indra/newview/skins/default/xui/ru/panel_region_experiences.xml
index 4fd70b5650..f777fe3378 100644
--- a/indra/newview/skins/default/xui/ru/panel_region_experiences.xml
+++ b/indra/newview/skins/default/xui/ru/panel_region_experiences.xml
@@ -5,7 +5,7 @@
 
 У ключевых приключений есть разрешение на запуск в этом землевладении.
 
-Кроме того, если в землевладении не разрешен публичный доступ, то жители, участвующие в любом ключевом приключении, могут входить в землевладение и оставаться в нем до тех пор, пока они находятся в ключевом приключении.
+Кроме того, если к землевладению не разрешен публичный доступ, то жители, участвующие в любом ключевом приключении, могут входить в землевладение и оставаться в нем до тех пор, пока они находятся в ключевом приключении.
 	</panel.string>
 	<panel.string name="allowed_estate_text">
 		Могут быть разрешены только приключения, привязанные к земле.
diff --git a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
index adc612dfd8..f07e12e0ed 100644
--- a/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/ru/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Сохранение изображения в инвентаре стоит L$[UPLOAD_COST]. Чтобы сохранить его как текстуру, выберите один из квадратных форматов.
 	</text>
 	<combo_box label="Размер" name="texture_size_combo">
-		<combo_box.item label="Текущее окно" name="CurrentWindow"/>
+		<combo_box.item label="Текущее окно (512x512)" name="CurrentWindow"/>
 		<combo_box.item label="Маленький (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Средний (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Большой (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/ru/panel_tools_texture.xml b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
index 1abf729487..def12d3cdb 100644
--- a/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/ru/panel_tools_texture.xml
@@ -21,11 +21,11 @@
 		<combo_box.item label="Материалы" name="Materials"/>
 		<combo_box.item label="Медиа" name="Media"/>
 	</combo_box>
-	<combo_box name="combobox mattype">
-		<combo_box.item label="Текстура (рассеянная)" name="Texture (diffuse)"/>
-		<combo_box.item label="Шероховатость (обычная)" name="Bumpiness (normal)"/>
-		<combo_box.item label="Блеск (зеркальный)" name="Shininess (specular)"/>
-	</combo_box>
+	<radio_group name="radio_material_type">
+		<radio_item label="Текстура (рассеянная)" name="Texture (diffuse)" value="0"/>
+		<radio_item label="Шероховатость (обычная)" name="Bumpiness (normal)" value="1"/>
+		<radio_item label="Блеск (зеркальный)" name="Shininess (specular)" value="2"/>
+	</radio_group>
 	<texture_picker label="Текстура" name="texture control" tool_tip="Щелкните для выбора изображения"/>
 	<text name="label alphamode">
 		Альфа-режим
diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml
index 1617451a3a..4cd6fac2e1 100644
--- a/indra/newview/skins/default/xui/ru/strings.xml
+++ b/indra/newview/skins/default/xui/ru/strings.xml
@@ -67,7 +67,7 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 Версия libcurl: [LIBCURL_VERSION]
 Версия декодера J2C: [J2C_VERSION]
 Версия драйвера звука: [AUDIO_DRIVER_VERSION]
-Версия Qt Webkit: [QT_WEBKIT_VERSION]
+Версия LLCEFLib/CEF: [LLCEFLIB_VERSION]
 Версия голосового сервера: [VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">
@@ -178,6 +178,12 @@ SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="AgniGridLabel">
+		Основная сетка Second Life (Agni)
+	</string>
+	<string name="AditiGridLabel">
+		Сетка Second Life для бета-тестирования (Aditi)
+	</string>
 	<string name="ViewerDownloadURL">
 		http://secondlife.com/download
 	</string>
@@ -453,6 +459,9 @@ support@secondlife.com.
 		Нельзя носить папку, содержащую более [AMOUNT] вещей.  Это ограничение можно изменить в меню «Дополнительно &gt; Настройки отладки &gt; WearFolderLimit.
 	</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]:"/>
+	<string name="TooltipSLIcon">
+		Эта ссылка ведет на страницу официального домена SecondLife.com или LindenLab.com.
+	</string>
 	<string name="TooltipOutboxDragToWorld">
 		Нельзя выложить предметы из папки списков товаров торгового центра
 	</string>
@@ -472,7 +481,7 @@ support@secondlife.com.
 		Количество предметов не может превышать [AMOUNT].
 	</string>
 	<string name="TooltipOutboxCannotDropOnRoot">
-		Можно перетаскивать предметы или папки только на вкладку «ВСЕ». Выберите эту вкладку и переместите предметы или папки снова.
+		Можно перетаскивать предметы или папки только на вкладку «ВСЕ» или «НЕСВЯЗАННЫЕ». Выберите одну из этих вкладок и переместите предметы или папки снова.
 	</string>
 	<string name="TooltipOutboxNoTransfer">
 		Часть этих объектов нельзя продать или передать
@@ -556,6 +565,9 @@ support@secondlife.com.
 		Щелкните, чтобы выполнить команду secondlife://
 	</string>
 	<string name="CurrentURL" value="Текущий URL-адрес: [CurrentURL]"/>
+	<string name="TooltipEmail">
+		Щелкните, чтобы написать письмо
+	</string>
 	<string name="SLurlLabelTeleport">
 		Телепортироваться в
 	</string>
@@ -1078,7 +1090,7 @@ support@secondlife.com.
 	<string name="AgentNameSubst">
 		(Вы)
 	</string>
-	<string name="JoinAnExperience"/><!-- intentionally blank -->
+	<string name="JoinAnExperience"/>
 	<string name="SilentlyManageEstateAccess">
 		Отключить извещения при управлении списками доступа к землевладениям
 	</string>
@@ -1857,6 +1869,21 @@ support@secondlife.com.
 	<string name="TodayOld">
 		Сегодня
 	</string>
+	<string name="av_render_everyone_now">
+		Теперь все могут видеть вас.
+	</string>
+	<string name="av_render_not_everyone">
+		Все окружающие участники не могут отрисовать вас.
+	</string>
+	<string name="av_render_over_half">
+		Более половины окружающих участников не могут отрисовать вас.
+	</string>
+	<string name="av_render_most_of">
+		Большинство окружающих участников не может отрисовать вас.
+	</string>
+	<string name="av_render_anyone">
+		Никто из окружающих участников не может отрисовать вас.
+	</string>
 	<string name="AgeYearsA">
 		[COUNT] год
 	</string>
@@ -1974,6 +2001,9 @@ support@secondlife.com.
 	<string name="CompileQueueUnknownFailure">
 		Неизвестный сбой загрузки
 	</string>
+	<string name="CompileNoExperiencePerm">
+		Пропуск скрипта [SCRIPT] с приключением [EXPERIENCE].
+	</string>
 	<string name="CompileQueueTitle">
 		Ход повторной компиляции
 	</string>
@@ -2019,9 +2049,6 @@ support@secondlife.com.
 	<string name="GroupsNone">
 		нет
 	</string>
-	<string name="CompileNoExperiencePerm">
-		Пропуск скрипта [SCRIPT] с приключением [EXPERIENCE].
-	</string>
 	<string name="Group" value="(группа)"/>
 	<string name="Unknown">
 		(Неизвестно)
@@ -5386,18 +5413,6 @@ support@secondlife.com.
 	<string name="UserDictionary">
 		[Пользователь]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Разговоры не записываются. Чтобы начать запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Разговоры больше не будут записываться. Чтобы восстановить запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Нет зарегистрированных разговоров. Если вы обратитесь к кому-то или наоборот, в журнале появится новая запись.
-	</string>
-	<string name="loading_chat_logs">
-		Загрузка...
-	</string>
 	<string name="experience_tools_experience">
 		Приключение
 	</string>
@@ -5453,7 +5468,7 @@ support@secondlife.com.
 		телепортировать вас
 	</string>
 	<string name="ExperiencePermission12">
-		автоматически принимать разрешения приключения
+		автоматически принимать разрешения для приключения
 	</string>
 	<string name="ExperiencePermissionShortUnknown">
 		выполнил неизвестную операцию: [Permission]
@@ -5479,4 +5494,37 @@ support@secondlife.com.
 	<string name="ExperiencePermissionShort12">
 		Разрешение
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Разговоры не записываются. Чтобы начать запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Разговоры больше не будут записываться. Чтобы восстановить запись разговора, в меню «Настройки &gt; Чат» выберите «Сохранять: только журнал» или «Сохранять: журнал и записи».
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Нет зарегистрированных разговоров. Если вы обратитесь к кому-то или наоборот, в журнале появится новая запись.
+	</string>
+	<string name="loading_chat_logs">
+		Загрузка...
+	</string>
+	<string name="preset_combo_label">
+		-Пустой список-
+	</string>
+	<string name="Default">
+		По умолчанию
+	</string>
+	<string name="none_paren_cap">
+		(нет)
+	</string>
+	<string name="no_limit">
+		Без ограничений
+	</string>
+	<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+		Физическая форма содержит слишком маленькие треугольники. Попробуйте упростить физическую модель.
+	</string>
+	<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+		Физическая форма содержит неправильные данные подтверждения. Попробуйте исправить физическую модель.
+	</string>
+	<string name="Mav_Details_MAV_UNKNOWN_VERSION">
+		У физической формы нет правильной версии. Задайте правильную версию для физической модели.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/tr/floater_about.xml b/indra/newview/skins/default/xui/tr/floater_about.xml
index 7034de64c9..b91575954b 100644
--- a/indra/newview/skins/default/xui/tr/floater_about.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about.xml
@@ -3,6 +3,7 @@
 	<tab_container name="about_tab">
 		<panel label="Bilgi" name="support_panel">
 			<button label="Panoya Kopyala" name="copy_btn"/>
+			<button label="Güncellemeleri kontrol et" name="update_btn"/>
 		</panel>
 		<panel label="Katkıda Bulunanlar" name="credits_panel">
 			<text name="linden_intro">Second Life, Lindens tarafından geliştirilmiştir ve 
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 090e135b3b..e4d38361ca 100644
--- a/indra/newview/skins/default/xui/tr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/tr/floater_about_land.xml
@@ -10,13 +10,13 @@
 		&quot;Parcel_R_Dark&quot;
 	</floater.string>
 	<floater.string name="Minutes">
-		[MINUTES] dakika
+		[MINUTES] dak.
 	</floater.string>
 	<floater.string name="Minute">
-		dakika
+		dak.
 	</floater.string>
 	<floater.string name="Seconds">
-		[SECONDS] saniye
+		[SECONDS] sn.
 	</floater.string>
 	<floater.string name="Remaining">
 		kaldı
@@ -446,7 +446,7 @@ Sadece büyük parseller aramada görünür.
 			<spinner label="Erişim saatleri:" name="HoursSpin"/>
 			<panel name="Allowed_layout_panel">
 				<text label="Her Zaman İzin Ver" name="AllowedText">
-					İzin Verilen Sakinler
+					İzin Verilen Sakinler ([COUNT])
 				</text>
 				<name_list name="AccessList" tool_tip="([LISTED] listeli, [MAX] maksimum)"/>
 				<button label="Ekle" name="add_allowed"/>
@@ -454,7 +454,7 @@ Sadece büyük parseller aramada görünür.
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="Yasakla" name="BanCheck">
-					Yasaklı Sakinler
+					Yasaklı Sakinler ([COUNT])
 				</text>
 				<name_list name="BannedList" tool_tip="([LISTED] listeli, [MAX] maksimum)"/>
 				<button label="Ekle" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_autoreplace.xml b/indra/newview/skins/default/xui/tr/floater_autoreplace.xml
index e52e05dc61..feb50054df 100644
--- a/indra/newview/skins/default/xui/tr/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/tr/floater_autoreplace.xml
@@ -13,6 +13,12 @@
 	</scroll_list>
 	<button label="Ekle..." name="autoreplace_add_entry"/>
 	<button label="Kaldır" name="autoreplace_delete_entry"/>
+	<text name="autoreplace_keyword_txt">
+		Anahtar kelime:
+	</text>
+	<text name="autoreplace_replacement_txt">
+		Değiştirme:
+	</text>
 	<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."/>
diff --git a/indra/newview/skins/default/xui/tr/floater_bumps.xml b/indra/newview/skins/default/xui/tr/floater_bumps.xml
index 06ae3a2ec3..c4d08b89a4 100644
--- a/indra/newview/skins/default/xui/tr/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/tr/floater_bumps.xml
@@ -19,6 +19,6 @@
 		[TIME]  [NAME] fiziki bir nesneyle size vurdu
 	</floater.string>
 	<floater.string name="timeStr">
-		[[hour,datetime,slt]:[min,datetime,slt]]
+		[[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
 	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/tr/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000..30bef80d06
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="TERCİHLİ ÖN AYARI SİL">
+	<string name="title_graphic">
+		Grafik Ön Ayarını Sil
+	</string>
+	<string name="title_camera">
+		Kamera Ön Ayarını Sil
+	</string>
+	<text name="Preset">
+		Bir ön ayar seçin
+	</text>
+	<button label="Sil" name="delete"/>
+	<button label="İptal" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_experienceprofile.xml b/indra/newview/skins/default/xui/tr/floater_experienceprofile.xml
index 641d61b8f3..6858faf7bf 100644
--- a/indra/newview/skins/default/xui/tr/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/tr/floater_experienceprofile.xml
@@ -33,7 +33,7 @@
 						</layout_panel>
 						<layout_panel>
 							<text name="Owner">
-								Sahip:
+								Sahibi:
 							</text>
 						</layout_panel>
 						<layout_panel name="group_panel">
diff --git a/indra/newview/skins/default/xui/tr/floater_fast_timers.xml b/indra/newview/skins/default/xui/tr/floater_fast_timers.xml
index 5736bda45e..5d18767143 100644
--- a/indra/newview/skins/default/xui/tr/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/tr/floater_fast_timers.xml
@@ -6,5 +6,16 @@
 	<string name="run">
 		Koş
 	</string>
+	<combo_box name="time_scale_combo">
+		<item label="Ortalamanın 2 katı" name="2x Average"/>
+		<item label="Maks." name="Max"/>
+		<item label="En Güncel Maks." name="Recent Max"/>
+		<item label="100ms" name="100ms"/>
+	</combo_box>
+	<combo_box name="metric_combo">
+		<item label="Süre" name="Time"/>
+		<item label="Arama Sayısı" name="Number of Calls"/>
+		<item label="Hz" name="Hz"/>
+	</combo_box>
 	<button label="Duraklat" name="pause_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
index 35f30f47cc..8ced76cef1 100644
--- a/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/tr/floater_inventory_view_finder.xml
@@ -24,6 +24,12 @@
 		<radio_item label="Şundan daha eski:" name="older"/>
 	</radio_group>
 	<spinner label="Saat Önce" name="spin_hours_ago"/>
+	<text name="label_hours">
+		Saat
+	</text>
 	<spinner label="Gün Önce" name="spin_days_ago"/>
+	<text name="label_days">
+		Gün
+	</text>
 	<button label="Kapat" label_selected="Kapat" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/tr/floater_load_pref_preset.xml
new file mode 100644
index 0000000000..418a77a5cb
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="TERCİHLİ ÖN AYARI YÜKLE">
+	<string name="title_graphic">
+		Grafik Ön Ayarını Yükle
+	</string>
+	<string name="title_camera">
+		Kamera Ön Ayarını Yükle
+	</string>
+	<text name="Preset">
+		Bir ön ayar seçin
+	</text>
+	<button label="Tamam" name="ok"/>
+	<button label="İptal" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml
index 325d1d9ed9..e5643f3bf6 100644
--- a/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/tr/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
 	<string name="OutboxInitializing">
 		Başlatılıyor...
 	</string>
-	<panel label="">
-		<panel>
+	<panel label="" name="panel_1">
+		<panel name="panel_2">
 			<panel name="outbox_inventory_placeholder_panel">
 				<text name="outbox_inventory_placeholder_title">
 					Yükleniyor...
 				</text>
 			</panel>
 		</panel>
-		<panel>
+		<panel name="panel_3">
+			<panel name="outbox_generic_drag_target">
+				<text name="text_1">
+					Klasör oluşturmak için öğeleri buraya sürükleyin
+				</text>
+			</panel>
 			<button label="Pazaryerine Gönder" name="outbox_import_btn" tool_tip="Pazaryeri Vitrinime Gönder"/>
 		</panel>
 	</panel>
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 c00cadd3bd..29a56bae7e 100644
--- a/indra/newview/skins/default/xui/tr/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/tr/floater_model_preview.xml
@@ -55,6 +55,9 @@
 	<string name="mesh_status_invalid_material_list">
 		Ayrıntı seviyesi malzemeleri, referans modelin bir alt kümesi değil.
 	</string>
+	<string name="phys_status_vertex_limit_exceeded">
+		Bazı fiziksel gövdeler vertex limitlerini aşıyor.
+	</string>
 	<string name="layer_all">
 		Tümü
 	</string>
@@ -93,52 +96,52 @@
 				<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"/>
+					<item label="Dosyadan yükle" name="Load from file" value="Dosyadan yükle"/>
+					<item label="Oluştur" 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"/>
+					<item label="Üçgen Limiti" name="Triangle Limit" value="Üçgen Limiti"/>
+					<item label="Hata Eşiği" 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"/>
+					<item label="Dosyadan yükle" name="Load from file" value="Dosyadan yükle"/>
+					<item label="Oluştur" name="Generate" value="Oluştur"/>
+					<item label="Yukarıdaki ayrıntı seviyesini kullan" 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"/>
+					<item label="Üçgen Limiti" name="Triangle Limit" value="Üçgen Limiti"/>
+					<item label="Hata Eşiği" 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"/>
+					<item label="Dosyadan yükle" name="Load from file" value="Dosyadan yükle"/>
+					<item label="Oluştur" name="Generate" value="Oluştur"/>
+					<item label="Yukarıdaki ayrıntı seviyesini kullan" 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"/>
+					<item label="Üçgen Limiti" name="Triangle Limit" value="Üçgen Limiti"/>
+					<item label="Hata Eşiği" 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"/>
+					<item label="Dosyadan yükle" name="Load from file" value="Dosyadan yükle"/>
+					<item label="Oluştur" name="Generate" value="Oluştur"/>
+					<item label="Yukarıdaki ayrıntı seviyesini kullan" 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"/>
+					<item label="Üçgen Limiti" name="Triangle Limit" value="Üçgen Limiti"/>
+					<item label="Hata Eşiği" 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"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/tr/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000..87398e7fc5
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="BİLDİRİMLER">
+	<floater.string name="system_tab_title">
+		Sistem ([COUNT])
+	</floater.string>
+	<floater.string name="transactions_tab_title">
+		İşlemler ([COUNT])
+	</floater.string>
+	<floater.string name="group_invitations_tab_title">
+		Davetler ([COUNT])
+	</floater.string>
+	<floater.string name="group_notices_tab_title">
+		Grup ([COUNT])
+	</floater.string>
+	<string name="title_notification_tabbed_window">
+		BİLDİRİMLER
+	</string>
+	<layout_stack name="TabButtonsStack">
+		<layout_panel name="TabButtonsLayoutPanel">
+			<tab_container name="notifications_tab_container">
+				<panel label="Sistem (0)" name="system_notification_list_tab"/>
+				<panel label="İşlemler (0)" name="transaction_notifications_tab"/>
+				<panel label="Davetler (0)" name="group_invite_notifications_tab"/>
+				<panel label="Grup (0)" name="group_notice_notifications_tab"/>
+			</tab_container>
+			<layout_stack name="ButtonsStack">
+				<layout_panel name="CondenseAllButtonPanel">
+					<button label="Tümünü daralt" name="collapse_all_button"/>
+				</layout_panel>
+				<layout_panel name="GapLayoutPanel">
+					<panel label="Boşluk Paneli" name="GapPanel"/>
+				</layout_panel>
+				<layout_panel name="DeleteAllButtonPanel">
+					<button label="Tümünü sil" name="delete_all_button"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</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
index f38d8c84c6..4f2e078426 100644
--- a/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
 	<floater.string name="character_owner_group">
 		[grup]
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_chars_main">
 		<scroll_list name="objects_scroll_list">
 			<scroll_list.columns label="Ad" name="name"/>
 			<scroll_list.columns label="Açıklama" name="description"/>
@@ -42,7 +42,7 @@
 		<button label="Tümünü seç" name="select_all_objects"/>
 		<button label="Hiçbirini seçme" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_chars_actions">
 		<text name="actions_label">
 			Seçilen karakterler üzerinde eylemler:
 		</text>
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
index 6eecc7fb77..072f964273 100644
--- a/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
 	<floater.string name="pathing_error">
 		Yol oluşturma sırasında bir hata meydana geldi.
 	</floater.string>
+	<panel name="pathfinding_console_main">
+		<text name="viewer_status_label">
+			Görüntüleyici durumu
+		</text>
+	</panel>
+	<panel name="pathfinding_console_simulator">
+		<text name="simulator_status_label">
+			Simülatör durumu
+		</text>
+	</panel>
 	<tab_container name="view_test_tab_container">
 		<panel label="Görünüm" name="view_panel">
 			<text name="show_label">
diff --git a/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml
index 2e416c9311..31be1b7ab1 100644
--- a/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/tr/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
 	<floater.string name="linkset_choose_use">
 		Bağlantı kümesi kullanımını seç...
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_linksets_main">
+		<text name="linksets_filter_label">
+			Şuna göre filtrele:
+		</text>
+		<text name="linksets_name_label">
+			Ad
+		</text>
+		<text name="linksets_desc_label">
+			Açıklama
+		</text>
 		<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"/>
@@ -122,7 +131,10 @@
 		<button label="Tümünü seç" name="select_all_objects"/>
 		<button label="Hiçbirini seçme" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_actions">
+		<text name="linksets_actions_label">
+			Seçilen bağlantı kümeleri üzerindeki işlemler (bir bağlantı kümesi dünyadan çıkarılırsa, özellikleri de kaybolabilir)
+		</text>
 		<check_box label="İşareti göster" name="show_beacon"/>
 		<button label="Al" name="take_objects"/>
 		<button label="Kopya al" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
 		<button label="İade Et" name="return_objects"/>
 		<button label="Sil" name="delete_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_attributes">
+		<text name="linksets_attributes_label">
+			Seçili bağlantı kümelerinin özelliklerini düzenleyin ve değişiklikleri uygulamak için düğmeye basın
+		</text>
 		<text name="walkability_coefficients_label">
 			Yürüyebilirlik:
 		</text>
diff --git a/indra/newview/skins/default/xui/tr/floater_perms_default.xml b/indra/newview/skins/default/xui/tr/floater_perms_default.xml
index 2f371c056c..9691b678f2 100644
--- a/indra/newview/skins/default/xui/tr/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/tr/floater_perms_default.xml
@@ -1,6 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perms default" title="VARSAYILAN OLUŞTURMA İZİNLERİ">
-	<panel label="Varsayılan İzinler" name="default permissions"/>
+	<panel label="Varsayılan İzinler" name="default permissions">
+		<text name="label_1">
+			Sonraki sahip:
+		</text>
+		<text name="label_2">
+			Kopyala
+		</text>
+		<text name="label_3">
+			Değiştir
+		</text>
+		<text name="label_4">
+			Aktar
+		</text>
+		<text name="label_5">
+			Grupla paylaş
+		</text>
+		<text name="label_6">
+			Herkese kopyalama izni ver
+		</text>
+		<text name="label_7" tool_tip="Nesneler oluşturulduğunda varsayılan izinleri ayarla">
+			Nesneler
+		</text>
+		<text name="label_8" tool_tip="Karşıya yüklenen öğeler için varsayılan izinleri ayarla">
+			Karşıya Yüklemeler
+		</text>
+		<text name="label_9" tool_tip="Komut dosyaları oluşturulduğunda varsayılan izinleri ayarla">
+			Komut Dosyaları
+		</text>
+		<text name="label_10" tool_tip="Not kartları oluşturulduğunda varsayılan izinleri ayarla">
+			Not kartları
+		</text>
+		<text name="label_11" tool_tip="Mimikler oluşturulduğunda varsayılan izinleri ayarla">
+			Mimikler
+		</text>
+		<text name="label_12" tool_tip="Giysi ya da Vücut Parçaları oluşturulduğunda varsayılan izinleri ayarla">
+			Giyilebilir öğeler
+		</text>
+	</panel>
 	<button label="Tamam" label_selected="Tamam" name="ok"/>
 	<button label="İptal" label_selected="İptal" name="cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000..53938117fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="GELİŞMİŞ GRAFİK TERCİHLERİ">
+	<text name="GeneralText">
+		Genel
+	</text>
+	<slider label="Çizme mesafesi:" name="DrawDistance"/>
+	<text name="DrawDistanceMeterText2">
+		m
+	</text>
+	<slider label="Maks. parçacık sayısı:" name="MaxParticleCount"/>
+	<slider label="Son işleme kalitesi:" name="RenderPostProcess"/>
+	<text name="PostProcessText">
+		Düşük
+	</text>
+	<text name="AvatarText">
+		Avatar
+	</text>
+	<slider label="Maksimum karmaşıklık:" name="IndirectMaxComplexity" tool_tip="Görsel olarak karmaşık yapıdaki bir avatarın hangi noktada jelibon gibi tek renkli olarak çizileceğini kontrol eder"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
+	<slider label="Düşük grafik özellikli olmayan maks. avatar sayısı:" name="IndirectMaxNonImpostors"/>
+	<text name="IndirectMaxNonImpostorsText">
+		0
+	</text>
+	<slider label="Ayrıntı:" name="AvatarMeshDetail"/>
+	<text name="AvatarMeshDetailText">
+		Düşük
+	</text>
+	<slider label="Fizik:" name="AvatarPhysicsDetail"/>
+	<text name="AvatarPhysicsDetailText">
+		Düşük
+	</text>
+	<text name="ShadersText">
+		Donanım
+	</text>
+	<slider label="Doku Belleği (MB):" name="GraphicsCardTextureMemory" tool_tip="Dokular için tahsis edilecek bellek miktarı. Varsayılan değer video kartı belleğidir. Bu değerin küçültülmesi performansı artırabilir, ama ayrıca dokuları bulanıklaştırabilir."/>
+	<slider label="Sis Mesafe Oranı:" name="fog"/>
+	<slider label="Gama:" name="gamma"/>
+	<text name="(brightness, lower is brighter)">
+		(0 = varsayılan parlaklık, düşük = daha parlak)
+	</text>
+	<check_box label="Anisotropik Filtreleme (etkinken daha yavaş)" name="ani"/>
+	<check_box initial_value="true" label="OpenGL Vertex Tampon Nesnelerini Etkinleştir" name="vbo" tool_tip="Modern donanımlarda bunun etkinleştirilmesi performans artışı sağlar.  Ancak, eski donanımlardaki VBO uygulamaları yetersizdir ve etkinleştirildiğinde bilgisayarınız çökebilir."/>
+	<check_box initial_value="true" label="Doku Sıkıştırmasını Etkinleştir (yeniden başlatma gerektirir)" name="texture compression" tool_tip="Video bellekteki dokuları sıkıştırır, renk kalitesinde bazı kayıplar olmasına karşın daha yüksek çözünürlükte dokuların yüklenmesine imkan tanır."/>
+	<text name="antialiasing label">
+		Antialiasing:
+	</text>
+	<combo_box label="Antialiasing" name="fsaa">
+		<combo_box.item label="Devre dışı" name="FSAADisabled"/>
+		<combo_box.item label="2x" name="2x"/>
+		<combo_box.item label="4x" name="4x"/>
+		<combo_box.item label="8x" name="8x"/>
+		<combo_box.item label="16x" name="16x"/>
+	</combo_box>
+	<text name="antialiasing restart">
+		(yeniden başlatma gerektirir)
+	</text>
+	<slider label="Yüzey Ağ Ayrıntısı:" name="TerrainMeshDetail"/>
+	<text name="TerrainMeshDetailText">
+		Düşük
+	</text>
+	<slider label="Ağaçlar:" name="TreeMeshDetail"/>
+	<text name="TreeMeshDetailText">
+		Düşük
+	</text>
+	<slider label="Nesneler:" name="ObjectMeshDetail"/>
+	<text name="ObjectMeshDetailText">
+		Düşük
+	</text>
+	<slider label="Esnek primler:" name="FlexibleMeshDetail"/>
+	<text name="FlexibleMeshDetailText">
+		Düşük
+	</text>
+	<check_box initial_value="true" label="Saydam Su" name="TransparentWater"/>
+	<check_box initial_value="true" label="Tümsek eşleme ve parlaklık" name="BumpShiny"/>
+	<check_box initial_value="true" label="Yerel Işıklar" name="LocalLights"/>
+	<check_box initial_value="true" label="Temel gölgeleyiciler" name="BasicShaders" tool_tip="Bu seçeneğin devre dışı bırakılması bazı grafik kartlarının sürücülerinin kilitlenmesini önleyebilir"/>
+	<slider label="Yüzey Ayrıntısı:" name="TerrainDetail"/>
+	<text name="TerrainDetailText">
+		Düşük
+	</text>
+	<check_box initial_value="true" label="Avatarı Donanım ile kaplama" name="AvatarVertexProgram"/>
+	<check_box initial_value="true" label="Avatar giysisi" name="AvatarCloth"/>
+	<text name="ReflectionsText">
+		Su Yansımaları:
+	</text>
+	<combo_box name="Reflections">
+		<combo_box.item label="Minimal" name="0"/>
+		<combo_box.item label="Yüzey ve ağaçlar" name="1"/>
+		<combo_box.item label="Tüm statik nesneler" name="2"/>
+		<combo_box.item label="Tüm avatarlar ve nesneler" name="3"/>
+		<combo_box.item label="Her şey" name="4"/>
+	</combo_box>
+	<check_box initial_value="true" label="Atmosferik gölgeleyiciler" name="WindLightUseAtmosShaders"/>
+	<slider label="Gökyüzü:" name="SkyMeshDetail"/>
+	<text name="SkyMeshDetailText">
+		Düşük
+	</text>
+	<check_box initial_value="true" label="Gelişmiş Aydınlatma Modeli" name="UseLightShaders"/>
+	<check_box initial_value="true" label="Ortam Emilimi" name="UseSSAO"/>
+	<check_box initial_value="true" label="Alan Derinliği" name="UseDoF"/>
+	<text name="RenderShadowDetailText">
+		Gölgeler:
+	</text>
+	<combo_box name="ShadowDetail">
+		<combo_box.item label="Yok" name="0"/>
+		<combo_box.item label="Güneş/Ay" name="1"/>
+		<combo_box.item label="Güneş/Ay + Projektörler" name="2"/>
+	</combo_box>
+	<button label="Önerilen ayarlara dön" name="Defaults"/>
+	<button label="Tamam" label_selected="Tamam" name="OK"/>
+	<button label="İptal" label_selected="İptal" name="Cancel"/>
+	<check_box label="AvatarMaksKarmaşıklığıİşleme" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/tr/floater_save_pref_preset.xml
new file mode 100644
index 0000000000..69aa232093
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="TERCİHLİ ÖN AYAR OLARAK KAYDET">
+	<string name="title_graphic">
+		Grafik Ön Ayarı Olarak Kaydet
+	</string>
+	<string name="title_camera">
+		Kamera Ön Ayarı Olarak Kaydet
+	</string>
+	<text name="Preset">
+		Ön ayar için bir ad girin veya mevcut bir ön ayarı seçin.
+	</text>
+	<button label="Kaydet" name="save"/>
+	<button label="İptal" name="cancel"/>
+</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
index ded71cad40..9ab0ea2613 100644
--- a/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/tr/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_import" title="Sözlüğü İçeri Aktar">
+	<text name="import_dict">
+		Sözlük:
+	</text>
 	<button label="Gözat" label_selected="Gözat" name="dictionary_path_browse"/>
+	<text name="import_name">
+		Ad:
+	</text>
+	<text name="import_lang">
+		Dil:
+	</text>
 	<button label="İçeri Aktar" name="ok_btn"/>
 	<button label="İptal" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_tos.xml b/indra/newview/skins/default/xui/tr/floater_tos.xml
index 7ff0001ddd..87beb5476f 100644
--- a/indra/newview/skins/default/xui/tr/floater_tos.xml
+++ b/indra/newview/skins/default/xui/tr/floater_tos.xml
@@ -12,4 +12,7 @@
 	<text name="tos_heading">
 		Aşağıdaki Hizmet Koşullarını ve Gizlilik Politikasını dikkatle okuyun. [SECOND_LIFE]&apos;ta oturum açmaya devam etmek için anlaşmayı kabul etmelisiniz.
 	</text>
+	<text name="external_tos_required">
+		Devam etmeden önce my.secondlife.com adresine gitmeniz ve oturum açarak Hizmet Şartlarını kabul etmeniz gerekiyor. Teşekkürler!
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
index 0cb233a657..8a669a28f7 100644
--- a/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_attachment_other.xml
@@ -15,5 +15,8 @@
 	<menu_item_call label="Yakınlaştır" name="Zoom In"/>
 	<menu_item_call label="Öde" name="Pay..."/>
 	<menu_item_call label="Nesne Profili" name="Object Inspect"/>
+	<menu_item_check label="Normal Olarak İşle" name="RenderNormally"/>
+	<menu_item_check label="İşleme" name="DoNotRender"/>
+	<menu_item_check label="Tam Olarak İşle" name="AlwaysRenderFully"/>
 	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
index 0da328a894..e4ba3a5616 100644
--- a/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/tr/menu_avatar_other.xml
@@ -14,5 +14,8 @@
 	<menu_item_call label="XML Dökümünü Al" name="Dump XML"/>
 	<menu_item_call label="Yakınlaştır" name="Zoom In"/>
 	<menu_item_call label="Öde" name="Pay..."/>
+	<menu_item_check label="Normal Olarak İşle" name="RenderNormally"/>
+	<menu_item_check label="İşleme" name="DoNotRender"/>
+	<menu_item_check label="Tam Olarak İşle" name="AlwaysRenderFully"/>
 	<menu_item_call label="Parçacık Sahibini Engelle" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_login.xml b/indra/newview/skins/default/xui/tr/menu_login.xml
index ecd29370a5..a940635778 100644
--- a/indra/newview/skins/default/xui/tr/menu_login.xml
+++ b/indra/newview/skins/default/xui/tr/menu_login.xml
@@ -15,6 +15,7 @@
 		<menu_item_call label="[SECOND_LIFE] Bloklar" name="Second Life Blogs"/>
 		<menu_item_call label="Hata Bildir" name="Report Bug"/>
 		<menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/>
+		<menu_item_call label="Güncellemeleri Kontrol Et" name="Check for Updates"/>
 	</menu>
 	<menu_item_check label="Hata Ayıklama Menüsünü Göster" name="Show Debug Menu"/>
 	<menu label="Hata ayıkla" name="Debug">
diff --git a/indra/newview/skins/default/xui/tr/menu_marketplace_view.xml b/indra/newview/skins/default/xui/tr/menu_marketplace_view.xml
index c114f50c92..11ef36ceb4 100644
--- a/indra/newview/skins/default/xui/tr/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/tr/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_marketplace_sort">
+	<menu_item_check label="Ada göre sırala" name="sort_by_name"/>
+	<menu_item_check label="En son yapılana göre sırala" name="sort_by_recent"/>
 	<menu_item_check label="Stok miktarına göre sırala (düşükten yükseğe)" name="sort_by_stock_amount"/>
 	<menu_item_check label="Sadece ilan klasörlerini göster" name="show_only_listing_folders"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_url_email.xml b/indra/newview/skins/default/xui/tr/menu_url_email.xml
new file mode 100644
index 0000000000..0d1b366d1a
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+	<menu_item_call label="Harici bir istemciyi kullanarak e-posta oluştur" name="email_open_external"/>
+	<menu_item_call label="E-postayı panoya kopyala" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/tr/menu_viewer.xml b/indra/newview/skins/default/xui/tr/menu_viewer.xml
index cea57011dd..324e549a75 100644
--- a/indra/newview/skins/default/xui/tr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/tr/menu_viewer.xml
@@ -178,6 +178,7 @@
 		<menu_item_call label="Hata Bildir" name="Report Bug"/>
 		<menu_item_call label="Toslamalar, İtmeler ve Vurmalar" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu_item_call label="[APP_NAME] Hakkında" name="About Second Life"/>
+		<menu_item_call label="Güncellemeleri Kontrol Et" name="Check for Updates"/>
 	</menu>
 	<menu label="Gelişmiş" name="Advanced">
 		<menu_item_call label="Dokuları Tekrar Kaydet" name="Rebake Texture"/>
@@ -191,7 +192,7 @@
 			<menu_item_call label="Gecikme Ölçer" name="Lag Meter"/>
 			<menu_item_check label="İstatistik Çubuğu" name="Statistics Bar"/>
 			<menu_item_call label="Sahne Yükleme İstatistikleri" name="Scene Load Statistics"/>
-			<menu_item_check label="Avatarlar İçin Çizim Ağırlığını Göster" name="Avatar Rendering Cost"/>
+			<menu_item_check label="Avatarın karmaşıklık bilgisini göster" name="Avatar Draw Info"/>
 		</menu>
 		<menu label="Vurgulama ve Görünürlük" name="Highlighting and Visibility">
 			<menu_item_check label="Yanıp Sönen İşaret" name="Cheesy Beacon"/>
@@ -314,8 +315,6 @@
 			<menu_item_check label="Eklemler" name="Joints"/>
 			<menu_item_check label="Işın Yayını" name="Raycast"/>
 			<menu_item_check label="Rüzgar Vektörleri" name="Wind Vectors"/>
-			<menu_item_check label="İşleme Karmaşıklığı" name="rendercomplexity"/>
-			<menu_item_check label="Aksesuar Bayt Büyüklüğü" name="attachment bytes"/>
 			<menu_item_check label="Şekillendir" name="Sculpt"/>
 			<menu label="Doku Yoğunluğu" name="Texture Density">
 				<menu_item_check label="Yok" name="None"/>
@@ -421,13 +420,11 @@
 			<menu_item_check label="Debug Character Vis" name="Debug Character Vis"/>
 			<menu_item_check label="Çarpışma İskeletini Göster" name="Show Collision Skeleton"/>
 			<menu_item_check label="Aracı Hedefini Göster" name="Display Agent Target"/>
-			--&gt;
 			<menu_item_call label="Aksesuarların Dökümünü Al" name="Dump Attachments"/>
 			<menu_item_call label="Avatar Dokuları İçin Hata Ayıklama" name="Debug Avatar Textures"/>
 			<menu_item_call label="Yerel Dokuların Dökümünü Al" name="Dump Local Textures"/>
 		</menu>
 		<menu_item_check label="HTTP Dokuları" name="HTTP Textures"/>
-		<menu_item_check label="HTTP Envanteri" name="HTTP Inventory"/>
 		<menu_item_call label="Görüntüleri Sıkıştır" name="Compress Images"/>
 		<menu_item_call label="Visual Leak Detector&apos;ı Etkinleştir" name="Enable Visual Leak Detector"/>
 		<menu_item_check label="Mini Döküm Dosyası Hata Ayıklama Çıktısı" name="Output Debug Minidump"/>
diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml
index df22251b3d..8c8aacf36e 100644
--- a/indra/newview/skins/default/xui/tr/notifications.xml
+++ b/indra/newview/skins/default/xui/tr/notifications.xml
@@ -164,6 +164,10 @@ Bir sistem veya ağ hatası nedeniyle Pazaryeri başlatılamadı.  Daha sonra te
         &quot;[ERROR_CODE]&quot;
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
+	<notification name="MerchantForceValidateListing">
+		İlanınızı oluşturmak için, ilan içeriklerinizin hiyerarşisini düzelttik.
+		<usetemplate ignoretext="Bir ilan oluşturmanın içeriğin hiyerarşisini değiştireceği konusunda beni uyar" name="okignore" yestext="Tamam"/>
+	</notification>
 	<notification name="ConfirmMerchantActiveChange">
 		Bu eylem, bu ilanın etkin içeriğini değiştirecek. Devam etmek istiyor musunuz?
 		<usetemplate ignoretext="Pazaryerindeki etkin bir ilanı değiştirmek istediğimde doğrulama iste" name="okcancelignore" notext="İptal" yestext="Tamam"/>
@@ -211,6 +215,10 @@ Bu öğeyi Pazaryeri üzerinde düzenlemek için [[URL] buraya tıklayın].
 		Stok boş olduğu için ilanınızı yayından kaldırdık. İlanı yeniden yayınlamak için stok klasörüne daha fazla birim eklemeniz gerekir.
 		<usetemplate ignoretext="Bir ilan, stok klasörü boş olduğu için listeden kaldırılınca uyar" name="okignore" yestext="Tamam"/>
 	</notification>
+	<notification name="AlertMerchantVersionFolderEmpty">
+		Sürüm klasörü boş olduğu için ilanınızı yayından kaldırdık. İlanı yeniden yayınlamak için sürüm klasörüne daha fazla birim eklemeniz gerekir.
+		<usetemplate ignoretext="Bir ilan, sürüm klasörü boş olduğu için listeden kaldırılınca uyar" name="okignore" yestext="Tamam"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		Aşağıdaki nedenden dolayı, bir komut dosyası için metin karşıya yüklenirken bir sorun oluştu: [REASON]. Lütfen daha sonra tekrar deneyin.
 	</notification>
@@ -320,6 +328,14 @@ Bu yeteneklerin artık bu rolde bulunmasını istemiyorsanız, onları hemen dev
 		Gruptan [COUNT] üyeyi çıkarmak üzeresiniz.
 		<usetemplate ignoretext="Gruptan birden çok üyenin çıkarılmasını doğrulayın" name="okcancelignore" notext="İptal" yestext="Çıkar"/>
 	</notification>
+	<notification name="BanGroupMemberWarning">
+		[AVATAR_NAME] adlı üyeyi grubun yasaklı listesine eklemek üzeresiniz.
+		<usetemplate ignoretext="Bir katılımcının grubun yasaklı listesine eklenmesini doğrulayın" name="okcancelignore" notext="İptal" yestext="Yasakla"/>
+	</notification>
+	<notification name="BanGroupMembersWarning">
+		[COUNT] üyeyi grubun yasaklı listesine eklemek üzeresiniz.
+		<usetemplate ignoretext="Gruptan birden çok üyenin yasaklanmasını doğrulayın" name="okcancelignore" notext="İptal" yestext="Yasakla"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		Aksesuarınızı çıkarmak üzeresiniz.
     Devam etmek istediğinize emin misiniz?
@@ -404,7 +420,7 @@ Nesneler: [N]
 		<usetemplate name="okcancelbuttons" notext="İptal" yestext="Tamam"/>
 	</notification>
 	<notification name="ReturnAllTopObjects">
-		Listelenen tüm nesneleri kendi sahiplerinin envanterlerine iade etmek istediğinize emin misiniz?
+		Listedeki tüm nesneleri kendi sahiplerinin envanterlerine iade etmek istediğinize emin misiniz? Bu, bölgedeki TÜM komut dosyalı nesneleri iade edecektir.
 		<usetemplate name="okcancelbuttons" notext="İptal" yestext="Tamam"/>
 	</notification>
 	<notification name="DisableAllTopObjects">
@@ -609,6 +625,10 @@ Nesne aralık dışında ya da silinmiş olabilir.
 	<notification name="CannotDownloadFile">
 		Dosya karşıdan yüklenemiyor.
 	</notification>
+	<notification label="" name="MediaFileDownloadUnsupported">
+		[SECOND_LIFE] içinde desteklenmeyen bir dosya indirmeyi talep ettiniz.
+		<usetemplate ignoretext="Desteklenmeyen dosya indirme işlemleri hakkında uyar" name="okignore" yestext="Tamam"/>
+	</notification>
 	<notification name="CannotWriteFile">
 		[[FILE]] dosyası yazılamıyor.
 	</notification>
@@ -1109,7 +1129,8 @@ Bu genellikle geçici bir arızadır. Lütfen giyilebilir öğeyi birkaç dakika
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
 		Üzgünüz. [SECOND_LIFE] oturumunuz kapandı.
-            [MESSAGE]
+
+[MESSAGE]
 		<usetemplate name="okcancelbuttons" notext="Çık" yestext="Anlık İleti ve Sohbeti Görüntüle"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
@@ -1357,6 +1378,13 @@ Yeni bir ana konum ayarlamak isteyebilirsiniz.
 			<ignore name="ignore" text="Giysilerin karşıdan yüklenmesi uzun zaman alıyor"/>
 		</form>
 	</notification>
+	<notification name="RegionAndAgentComplexity">
+		[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 Görsel karmaşıklık] seviyeniz: [AGENT_COMPLEXITY].
+[OVERLIMIT_MSG]
+	</notification>
+	<notification name="AgentComplexity">
+		[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 Görsel karmaşıklık] seviyeniz: [AGENT_COMPLEXITY].
+	</notification>
 	<notification name="FirstRun">
 		[APP_NAME] yüklemesi tamamlandı.
 
@@ -1636,6 +1664,25 @@ Bu deneysel görüntüleyicinin yerini bir [NEW_CHANNEL] görüntüleyici aldı;
 bkz. [[INFO_URL] Bu güncelleme hakkında bilgi]
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
+	<notification name="UpdateDownloadInProgress">
+		Bir güncelleme mevcut.
+Şu anda arkaplanda indiriliyor ve hazır olduğunda yüklemeyi bitirmek için görüntüleyicinizi yeniden başlatmanız için sizi uyaracağız.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
+	<notification name="UpdateDownloadComplete">
+		Bir güncelleme indirildi. Yeniden başlatma sırasında yüklenecek.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
+	<notification name="UpdateCheckError">
+		Güncelleme kontrolü yapılırken bir hata oluştu.
+Lütfen daha sonra tekrar deneyin.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
+	<notification name="UpdateViewerUpToDate">
+		Görüntüleyiciniz güncel.
+En yeni özellikleri ve düzeltmeleri görmek için sabırsızlanıyorsanız Alternatif Görüntüleyici sayfasına göz atın. http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
 	<notification name="DeedObjectToGroup">
 		Bu nesnenin devredilmesi grubun şunu yapmasına sebep olacak:
 * Nesneye ödenen L$&apos;nı almasına
@@ -1740,6 +1787,14 @@ Gruptan ayrılmak istiyor musunuz?
 		Maksimum grup sayısına eriştiniz. Lütfen yeni bir gruba katılmadan ya da yeni bir grup oluşturmadan önce grupların bazılarından ayrılın.
 		<usetemplate name="okbutton" yestext="Tamam"/>
 	</notification>
+	<notification name="GroupLimitInfo">
+		Temel hesaplar için grup limiti [MAX_BASIC], [https://secondlife.com/premium/ özel] hesaplar 
+içinse [MAX_PREMIUM] olarak belirlenmiştir.
+Hesabınızı indirgediyseniz, daha fazla gruba katılmak için önce grup sayınızı [MAX_BASIC] grubun altına düşürmelisiniz.
+
+[https://secondlife.com/my/account/membership.php Şimdi yükselt!]
+		<usetemplate name="okbutton" yestext="Kapat"/>
+	</notification>
 	<notification name="KickUser">
 		Bu Sakin hangi iletiyle çıkarılsın?
 		<form name="form">
@@ -1939,7 +1994,7 @@ Binlerce bölgeyi değiştirecek ve alan sunucusunu kesintiye uğratacaktır.
 		<usetemplate canceltext="İptal" name="yesnocancelbuttons" notext="Tüm Gayrimenkuller" yestext="Bu Gayrimenkul"/>
 	</notification>
 	<notification label="Gayrimenkul seç" name="EstateTrustedExperienceRemove">
-		Yalnızca bu gayrimenkul için mi anahtar listesine çıkarılsın, yoksa [ALL_ESTATES] için mi?
+		Yalnızca bu gayrimenkul için mi anahtar listesinden çıkarılsın, yoksa [ALL_ESTATES] için mi?
 		<usetemplate canceltext="İptal" name="yesnocancelbuttons" notext="Tüm Gayrimenkuller" yestext="Bu Gayrimenkul"/>
 	</notification>
 	<notification label="Çıkarmayı Onayla" name="EstateKickUser">
@@ -2248,6 +2303,10 @@ Envanter öğesi/öğeleri taşınsın mı?
 		[TARGET] hedefine [AMOUNT]L$ ödemek istediğinizi doğrulayın.
 		<usetemplate ignoretext="Ödeme yapılmadan önce doğrulama iste (200L$ üzerinde tutarlar için)" name="okcancelignore" notext="İptal" yestext="Öde"/>
 	</notification>
+	<notification name="PayObjectFailed">
+		Ödeme başarısız: nesne bulunamadı.
+		<usetemplate name="okbutton" yestext="Tamam"/>
+	</notification>
 	<notification name="OpenObjectCannotCopy">
 		Bu nesne içinde kopyalama izniniz olan bir öğe yok.
 	</notification>
@@ -2279,10 +2338,9 @@ Bu eylemi geri alamazsınız.
 		[QUESTION]
 		<usetemplate ignoretext="Öğeleri silmeden önce doğrulama iste" name="okcancelignore" notext="İptal" yestext="Tamam"/>
 	</notification>
-	<notification name="HelpReportAbuseEmailLL">
-		[http://secondlife.com/corporate/tos.php Hizmet Sözleşmesi] ve [http://secondlife.com/corporate/cs.php Topluluk Standartları] ihlallerini bildirmek için bu aracı kullanın.
-
-Bildirilen tüm kötüye kullanımlar incelenir ve çözüme ulaştırılır.
+	<notification name="ConfirmUnlink">
+		Bu, geniş bir bağlantı kümeleri seçimi. Bağlantıyı kaldırırsanız tekrar bağlayamayabilirsiniz. Tedbiren, envanterinizdeki bağlantı kümelerinin bir kopyasını almayı isteyebilirsiniz.
+		<usetemplate ignoretext="Bir bağlantı kümesinin bağının kaldırılmasını onayla" name="okcancelignore" notext="İptal" yestext="Bağlantıyı Kopar"/>
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		Lütfen bu kötüye kullanım bildirimi için bir kategori seçin.
@@ -3211,6 +3269,12 @@ Güvenliğiniz için birkaç saniye engellenecek.
 	<notification name="AttachmentSaved">
 		Aksesuar kaydedildi.
 	</notification>
+	<notification name="PresetNotSaved">
+		[NAME] ön ayarı kaydedilirken hata oluştu.
+	</notification>
+	<notification name="PresetNotDeleted">
+		[NAME] ön ayarı silinirken hata oluştu.
+	</notification>
 	<notification name="UnableToFindHelpTopic">
 		Bu öğe için yardım başlığı bulunamıyor.
 	</notification>
@@ -3243,9 +3307,8 @@ Yeterli yer olduğunda düğme gösterilecek.
 		Paylaşılacak sakinleri seç.
 	</notification>
 	<notification name="MeshUploadError">
-		[LABEL] karşıya yüklenemedi: [MESSAGE] [IDENTIFIER] 
-
-Ayrıntılar için günlük dosyasına bakın.
+		[LABEL] karşıya yüklenemedi: [MESSAGE] [IDENTIFIER]
+[DETAILS]Ayrıntılar için bkz. SecondLife.log
 	</notification>
 	<notification name="MeshUploadPermError">
 		Karşıya örgü yükleme izinleri talep edilirken hata oluştu.
diff --git a/indra/newview/skins/default/xui/tr/panel_experience_info.xml b/indra/newview/skins/default/xui/tr/panel_experience_info.xml
index 0bce4fea8f..bbe2ab0dd5 100644
--- a/indra/newview/skins/default/xui/tr/panel_experience_info.xml
+++ b/indra/newview/skins/default/xui/tr/panel_experience_info.xml
@@ -14,7 +14,7 @@
 					<text name="LocationTextText">
 						bir yer
 					</text>
-					<button label="Işınla" name="teleport_btn"/>
+					<button label="Işınlama" name="teleport_btn"/>
 					<button label="Harita" name="map_btn"/>
 				</layout_panel>
 				<layout_panel name="marketplace panel">
@@ -33,7 +33,7 @@
 						Yetişkin
 					</text>
 					<text name="Owner">
-						Sahip:
+						Sahibi:
 					</text>
 					<text name="OwnerText">
 						Kyle
diff --git a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
index c69fb39130..0761f0531d 100644
--- a/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_main_inventory.xml
@@ -6,6 +6,9 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] Öge [FILTER]
 	</panel.string>
+	<panel.string name="ItemcountUnknown">
+		Alınan [ITEM_COUNT] Öğe [FILTER]
+	</panel.string>
 	<text name="ItemcountText">
 		Ögeler:
 	</text>
diff --git a/indra/newview/skins/default/xui/tr/panel_people.xml b/indra/newview/skins/default/xui/tr/panel_people.xml
index b499ec8307..29ca4772fd 100644
--- a/indra/newview/skins/default/xui/tr/panel_people.xml
+++ b/indra/newview/skins/default/xui/tr/panel_people.xml
@@ -18,6 +18,7 @@ Birlikte takılacak kişiler mi arıyorsunuz? [secondlife:///app/worldmap Dünya
 	<string name="no_groups_msg" value="Katılacak Gruplar mı arıyorsunuz? [secondlife:///app/search/groups Ara] deneyin."/>
 	<string name="MiniMapToolTipMsg" value="[REGION](Haritayı açmak için çift tıkla, yatay hareket için shift çek)"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION](Işınlamak için çift tıkla, yatay hareket için shift çek)"/>
+	<string name="GroupCountWithInfo" value="[COUNT] gruba üyesiniz, daha [REMAINING] gruba üye olabilirsiniz.  [secondlife:/// Daha fazlasını mı istiyorsunuz?]"/>
 	<tab_container name="tabs">
 		<panel label="YAKIN" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
index 82c7b87c9a..c3ac198d08 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_advanced.xml
@@ -27,6 +27,6 @@
 	<check_box label="Birden Çok Görüntüleyiciye İzin Ver" name="allow_multiple_viewer_check"/>
 	<check_box label="Oturum açarken Ağ Seçimini göster" name="show_grid_selection_check"/>
 	<check_box label="Gelişmiş Menüyü Göster" name="show_advanced_menu_check"/>
-	<check_box label="Geliştirici Menüsünü Göster" name="show_develop_menu_check"/>
+	<check_box label="Geliştirme Menüsünü Göster" name="show_develop_menu_check"/>
 	<button label="Varsayılan Oluşturma İzinleri" name="default_creation_permissions"/>
 </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 d46f3e08cc..6a00d06e7e 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
 		<check_box label="Envanter teklifi" name="inventory_offer"/>
 	</panel>
 	<panel name="log_settings">
+		<text name="logging_label">
+			Kaydet:
+		</text>
+		<combo_box name="conversation_log_combo">
+			<item label="Günlük ve dökümler" name="log_and_transcripts" value="2"/>
+			<item label="Sadece günlük" name="log_only" value="1"/>
+			<item label="Günlük veya döküm yok" name="no_log_or_transcript" value="0"/>
+		</combo_box>
 		<button label="Günlüğü temizle..." name="clear_log"/>
 		<button label="Dökümleri sil..." name="delete_transcripts"/>
+		<text name="log_location_label">
+			Konum:
+		</text>
 		<button label="Gözat..." label_selected="Gözat" name="log_path_button"/>
 	</panel>
 	<button label="Çeviri..." name="ok_btn"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
index 25c9e966c7..13984c2792 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_graphics1.xml
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Grafikler" name="Display panel">
-	<text name="QualitySpeed">
-		Kalite ve hız:
-	</text>
-	<text name="FasterText">
-		Daha hızlı
+	<text name="preset_text">
+		(Hiçbiri)
 	</text>
-	<text name="BetterText">
-		Daha iyi
+	<text name="QualitySpeed">
+		Kalite &amp; hız:
 	</text>
 	<text name="ShadersPrefText">
 		Düşük
@@ -21,94 +18,17 @@
 	<text name="ShadersPrefText4">
 		Ultra
 	</text>
-	<panel label="ÖzelGrafikler" name="CustomGraphics Panel">
-		<text name="ShadersText">
-			Gölgelendiriciler:
-		</text>
-		<check_box initial_value="true" label="Saydam Su" name="TransparentWater"/>
-		<check_box initial_value="true" label="Tümsek eşleme ve parlaklık" name="BumpShiny"/>
-		<check_box initial_value="true" label="Yerel Işıklar" name="LocalLights"/>
-		<check_box initial_value="true" label="Temel gölgeleyiciler" name="BasicShaders" tool_tip="Bu seçeneğin devre dışı bırakılması bazı grafik kartlarının sürücülerinin kilitlenmesini önleyebilir"/>
-		<check_box initial_value="true" label="Atmosferik gölgeleyiciler" name="WindLightUseAtmosShaders"/>
-		<check_box initial_value="true" label="Gelişmiş Aydınlatma Modeli" name="UseLightShaders"/>
-		<check_box initial_value="true" label="Ortam Gölgeleme" name="UseSSAO"/>
-		<check_box initial_value="true" label="Alan Derinliği" name="UseDoF"/>
-		<text name="shadows_label">
-			Gölgeler:
-		</text>
-		<combo_box name="ShadowDetail">
-			<combo_box.item label="Hiçbiri" name="0"/>
-			<combo_box.item label="Güneş/Ay" name="1"/>
-			<combo_box.item label="Güneş/Ay + Projektörler" name="2"/>
-		</combo_box>
-		<text name="reflection_label">
-			Su Yansımaları:
-		</text>
-		<combo_box name="Reflections">
-			<combo_box.item label="Minimal" name="0"/>
-			<combo_box.item label="Yüzey ve ağaçlar" name="1"/>
-			<combo_box.item label="Tüm statik nesneler" name="2"/>
-			<combo_box.item label="Tüm avatarlar ve nesneler" name="3"/>
-			<combo_box.item label="Her şey" name="4"/>
-		</combo_box>
-		<slider label="Avatar Fzk. Özlk.:" name="AvatarPhysicsDetail"/>
-		<text name="AvatarPhysicsDetailText">
-			Düşük
-		</text>
-		<slider label="Mesafeyi çiz:" name="DrawDistance"/>
-		<text name="DrawDistanceMeterText2">
-			m
-		</text>
-		<slider label="Maks. parçacık sayısı:" name="MaxParticleCount"/>
-		<slider label="Düşük gr. özl. olmayan mks. avatar:" name="MaxNumberAvatarDrawn"/>
-		<slider label="Son işleme kalitesi:" name="RenderPostProcess"/>
-		<text name="MeshDetailText">
-			Örgü detayı:
-		</text>
-		<slider label="Nesneler:" name="ObjectMeshDetail"/>
-		<slider label="Esnek primler:" name="FlexibleMeshDetail"/>
-		<slider label="Ağaçlar:" name="TreeMeshDetail"/>
-		<slider label="Avatarlar:" name="AvatarMeshDetail"/>
-		<slider label="Yüzey:" name="TerrainMeshDetail"/>
-		<slider label="Gökyüzü:" name="SkyMeshDetail"/>
-		<text name="PostProcessText">
-			Düşük
-		</text>
-		<text name="ObjectMeshDetailText">
-			Düşük
-		</text>
-		<text name="FlexibleMeshDetailText">
-			Düşük
-		</text>
-		<text name="TreeMeshDetailText">
-			Düşük
-		</text>
-		<text name="AvatarMeshDetailText">
-			Düşük
-		</text>
-		<text name="TerrainMeshDetailText">
-			Düşük
-		</text>
-		<text name="SkyMeshDetailText">
-			Düşük
-		</text>
-		<text name="AvatarRenderingText">
-			Avatar İşleme:
-		</text>
-		<check_box initial_value="true" label="Düşük grafik özellikli avatarlar" name="AvatarImpostors"/>
-		<check_box initial_value="true" label="Donanım ile kaplama" name="AvatarVertexProgram"/>
-		<check_box initial_value="true" label="Avatar giysisi" name="AvatarCloth"/>
-		<text name="TerrainDetailText">
-			Yüzey detayı:
-		</text>
-		<radio_group name="TerrainDetailRadio">
-			<radio_item label="Düşük" name="0"/>
-			<radio_item label="Yüksek" name="2"/>
-		</radio_group>
-		--&gt;
-	</panel>
-	<button label="Uygula" label_selected="Uygula" name="Apply"/>
-	<button label="Sıfırla" name="Defaults"/>
-	<button label="Gelişmiş" name="Advanced"/>
-	<button label="Donanım" label_selected="Donanım" name="GraphicsHardwareButton"/>
+	<text name="FasterText">
+		Daha hızlı
+	</text>
+	<text name="BetterText">
+		Daha iyi
+	</text>
+	<check_box initial_value="true" label="Atmosferik gölgeleyiciler" name="WindLightUseAtmosShaders"/>
+	<check_box initial_value="true" label="Gelişmiş Aydınlatma Modeli" name="UseLightShaders"/>
+	<button label="Ayarları ön ayar olarak kaydet..." name="PrefSaveButton"/>
+	<button label="Ön ayarı yükle..." name="PrefLoadButton"/>
+	<button label="Ön ayarı sil..." name="PrefDeleteButton"/>
+	<button label="Önerilen ayarlara dön" name="Defaults"/>
+	<button label="Gelişmiş Ayarlar..." name="AdvancedSettings"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
index acb20595f7..8f74c8ef7e 100644
--- a/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/tr/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
 	<radio_group name="preferred_browser_behavior">
 		<radio_item label="Tüm bağlantılar için kendi tarayıcımı kullan (Chrome, Firefox, IE)" name="internal" tool_tip="Yardım, web bağlantıları vb. için sistemin varsayılan web tarayıcısını kullanın. Tam ekran çalıştırılıyorsa tavsiye edilmez." value="0"/>
 		<radio_item label="Yerleşik tarayıcıyı yalnızca Second Life bağlantıları için kullan" name="external" tool_tip="Yardım, web bağlantıları vb. için sistemin varsayılan web tarayıcısını kullanın. Yerleşik tarayıcı yalnızca LindenLab/SecondLife bağlantıları için kullanılır." value="1"/>
+		<radio_item label="Tüm bağlantılar için yerleşik tarayıcıyı kullan" name="external_all" tool_tip="Yardım, web bağlantıları vs. için dahili web tarayıcısını kullanın. Bu tarayıcı [APP_NAME] içerisinde yeni bir pencere olarak açılır." value="2"/>
 	</radio_group>
 	<check_box initial_value="true" label="Eklentileri etkinleştir" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="Çerezleri kabul et" name="cookies_enabled"/>
 	<check_box initial_value="true" label="Javascript&apos;i etkinleştir" name="browser_javascript_enabled"/>
-	<check_box initial_value="false" label="Ortam tarayıcısı açılır pencerelerini etkinleştir" name="media_popup_enabled"/>
 	<text name="Software updates:">
 		Yazılım güncelleştirmeleri:
 	</text>
 	<combo_box name="updater_service_combobox">
 		<combo_box.item label="Otomatik olarak kurulsun" name="Install_automatically"/>
-		<combo_box.item label="Güncelleştirmeler manuel olarak karşıdan yüklensin ve kurulsun" name="Install_manual"/>
+		<combo_box.item label="Güncellemeleri manuel olarak indirip yükleyeceğim" name="Install_manual"/>
 	</combo_box>
 	<check_box label="Sürüm adaylarına güncelleme yapmaya gönüllü" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/tr/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/tr/panel_presets_pulldown.xml
new file mode 100644
index 0000000000..1f27565655
--- /dev/null
+++ b/indra/newview/skins/default/xui/tr/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+	<text name="Graphic Presets">
+		Grafik Ön Ayarları
+	</text>
+	<button label="Grafik Tercihlerini Aç" name="open_prefs_btn" tool_tip="Grafik tercihlerini getir"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml
index 0433d03450..5d54c1771c 100644
--- a/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml
@@ -57,12 +57,9 @@
 		<layout_panel name="media_address">
 			<line_editor name="media_address_url" tool_tip="Ortam URL&apos;si"/>
 			<layout_stack name="media_address_url_icons">
-				<layout_panel>
+				<layout_panel name="media_address_url_icons_wl">
 					<icon name="media_whitelist_flag" tool_tip="Beyaz Liste etkin"/>
 				</layout_panel>
-				<layout_panel>
-					<icon name="media_secure_lock_flag" tool_tip="Güvenli Tarama"/>
-				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 		<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
index 160cba8700..be5940c4b9 100644
--- a/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/tr/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		Bir görüntüyü envanterinize kaydetmenin maliyeti L$[UPLOAD_COST] olur. Görüntünüzü bir doku olarak kaydetmek için kare formatlardan birini seçin.
 	</text>
 	<combo_box label="Çözünürlük" name="texture_size_combo">
-		<combo_box.item label="Mevcut Pencere" name="CurrentWindow"/>
+		<combo_box.item label="Mevcut Pencere(512x512)" name="CurrentWindow"/>
 		<combo_box.item label="Küçük (128x128)" name="Small(128x128)"/>
 		<combo_box.item label="Orta (256x256)" name="Medium(256x256)"/>
 		<combo_box.item label="Büyük (512x512)" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/tr/panel_tools_texture.xml b/indra/newview/skins/default/xui/tr/panel_tools_texture.xml
index 2ce7c9c11f..9760c7f9f7 100644
--- a/indra/newview/skins/default/xui/tr/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/tr/panel_tools_texture.xml
@@ -21,11 +21,11 @@
 		<combo_box.item label="Malzemeler" name="Materials"/>
 		<combo_box.item label="Ortam" name="Media"/>
 	</combo_box>
-	<combo_box name="combobox mattype">
-		<combo_box.item label="Doku (yayılmış)" name="Texture (diffuse)"/>
-		<combo_box.item label="Yumruluk (normal)" name="Bumpiness (normal)"/>
-		<combo_box.item label="Parıldama (yansıtan)" name="Shininess (specular)"/>
-	</combo_box>
+	<radio_group name="radio_material_type">
+		<radio_item label="Doku (yayılmış)" name="Texture (diffuse)" value="0"/>
+		<radio_item label="Yumruluk (normal)" name="Bumpiness (normal)" value="1"/>
+		<radio_item label="Parıldama (yansıtan)" name="Shininess (specular)" value="2"/>
+	</radio_group>
 	<texture_picker label="Doku" name="texture control" tool_tip="Bir resim seçmek için tıklayın"/>
 	<text name="label alphamode">
 		Alfa modu
diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml
index 18a133a447..49c0bcf02b 100644
--- a/indra/newview/skins/default/xui/tr/strings.xml
+++ b/indra/newview/skins/default/xui/tr/strings.xml
@@ -67,7 +67,7 @@ Grafik Kartı: [GRAPHICS_CARD]
 libcurl Sürümü: [LIBCURL_VERSION]
 J2C Kod Çözücü Sürümü: [J2C_VERSION]
 Ses Sürücüsü Sürümü: [AUDIO_DRIVER_VERSION]
-Qt Web Kit Sürümü: [QT_WEBKIT_VERSION]
+LLCEFLib/CEF Sürümü: [LLCEFLIB_VERSION]
 Ses Sunucusu Sürümü: [VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">
@@ -178,6 +178,12 @@ Ses Sunucusu Sürümü: [VOICE_VERSION]
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="AgniGridLabel">
+		Second Life Ana Ağı (Agni)
+	</string>
+	<string name="AditiGridLabel">
+		Second Life Beta Test Ağı (Aditi)
+	</string>
 	<string name="ViewerDownloadURL">
 		http://secondlife.com/download
 	</string>
@@ -453,6 +459,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 		[AMOUNT] öğeden fazlasını içeren bir klasörü kullanamazsınız.  Bu limiti Gelişmiş &gt; Hata Ayıklama Ayarlarını Göster &gt; KullanılabilirKlasörLimiti öğesinden değiştirebilirsiniz.
 	</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]:"/>
+	<string name="TooltipSLIcon">
+		Bu bağlantı, resmi SecondLife.com ya da LindenLab.com etki alanındaki bir sayfaya gider.
+	</string>
 	<string name="TooltipOutboxDragToWorld">
 		Pazaryeri İlanları klasöründen öğe oluşturamazsınız
 	</string>
@@ -472,7 +481,7 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 		Stok öğelerinin sayısı [AMOUNT] değerini geçiyor.
 	</string>
 	<string name="TooltipOutboxCannotDropOnRoot">
-		Öğeleri veya klasörleri sadece TÜMÜ sekmesine bırakabilirsiniz. Lütfen bu sekmeyi seçin ve öğelerinizi ya da klasörlerinizi yeniden taşıyın.
+		Öğeleri veya klasörleri sadece TÜMÜ ya da İLİŞKİLENDİRİLMEMİŞ sekmesine bırakabilirsiniz. Lütfen bu sekmelerden birini seçin ve öğelerinizi ya da klasörlerinizi taşıyın.
 	</string>
 	<string name="TooltipOutboxNoTransfer">
 		Bu nesnelerden bir veya daha fazlası satılamaz veya aktarılamaz
@@ -556,6 +565,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 		secondlife:// komutunu çalıştırmak için tıklayın
 	</string>
 	<string name="CurrentURL" value="Geçerli URL: [CurrentURL]"/>
+	<string name="TooltipEmail">
+		Bir e-posta oluşturmak için tıklayın
+	</string>
 	<string name="SLurlLabelTeleport">
 		Şuraya ışınla:
 	</string>
@@ -1078,7 +1090,7 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="AgentNameSubst">
 		(Siz)
 	</string>
-	<string name="JoinAnExperience"/><!-- intentionally blank -->
+	<string name="JoinAnExperience"/>
 	<string name="SilentlyManageEstateAccess">
 		Gayri menkul erişim listelerini yönetirken uyarıları bastır
 	</string>
@@ -1857,6 +1869,21 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="TodayOld">
 		Bugün katıldı
 	</string>
+	<string name="av_render_everyone_now">
+		Artık herkes sizi görebilir.
+	</string>
+	<string name="av_render_not_everyone">
+		Çevrenizdeki herkes sizi işleyemeyebilir.
+	</string>
+	<string name="av_render_over_half">
+		Çevrenizdeki kişilerin yarıdan fazlası sizi işleyemeyebilir.
+	</string>
+	<string name="av_render_most_of">
+		Çevrenizdeki çoğu kişi sizi işleyemeyebilir.
+	</string>
+	<string name="av_render_anyone">
+		Çevrenizdeki kimse sizi işleyemeyebilir.
+	</string>
 	<string name="AgeYearsA">
 		[COUNT] yıl
 	</string>
@@ -1974,6 +2001,9 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="CompileQueueUnknownFailure">
 		Karşıdan yüklerken bilinmeyen hata
 	</string>
+	<string name="CompileNoExperiencePerm">
+		[SCRIPT] komut dizisi [EXPERIENCE] deneyimiyle atlanıyor.
+	</string>
 	<string name="CompileQueueTitle">
 		Tekrar Derleme İlerlemesi
 	</string>
@@ -2019,9 +2049,6 @@ Lütfen bir dakika içerisinde tekrar oturum açmayı deneyin.
 	<string name="GroupsNone">
 		hiçbiri
 	</string>
-	<string name="CompileNoExperiencePerm">
-		[SCRIPT] komut dizisi [EXPERIENCE] deneyimiyle atlanıyor.
-	</string>
 	<string name="Group" value="(grup)"/>
 	<string name="Unknown">
 		(Bilinmiyor)
@@ -5387,18 +5414,6 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		Sohbetlerin günlüğü tutulmuyor. Bir günlük tutmaya başlamak için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		Bundan böyle sohbetlerin günlükleri tutulmayacak. Bir günlük tutmaya devam etmek için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		Günlüğü tutulmuş sohbet yok. Siz biriyle iletişime geçtikten sonra veya biri sizinle iletişime geçtikten sonra, burada bir günlük girişi gösterilir.
-	</string>
-	<string name="loading_chat_logs">
-		Yükleniyor...
-	</string>
 	<string name="experience_tools_experience">
 		Deneyim
 	</string>
@@ -5475,9 +5490,42 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin.
 		Kamera Kontrolü
 	</string>
 	<string name="ExperiencePermissionShort11">
-		Işınla
+		Işınlama
 	</string>
 	<string name="ExperiencePermissionShort12">
 		İzin
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		Sohbetlerin günlüğü tutulmuyor. Bir günlük tutmaya başlamak için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		Bundan böyle sohbetlerin günlükleri tutulmayacak. Bir günlük tutmaya devam etmek için, Tercihler &gt; Sohbet altında &quot;Kaydet: Sadece günlük&quot; veya &quot;Kaydet: Günlük ve dökümler&quot; seçimini yapın.
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		Günlüğü tutulmuş sohbet yok. Siz biriyle iletişime geçtikten sonra veya biri sizinle iletişime geçtikten sonra, burada bir günlük girişi gösterilir.
+	</string>
+	<string name="loading_chat_logs">
+		Yükleniyor...
+	</string>
+	<string name="preset_combo_label">
+		-Boş liste-
+	</string>
+	<string name="Default">
+		Varsayılan
+	</string>
+	<string name="none_paren_cap">
+		(Hiçbiri)
+	</string>
+	<string name="no_limit">
+		Sınırsız
+	</string>
+	<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+		Fiziksel görünüm çok küçük üçgenler içeriyor. Fiziksel modeli basitleştirmeye çalışın.
+	</string>
+	<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+		Fiziksel şekil geçersiz doğrulama verileri içeriyor. Fiziksel modeli düzeltmeye çalışın.
+	</string>
+	<string name="Mav_Details_MAV_UNKNOWN_VERSION">
+		Fiziksel şekil doğru sürüme sahip değil. Fiziksel model için doğru sürümü ayarlayın.
+	</string>
 </strings>
diff --git a/indra/newview/skins/default/xui/zh/floater_about.xml b/indra/newview/skins/default/xui/zh/floater_about.xml
index 250cbe67e0..9f6b4421a9 100644
--- a/indra/newview/skins/default/xui/zh/floater_about.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about.xml
@@ -3,6 +3,7 @@
 	<tab_container name="about_tab">
 		<panel label="資訊" name="support_panel">
 			<button label="覆製到剪貼簿" name="copy_btn"/>
+			<button label="查詢是否有更新版" name="update_btn"/>
 		</panel>
 		<panel label="貸記" name="credits_panel">
 			<text name="linden_intro">Second Life 由以下的 Linden 家族帶給你： 
diff --git a/indra/newview/skins/default/xui/zh/floater_about_land.xml b/indra/newview/skins/default/xui/zh/floater_about_land.xml
index a9d95e5b9b..489ea61c72 100644
--- a/indra/newview/skins/default/xui/zh/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/zh/floater_about_land.xml
@@ -13,7 +13,7 @@
 		[MINUTES] 分鐘
 	</floater.string>
 	<floater.string name="Minute">
-		分鐘
+		分
 	</floater.string>
 	<floater.string name="Seconds">
 		[SECONDS] 秒
@@ -446,7 +446,7 @@
 			<spinner label="出入時間：" name="HoursSpin"/>
 			<panel name="Allowed_layout_panel">
 				<text label="永遠允許" name="AllowedText">
-					允許的居民
+					允許的居民 ([COUNT])
 				</text>
 				<name_list name="AccessList" tool_tip="（已列入 [LISTED]，最多可列 [MAX]）"/>
 				<button label="添加" name="add_allowed"/>
@@ -454,7 +454,7 @@
 			</panel>
 			<panel name="Banned_layout_panel">
 				<text label="禁止" name="BanCheck">
-					被封鎖的居民
+					被封鎖的居民 ([COUNT])
 				</text>
 				<name_list name="BannedList" tool_tip="（已列入 [LISTED]，最多可列 [MAX]）"/>
 				<button label="添加" name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml
index 4ee07e6295..ee031edb2d 100644
--- a/indra/newview/skins/default/xui/zh/floater_autoreplace.xml
+++ b/indra/newview/skins/default/xui/zh/floater_autoreplace.xml
@@ -13,6 +13,12 @@
 	</scroll_list>
 	<button label="添加..." name="autoreplace_add_entry"/>
 	<button label="移除" name="autoreplace_delete_entry"/>
+	<text name="autoreplace_keyword_txt">
+		關鍵字：
+	</text>
+	<text name="autoreplace_replacement_txt">
+		取代文字：
+	</text>
 	<button label="儲存項目" name="autoreplace_save_entry" tool_tip="儲存此項目。"/>
 	<button label="儲存變更" name="autoreplace_save_changes" tool_tip="儲存所有變更。"/>
 	<button label="取消" name="autoreplace_cancel" tool_tip="放棄所有變更。"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_bumps.xml b/indra/newview/skins/default/xui/zh/floater_bumps.xml
index 2d76a9f831..d6bdec61b7 100644
--- a/indra/newview/skins/default/xui/zh/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/zh/floater_bumps.xml
@@ -19,6 +19,6 @@
 		[TIME]  [NAME] 以物理物件擊中你
 	</floater.string>
 	<floater.string name="timeStr">
-		[[hour,datetime,slt]:[min,datetime,slt]]
+		[[hour,datetime,slt]:[min,datetime,slt]:[second,datetime,slt]]
 	</floater.string>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_delete_pref_preset.xml b/indra/newview/skins/default/xui/zh/floater_delete_pref_preset.xml
new file mode 100644
index 0000000000..f7dd4c8145
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_delete_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Delete Pref Preset" title="刪除偏好預設">
+	<string name="title_graphic">
+		刪除顯像預設
+	</string>
+	<string name="title_camera">
+		刪除攝影機預設
+	</string>
+	<text name="Preset">
+		選擇一個預設
+	</text>
+	<button label="刪除" name="delete"/>
+	<button label="取消" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml b/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml
index 4d2b3331d7..62e4165c5c 100644
--- a/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml
+++ b/indra/newview/skins/default/xui/zh/floater_experienceprofile.xml
@@ -66,7 +66,7 @@
 					<icons_combo_box label="適度成人" name="edit_ContentRatingText" tool_tip="提升體驗的內容分級將會重設所有已允許該體驗的居民的權限。">
 						<icons_combo_box.item label="完全成人" name="Adult" value="42"/>
 						<icons_combo_box.item label="適度成人" name="Mature" value="21"/>
-						<icons_combo_box.item label="一般" name="PG" value="13"/>
+						<icons_combo_box.item label="普級" name="PG" value="13"/>
 					</icons_combo_box>
 					<text name="edit_Location">
 						位置：
diff --git a/indra/newview/skins/default/xui/zh/floater_fast_timers.xml b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml
index 871849305c..be8a824eed 100644
--- a/indra/newview/skins/default/xui/zh/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/zh/floater_fast_timers.xml
@@ -6,5 +6,16 @@
 	<string name="run">
 		跑步
 	</string>
+	<combo_box name="time_scale_combo">
+		<item label="2x 平均值" name="2x Average"/>
+		<item label="最大值" name="Max"/>
+		<item label="最近的最大值" name="Recent Max"/>
+		<item label="100毫秒" name="100ms"/>
+	</combo_box>
+	<combo_box name="metric_combo">
+		<item label="時間" name="Time"/>
+		<item label="通話次數" name="Number of Calls"/>
+		<item label="赫茲" name="Hz"/>
+	</combo_box>
 	<button label="暫停" name="pause_btn"/>
 </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 51dc73d971..d4dfd835d1 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
@@ -24,6 +24,12 @@
 		<radio_item label="早於" name="older"/>
 	</radio_group>
 	<spinner label="小時前" name="spin_hours_ago"/>
+	<text name="label_hours">
+		小時
+	</text>
 	<spinner label="天前" name="spin_days_ago"/>
+	<text name="label_days">
+		日
+	</text>
 	<button label="關閉" label_selected="關閉" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_load_pref_preset.xml b/indra/newview/skins/default/xui/zh/floater_load_pref_preset.xml
new file mode 100644
index 0000000000..42eb6c292d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_load_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Load Pref Preset" title="載入偏好預設">
+	<string name="title_graphic">
+		載入顯像預設
+	</string>
+	<string name="title_camera">
+		載入攝影機預設
+	</string>
+	<text name="Preset">
+		選擇一個預設
+	</text>
+	<button label="確定" name="ok"/>
+	<button label="取消" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml
index 6b6126c8e0..e6a70a7724 100644
--- a/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml
+++ b/indra/newview/skins/default/xui/zh/floater_merchant_outbox.xml
@@ -12,15 +12,20 @@
 	<string name="OutboxInitializing">
 		正在初始化…
 	</string>
-	<panel label="">
-		<panel>
+	<panel label="" name="panel_1">
+		<panel name="panel_2">
 			<panel name="outbox_inventory_placeholder_panel">
 				<text name="outbox_inventory_placeholder_title">
-					載入中...
+					載入中…
 				</text>
 			</panel>
 		</panel>
-		<panel>
+		<panel name="panel_3">
+			<panel name="outbox_generic_drag_target">
+				<text name="text_1">
+					把物項拖曳到這裡，可建立資料夾
+				</text>
+			</panel>
 			<button label="送往第二人生購物市集" name="outbox_import_btn" tool_tip="推到我第二人生購物市集的店面"/>
 		</panel>
 	</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_model_preview.xml b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
index 22b3d3b065..817b1af88d 100644
--- a/indra/newview/skins/default/xui/zh/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/zh/floater_model_preview.xml
@@ -55,6 +55,9 @@
 	<string name="mesh_status_invalid_material_list">
 		細節層次材料並非參考模型的子集合。
 	</string>
+	<string name="phys_status_vertex_limit_exceeded">
+		有些具體殼面超出頂點限制。
+	</string>
 	<string name="layer_all">
 		全部
 	</string>
@@ -93,52 +96,52 @@
 				<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="產生"/>
+					<item label="從檔案載入" name="Load from file" value="從檔案載入"/>
+					<item label="產生" 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="錯誤門檻"/>
+					<item label="三角形上限" name="Triangle Limit" value="三角形上限"/>
+					<item label="錯誤門檻" 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="以上使用低階細節"/>
+					<item label="從檔案載入" name="Load from file" value="從檔案載入"/>
+					<item label="產生" name="Generate" value="產生"/>
+					<item label="以上使用低階細節" 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="錯誤門檻"/>
+					<item label="三角形上限" name="Triangle Limit" value="三角形上限"/>
+					<item label="錯誤門檻" 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="以上使用低階細節"/>
+					<item label="從檔案載入" name="Load from file" value="從檔案載入"/>
+					<item label="產生" name="Generate" value="產生"/>
+					<item label="以上使用低階細節" 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="錯誤門檻"/>
+					<item label="三角形上限" name="Triangle Limit" value="三角形上限"/>
+					<item label="錯誤門檻" 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="以上使用低階細節"/>
+					<item label="從檔案載入" name="Load from file" value="從檔案載入"/>
+					<item label="產生" name="Generate" value="產生"/>
+					<item label="以上使用低階細節" 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="錯誤門檻"/>
+					<item label="三角形上限" name="Triangle Limit" value="三角形上限"/>
+					<item label="錯誤門檻" name="Error Threshold" value="錯誤門檻"/>
 				</combo_box>
 				<text initial_value="0" name="lowest_triangles" value="0"/>
 				<text initial_value="0" name="lowest_vertices" value="0"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/zh/floater_notifications_tabbed.xml
new file mode 100644
index 0000000000..d1b89a4267
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_notifications_tabbed.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_notifications_tabbed" title="通知">
+	<floater.string name="system_tab_title">
+		系統：([COUNT])
+	</floater.string>
+	<floater.string name="transactions_tab_title">
+		交易：([COUNT])
+	</floater.string>
+	<floater.string name="group_invitations_tab_title">
+		邀請：([COUNT])
+	</floater.string>
+	<floater.string name="group_notices_tab_title">
+		群組：([COUNT])
+	</floater.string>
+	<string name="title_notification_tabbed_window">
+		通知
+	</string>
+	<layout_stack name="TabButtonsStack">
+		<layout_panel name="TabButtonsLayoutPanel">
+			<tab_container name="notifications_tab_container">
+				<panel label="系統 (0)" name="system_notification_list_tab"/>
+				<panel label="交易 (0)" name="transaction_notifications_tab"/>
+				<panel label="邀請 (0)" name="group_invite_notifications_tab"/>
+				<panel label="群組 (0)" name="group_notice_notifications_tab"/>
+			</tab_container>
+			<layout_stack name="ButtonsStack">
+				<layout_panel name="CondenseAllButtonPanel">
+					<button label="全部摺疊" name="collapse_all_button"/>
+				</layout_panel>
+				<layout_panel name="GapLayoutPanel">
+					<panel label="空隙欄" name="GapPanel"/>
+				</layout_panel>
+				<layout_panel name="DeleteAllButtonPanel">
+					<button label="全部刪除" name="delete_all_button"/>
+				</layout_panel>
+			</layout_stack>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
index e6971d111f..e04166c589 100644
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_characters.xml
@@ -27,7 +27,7 @@
 	<floater.string name="character_owner_group">
 		[group]
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_chars_main">
 		<scroll_list name="objects_scroll_list">
 			<scroll_list.columns label="名稱" name="name"/>
 			<scroll_list.columns label="描述" name="description"/>
@@ -42,7 +42,7 @@
 		<button label="全選" name="select_all_objects"/>
 		<button label="全都不選" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_chars_actions">
 		<text name="actions_label">
 			所選角色所採動作：
 		</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
index be009b54d8..7cd1094a05 100644
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_console.xml
@@ -66,6 +66,16 @@
 	<floater.string name="pathing_error">
 		產生路徑時出錯。
 	</floater.string>
+	<panel name="pathfinding_console_main">
+		<text name="viewer_status_label">
+			瀏覽器狀態
+		</text>
+	</panel>
+	<panel name="pathfinding_console_simulator">
+		<text name="simulator_status_label">
+			模擬器狀態
+		</text>
+	</panel>
 	<tab_container name="view_test_tab_container">
 		<panel label="視角" name="view_panel">
 			<text name="show_label">
diff --git a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
index 22e5d2e846..71278b7ce6 100644
--- a/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/zh/floater_pathfinding_linksets.xml
@@ -90,7 +90,16 @@
 	<floater.string name="linkset_choose_use">
 		選擇聯結集的使用…
 	</floater.string>
-	<panel>
+	<panel name="pathfinding_linksets_main">
+		<text name="linksets_filter_label">
+			過濾方式：
+		</text>
+		<text name="linksets_name_label">
+			名稱
+		</text>
+		<text name="linksets_desc_label">
+			描述
+		</text>
 		<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"/>
@@ -122,7 +131,10 @@
 		<button label="全選" name="select_all_objects"/>
 		<button label="全都不選" name="select_none_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_actions">
+		<text name="linksets_actions_label">
+			對所選聯結集採取的動作（如果連結集從虛擬世界移除，其屬性恐會遺失）：
+		</text>
 		<check_box label="顯示指標" name="show_beacon"/>
 		<button label="取得" name="take_objects"/>
 		<button label="拿取副本" name="take_copy_objects"/>
@@ -130,7 +142,10 @@
 		<button label="退回" name="return_objects"/>
 		<button label="刪除" name="delete_objects"/>
 	</panel>
-	<panel>
+	<panel name="pathfinding_linksets_attributes">
+		<text name="linksets_attributes_label">
+			編輯所選聯結集的屬性，並按按鈕啟用變更
+		</text>
 		<text name="walkability_coefficients_label">
 			可行走性：
 		</text>
diff --git a/indra/newview/skins/default/xui/zh/floater_perms_default.xml b/indra/newview/skins/default/xui/zh/floater_perms_default.xml
index 78696be482..d4706d8d87 100644
--- a/indra/newview/skins/default/xui/zh/floater_perms_default.xml
+++ b/indra/newview/skins/default/xui/zh/floater_perms_default.xml
@@ -1,6 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="perms default" title="預設的創建權限">
-	<panel label="預設的權限" name="default permissions"/>
+	<panel label="預設的權限" name="default permissions">
+		<text name="label_1">
+			下一個所有人：
+		</text>
+		<text name="label_2">
+			複製
+		</text>
+		<text name="label_3">
+			修改
+		</text>
+		<text name="label_4">
+			轉移
+		</text>
+		<text name="label_5">
+			與群組分享
+		</text>
+		<text name="label_6">
+			允許任何人覆製
+		</text>
+		<text name="label_7" tool_tip="設定預設權限決定何時建立物件">
+			物件
+		</text>
+		<text name="label_8" tool_tip="設定已上傳物項的預設權限">
+			上傳內容
+		</text>
+		<text name="label_9" tool_tip="設定預設權限決定何時建立腳本">
+			腳本
+		</text>
+		<text name="label_10" tool_tip="設定預設權限決定何時建立記事卡">
+			記事卡
+		</text>
+		<text name="label_11" tool_tip="設定預設權限決定何時建立姿勢">
+			姿勢
+		</text>
+		<text name="label_12" tool_tip="設定預設權限決定何時建立服裝或身體部位">
+			可穿裝扮
+		</text>
+	</panel>
 	<button label="確定" label_selected="確定" name="ok"/>
 	<button label="取消" label_selected="取消" name="cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
new file mode 100644
index 0000000000..f9c2fe47e7
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_preferences_graphics_advanced.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="prefs_graphics_advanced" title="進階顯像偏好設定">
+	<text name="GeneralText">
+		一般
+	</text>
+	<slider label="描繪距離：" name="DrawDistance"/>
+	<text name="DrawDistanceMeterText2">
+		公尺
+	</text>
+	<slider label="最大粒子效果數量：" name="MaxParticleCount"/>
+	<slider label="後處理品質：" name="RenderPostProcess"/>
+	<text name="PostProcessText">
+		低
+	</text>
+	<text name="AvatarText">
+		化身
+	</text>
+	<slider label="最大複雜度：" name="IndirectMaxComplexity" tool_tip="控制在何時機下讓複雜化身呈像為「單色軟糖娃娃」"/>
+	<text name="IndirectMaxComplexityText">
+		0
+	</text>
+	<slider label="非假冒化身數目上限：" name="IndirectMaxNonImpostors"/>
+	<text name="IndirectMaxNonImpostorsText">
+		0
+	</text>
+	<slider label="細節：" name="AvatarMeshDetail"/>
+	<text name="AvatarMeshDetailText">
+		低
+	</text>
+	<slider label="身體物理：" name="AvatarPhysicsDetail"/>
+	<text name="AvatarPhysicsDetailText">
+		低
+	</text>
+	<text name="ShadersText">
+		硬體
+	</text>
+	<slider label="材質記憶體（MB）：" name="GraphicsCardTextureMemory" tool_tip="配置給材質使用的記憶體量。 預設為顯像卡記憶體。 降低此值可以提升效能，但材質也會變模糊。"/>
+	<slider label="霧距離比率：" name="fog"/>
+	<slider label="伽瑪值：" name="gamma"/>
+	<text name="(brightness, lower is brighter)">
+		（0 = 預設亮度；值越小 = 亮度越高）
+	</text>
+	<check_box label="各向異性過濾（若啟用會變慢）" name="ani"/>
+	<check_box initial_value="true" label="啟用 OpenGL 頂點緩衝物件(VBO)" name="vbo" tool_tip="在較新硬體上啟用，可提升效能。  但是，較舊硬體的 VBO 實作不佳，若啟用可能導致當機。"/>
+	<check_box initial_value="true" label="啟用材質壓縮（須重新啟動）" name="texture compression" tool_tip="在影片記憶體中壓縮材質，讓高解析度材質可以載入，但色彩品質稍差。"/>
+	<text name="antialiasing label">
+		消除鋸齒：
+	</text>
+	<combo_box label="消除鋸齒" name="fsaa">
+		<combo_box.item label="已停用" name="FSAADisabled"/>
+		<combo_box.item label="2x" name="2x"/>
+		<combo_box.item label="4x" name="4x"/>
+		<combo_box.item label="8x" name="8x"/>
+		<combo_box.item label="16x" name="16x"/>
+	</combo_box>
+	<text name="antialiasing restart">
+		（須重新啟動）
+	</text>
+	<slider label="地形網面細節：" name="TerrainMeshDetail"/>
+	<text name="TerrainMeshDetailText">
+		低
+	</text>
+	<slider label="樹木：" name="TreeMeshDetail"/>
+	<text name="TreeMeshDetailText">
+		低
+	</text>
+	<slider label="物件：" name="ObjectMeshDetail"/>
+	<text name="ObjectMeshDetailText">
+		低
+	</text>
+	<slider label="彈性幾何元件：" name="FlexibleMeshDetail"/>
+	<text name="FlexibleMeshDetailText">
+		低
+	</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="關閉此一選項可能避免部分顯示卡驅動程式損毀當機"/>
+	<slider label="地形細節：" name="TerrainDetail"/>
+	<text name="TerrainDetailText">
+		低
+	</text>
+	<check_box initial_value="true" label="硬體化身換膚" name="AvatarVertexProgram"/>
+	<check_box initial_value="true" label="化身衣服" name="AvatarCloth"/>
+	<text name="ReflectionsText">
+		水文反射：
+	</text>
+	<combo_box name="Reflections">
+		<combo_box.item label="最小" name="0"/>
+		<combo_box.item label="地形與樹木" name="1"/>
+		<combo_box.item label="全部靜態物件" name="2"/>
+		<combo_box.item label="全部化身與物件" name="3"/>
+		<combo_box.item label="一切" name="4"/>
+	</combo_box>
+	<check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/>
+	<slider label="天空：" name="SkyMeshDetail"/>
+	<text name="SkyMeshDetailText">
+		低
+	</text>
+	<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="RenderShadowDetailText">
+		陰影：
+	</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>
+	<button label="重設為我們建議的設定" name="Defaults"/>
+	<button label="確定" label_selected="確定" name="OK"/>
+	<button label="取消" label_selected="取消" name="Cancel"/>
+	<check_box label="RenderAvatarMaxComplexity" name="RenderAvatarMaxNonImpostors"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_save_pref_preset.xml b/indra/newview/skins/default/xui/zh/floater_save_pref_preset.xml
new file mode 100644
index 0000000000..6a3c95940c
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/floater_save_pref_preset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<floater name="Save Pref Preset" title="儲存偏好預設">
+	<string name="title_graphic">
+		儲存顯示預設
+	</string>
+	<string name="title_camera">
+		儲存攝影機預設
+	</string>
+	<text name="Preset">
+		輸入預設名稱，或選擇一組現有預設。
+	</text>
+	<button label="儲存" name="save"/>
+	<button label="取消" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml
index 6094a3bbce..bb4ebcdf21 100644
--- a/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml
+++ b/indra/newview/skins/default/xui/zh/floater_spellcheck_import.xml
@@ -1,6 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="spellcheck_import" title="匯入字典">
+	<text name="import_dict">
+		字典：
+	</text>
 	<button label="瀏覽" label_selected="瀏覽" name="dictionary_path_browse"/>
+	<text name="import_name">
+		名稱：
+	</text>
+	<text name="import_lang">
+		語言：
+	</text>
 	<button label="匯入" name="ok_btn"/>
 	<button label="取消" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_tos.xml b/indra/newview/skins/default/xui/zh/floater_tos.xml
index 3da9445a55..c86cc3057d 100644
--- a/indra/newview/skins/default/xui/zh/floater_tos.xml
+++ b/indra/newview/skins/default/xui/zh/floater_tos.xml
@@ -12,4 +12,7 @@
 	<text name="tos_heading">
 		請仔細閱讀以下服務條款及隱私政策。 繼續登入 [SECOND_LIFE] 前，你必須同意條款。
 	</text>
+	<text name="external_tos_required">
+		你需先登入 my.secondlife.com 同意服務條款，才可繼續。 謝謝你！
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
index 41b3409627..ace1302250 100644
--- a/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_attachment_other.xml
@@ -15,5 +15,8 @@
 	<menu_item_call label="放大" name="Zoom In"/>
 	<menu_item_call label="支付" name="Pay..."/>
 	<menu_item_call label="物件檔案" name="Object Inspect"/>
+	<menu_item_check label="正常呈像" name="RenderNormally"/>
+	<menu_item_check label="不要呈像" name="DoNotRender"/>
+	<menu_item_check label="完全呈像" name="AlwaysRenderFully"/>
 	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
index dc035bafa0..0e0d1cc3d2 100644
--- a/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
+++ b/indra/newview/skins/default/xui/zh/menu_avatar_other.xml
@@ -14,5 +14,8 @@
 	<menu_item_call label="傾印 XML" name="Dump XML"/>
 	<menu_item_call label="放大" name="Zoom In"/>
 	<menu_item_call label="支付" name="Pay..."/>
+	<menu_item_check label="正常呈像" name="RenderNormally"/>
+	<menu_item_check label="不要呈像" name="DoNotRender"/>
+	<menu_item_check label="完全呈像" name="AlwaysRenderFully"/>
 	<menu_item_call label="封鎖粒子所有人" name="Mute Particle"/>
 </context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_login.xml b/indra/newview/skins/default/xui/zh/menu_login.xml
index 4a1e2f4364..7ef9240e83 100644
--- a/indra/newview/skins/default/xui/zh/menu_login.xml
+++ b/indra/newview/skins/default/xui/zh/menu_login.xml
@@ -15,6 +15,7 @@
 		<menu_item_call label="[SECOND_LIFE] 部落格" name="Second Life Blogs"/>
 		<menu_item_call label="回報錯誤" name="Report Bug"/>
 		<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="查詢是否有新版" name="Check for Updates"/>
 	</menu>
 	<menu_item_check label="顯示除錯選單" name="Show Debug Menu"/>
 	<menu label="除錯" name="Debug">
diff --git a/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml b/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml
index 5396b2a866..a2f520d6ed 100644
--- a/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml
+++ b/indra/newview/skins/default/xui/zh/menu_marketplace_view.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <toggleable_menu name="menu_marketplace_sort">
+	<menu_item_check label="依名稱排序" name="sort_by_name"/>
+	<menu_item_check label="依最近時間排序" name="sort_by_recent"/>
 	<menu_item_check label="按存量排序（由少到多）" name="sort_by_stock_amount"/>
 	<menu_item_check label="只顯示刊登資料夾" name="show_only_listing_folders"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_url_email.xml b/indra/newview/skins/default/xui/zh/menu_url_email.xml
new file mode 100644
index 0000000000..9db99a2b6d
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/menu_url_email.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<context_menu name="Email Popup">
+	<menu_item_call label="用外部客戶程式編纂電郵" name="email_open_external"/>
+	<menu_item_call label="複製電郵到剪貼簿" name="email_copy"/>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/zh/menu_viewer.xml b/indra/newview/skins/default/xui/zh/menu_viewer.xml
index 9572ad49d3..41590d60c7 100644
--- a/indra/newview/skins/default/xui/zh/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/zh/menu_viewer.xml
@@ -178,6 +178,7 @@
 		<menu_item_call label="回報臭蟲" name="Report Bug"/>
 		<menu_item_call label="碰撞、推擠與打擊" name="Bumps, Pushes &amp;amp; Hits"/>
 		<menu_item_call label="關於 [APP_NAME]" name="About Second Life"/>
+		<menu_item_call label="查詢是否有新版" name="Check for Updates"/>
 	</menu>
 	<menu label="進階" name="Advanced">
 		<menu_item_call label="重新產出材質" name="Rebake Texture"/>
@@ -191,7 +192,7 @@
 			<menu_item_call label="Lag 測量器" name="Lag Meter"/>
 			<menu_item_check label="統計列" name="Statistics Bar"/>
 			<menu_item_call label="場景負載統計資料" name="Scene Load Statistics"/>
-			<menu_item_check label="顯示化身的繪製重量" name="Avatar Rendering Cost"/>
+			<menu_item_check label="顯示化身複雜度資訊" name="Avatar Draw Info"/>
 		</menu>
 		<menu label="高亮顯示與可見度" name="Highlighting and Visibility">
 			<menu_item_check label="Cheesy 指標" name="Cheesy Beacon"/>
@@ -314,8 +315,6 @@
 			<menu_item_check label="接點" name="Joints"/>
 			<menu_item_check label="光線投射" name="Raycast"/>
 			<menu_item_check label="風力向量" name="Wind Vectors"/>
-			<menu_item_check label="繪出複雜度" name="rendercomplexity"/>
-			<menu_item_check label="附件位元組" name="attachment bytes"/>
 			<menu_item_check label="雕刻" name="Sculpt"/>
 			<menu label="材質密度" name="Texture Density">
 				<menu_item_check label="無" name="None"/>
@@ -421,13 +420,11 @@
 			<menu_item_check label="除錯字元可見性" name="Debug Character Vis"/>
 			<menu_item_check label="顯示碰撞骨架" name="Show Collision Skeleton"/>
 			<menu_item_check label="顯示用戶目標" name="Display Agent Target"/>
-			--&gt;
 			<menu_item_call label="傾印附件" name="Dump Attachments"/>
 			<menu_item_call label="除錯化身材質" name="Debug Avatar Textures"/>
 			<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_call label="啟用記憶體洩漏視覺偵測器" name="Enable Visual Leak Detector"/>
 		<menu_item_check label="輸出除錯小型傾印" name="Output Debug Minidump"/>
diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml
index 0a98101b60..0865c6dbc1 100644
--- a/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/indra/newview/skins/default/xui/zh/notifications.xml
@@ -164,6 +164,10 @@
         &apos;[ERROR_CODE]&apos;
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
+	<notification name="MerchantForceValidateListing">
+		為能建立你的刊登內容，我們修正了你刊登內容的層級架構。
+		<usetemplate ignoretext="如果建立新的刊登時會修動內容物的層級架構，給我提醒" name="okignore" yestext="確定"/>
+	</notification>
 	<notification name="ConfirmMerchantActiveChange">
 		這個動作會改變此刊登的內容。 你確定要繼續嗎？
 		<usetemplate ignoretext="在我變更 Marketplace 的一項刊登內容之前，先跟我確認" name="okcancelignore" notext="取消" yestext="確定"/>
@@ -211,6 +215,10 @@
 		因為存量爲零，我們已經把你的刊登物下架。 你若希望重新刊登，必須先增加存量。
 		<usetemplate ignoretext="限量資料夾如果成空、導致刊登物下架，告知我" name="okignore" yestext="確定"/>
 	</notification>
+	<notification name="AlertMerchantVersionFolderEmpty">
+		因為版本資料夾是空的，我們已經把你的刊登物下架。 你若希望重新刊登，必須先新增物項到該版本資料夾。
+		<usetemplate ignoretext="版本資料夾如果成空、導致刊登物下架，告知我" name="okignore" yestext="確定"/>
+	</notification>
 	<notification name="CompileQueueSaveText">
 		上傳腳本文字時出問題，原因：[REASON]。 請稍候再試一次。
 	</notification>
@@ -320,6 +328,14 @@
 		你即將把 [COUNT] 個人踢出群組。
 		<usetemplate ignoretext="確定將多人踢出群組" name="okcancelignore" notext="取消" yestext="踢出"/>
 	</notification>
+	<notification name="BanGroupMemberWarning">
+		你即將禁止[AVATAR_NAME]留在群組。
+		<usetemplate ignoretext="確定禁止某人留在群組" name="okcancelignore" notext="取消" yestext="禁止"/>
+	</notification>
+	<notification name="BanGroupMembersWarning">
+		你即將禁止[COUNT]個人留在群組。
+		<usetemplate ignoretext="確定要禁止多名成員續留此群組" name="okcancelignore" notext="取消" yestext="禁止"/>
+	</notification>
 	<notification name="AttachmentDrop">
 		你即將卸除你的附件。
     你確定你要繼續？
@@ -404,7 +420,7 @@
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="ReturnAllTopObjects">
-		你確定要將所列的所有物件送返其所有人的收納區？
+		你確定要將所列的所有物件送返其所有人的收納區？ 這將送回這個地區全部的腳本物件！
 		<usetemplate name="okcancelbuttons" notext="取消" yestext="確定"/>
 	</notification>
 	<notification name="DisableAllTopObjects">
@@ -609,6 +625,10 @@
 	<notification name="CannotDownloadFile">
 		無法下載檔案
 	</notification>
+	<notification label="" name="MediaFileDownloadUnsupported">
+		你要求下載檔案，在 [SECOND_LIFE] 裡未支援這動作。
+		<usetemplate ignoretext="如果下載的檔案不受支援，給我提醒" name="okignore" yestext="確定"/>
+	</notification>
 	<notification name="CannotWriteFile">
 		無法寫入檔案 [[FILE]]
 	</notification>
@@ -1108,8 +1128,9 @@
 這異常狀況通常只是暫時的。 請稍待幾分鐘後，再自訂並儲存可穿裝扮。
 	</notification>
 	<notification name="YouHaveBeenLoggedOut">
-		糟糕！ 你已被登出 [SECOND_LIFE]
-            [MESSAGE]
+		糟糕！ 你已被登出 [SECOND_LIFE]。
+
+[MESSAGE]
 		<usetemplate name="okcancelbuttons" notext="結束退出" yestext="察看 IM 和聊天內容"/>
 	</notification>
 	<notification name="OnlyOfficerCanBuyLand">
@@ -1350,6 +1371,13 @@
 			<ignore name="ignore" text="服裝花太多時間下載"/>
 		</form>
 	</notification>
+	<notification name="RegionAndAgentComplexity">
+		你的[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 視覺複雜度]是[AGENT_COMPLEXITY]。
+[OVERLIMIT_MSG]
+	</notification>
+	<notification name="AgentComplexity">
+		你的[https://community.secondlife.com/t5/English-Knowledge-Base/Avatar-Rendering-Complexity/ta-p/2967838 視覺複雜度]是[AGENT_COMPLEXITY]。
+	</notification>
 	<notification name="FirstRun">
 		[APP_NAME] 安裝完成。
 
@@ -1626,6 +1654,25 @@ SHA1 指紋：[MD5_DIGEST]
 參見[[INFO_URL] 介紹此更新版的資訊]
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
+	<notification name="UpdateDownloadInProgress">
+		有更新版本！
+正在背景下載中，一完成下載我們會通知你重啟瀏覽器以便安裝。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="UpdateDownloadComplete">
+		一個更新版本已經下載完畢。 重啟時將會安裝。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="UpdateCheckError">
+		查詢是否有更新時出錯。
+請稍候再試一次。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
+	<notification name="UpdateViewerUpToDate">
+		你的瀏覽器已是最新版！
+如果你急欲試用最新的功能和修補，請光臨「替代瀏覽器」網頁：http://wiki.secondlife.com/wiki/Linden_Lab_Official:Alternate_Viewers。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
 	<notification name="DeedObjectToGroup">
 		讓渡此物件將可讓這個群組：
 * 收取付給此物件的 L$
@@ -1730,6 +1777,13 @@ SHA1 指紋：[MD5_DIGEST]
 		你已達可同時加入的群組數上限。 請先離開某些群組再加入或新建新群組。
 		<usetemplate name="okbutton" yestext="確定"/>
 	</notification>
+	<notification name="GroupLimitInfo">
+		基本帳戶的群組限制是[MAX_BASIC]，[https://secondlife.com/premium/ 付費]帳戶則是[MAX_PREMIUM]。
+如果你把帳戶降級，你必須先低於[MAX_BASIC]的群組限制，才可再加入更多群組。
+
+[https://secondlife.com/my/account/membership.php 現在就升級！]
+		<usetemplate name="okbutton" yestext="關閉"/>
+	</notification>
 	<notification name="KickUser">
 		踢出這個居民並留給他什麼訊息？
 		<form name="form">
@@ -1930,7 +1984,7 @@ SHA1 指紋：[MD5_DIGEST]
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="選擇領地" name="EstateTrustedExperienceRemove">
-		僅針對這個領地或針對 [ALL_ESTATES] 將它從金鑰清單中移除？
+		僅針對這個領地，還是針對 [ALL_ESTATES] 將它從金鑰清單中移除？
 		<usetemplate canceltext="取消" name="yesnocancelbuttons" notext="全部領地" yestext="這個領地"/>
 	</notification>
 	<notification label="確認踢出" name="EstateKickUser">
@@ -2239,6 +2293,10 @@ SHA1 指紋：[MD5_DIGEST]
 		確認你真要支付 L$[AMOUNT] 給 [TARGET]。
 		<usetemplate ignoretext="付款前跟我確認（超過 L$200 的總額）" name="okcancelignore" notext="取消" yestext="支付"/>
 	</notification>
+	<notification name="PayObjectFailed">
+		付款失敗：找不到物件。
+		<usetemplate name="okbutton" yestext="確定"/>
+	</notification>
 	<notification name="OpenObjectCannotCopy">
 		這物件中沒有任何准許你複製的物項。
 	</notification>
@@ -2270,10 +2328,9 @@ SHA1 指紋：[MD5_DIGEST]
 		[QUESTION]
 		<usetemplate ignoretext="刪除物品前確認" name="okcancelignore" notext="取消" yestext="確定"/>
 	</notification>
-	<notification name="HelpReportAbuseEmailLL">
-		使用這個工具舉報任何違反[http://secondlife.com/corporate/tos.php 服務條款]和[http://secondlife.com/corporate/cs.php 社群準則]的情事。
-
-所有舉報的違規事件都有人調查，加以解決。
+	<notification name="ConfirmUnlink">
+		這是一組包含聯結集的巨大選取項。 一旦你取消它的聯結，很可能不能再重新聯結。 為防萬一，建議你把聯結集複製到收納區。
+		<usetemplate ignoretext="取消聯結集聯結時，跟我確認" name="okcancelignore" notext="取消" yestext="取消聯結"/>
 	</notification>
 	<notification name="HelpReportAbuseSelectCategory">
 		請選擇適合這次違規舉報的類別。
@@ -3201,6 +3258,12 @@ SHA1 指紋：[MD5_DIGEST]
 	<notification name="AttachmentSaved">
 		附件已儲存。
 	</notification>
+	<notification name="PresetNotSaved">
+		儲存預設名稱[NAME]時出錯。
+	</notification>
+	<notification name="PresetNotDeleted">
+		刪除預設名稱[NAME]時出錯。
+	</notification>
 	<notification name="UnableToFindHelpTopic">
 		找不到這個元件的幫助主題。
 	</notification>
@@ -3233,9 +3296,8 @@ SHA1 指紋：[MD5_DIGEST]
 		選取要分享的居民。
 	</notification>
 	<notification name="MeshUploadError">
-		[LABEL] 上傳失敗：[MESSAGE] [IDENTIFIER] 
-
-詳見記錄檔。
+		[LABEL] 上傳失敗：[MESSAGE] [IDENTIFIER]
+[DETAILS]詳情見 SecondLife.log
 	</notification>
 	<notification name="MeshUploadPermError">
 		請求網面上傳權限時出錯。
diff --git a/indra/newview/skins/default/xui/zh/panel_experience_search.xml b/indra/newview/skins/default/xui/zh/panel_experience_search.xml
index 9b0145748e..25b15d03ab 100644
--- a/indra/newview/skins/default/xui/zh/panel_experience_search.xml
+++ b/indra/newview/skins/default/xui/zh/panel_experience_search.xml
@@ -26,7 +26,7 @@
 		<icons_combo_box label="適度成人" name="maturity">
 			<icons_combo_box.item label="完全成人" name="Adult" value="42"/>
 			<icons_combo_box.item label="適度成人" name="Mature" value="21"/>
-			<icons_combo_box.item label="一般" name="PG" value="13"/>
+			<icons_combo_box.item label="普級" name="PG" value="13"/>
 		</icons_combo_box>
 		<scroll_list name="search_results">
 			<columns label="名稱" name="experience_name"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
index 0ad3d8506d..4765276158 100644
--- a/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_main_inventory.xml
@@ -6,6 +6,9 @@
 	<panel.string name="ItemcountCompleted">
 		[ITEM_COUNT] 物品 [FILTER]
 	</panel.string>
+	<panel.string name="ItemcountUnknown">
+		已取得 [ITEM_COUNT] 物品 [FILTER]
+	</panel.string>
 	<text name="ItemcountText">
 		物品：
 	</text>
diff --git a/indra/newview/skins/default/xui/zh/panel_people.xml b/indra/newview/skins/default/xui/zh/panel_people.xml
index da5918d553..b0e60218cf 100644
--- a/indra/newview/skins/default/xui/zh/panel_people.xml
+++ b/indra/newview/skins/default/xui/zh/panel_people.xml
@@ -18,6 +18,7 @@
 	<string name="no_groups_msg" value="要尋找群組考慮加入嗎？ 請試試[secondlife:///app/search/groups 搜尋]。"/>
 	<string name="MiniMapToolTipMsg" value="[REGION]（雙擊以開啟地圖，按下 shift 鍵拖曳來平移）"/>
 	<string name="AltMiniMapToolTipMsg" value="[REGION]（雙擊以瞬間傳送，按下 shift 鍵拖曳來平移）"/>
+	<string name="GroupCountWithInfo" value="你目前屬於 [COUNT] 個群組，可再加入 [REMAINING] 個。  [secondlife:/// 想要更多？]"/>
 	<tab_container name="tabs">
 		<panel label="附近" name="nearby_panel">
 			<panel label="bottom_panel" name="nearby_buttons_panel">
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
index b5cdddc252..57add4f9d6 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_chat.xml
@@ -89,8 +89,19 @@
 		<check_box label="收納物品贈送" name="inventory_offer"/>
 	</panel>
 	<panel name="log_settings">
+		<text name="logging_label">
+			儲存：
+		</text>
+		<combo_box name="conversation_log_combo">
+			<item label="活動記錄和交談記錄" name="log_and_transcripts" value="2"/>
+			<item label="僅活動記錄" name="log_only" value="1"/>
+			<item label="沒有活動記錄或交談記錄" name="no_log_or_transcript" value="0"/>
+		</combo_box>
 		<button label="清空記錄…" name="clear_log"/>
 		<button label="刪除交談內容記錄…" name="delete_transcripts"/>
+		<text name="log_location_label">
+			位置：
+		</text>
 		<button label="瀏覽…" label_selected="瀏覽" name="log_path_button"/>
 	</panel>
 	<button label="翻譯…" name="ok_btn"/>
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 2311eb99a7..8c4d2f9c18 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_graphics1.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="顯像" name="Display panel">
+	<text name="preset_text">
+		（無）
+	</text>
 	<text name="QualitySpeed">
 		品質與速度：
 	</text>
-	<text name="FasterText">
-		最快
-	</text>
-	<text name="BetterText">
-		最佳
-	</text>
 	<text name="ShadersPrefText">
 		低
 	</text>
@@ -21,94 +18,17 @@
 	<text name="ShadersPrefText4">
 		超高
 	</text>
-	<panel label="自訂圖形" name="CustomGraphics Panel">
-		<text name="ShadersText">
-			著色器：
-		</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>
-		<combo_box name="Reflections">
-			<combo_box.item label="最小" name="0"/>
-			<combo_box.item label="地形與樹木" name="1"/>
-			<combo_box.item label="全部靜態物件" name="2"/>
-			<combo_box.item label="全部化身與物件" name="3"/>
-			<combo_box.item label="一切" name="4"/>
-		</combo_box>
-		<slider label="化身物理：" name="AvatarPhysicsDetail"/>
-		<text name="AvatarPhysicsDetailText">
-			低
-		</text>
-		<slider label="描繪距離：" name="DrawDistance"/>
-		<text name="DrawDistanceMeterText2">
-			公尺
-		</text>
-		<slider label="最大粒子效果數量：" name="MaxParticleCount"/>
-		<slider label="非假冒化身上限：" name="MaxNumberAvatarDrawn"/>
-		<slider label="後處理品質：" name="RenderPostProcess"/>
-		<text name="MeshDetailText">
-			網面細節：
-		</text>
-		<slider label="物件：" name="ObjectMeshDetail"/>
-		<slider label="彈性幾何元件：" name="FlexibleMeshDetail"/>
-		<slider label="樹木：" name="TreeMeshDetail"/>
-		<slider label="化身：" name="AvatarMeshDetail"/>
-		<slider label="地形：" name="TerrainMeshDetail"/>
-		<slider label="天空：" name="SkyMeshDetail"/>
-		<text name="PostProcessText">
-			低
-		</text>
-		<text name="ObjectMeshDetailText">
-			低
-		</text>
-		<text name="FlexibleMeshDetailText">
-			低
-		</text>
-		<text name="TreeMeshDetailText">
-			低
-		</text>
-		<text name="AvatarMeshDetailText">
-			低
-		</text>
-		<text name="TerrainMeshDetailText">
-			低
-		</text>
-		<text name="SkyMeshDetailText">
-			低
-		</text>
-		<text name="AvatarRenderingText">
-			化身呈像：
-		</text>
-		<check_box initial_value="true" label="化身假冒者" name="AvatarImpostors"/>
-		<check_box initial_value="true" label="硬體換膚" name="AvatarVertexProgram"/>
-		<check_box initial_value="true" label="化身衣服" name="AvatarCloth"/>
-		<text name="TerrainDetailText">
-			地形細節：
-		</text>
-		<radio_group name="TerrainDetailRadio">
-			<radio_item label="低" name="0"/>
-			<radio_item label="高" name="2"/>
-		</radio_group>
-		--&gt;
-	</panel>
-	<button label="套用" label_selected="套用" name="Apply"/>
-	<button label="重設" name="Defaults"/>
-	<button label="進階" name="Advanced"/>
-	<button label="硬體" label_selected="硬體" name="GraphicsHardwareButton"/>
+	<text name="FasterText">
+		最快
+	</text>
+	<text name="BetterText">
+		最佳
+	</text>
+	<check_box initial_value="true" label="大氣著色" name="WindLightUseAtmosShaders"/>
+	<check_box initial_value="true" label="進階照明模型" name="UseLightShaders"/>
+	<button label="將設定存為預設值 …" name="PrefSaveButton"/>
+	<button label="載入預設..." name="PrefLoadButton"/>
+	<button label="刪除自訂配置…" name="PrefDeleteButton"/>
+	<button label="重設為我們建議的設定" name="Defaults"/>
+	<button label="進階設定…" name="AdvancedSettings"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
index fcbed76d49..942bd27140 100644
--- a/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/zh/panel_preferences_setup.xml
@@ -17,17 +17,17 @@
 	<radio_group name="preferred_browser_behavior">
 		<radio_item label="所有連結都用我的網頁瀏覽器（例如 Chrome、Firefox、IE）開啟" name="internal" tool_tip="使用系統預設的瀏覽器瀏覽幫助，開啟網頁。全螢幕模式下不建議這麼做。" value="0"/>
 		<radio_item label="僅在開啟第二人生連結時使用內建瀏覽器" name="external" tool_tip="使用系統預設的瀏覽器瀏覽幫助，開啟網頁。僅在開啟 LindenLab/SecondLife 的連結時才會使用內建瀏覽器。" value="1"/>
+		<radio_item label="用內建瀏覽器開啟所有連結" name="external_all" tool_tip="使用內建的瀏覽器瀏覽幫助，開啟網頁。該瀏覽器將透過 [APP_NAME] 開啟新視窗。" value="2"/>
 	</radio_group>
 	<check_box initial_value="true" label="啟用外掛" name="browser_plugins_enabled"/>
 	<check_box initial_value="true" label="接受 cookies" name="cookies_enabled"/>
 	<check_box initial_value="true" label="啟用 Javascript" name="browser_javascript_enabled"/>
-	<check_box initial_value="false" label="啟用媒體瀏覽的突顯式視窗" name="media_popup_enabled"/>
 	<text name="Software updates:">
 		軟體更新：
 	</text>
 	<combo_box name="updater_service_combobox">
 		<combo_box.item label="自動安裝" name="Install_automatically"/>
-		<combo_box.item label="手動下載及安裝" name="Install_manual"/>
+		<combo_box.item label="讓我自己手動下載並安裝" name="Install_manual"/>
 	</combo_box>
 	<check_box label="願意在更新時搶先試用釋出候選版" name="update_willing_to_test"/>
 	<text name="Proxy Settings:">
diff --git a/indra/newview/skins/default/xui/zh/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/zh/panel_presets_pulldown.xml
new file mode 100644
index 0000000000..cd2cbfdd5a
--- /dev/null
+++ b/indra/newview/skins/default/xui/zh/panel_presets_pulldown.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="presets_pulldown">
+	<text name="Graphic Presets">
+		顯像預設
+	</text>
+	<button label="開啟顯像偏好設定" name="open_prefs_btn" tool_tip="打開顯像偏好設定"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
index 09043311da..39d0aa9593 100644
--- a/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/zh/panel_prim_media_controls.xml
@@ -57,12 +57,9 @@
 		<layout_panel name="media_address">
 			<line_editor name="media_address_url" tool_tip="媒體網址"/>
 			<layout_stack name="media_address_url_icons">
-				<layout_panel>
+				<layout_panel name="media_address_url_icons_wl">
 					<icon name="media_whitelist_flag" tool_tip="白名單已啟用"/>
 				</layout_panel>
-				<layout_panel>
-					<icon name="media_secure_lock_flag" tool_tip="加密的瀏覽"/>
-				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 		<layout_panel name="media_play_position">
diff --git a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
index 9c45c54a5e..094bf019b4 100644
--- a/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
+++ b/indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
@@ -7,7 +7,7 @@
 		將圖像儲存到收納區的費用為 L$[UPLOAD_COST]。 若要將圖像存為材質，請選擇一個正方格式。
 	</text>
 	<combo_box label="解析度" name="texture_size_combo">
-		<combo_box.item label="目前視窗" name="CurrentWindow"/>
+		<combo_box.item label="目前視窗(512x512)" name="CurrentWindow"/>
 		<combo_box.item label="小（128x128）" name="Small(128x128)"/>
 		<combo_box.item label="中（256x256）" name="Medium(256x256)"/>
 		<combo_box.item label="大（512x512）" name="Large(512x512)"/>
diff --git a/indra/newview/skins/default/xui/zh/panel_tools_texture.xml b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
index 5ea6d818c7..03f83693d6 100644
--- a/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/zh/panel_tools_texture.xml
@@ -21,11 +21,11 @@
 		<combo_box.item label="材料" name="Materials"/>
 		<combo_box.item label="媒體" name="Media"/>
 	</combo_box>
-	<combo_box name="combobox mattype">
-		<combo_box.item label="材質（漫反射圖）" name="Texture (diffuse)"/>
-		<combo_box.item label="凹凸度（正交）" name="Bumpiness (normal)"/>
-		<combo_box.item label="閃亮度（鏡反光）" name="Shininess (specular)"/>
-	</combo_box>
+	<radio_group name="radio_material_type">
+		<radio_item label="材質（漫反射圖）" name="Texture (diffuse)" value="0"/>
+		<radio_item label="凹凸度（正交）" name="Bumpiness (normal)" value="1"/>
+		<radio_item label="閃亮度（鏡反光）" name="Shininess (specular)" value="2"/>
+	</radio_group>
 	<texture_picker label="材質" name="texture control" tool_tip="點按以挑選圖片"/>
 	<text name="label alphamode">
 		半透明模式
diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml
index 2e07e4ebd0..4f16eaf82b 100644
--- a/indra/newview/skins/default/xui/zh/strings.xml
+++ b/indra/newview/skins/default/xui/zh/strings.xml
@@ -67,7 +67,7 @@
 libcurl 版本： [LIBCURL_VERSION]
 J2C 解碼器版本： [J2C_VERSION]
 音效驅動程式版本： [AUDIO_DRIVER_VERSION]
-Qt Webkit 版本： [QT_WEBKIT_VERSION]
+LLCEFLib/CEF版本：[LLCEFLIB_VERSION]
 語音伺服器版本： [VOICE_VERSION]
 	</string>
 	<string name="AboutTraffic">
@@ -178,6 +178,12 @@ Qt Webkit 版本： [QT_WEBKIT_VERSION]
 	<string name="create_account_url">
 		http://join.secondlife.com/?sourceid=[sourceid]
 	</string>
+	<string name="AgniGridLabel">
+		第二人生主要網格(Agni)
+	</string>
+	<string name="AditiGridLabel">
+		第二人生Beta版測試網格(Aditi)
+	</string>
 	<string name="ViewerDownloadURL">
 		http://secondlife.com/download
 	</string>
@@ -448,6 +454,9 @@ http://secondlife.com/viewer-access-faq
 		你不能對含超過 [AMOUNT] 個物項的資料夾作穿戴動作。  欲變更此上限，可到「進階」&gt;「顯示除錯設定」&gt;「WearFolderLimit」。
 	</string>
 	<string name="TooltipPrice" value="L$[AMOUNT]："/>
+	<string name="TooltipSLIcon">
+		這將連結到位於SecondLife.com或LindenLab.com官方網域的一個網頁。
+	</string>
 	<string name="TooltipOutboxDragToWorld">
 		你不能從 Marketplace 的刊登資料夾產生物件。
 	</string>
@@ -467,7 +476,7 @@ http://secondlife.com/viewer-access-faq
 		限量物件數目超過 [AMOUNT]。
 	</string>
 	<string name="TooltipOutboxCannotDropOnRoot">
-		你只能把物項或資料夾拖放到「所有」(ALL)頁籤 請選取該頁籤，再移動你的物項或資料夾。
+		你只能把物項或資料夾拖放到所有(ALL)或已取消聯結(UNASSOCIATED)頁籤。 請選取其中一個頁籤，再移動你的物項或資料夾。
 	</string>
 	<string name="TooltipOutboxNoTransfer">
 		至少一個物件無法出售或轉移
@@ -551,6 +560,9 @@ http://secondlife.com/viewer-access-faq
 		點按以執行 secondlife:// 指令
 	</string>
 	<string name="CurrentURL" value="目前網址：[CurrentURL]"/>
+	<string name="TooltipEmail">
+		點按一下可編寫電郵
+	</string>
 	<string name="SLurlLabelTeleport">
 		瞬間傳送到
 	</string>
@@ -1073,7 +1085,7 @@ http://secondlife.com/viewer-access-faq
 	<string name="AgentNameSubst">
 		（你）
 	</string>
-	<string name="JoinAnExperience"/><!-- intentionally blank -->
+	<string name="JoinAnExperience"/>
 	<string name="SilentlyManageEstateAccess">
 		管理領出入許可名單時，不顯示警示
 	</string>
@@ -1852,6 +1864,21 @@ http://secondlife.com/viewer-access-faq
 	<string name="TodayOld">
 		今日剛加入
 	</string>
+	<string name="av_render_everyone_now">
+		現在每個人都能看見你了。
+	</string>
+	<string name="av_render_not_everyone">
+		你恐怕不能呈像給你周遭的所有人。
+	</string>
+	<string name="av_render_over_half">
+		你恐怕不能呈像給你周遭一半以上的人。
+	</string>
+	<string name="av_render_most_of">
+		你恐怕不能呈像給你周遭大部分的人。
+	</string>
+	<string name="av_render_anyone">
+		你恐怕不能呈像給你周遭的任何人。
+	</string>
 	<string name="AgeYearsA">
 		[COUNT] 年
 	</string>
@@ -1969,6 +1996,9 @@ http://secondlife.com/viewer-access-faq
 	<string name="CompileQueueUnknownFailure">
 		下載失敗，原因不明
 	</string>
+	<string name="CompileNoExperiencePerm">
+		略過體驗 [EXPERIENCE] 的腳本 [SCRIPT]。
+	</string>
 	<string name="CompileQueueTitle">
 		重新編譯進度
 	</string>
@@ -2014,9 +2044,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="GroupsNone">
 		無
 	</string>
-	<string name="CompileNoExperiencePerm">
-		略過體驗 [EXPERIENCE] 的腳本 [SCRIPT]。
-	</string>
 	<string name="Group" value="（群組）"/>
 	<string name="Unknown">
 		（未知）
@@ -5384,18 +5411,6 @@ http://secondlife.com/viewer-access-faq
 	<string name="UserDictionary">
 		[User]
 	</string>
-	<string name="logging_calls_disabled_log_empty">
-		交談未留記錄。 若想開始留記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
-	</string>
-	<string name="logging_calls_disabled_log_not_empty">
-		將不再為交談留記錄。 若想恢復留存記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
-	</string>
-	<string name="logging_calls_enabled_log_empty">
-		目前沒有交談記錄。 在你聯絡某人或某人聯絡你之後，這裡將留存記錄。
-	</string>
-	<string name="loading_chat_logs">
-		載入中…
-	</string>
 	<string name="experience_tools_experience">
 		體驗
 	</string>
@@ -5477,4 +5492,37 @@ http://secondlife.com/viewer-access-faq
 	<string name="ExperiencePermissionShort12">
 		權限
 	</string>
+	<string name="logging_calls_disabled_log_empty">
+		交談未留記錄。 若想開始留記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
+	</string>
+	<string name="logging_calls_disabled_log_not_empty">
+		將不再為交談留記錄。 若想恢復留存記錄，請到「偏好設定 &gt; 聊天」，選擇「儲存：只留歷史記錄」或「儲存：歷史記錄兼交談內容」。
+	</string>
+	<string name="logging_calls_enabled_log_empty">
+		目前沒有交談記錄。 在你聯絡某人或某人聯絡你之後，這裡將留存記錄。
+	</string>
+	<string name="loading_chat_logs">
+		載入中…
+	</string>
+	<string name="preset_combo_label">
+		-空白清單-
+	</string>
+	<string name="Default">
+		預設
+	</string>
+	<string name="none_paren_cap">
+		（無）
+	</string>
+	<string name="no_limit">
+		無上限
+	</string>
+	<string name="Mav_Details_MAV_FOUND_DEGENERATE_TRIANGLES">
+		該物理形狀包含太小的三角形。 請試著簡化該物理模型。
+	</string>
+	<string name="Mav_Details_MAV_CONFIRMATION_DATA_MISMATCH">
+		該物理形狀包含壞的確認資料。 請試著修正該物理模型。
+	</string>
+	<string name="Mav_Details_MAV_UNKNOWN_VERSION">
+		物理形狀的版本不正確。 請設成正確的物理模型版本。
+	</string>
 </strings>