Anonymous avatar Anonymous committed 8291b5e

FIX INTL-99 set32 translation for 8 languages

Comments (0)

Files changed (72)

indra/newview/skins/default/xui/de/floater_hardware_settings.xml

 		VBO aktivieren:
 	</text>
 	<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."/>
+	<text name="tc label">
+		S3TC aktivieren:
+	</text>
+	<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)."/>
 	<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."/>
 	<spinner label="Nebeldistanzverhältnis:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>

indra/newview/skins/default/xui/de/floater_stats.xml

 					<stat_bar label="Pro Sek. gezeichnete KTris" name="ktrissec"/>
 					<stat_bar label="Objektanzahl" name="objs"/>
 					<stat_bar label="Neue Objekte" name="newobjs"/>
+					<stat_bar label="Objektcache-Trefferrate" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Textur" name="texture">
+					<stat_bar label="Cache-Trefferrate" name="texture_cache_hits"/>
+					<stat_bar label="Cache-Leselatenz" name="texture_cache_read_latency"/>
 					<stat_bar label="Zählen" name="numimagesstat"/>
 					<stat_bar label="Rohanzahl" name="numrawimagesstat"/>
 					<stat_bar label="GL Sp" name="gltexmemstat"/>

indra/newview/skins/default/xui/de/floater_texture_ctrl.xml

 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="TEXTUR AUSWÄHLEN">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Zum Auswählen eines Bildes hier klicken
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Auswählen:
+	</floater.string>
 	<text name="Multiple">
 		Mehrere Texturen
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventar" name="inventory" value="0"/>
+		<radio_item label="Lokal" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Größe: [DIMENSIONS]
 	</text>
 	<button label="Standard" label_selected="Standard" name="Default"/>
+	<button label="Leer" label_selected="Leer" name="Blank"/>
 	<button label="Keine" label_selected="Keine" name="None"/>
-	<button label="Leer" label_selected="Leer" name="Blank"/>
-	<check_box label="Ordner anzeigen" name="show_folders_check"/>
-	<search_editor label="Texturen filtern" name="inventory search editor"/>
-	<check_box label="Jetzt übernehmen" name="apply_immediate_check"/>
 	<button label="" label_selected="" name="Pipette"/>
+	<filter_editor label="Texturen filtern" name="inventory search editor"/>
+	<check_box initial_value="false" label="Ordner anzeigen" name="show_folders_check"/>
+	<button label="Hinzufügen" label_selected="Hinzufügen" name="l_add_btn"/>
+	<button label="Entfernen" label_selected="Entfernen" name="l_rem_btn"/>
+	<button label="Hochladen" label_selected="Hochladen" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Name" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
+	<button label="OK" label_selected="OK" name="Select"/>
 	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
-	<button label="OK" label_selected="OK" name="Select"/>
-	<text name="pick title">
-		Auswählen:
-	</text>
+	<check_box initial_value="true" label="Jetzt übernehmen" name="apply_immediate_check"/>
 </floater>

indra/newview/skins/default/xui/de/floater_texture_fetch_debugger.xml

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Debugger für Texturabruffehler">
+	<text name="total_num_fetched_label">
+		1, Gesamtzahl abgerufener Texturen: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Gesamtzahl von Abrufanforderungen: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Gesamtzahl von Cachetreffern: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Gesamtzahl sichtbarer Texturen: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Gesamtzahl von Abrufanforderungen für sichtbare Texturen: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Gesamtmenge abgerufener Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Gesamtmenge sichtbarer Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Gesamtmenge dargestellter Daten: [SIZE1] KB, decodierte Daten: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Gesamtzeit Cache-Lesezugriffe: [TIME] s
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Gesamtzeit Cache-Schreibzugriffe: [TIME] s
+	</text>
+	<text name="total_time_decode_label">
+		11, Gesamtzeit Decodierung: [TIME] s
+	</text>
+	<text name="total_time_gl_label">
+		12, Gesamtzeit GL-Texturerstellung: [TIME] s
+	</text>
+	<text name="total_time_http_label">
+		13, Gesamtzeit HTTP-Abrufe: [TIME] s
+	</text>
+	<text name="total_time_fetch_label">
+		14, Gesamtzeit für alle Abrufe: [TIME] s
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Neuabruf sichtbarer Texturen aus Cache, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, Neuabruf sichtbarer Texturen von HTTP, Zeit: [TIME] s, Abrufmenge: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<spinner label="17, Verhältnis Texel/Pixel:" name="texel_pixel_ratio"/>
+	<button label="Starten" name="start_btn"/>
+	<button label="Zurücksetzen" name="clear_btn"/>
+	<button label="Schließen" name="close_btn"/>
+	<button label="Cache-Lesezugriff" name="cacheread_btn"/>
+	<button label="Cache-Schreibzugriff" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Decodieren" name="decode_btn"/>
+	<button label="GL-Textur" name="gl_btn"/>
+	<button label="Neuabruf sichtbarer Texturen (Cache)" name="refetchviscache_btn"/>
+	<button label="Neuabruf sichtbarer Texturen (HTTP)" name="refetchvishttp_btn"/>
+</floater>

indra/newview/skins/default/xui/de/floater_window_size.xml

 		Fenstergröße einstellen:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="Breite x Höhe">
-		<combo_box.item label="1000 x 700 (Standard)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (Standard)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Festlegen" name="set_btn"/>
 	<button label="Abbrechen" name="cancel_btn"/>

indra/newview/skins/default/xui/de/menu_viewer.xml

 			<menu_item_check label="Textur" name="Texture Console"/>
 			<menu_item_check label="Fehler beseitigen" name="Debug Console"/>
 			<menu_item_call label="Meldungen" name="Notifications"/>
-			<menu_item_check label="Texturgröße" name="Texture Size"/>
-			<menu_item_check label="Texture-Kategorie" name="Texture Category"/>
 			<menu_item_check label="Schnelle Timer" name="Fast Timers"/>
 			<menu_item_check label="Speicher" name="Memory"/>
 			<menu_item_check label="Szenestatistiken" name="Scene Statistics"/>
+			<menu_item_call label="Debug-Konsole für Texturabruffehler" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Info zu Region in Fenster Fehler beseitigen" name="Region Info to Debug Console"/>
 			<menu_item_call label="Gruppeninfo in Fenster Fehler beseitigen" name="Group Info to Debug Console"/>
 			<menu_item_call label="Info zu Fähigkeiten in Fenster Fehler beseitigen" name="Capabilities Info to Debug Console"/>
 			<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"/>
+				<menu_item_check label="Aktuelle" name="Current"/>
+				<menu_item_check label="Gewünschte" name="Desired"/>
+				<menu_item_check label="Volle" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Achsen" name="Axes"/>
 			<menu_item_check label="Animationstexturen" name="Animation Textures"/>
 			<menu_item_check label="Texturen deaktivieren" name="Disable Textures"/>
 			<menu_item_check label="Voll-Res-Texturen" name="Rull Res Textures"/>
-			<menu_item_check label="Texturen prüfen" name="Audit Textures"/>
 			<menu_item_check label="Textur-Atlas (experimentell)" name="Texture Atlas"/>
 			<menu_item_check label="Angehängte Lichter rendern" name="Render Attached Lights"/>
 			<menu_item_check label="Angehängte Partikel rendern" name="Render Attached Particles"/>

indra/newview/skins/default/xui/de/notifications.xml

 		</url>
 		<usetemplate ignoretext="Meine Hardware wird nicht unterstützt" name="okcancelignore" notext="Nein" yestext="Ja"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Wahrscheinlich gibt es einen neueren Treiber für Ihren Grafikchip. Durch Aktualisieren der Grafiktreiber lässt sich die Leistung u. U. beträchtlich verbessern.
+
+    Unter [_URL] nach aktualisierten Treibern suchen?
+		<url name="url">
+			http://www.intel.com/p/de_DE/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Mein Grafiktreiber ist veraltet" name="okcancelignore" notext="Nein" yestext="Ja"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Ihr System verwendet eine Grafikkarte, die [APP_NAME] nicht erkennt.
 Dies passiert dann, wenn die neue Hardware noch nicht mit [APP_NAME] getestet wurde.  Wahrscheinlich wird das Programm richtig ausgeführt, aber Sie müssen eventuell ein paar Grafikeinstellungen vornehmen.
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Das Objekt „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“, das „[NAME]“ gehört, stellt folgende Anfrage:
-
-[QUESTIONS]
-Wenn Sie diesem Objekt und seinem Ersteller nicht vertrauen, sollten Sie diese Anfrage ablehnen.
-
-Anfrage gestatten?
+		Achtung: Das Objekt „&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;“ fordert uneingeschränkten Zugriff auf Ihr Linden-Dollar-Konto an. Wenn Sie Zugriff gewähren, kann dieses Objekt jederzeit und ohne weitere Warnung Ihr Konto belasten bzw. ganz leeren.
+  
+Eine solche Anforderung ist nur in seltenen Fällen legitim. Gewähren Sie dem Objekt nur dann Zugriff, wenn Sie genau verstehen, wieso ein solcher Zugriff auf Ihr Konto erforderlich ist.
 		<form name="form">
-			<button name="Grant" text="Gewähren"/>
+			<button name="Grant" text="Uneingeschränkten Zugriff gewähren"/>
 			<button name="Deny" text="Verweigern"/>
-			<button name="Details" text="Info..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
 	<global name="You died and have been teleported to your home location">
 		Sie sind gestorben und wurden zu Ihrem Zuhause teleportiert.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] wurde nicht gefunden und konnte deshalb nicht aktualisiert werden.
+Zukünftige Aktualisierungen dieser Datei werden deaktiviert.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] konnte auch nach [NRETRIES] Versuchen nicht geöffnet oder decodiert werden und gilt als beschädigt.
+Zukünftige Aktualisierungen dieser Datei werden deaktiviert.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Versuch, eine ungültige oder nicht lesbare Bilddatei ([FNAME]) hinzuzufügen, die nicht geöffnet oder decodiert werden konnte.
+Versuch abgebrochen.
+	</notification>
 </notifications>

indra/newview/skins/default/xui/de/panel_script_question_toast.xml

+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>

indra/newview/skins/default/xui/de/strings.xml

 	<string name="ScriptQuestionCautionChatDenied">
 		Dem Objekt „[OBJECTNAME]“, ein Objekt von „[OWNERNAME]“, in [REGIONNAME] [REGIONPOS], wurde folgende Berechtigung verweigert: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Wenn Sie dem Objekt Zugriff auf Ihr Konto gewähren, kann dieses außerdem:
+	</string>
 	<string name="ScriptTakeMoney">
 		Linden-Dollar (L$) von Ihnen nehmen
 	</string>
 	<string name="ControlYourCamera">
 		Kamerasteuerung
 	</string>
+	<string name="TeleportYourAgent">
+		Sie teleportieren
+	</string>
 	<string name="NotConnected">
 		Nicht verbunden
 	</string>

indra/newview/skins/default/xui/es/floater_hardware_settings.xml

 		Activar VBO:
 	</text>
 	<check_box initial_value="true" label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="En hardware moderno, habilitar esta opción mejora el rendimiento. Pero en hardware antiguo, el habilitarlo hace que, frecuentemente, se obtenga una implementación pobre de VBO, lo que puede provocarle caídas."/>
+	<text name="tc label">
+		Activar S3TC:
+	</text>
+	<check_box initial_value="verdadero" label="Activar la compresión de texturas (requiere reiniciar)" name="texture compression" tool_tip="Comprime las texturas de 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."/>
 	<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."/>
 	<spinner label="Intensidad de la niebla:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>

indra/newview/skins/default/xui/es/floater_stats.xml

 					<stat_bar label="KTris generados por segundo" name="ktrissec"/>
 					<stat_bar label="Objetos en total" name="objs"/>
 					<stat_bar label="Objetos nuevos" name="newobjs"/>
+					<stat_bar label="Índice de aciertos de caché de objetos" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Textura" name="texture">
+					<stat_bar label="Índice de aciertos de caché" name="texture_cache_hits"/>
+					<stat_bar label="Latencia de lectura de caché" name="texture_cache_read_latency"/>
 					<stat_bar label="Número" name="numimagesstat"/>
 					<stat_bar label="Raw: número" name="numrawimagesstat"/>
 					<stat_bar label="GL Mem" name="gltexmemstat"/>

indra/newview/skins/default/xui/es/floater_texture_ctrl.xml

 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="DESTACADO: TEXTURA">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Pulse para elegir una imagen
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Elegir:
+	</floater.string>
 	<text name="Multiple">
 		Texturas múltiples
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventario" name="inventory" value="0"/>
+		<radio_item label="Local" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Tamaño: [DIMENSIONS]
 	</text>
 	<button label="Por defecto" label_selected="Por defecto" name="Default" width="84"/>
+	<button label="Blanca" label_selected="Blanca" name="Blank"/>
 	<button label="Ninguna" label_selected="Ninguna" left="90" name="None"/>
-	<button label="Blanca" label_selected="Blanca" name="Blank"/>
-	<check_box label="Ver las carpetas" name="show_folders_check"/>
-	<search_editor label="Filtrar las texturas" name="inventory search editor"/>
-	<check_box label="Aplicarlo ahora" name="apply_immediate_check"/>
 	<button label="" label_selected="" name="Pipette"/>
+	<filter_editor label="Filtrar las texturas" name="inventory search editor"/>
+	<check_box initial_value="false" label="Ver las carpetas" name="show_folders_check"/>
+	<button label="Añadir" label_selected="Añadir" name="l_add_btn"/>
+	<button label="Eliminar" label_selected="Eliminar" name="l_rem_btn"/>
+	<button label="Subir" label_selected="Subir" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Nombre" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
+	<button label="OK" label_selected="OK" name="Select"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
-	<button label="OK" label_selected="OK" name="Select"/>
-	<string name="pick title">
-		Elegir:
-	</string>
+	<check_box initial_value="true" label="Aplicarlo ahora" name="apply_immediate_check"/>
 </floater>

indra/newview/skins/default/xui/es/floater_texture_fetch_debugger.xml

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Depurador de obtención de texturas">
+	<text name="total_num_fetched_label">
+		1, Número total de texturas obtenidas: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Número total de solicitudes de obtención: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Número total de aciertos de caché: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Número total de texturas visibles: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Número total de solicitudes de obtención de texturas visibles: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Número total de datos obtenidos: [SIZE1] KB, Datos descodificados: [SIZE2] KB, [PIXEL] MPíxeles
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Número total de datos visibles: [SIZE1] KB, Datos descodificados: [SIZE2] KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Número total de datos representados: [SIZE1] KB, Datos descodificados: [SIZE2] KB, [PIXEL] MPíxeles
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Tiempo total en lecturas de caché: [TIME] segundos
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Tiempo total en escrituras de caché: [TIME] segundos
+	</text>
+	<text name="total_time_decode_label">
+		11, Tiempo total en descodificaciones: [TIME] segundos
+	</text>
+	<text name="total_time_gl_label">
+		12, Tiempo total en la creación de texturas gl: [TIME] segundos
+	</text>
+	<text name="total_time_http_label">
+		13, Tiempo total en obtención de HTTP: [TIME] segundos
+	</text>
+	<text name="total_time_fetch_label">
+		14, Tiempo total en obtención completa: [TIME] segundos
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Volviendo a obtener visibles de la caché, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, Volviendo a obtener visibles de HTTP, Tiempo: [TIME] segundos, Obtenidos: [SIZE] KB, [PIXEL] MPíxeles
+	</text>
+	<spinner label="17, Proporción de texeles/píxeles:" name="texel_pixel_ratio"/>
+	<button label="Iniciar" name="start_btn"/>
+	<button label="Restablecer" name="clear_btn"/>
+	<button label="Cerrar" name="close_btn"/>
+	<button label="Lectura de caché" name="cacheread_btn"/>
+	<button label="Escritura de caché" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Descodificar" name="decode_btn"/>
+	<button label="Textura GL" name="gl_btn"/>
+	<button label="Volver a obtener caché de vis." name="refetchviscache_btn"/>
+	<button label="Volver a obtener HTTP de vis." name="refetchvishttp_btn"/>
+</floater>

indra/newview/skins/default/xui/es/floater_window_size.xml

 		Definir el tamaño de la ventana:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="ancho x alto">
-		<combo_box.item label="1000 x 700 (por defecto)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720 p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080 p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (por defecto)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Configurar" name="set_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>

indra/newview/skins/default/xui/es/menu_viewer.xml

 			<menu_item_check label="Texture Console" name="Texture Console"/>
 			<menu_item_check label="Debug Console" name="Debug Console"/>
 			<menu_item_call label="Notifications Console" name="Notifications"/>
-			<menu_item_check label="Texture Size Console" name="Texture Size"/>
-			<menu_item_check label="Texture Category Console" name="Texture Category"/>
 			<menu_item_check label="Fast Timers" name="Fast Timers"/>
 			<menu_item_check label="Memory" name="Memory"/>
 			<menu_item_check label="Datos de la escena" name="Scene Statistics"/>
+			<menu_item_call label="Consola de depuración de obtención de texturas" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/>
 			<menu_item_check label="Camera" name="Camera"/>
 			<menu_item_check label="Wind" name="Wind"/>
 			<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"/>
+				<menu_item_check label="Actual" name="Current"/>
+				<menu_item_check label="Deseada" name="Desired"/>
+				<menu_item_check label="Completa" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>

indra/newview/skins/default/xui/es/notifications.xml

 		</url>
 		<usetemplate ignoretext="El hardware de mi ordenador no está admitido" name="okcancelignore" notext="No" yestext="Sí"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Probablemente ya existe un controlador más reciente para tu procesador de gráficos. La actualización del controlador de gráficos puede mejorar sustancialmente el rendimiento.
+
+    ¿Deseas visitar [_URL] para comprobar si hay controladores actualizados?
+		<url name="url">
+			http://www.intel.com/p/es_XL/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Mi controlador de gráficos no está actualizado" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Tu sistema usa una tarjeta gráfica que [APP_NAME] no reconoce.
 Suele suceder con hardware nuevo que todavía no ha sido probado con [APP_NAME].  Probablemente todo irá bien, pero deberás ajustar tus configuraciones gráficas.
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Un objeto de nombre &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, propiedad de &apos;[NAME]&apos;, quiere:
-
-[QUESTIONS]
-Si no confias en este objeto y en su creador, deberías rehusar esta petición.
-
-¿Autorizar esta petición?
+		Atención: El objeto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; solicita un acceso total a tu cuenta de dólares Linden. Si le autorizas el acceso, podrá retirar fondos de tu cuenta en cualquier momento o vaciarla por completo, de manera permanente y sin más advertencias.
+  
+Estas solicitudes pocas veces son legítimas. No autorices el acceso si no conoces la razón exacta por la que desea el acceso a tu cuenta.
 		<form name="form">
-			<button name="Grant" text="Autorizar"/>
+			<button name="Grant" text="Permitir acceso total"/>
 			<button name="Deny" text="Denegar"/>
-			<button name="Details" text="Detalles..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
 		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [NAME]
 [MESSAGE]
-		<form name="form">
-			<button name="Mute" text="Ignorar"/>
-			<button name="Ignore" text="Ignorar"/>
-		</form>
+		<form name="form"/>
 	</notification>
 	<notification name="ScriptDialogGroup">
 		&apos;&lt;nolink&gt;[TITLE]&lt;/nolink&gt;&apos; de [GROUPNAME]
 [MESSAGE]
-		<form name="form">
-			<button name="Mute" text="Ignorar"/>
-			<button name="Ignore" text="Ignorar"/>
-		</form>
+		<form name="form"/>
 	</notification>
 	<notification name="BuyLindenDollarSuccess">
 		¡Gracias por tu pago!
 	<global name="You died and have been teleported to your home location">
 		Has muerto y te has teleportado a tu Base.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] no se ha podido actualizar porque el archivo ya no se encuentra.
+Desactivando futuras actualizaciones de este archivo.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] se ha intentado abrir o descodificar durante [NRETRIES] intentos sin éxito, y ahora se considera roto.
+Desactivando futuras actualizaciones de este archivo.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Se ha intentado añadir un archivo de imagen [FNAME] no válido o ilegible, que no se puede abrir ni descodificar.
+Intento cancelado.
+	</notification>
 </notifications>

indra/newview/skins/default/xui/es/panel_script_question_toast.xml

+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>

indra/newview/skins/default/xui/es/strings.xml

 	<string name="ScriptQuestionCautionChatDenied">
 		A &apos;[OBJECTNAME]&apos;, un objeto propiedad de &apos;[OWNERNAME]&apos;, localizado en [REGIONNAME] con la posición [REGIONPOS], se le ha denegado el permiso para: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Si autorizas el acceso a tu cuenta, también permitirás al objeto:
+	</string>
 	<string name="ScriptTakeMoney">
 		Cogerle a usted dólares Linden (L$)
 	</string>
 	<string name="ControlYourCamera">
 		Controlar su cámara
 	</string>
+	<string name="TeleportYourAgent">
+		Teleportarte
+	</string>
 	<string name="SIM_ACCESS_PG">
 		General
 	</string>

indra/newview/skins/default/xui/fr/floater_hardware_settings.xml

 		Activer le VBO :
 	</text>
 	<check_box initial_value="true" label="Activer OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Sur un matériel moderne, cette option permet une meilleure performance. Par contre, sur un matériel plus ancien, les VBO sont souvent mal implémentés et peuvent causer des crashs lorsqu&apos;ils sont activés."/>
+	<text name="tc label">
+		Activer S3TC :
+	</text>
+	<check_box initial_value="vraie" 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&apos;une certaine qualité de couleur."/>
 	<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&apos;être floues."/>
 	<spinner label="Indice du brouillard :" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>

indra/newview/skins/default/xui/fr/floater_stats.xml

 					<stat_bar label="KTris par s" name="ktrissec"/>
 					<stat_bar label="Objets totaux" name="objs"/>
 					<stat_bar label="Nouveaux objets" name="newobjs"/>
+					<stat_bar label="Taux de réussite du cache des objets" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Texture" name="texture">
+					<stat_bar label="Taux de réussite du cache" name="texture_cache_hits"/>
+					<stat_bar label="Latence de lecture du cache" name="texture_cache_read_latency"/>
 					<stat_bar label="Nombre" name="numimagesstat"/>
 					<stat_bar label="Nombre brut" name="numrawimagesstat"/>
 					<stat_bar label="Mém GL" name="gltexmemstat"/>
 				<stat_bar label="Chargements en attente" name="simpendinguploads"/>
 				<stat_bar label="Total Unacked Bytes" name="simtotalunackedbytes"/>
 				<stat_view label="Temps (ms)" name="simperf">
-					<stat_bar label="Durée totale de l'image" name="simframemsec"/>
+					<stat_bar label="Durée totale de l&apos;image" name="simframemsec"/>
 					<stat_bar label="Durée nette" name="simnetmsec"/>
 					<stat_bar label="Durée sim (physique)" name="simsimphysicsmsec"/>
 					<stat_bar label="Durée sim (autre)" name="simsimothermsec"/>

indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml

 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="CHOISIR : TEXTURE">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Cliquez pour sélectionner une image
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Choisir :
+	</floater.string>
 	<text name="Multiple">
 		Textures multiples
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventaire" name="inventory" value="0"/>
+		<radio_item label="Local" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Taille : [DIMENSIONS]
 	</text>
 	<button label="Défaut" label_selected="Défaut" name="Default" width="60"/>
+	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
 	<button label="Aucune" label_selected="Aucune" left="68" name="None" width="60"/>
-	<button label="Vierge" label_selected="Vierge" name="Blank" width="60"/>
-	<check_box label="Afficher les dossiers" name="show_folders_check"/>
-	<search_editor label="Filtrer les textures" name="inventory search editor"/>
-	<check_box label="Appliquer maintenant" name="apply_immediate_check"/>
 	<button bottom="-240" label="" label_selected="" name="Pipette"/>
+	<filter_editor label="Filtrer les textures" name="inventory search editor"/>
+	<check_box initial_value="false" label="Afficher les dossiers" name="show_folders_check"/>
+	<button label="Ajouter" label_selected="Ajouter" name="l_add_btn"/>
+	<button label="Supprimer" label_selected="Supprimer" name="l_rem_btn"/>
+	<button label="Charger" label_selected="Charger" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Nom" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
+	<button label="OK" label_selected="OK" name="Select"/>
 	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
-	<button label="OK" label_selected="OK" name="Select"/>
-	<string name="pick title">
-		Choisir :
-	</string>
+	<check_box initial_value="true" label="Appliquer maintenant" name="apply_immediate_check"/>
 </floater>

indra/newview/skins/default/xui/fr/floater_texture_fetch_debugger.xml

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Outil de débogage de la récupération des textures">
+	<text name="total_num_fetched_label">
+		1, nombre total de textures récupérées : [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, nombre total de demandes de récupération : [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, nombre total de présences dans le cache : [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, nombre total de textures visibles : [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, nombre total de demandes de récupération de textures visibles : [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, nombre total de données récupérées : [SIZE1] Ko, données décodées : [SIZE2] Ko, [PIXEL] Mpixels
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, nombre total de données visibles : [SIZE1] Ko, données décodées : [SIZE2] Ko
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, nombre total de données rendues : [SIZE1] Ko, données décodées : [SIZE2] Ko, [PIXEL] Mpixels
+	</text>
+	<text name="total_time_cache_read_label">
+		9, durée totale des lectures du cache : [TIME] secondes
+	</text>
+	<text name="total_time_cache_write_label">
+		10, durée totale des écritures du cache : [TIME] secondes
+	</text>
+	<text name="total_time_decode_label">
+		11, durée totale des décodages : [TIME] secondes
+	</text>
+	<text name="total_time_gl_label">
+		12, durée totale de la création de textures GL : [TIME] secondes
+	</text>
+	<text name="total_time_http_label">
+		13, durée totale de la récupération HTTP : [TIME] secondes
+	</text>
+	<text name="total_time_fetch_label">
+		14, durée totale de la récupération intégrale : [TIME] secondes
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, nouvelle récupération des données visibles du cache, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, nouvelle récupération des données visibles de la requête HTTP, Durée : [TIME] secondes, Récupéré : [SIZE] Ko, [PIXEL] Mpixels
+	</text>
+	<spinner label="17, taux de texels/pixels :" name="texel_pixel_ratio"/>
+	<button label="Démarrer" name="start_btn"/>
+	<button label="Réinitialiser" name="clear_btn"/>
+	<button label="Fermer" name="close_btn"/>
+	<button label="Lecture du cache" name="cacheread_btn"/>
+	<button label="Écriture du cache" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Décoder" name="decode_btn"/>
+	<button label="Texture GL" name="gl_btn"/>
+	<button label="Récupérer à nouveau les données visibles du cache" name="refetchviscache_btn"/>
+	<button label="Récupérer à nouveau les données visibles de la requête HTTP" name="refetchvishttp_btn"/>
+</floater>

indra/newview/skins/default/xui/fr/floater_window_size.xml

 		Définir la taille de la fenêtre :
 	</text>
 	<combo_box name="window_size_combo" tool_tip="largeur x hauteur">
-		<combo_box.item label="1 000 x 700 (défaut)" name="item0"/>
-		<combo_box.item label="1 024 x 768" name="item1"/>
-		<combo_box.item label="1 280 x 720 (720 p)" name="item2"/>
-		<combo_box.item label="1 920 x 1 080 (1 080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (par défaut)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Choisir" name="set_btn"/>
 	<button label="Annuler" name="cancel_btn"/>

indra/newview/skins/default/xui/fr/menu_viewer.xml

 			<menu_item_check label="Console de textures" name="Texture Console"/>
 			<menu_item_check label="Console de débogage" name="Debug Console"/>
 			<menu_item_call label="Console de notifications" name="Notifications"/>
-			<menu_item_check label="Console de tailles de textures" name="Texture Size"/>
-			<menu_item_check label="Console des catégories de textures" name="Texture Category"/>
 			<menu_item_check label="Chronos" name="Fast Timers"/>
 			<menu_item_check label="Mémoire" name="Memory"/>
 			<menu_item_check label="Statistiques de la scène" name="Scene Statistics"/>
+			<menu_item_call label="Console de débogage de la récupération des textures" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Infos de région vers la console de débogage" name="Region Info to Debug Console"/>
 			<menu_item_call label="Infos de groupe vers la console de débogage" name="Group Info to Debug Console"/>
 			<menu_item_call label="Infos de capacités vers la console de débogage" name="Capabilities Info to Debug Console"/>
 			<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"/>
+				<menu_item_check label="Actuelle" name="Current"/>
+				<menu_item_check label="Souhaitée" name="Desired"/>
+				<menu_item_check label="Complète" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendu" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>
 			<menu_item_check label="Textures d&apos;animation" name="Animation Textures"/>
 			<menu_item_check label="Désactiver les textures" name="Disable Textures"/>
 			<menu_item_check label="Textures pleine résolution" name="Rull Res Textures"/>
-			<menu_item_check label="Audit Textures" name="Audit Textures"/>
 			<menu_item_check label="Atlas des textures (expérimental)" name="Texture Atlas"/>
 			<menu_item_check label="Rendu des lumières jointes" name="Render Attached Lights"/>
 			<menu_item_check label="Rendu des particules jointes" name="Render Attached Particles"/>

indra/newview/skins/default/xui/fr/notifications.xml

 		</url>
 		<usetemplate ignoretext="Mon matériel n&apos;est pas pris en charge" name="okcancelignore" notext="Non" yestext="Oui"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Il existe probablement un pilote plus récent pour votre puce graphique. La mise à jour des pilotes graphiques est susceptible d&apos;améliorer considérablement les performances.
+
+    Visiter la page [_URL] pour rechercher d&apos;éventuelles mises à jour de pilotes ?
+		<url name="url">
+			http://www.intel.com/p/fr_FR/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Mon pilote graphique est obsolète." name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Votre système contient une carte graphique que [APP_NAME] ne reconnaît pas.
 Cela est souvent le cas avec le nouveau matériel qui n&apos;a pas encore été testé avec [APP_NAME].  Cela ne posera probablement pas de problème, mais vous devrez peut-être ajuster vos paramètres graphiques.
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Un objet nommé &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;, appartenant à [NAME], aimerait :
-
-[QUESTIONS]
-Si vous n&apos;avez pas confiance en cet objet ni en son créateur, refusez cette requête.
-
-Accepter cette requête ?
+		Avertissement : l&apos;objet &lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt; souhaite un accès total à votre compte en Linden dollars. Si vous autorisez cet accès, il pourra supprimer des fonds de votre compte à tout moment ou le vider entièrement de façon continue sans avis préalable.
+  
+Il est rare qu&apos;une telle demande soit légitime. N&apos;autorisez pas cet accès si vous ne comprenez pas entièrement pourquoi l&apos;objet souhaite accéder à votre compte.
 		<form name="form">
-			<button name="Grant" text="Accepter"/>
+			<button name="Grant" text="Permettre un accès total"/>
 			<button name="Deny" text="Refuser"/>
-			<button name="Details" text="Détails..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
 	<global name="You died and have been teleported to your home location">
 		Vous êtes mort et avez été téléporté à votre domicile.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		Impossible de mettre à jour [FNAME] car le fichier est introuvable.
+Désactivation des mises à jour futures de ce fichier...
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[NRETRIES] tentatives d&apos;ouverture ou de décodage de [FNAME] ont échoué. Le fichier est désormais considéré comme endommagé.
+Désactivation des mises à jour futures de ce fichier...
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Tentative d&apos;ajout d&apos;un fichier image [FNAME] non valide ou illisible n&apos;ayant pas pu être ouvert ou décodé. Tentative annulée.
+	</notification>
 </notifications>

indra/newview/skins/default/xui/fr/panel_script_question_toast.xml

+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>

indra/newview/skins/default/xui/fr/strings.xml

 	<string name="ScriptQuestionCautionChatDenied">
 		&apos;[OBJECTNAME]&apos;, un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], n&apos;a pas reçu le droit de : [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Si vous autorisez un accès à votre compte, vous autorisez également l&apos;objet à :
+	</string>
 	<string name="ScriptTakeMoney">
 		Débiter vos Linden dollars (L$)
 	</string>
 	<string name="ControlYourCamera">
 		Contrôler votre caméra
 	</string>
+	<string name="TeleportYourAgent">
+		Vous téléporter
+	</string>
 	<string name="NotConnected">
 		Pas connecté(e)
 	</string>

indra/newview/skins/default/xui/it/floater_hardware_settings.xml

 		Attiva VBO:
 	</text>
 	<check_box initial_value="true" label="Attiva oggetti OpenGL Vertex Buffer" name="vbo" tool_tip="Attivandolo su un hardware moderno aumenta la performance.  Ma, su un vecchio hardware, spesso l&apos;implementazione dei VBO è scarsa e potresti avere dei crash quando è attivato."/>
+	<text name="tc label">
+		Attiva S3TC:
+	</text>
+	<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 ua perdita di qualit&apos; del colore."/>
 	<slider label="Memoria texture (MB):" name="GraphicsCardTextureMemory" tool_tip="Spazio di memoria da ssegnare alle textures. 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."/>
 	<spinner label="Indice della distanza  della nebbia:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>

indra/newview/skins/default/xui/it/floater_stats.xml

 					<stat_bar label="KTris disegnato per secondo" name="ktrissec"/>
 					<stat_bar label="Totale oggetti" name="objs"/>
 					<stat_bar label="Nuovi oggetti" name="newobjs"/>
+					<stat_bar label="Hit rate della cache per l&apos;oggetto" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Texture" name="texture">
+					<stat_bar label="Hit rate della cache" name="texture_cache_hits"/>
+					<stat_bar label="Latenza di lettura della cache" name="texture_cache_read_latency"/>
 					<stat_bar label="Conteggio" name="numimagesstat"/>
 					<stat_bar label="Conteggio grezzo" name="numrawimagesstat"/>
 					<stat_bar label="Memoria GL" name="gltexmemstat"/>

indra/newview/skins/default/xui/it/floater_texture_ctrl.xml

 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="PREFERITO: TEXTURE">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Clicca per scegliere l&apos;immagine
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Scegli:
+	</floater.string>
 	<text name="Multiple">
 		Texture multiple
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventario" name="inventory" value="0"/>
+		<radio_item label="Locale" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Dimensioni: [DIMENSIONS]
 	</text>
 	<button label="Default" label_selected="Default" name="Default"/>
+	<button label="Vuoto" label_selected="Vuoto" name="Blank"/>
 	<button label="Niente" label_selected="Niente" name="None"/>
-	<button label="Vuoto" label_selected="Vuoto" name="Blank"/>
-	<check_box label="Mostra cartelle" name="show_folders_check"/>
-	<search_editor label="Filtro texture" name="inventory search editor"/>
-	<check_box label="Applica adesso" name="apply_immediate_check"/>
+	<filter_editor label="Filtro texture" name="inventory search editor"/>
+	<check_box initial_value="false" label="Mostra cartelle" name="show_folders_check"/>
+	<button label="Aggiungi" label_selected="Aggiungi" name="l_add_btn"/>
+	<button label="Rimuovi" label_selected="Rimuovi" name="l_rem_btn"/>
+	<button label="Carica" label_selected="Carica" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Nome" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
+	<button label="OK" label_selected="OK" name="Select"/>
 	<button label="Annulla" label_selected="Annulla" name="Cancel"/>
-	<button label="OK" label_selected="OK" name="Select"/>
-	<string name="pick title">
-		Scegli:
-	</string>
+	<check_box initial_value="true" label="Applica adesso" name="apply_immediate_check"/>
 </floater>

indra/newview/skins/default/xui/it/floater_texture_fetch_debugger.xml

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Debugger recupero texture">
+	<text name="total_num_fetched_label">
+		1, Numero totale di texture recuperate: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Numero totale di richieste di recupero: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Numero totale di recuperi dalla cache: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Numero totale di texture visibili: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Numero totale di richieste di fetching texture visibili: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Numero totale di fetching dati: [SIZE1] KB, Dati decodificati: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Numero totale di dati visibili: [SIZE1] KB, Dati decodificati: [SIZE2] KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Numero totale di rendering dei dati: [SIZE1] KB, Dati decodificati: [SIZE2] KB, [PIXEL] MPixel
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Tempo totale letture cache: [TIME] secondi
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Tempo totale scrittura cache: [TIME] secondi
+	</text>
+	<text name="total_time_decode_label">
+		11, Tempo totale decodifica: [TIME] secondi
+	</text>
+	<text name="total_time_gl_label">
+		12, Tempo totale creazione texture gl: [TIME] secondi
+	</text>
+	<text name="total_time_http_label">
+		13, Tempo totale fetching HTTP: [TIME] secondi
+	</text>
+	<text name="total_time_fetch_label">
+		14, Tempo totale complessivo fetching: [TIME] secondi
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Nuovo fetching elementi visibili dalla cache, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, Nuovo fetching elementi visibili da HTTP, Tempo: [TIME] secondi, fetching: [SIZE] KB, [PIXEL] MPixels
+	</text>
+	<spinner label="17, Rapporto Texel/Pixel:" name="texel_pixel_ratio"/>
+	<button label="Attiva" name="start_btn"/>
+	<button label="Reimposta" name="clear_btn"/>
+	<button label="Chiudi" name="close_btn"/>
+	<button label="Lettura cache" name="cacheread_btn"/>
+	<button label="Scrittura cache" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Decodifica" name="decode_btn"/>
+	<button label="Texture GL" name="gl_btn"/>
+	<button label="Nuovo fetch visibili cache" name="refetchviscache_btn"/>
+	<button label="Nuovo fetch visibili HTTP" name="refetchvishttp_btn"/>
+</floater>

indra/newview/skins/default/xui/it/floater_window_size.xml

 		Imposta dimensione finestra:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="larghezza x altezza">
-		<combo_box.item label="1000 x 700 (default)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (predefinito)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Imposta" name="set_btn"/>
 	<button label="Annulla" name="cancel_btn"/>

indra/newview/skins/default/xui/it/menu_viewer.xml

 			<menu_item_check label="Console texture" name="Texture Console"/>
 			<menu_item_check label="Console di Debug" name="Debug Console"/>
 			<menu_item_call label="Console notifiche" name="Notifications"/>
-			<menu_item_check label="Console dimensioni texture" name="Texture Size"/>
-			<menu_item_check label="Console categoria texture" name="Texture Category"/>
 			<menu_item_check label="Timer veloci" name="Fast Timers"/>
 			<menu_item_check label="Memoria" name="Memory"/>
 			<menu_item_check label="Statistiche scena" name="Scene Statistics"/>
+			<menu_item_call label="Console di debug recupero texture" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Informazioni regione sulla console di debug" name="Region Info to Debug Console"/>
 			<menu_item_check label="Fotocamera" name="Camera"/>
 			<menu_item_check label="Vento" name="Wind"/>
 			<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"/>
+				<menu_item_check label="Attuale" name="Current"/>
+				<menu_item_check label="Desiderata" name="Desired"/>
+				<menu_item_check label="Completa" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Assi" name="Axes"/>

indra/newview/skins/default/xui/it/notifications.xml

 		</url>
 		<usetemplate ignoretext="L&apos;hardware di questo computer non è compatibile" name="okcancelignore" notext="No" yestext="Si"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		È probabile che ci sia un driver aggiornato per il processore grafico.  L&apos;aggiornamento dei driver della grafica può migliorare le prestazioni in maniera significativa.
+
+    Visitare [_URL] per cercare un aggiornamento del driver?
+		<url name="url">
+			http://www.intel.com/p/it_IT/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="Driver grafica obsoleto" name="okcancelignore" notext="No" yestext="Sì"/>
+	</notification>
 	<notification name="UnknownGPU">
 		Il tuo sistema utilizza una scheda grafica che [APP_NAME] non riconosce.
 Questo succede spesso con un nuovo hardware che non è stato ancora testato con [APP_NAME].  Probabilmente tutto andrà bene, ma devi riconfigurare le tue impostazioni grafiche.
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		Un oggetto di nome &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos;, posseduto da  &apos;[NAME]&apos; vorrebbe:
-
-[QUESTIONS]
-Se non ti fidi di questo oggetto e del suo ideatore, dovresti rifiutare la richiesta.
-
-Concedi questa richiesta?
+		Attenzione: L&apos;oggetto &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; ha richiesto accesso completo al tuo account in Dollari Linden. Se consenti l&apos;accesso, potrà rimuovere fondi dal tuo account in qalunque momento e anche svuotare completamente l&apos;account, per un periodo illimitato e senza ulteriori avvisi.
+  
+Raramente questo tipo di richiesta è legittima. Non consentire l&apos;accesso se non comprendi perfettamente il motivo per cui desidera accedere al tuo account.
 		<form name="form">
-			<button name="Grant" text="Accetta"/>
+			<button name="Grant" text="Consenti accesso totale"/>
 			<button name="Deny" text="Nega"/>
-			<button name="Details" text="Dettagli..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
 	<global name="You died and have been teleported to your home location">
 		Sei deceduto e sei stato teleportato a casa tua.
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] non è stato aggiornato perché il file non è stato più trovato.
+Gli aggiornamenti futuri per questo file sono disattivati.
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] non è stato aperto o decodificato dopo [NRETRIES] tentativi, viene considerato danneggiato.
+Gli aggiornamenti futuri per questo file sono disattivati.
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		Tentativo di aggiungere un file immagine [FNAME] non valido o non leggibile che non è stato possibile aprire o decodificare.
+Tentativo annullato.
+	</notification>
 </notifications>

indra/newview/skins/default/xui/it/panel_script_question_toast.xml

+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>

indra/newview/skins/default/xui/it/strings.xml

 	<string name="ScriptQuestionCautionChatDenied">
 		A &apos;[OBJECTNAME]&apos;, un oggetto di proprietà di &apos;[OWNERNAME]&apos;, situato in [REGIONNAME] [REGIONPOS], è stato negato il permesso di: [PERMISSIONS].
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		Se consenti l&apos;accesso al tuo account, consentirai anche all&apos;oggetto di:
+	</string>
 	<string name="ScriptTakeMoney">
 		Prendere dollari Linden (L$) da te
 	</string>
 	<string name="ControlYourCamera">
 		Controllare la tua fotocamera
 	</string>
+	<string name="TeleportYourAgent">
+		Teleportarti
+	</string>
 	<string name="SIM_ACCESS_PG">
 		Generale
 	</string>

indra/newview/skins/default/xui/ja/floater_hardware_settings.xml

 		VBO を有効化:
 	</text>
 	<check_box initial_value="true" label="OpenGL Vertex Buffer Objectsを有効化" name="vbo" tool_tip="最新のハードウェアでこの設定を有効にすると、パフォーマンスが向上します。  しかし、旧型のハードウェアでは VBO の実装が貧弱な場合が多く、この設定を有効にすることでクラッシュにつながるおそれがあります。"/>
+	<text name="tc label">
+		S3TC を有効にする:
+	</text>
+	<check_box initial_value="true" label="テクスチャ圧縮を有効にする(再起動が必要)" name="texture compression" tool_tip="ビデオメモリ内でテクスチャを圧縮することにより、色の質を多少犠牲にしながら、より高解像度のテクスチャを読み込めるようにします。"/>
 	<slider label="テクスチャメモリ(MB):" name="GraphicsCardTextureMemory" tool_tip="テクスチャに割り当てられたメモリの量。 ビデオカードのメモリに既定。 数値を下げるとパフォーマンスが向上しますが、テクスチャの精度が落ちることがあります。"/>
 	<spinner label="フォグの距離比率:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>

indra/newview/skins/default/xui/ja/floater_stats.xml

 					<stat_bar label="秒ごとの KTris 描画" name="ktrissec"/>
 					<stat_bar label="オブジェクト合計" name="objs"/>
 					<stat_bar label="新規オブジェクト" name="newobjs"/>
+					<stat_bar label="オブジェクトキャッシュヒット率" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="テクスチャ" name="texture">
+					<stat_bar label="キャッシュヒット率" name="texture_cache_hits"/>
+					<stat_bar label="キャッシュ読み取り遅延" name="texture_cache_read_latency"/>
 					<stat_bar label="カウント" name="numimagesstat"/>
 					<stat_bar label="Raw カウント" name="numrawimagesstat"/>
 					<stat_bar label="GL メモリ" name="gltexmemstat"/>

indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml

 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="テクスチャの選択">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		クリックして写真を選択
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		ピック:
+	</floater.string>
 	<text name="Multiple">
 		複数のテクスチャ
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="インベントリ" name="inventory" value="0"/>
+		<radio_item label="ローカル" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		サイズ: [DIMENSIONS]
 	</text>
 	<button label="デフォルト" label_selected="デフォルト" name="Default"/>
+	<button label="ブランク" label_selected="ブランク" name="Blank"/>
 	<button label="なし" label_selected="なし" name="None"/>
-	<button label="ブランク" label_selected="ブランク" name="Blank"/>
-	<check_box label="フォルダを表示" name="show_folders_check"/>
-	<search_editor label="テクスチャをフィルター" name="inventory search editor"/>
-	<check_box label="すぐ適用" name="apply_immediate_check"/>
 	<button label="" label_selected="" name="Pipette"/>
+	<filter_editor label="テクスチャをフィルター" name="inventory search editor"/>
+	<check_box initial_value="false" label="フォルダを表示" name="show_folders_check"/>
+	<button label="追加" label_selected="追加" name="l_add_btn"/>
+	<button label="削除" label_selected="削除" name="l_rem_btn"/>
+	<button label="アップロード" label_selected="アップロード" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="名前" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
+	<button label="OK" label_selected="OK" name="Select"/>
 	<button label="取り消し" label_selected="取り消し" name="Cancel"/>
-	<button label="OK" label_selected="OK" name="Select"/>
-	<text name="pick title">
-		ピック:
-	</text>
+	<check_box initial_value="true" label="すぐ適用" name="apply_immediate_check"/>
 </floater>

indra/newview/skins/default/xui/ja/floater_texture_fetch_debugger.xml

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="テクスチャ取得デバッガ">
+	<text name="total_num_fetched_label">
+		1, 取得したテクスチャの合計数:[NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, 取得リクエストの合計数:[NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, キャッシュヒットの合計数:[NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, 表示テクスチャの合計数:[NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, 表示テクスチャ取得リクエストの合計数:[NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, 取得したデータの合計数:[SIZE1]KB、デコードされたデータ:[SIZE2]KB、[PIXEL]メガピクセル
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, 表示データの合計数:[SIZE1]KB、デコードされたデータ:[SIZE2]KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, レンダリングされたデータの合計数:[SIZE1]KB、デコードされたデータ:[SIZE2]KB、[PIXEL]メガピクセル
+	</text>
+	<text name="total_time_cache_read_label">
+		9, キャッシュ読み取りの合計時間:[TIME] 秒
+	</text>
+	<text name="total_time_cache_write_label">
+		10, キャッシュ書き込みの合計時間:[TIME] 秒
+	</text>
+	<text name="total_time_decode_label">
+		11, デコードの合計時間:[TIME] 秒
+	</text>
+	<text name="total_time_gl_label">
+		12, glテクスチャ作成の合計時間:[TIME] 秒
+	</text>
+	<text name="total_time_http_label">
+		13, HTTP 取得の合計時間:[TIME] 秒
+	</text>
+	<text name="total_time_fetch_label">
+		14, 取得全体の合計時間:[TIME] 秒
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, キャッシュから表示テクスチャを再取得、時間:[TIME] 秒、取得:[SIZE]KB、[PIXEL]メガピクセル
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, HTTP から表示テクスチャを再取得、時間:[TIME] 秒、取得:[SIZE]KB、[PIXEL]メガピクセル
+	</text>
+	<spinner label="17, テクセル/ピクセルの比率:" name="texel_pixel_ratio"/>
+	<button label="開始" name="start_btn"/>
+	<button label="リセット" name="clear_btn"/>
+	<button label="閉じる" name="close_btn"/>
+	<button label="キャッシュ読み取り" name="cacheread_btn"/>
+	<button label="キャッシュ書き込み" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="デコード" name="decode_btn"/>
+	<button label="GL テクスチャ" name="gl_btn"/>
+	<button label="キャッシュ表示テクスチャ再取得" name="refetchviscache_btn"/>
+	<button label="HTTP表示テクスチャ再取得" name="refetchvishttp_btn"/>
+</floater>

indra/newview/skins/default/xui/ja/floater_window_size.xml

 		ウィンドウのサイズを設定:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="横幅 x 高さ">
-		<combo_box.item label="1000 x 700 (標準)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (デフォルト)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="設定" name="set_btn"/>
 	<button label="キャンセル" name="cancel_btn"/>

indra/newview/skins/default/xui/ja/menu_viewer.xml

 			<menu_item_check label="テクスチャのコンソール" name="Texture Console"/>
 			<menu_item_check label="デバッグコンソール" name="Debug Console"/>
 			<menu_item_call label="通知コンソール" name="Notifications"/>
-			<menu_item_check label="テクスチャサイズのコンソール" name="Texture Size"/>
-			<menu_item_check label="テクスチャカテゴリのコンソール" name="Texture Category"/>
 			<menu_item_check label="ファーストタイマー" name="Fast Timers"/>
 			<menu_item_check label="メモリ" name="Memory"/>
 			<menu_item_check label="風景の統計" name="Scene Statistics"/>
+			<menu_item_call label="テクスチャ取得デバッグコンソール" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="リージョン情報をデバッグコンソールへ" name="Region Info to Debug Console"/>
 			<menu_item_call label="グループ情報をデバッグコンソールへ" name="Group Info to Debug Console"/>
 			<menu_item_call label="性能情報をデバッグコンソールへ" name="Capabilities Info to Debug Console"/>
 			<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"/>
+				<menu_item_check label="現在" name="Current"/>
+				<menu_item_check label="望ましい" name="Desired"/>
+				<menu_item_check label="フル" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="レンダリング" name="Rendering">
 			<menu_item_check label="軸" name="Axes"/>
 			<menu_item_check label="アニメーションテクスチャ" name="Animation Textures"/>
 			<menu_item_check label="テクスチャを無効にする" name="Disable Textures"/>
 			<menu_item_check label="フル解像度テクスチャ" name="Rull Res Textures"/>
-			<menu_item_check label="テクスチャの検査" name="Audit Textures"/>
 			<menu_item_check label="テクスチャアトラス(試験段階)" name="Texture Atlas"/>
 			<menu_item_check label="装着された光源を描画する" name="Render Attached Lights"/>
 			<menu_item_check label="取り付けられたパーティクルを描画する" name="Render Attached Particles"/>

indra/newview/skins/default/xui/ja/notifications.xml

 		</url>
 		<usetemplate ignoretext="使用中のコンピューターのハードウェアがサポートされていないとき" name="okcancelignore" notext="いいえ" yestext="はい"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		おそらくお使いのグラフィックチップ用の新しいドライバが入手可能です。グラフィックドライバを更新することにより、パフォーマンスが大幅に向上する場合があります。
+
+[_URL] にアクセスして更新版のドライバがあるかどうかを確認しますか?
+		<url name="url">
+			http://www.intel.com/p/ja_JP/support/detect/graphics
+		</url>
+		<usetemplate ignoretext="使用しているグラフィックドライバが古い場合" name="okcancelignore" notext="いいえ" yestext="はい"/>
+	</notification>
 	<notification name="UnknownGPU">
 		お使いのシステムには、[APP_NAME] が認識できないグラフィックカードが搭載されています。
 [APP_NAME] でまだテストされていない最新ハードウェアのためだと考えられます。  問題ないとは思いますが、グラフィックの設定を調整する必要があるかもしれません。
 		</form>
 	</notification>
 	<notification name="ScriptQuestionCaution">
-		[NAME] が所有する「&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;」 というオブジェクトが、次のことをしようとしています:
-
-[QUESTIONS]
-このオブジェクトや制作者を信用できない場合は、このリクエストを拒否してください。
-
-リクエストを受けますか?
+		警告:オブジェクト &apos;&lt;nolink&gt;[OBJECTNAME]&lt;/nolink&gt;&apos; はあなたのリンデンドルアカウントへのトータルアクセスを希望しています。アクセスを許可すると、このオブジェクトはいつでもあなたのアカウントから資金を削除したり、今後警告を表示することなく継続的にアカウントを完全に空にできるようになります。
+  
+このようなリクエストが正当であることは稀です。このオブジェクトがあなたのアカウントにアクセスしたい理由を完全に理解している場合を除き、アクセスの許可は避けてください。
 		<form name="form">
-			<button name="Grant" text="許可"/>
+			<button name="Grant" text="トータルアクセスを許可"/>
 			<button name="Deny" text="拒否"/>
-			<button name="Details" text="詳細..."/>
 		</form>
 	</notification>
 	<notification name="ScriptDialog">
 [RESIDENTS]
 		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/>
 	</notification>
-	<notification name="ShareFolderConfirmation">
-		フォルダは一度に 1 つしか共有できません。
-
-次のアイテムを共有しますか?
-
-&lt;nolink&gt;[ITEMS]&lt;/nolink&gt;
-
-次の住人と共有:
-
-[RESIDENTS]
-		<usetemplate name="okcancelbuttons" notext="取り消し" yestext="Ok"/>
-	</notification>
 	<notification name="ItemsShared">
 		アイテムが共有されました。
 	</notification>
 	<global name="You died and have been teleported to your home location">
 		死んでしまったので、ホームにテレポートされました。
 	</global>
+	<notification name="LocalBitmapsUpdateFileNotFound">
+		[FNAME] は、見つからなかったため、更新できませんでした。
+このファイルに対する今後の更新を無効にします。
+	</notification>
+	<notification name="LocalBitmapsUpdateFailedFinal">
+		[FNAME] を開くまたはデコードする試行に失敗しました(試行回数 [NRETRIES] 回)。そのため、このファイルは壊れているものとして処理されました。
+このファイルに対する今後の更新を無効にします。
+	</notification>
+	<notification name="LocalBitmapsVerifyFail">
+		開くことができない、またはデコードできない無効または読み取り不能な画像ファイル [FNAME] を追加しようとしました。
+この試行はキャンセルされました。
+	</notification>
 </notifications>

indra/newview/skins/default/xui/ja/panel_script_question_toast.xml

+<?xml version="1.0" encoding="utf-8"?>
+<panel label="script_question_panel" name="panel_script_question_toast">
+	<panel label="buttons_panel" name="buttons_panel"/>
+</panel>

indra/newview/skins/default/xui/ja/strings.xml

 	<string name="ScriptQuestionCautionChatDenied">
 		[REGIONNAME] の [REGIONPOS] という場所にある、「 [OWNERNAME] 」が所有する「 [OBJECTNAME] 」というオブジェクトは、次の権限を拒否しました: [PERMISSIONS]
 	</string>
+	<string name="AdditionalPermissionsRequestHeader">
+		あなたのアカウントへのアクセスを許可すると、このオブジェクトには次の操作も許可されます:
+	</string>
 	<string name="ScriptTakeMoney">
 		リンデンドル(L$)を支払う
 	</string>
 	<string name="ControlYourCamera">
 		カメラのコントロール
 	</string>
+	<string name="TeleportYourAgent">
+		あなたをテレポート
+	</string>
 	<string name="NotConnected">
 		接続されていません
 	</string>

indra/newview/skins/default/xui/pt/floater_hardware_settings.xml

 		Habilitar VBO:
 	</text>
 	<check_box initial_value="true" label="Habilitar Objetos com Armazenamento de Vértices" name="vbo" tool_tip="Habilitando-o em máquinas novas, ele oferece um ganho de performance. Contudo, as máquinas antigas tem freqüentemente implementações pobres de VBOs e você pode ter travamentos quando esta opção é habilitada."/>
+	<text name="tc label">
+		Habilitar S3TC:
+	</text>
+	<check_box initial_value="true" label="Habilitar compressão de texturas (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."/>
 	<slider label="Memória de texturas (MB):" name="GraphicsCardTextureMemory" tool_tip="Quanto da memória deve ser alocado para texturas.  O padrão é definido pela memória da placa de vídeo.  Reduzir este valor pode melhorar o desempenho, mas as texturas podem fica fora de foco."/>
 	<spinner label="Relação de Distância de  Nevoeiro:" name="fog"/>
 	<button label="OK" label_selected="OK" name="OK"/>

indra/newview/skins/default/xui/pt/floater_stats.xml

 					<stat_bar label="KTris desenhados por segundo" name="ktrissec"/>
 					<stat_bar label="Total Objects" name="objs"/>
 					<stat_bar label="New Objects" name="newobjs"/>
+					<stat_bar label="Taxa de acertos do cache do objeto" name="object_cache_hits"/>
 				</stat_view>
 				<stat_view label="Texture" name="texture">
+					<stat_bar label="Taxa de acertos do cache" name="texture_cache_hits"/>
+					<stat_bar label="Latência de leitura do cache" name="texture_cache_read_latency"/>
 					<stat_bar label="Count" name="numimagesstat"/>
 					<stat_bar label="Raw Count" name="numrawimagesstat"/>
 					<stat_bar label="GL Mem" name="gltexmemstat"/>

indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml

 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="texture picker" title="DESTAQUE: TEXTURA">
-	<string name="choose_picture">
+	<floater.string name="choose_picture">
 		Clique para escolher uma imagem
-	</string>
+	</floater.string>
+	<floater.string name="pick title">
+		Pegar:
+	</floater.string>
 	<text name="Multiple">
 		Multiplas texturas
 	</text>
+	<radio_group name="mode_selection">
+		<radio_item label="Inventário" name="inventory" value="0"/>
+		<radio_item label="Local" name="local" value="1"/>
+	</radio_group>
 	<text name="unknown">
 		Tamanho: [DIMENSÕES]
 	</text>
 	<button label="Padrão" label_selected="Padrão" name="Default"/>
+	<button label="Branco" label_selected="Branco" name="Blank"/>
 	<button label="Nenhum" label_selected="Nenhum" name="None"/>
-	<button label="Branco" label_selected="Branco" name="Blank"/>
-	<check_box label="Exibir pastas" name="show_folders_check"/>
-	<search_editor label="Filtrar texturas" name="inventory search editor"/>
-	<check_box label="Applicar agora" name="apply_immediate_check"/>
+	<filter_editor label="Filtrar texturas" name="inventory search editor"/>
+	<check_box initial_value="false" label="Exibir pastas" name="show_folders_check"/>
+	<button label="Adicionar" label_selected="Adicionar" name="l_add_btn"/>
+	<button label="Remover" label_selected="Remover" name="l_rem_btn"/>
+	<button label="Enviar" label_selected="Enviar" name="l_upl_btn"/>
+	<scroll_list name="l_name_list">
+		<column label="Nome" name="unit_name"/>
+		<column label="ID" name="unit_id_HIDDEN"/>
+	</scroll_list>
+	<button label="OK" label_selected="OK" name="Select"/>
 	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
-	<button label="OK" label_selected="OK" name="Select"/>
-	<string name="pick title">
-		Pegar:
-	</string>
+	<check_box initial_value="true" label="Applicar agora" name="apply_immediate_check"/>
 </floater>

indra/newview/skins/default/xui/pt/floater_texture_fetch_debugger.xml

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="TexFetchDebugger" title="Depurador de obtenção de textura">
+	<text name="total_num_fetched_label">
+		1, Número total de texturas obtidas: [NUM]
+	</text>
+	<text name="total_num_fetching_requests_label">
+		2, Número total de solicitações de obtenção: [NUM]
+	</text>
+	<text name="total_num_cache_hits_label">
+		3, Número total de acertos de cache: [NUM]
+	</text>
+	<text name="total_num_visible_tex_label">
+		4, Número total de texturas visíveis: [NUM]
+	</text>
+	<text name="total_num_visible_tex_fetch_req_label">
+		5, Número total de solicitações de obtenção de texturas visíveis: [NUM]
+	</text>
+	<text name="total_fetched_data_label">
+		6, Número total de dados obtidos: [SIZE1]KB, Dados decodificados: [SIZE2]KB, [PIXEL]MPixels
+	</text>
+	<text name="total_fetched_vis_data_label">
+		7, Número total de dados visíveis: [SIZE1]KB, Dados decodificados: [SIZE2]KB
+	</text>
+	<text name="total_fetched_rendered_data_label">
+		8, Número total de dados renderizados: [SIZE1]KB, Dados decodificados: [SIZE2]KB, [PIXEL]MPixels
+	</text>
+	<text name="total_time_cache_read_label">
+		9, Tempo total de leituras de cache: [TIME] segundos
+	</text>
+	<text name="total_time_cache_write_label">
+		10, Tempo total de gravações em cache: [TIME] segundos
+	</text>
+	<text name="total_time_decode_label">
+		11, Tempo total das decodificações: [TIME] segundos
+	</text>
+	<text name="total_time_gl_label">
+		12, Tempo total de criação de texturas gl: [TIME] segundos
+	</text>
+	<text name="total_time_http_label">
+		13, Tempo total de obtenção de HTTP: [TIME] segundos
+	</text>
+	<text name="total_time_fetch_label">
+		14, Tempo total de obtenção completa: [TIME] segundos
+	</text>
+	<text name="total_time_refetch_vis_cache_label">
+		15, Obtendo novamente visíveis do cache, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels
+	</text>
+	<text name="total_time_refetch_vis_http_label">
+		16, Obtendo novamente visíveis do HTTP, Tempo: [TIME] segundos, Obtidos: [SIZE]KB, [PIXEL]MPixels
+	</text>
+	<spinner label="17, Proporção de texel/pixel:" name="texel_pixel_ratio"/>
+	<button label="Iniciar" name="start_btn"/>
+	<button label="Redefinir" name="clear_btn"/>
+	<button label="Fechar" name="close_btn"/>
+	<button label="Leitura do cache" name="cacheread_btn"/>
+	<button label="Gravação em cache" name="cachewrite_btn"/>
+	<button label="HTTP" name="http_btn"/>
+	<button label="Decodificar" name="decode_btn"/>
+	<button label="Textura GL" name="gl_btn"/>
+	<button label="Obter novamente cache visível" name="refetchviscache_btn"/>
+	<button label="Obter novamente HTTP visível" name="refetchvishttp_btn"/>
+</floater>

indra/newview/skins/default/xui/pt/floater_window_size.xml

 		Definir tamanho da janela:
 	</text>
 	<combo_box name="window_size_combo" tool_tip="largura x altura">
-		<combo_box.item label="1000 x 700 (padrão)" name="item0"/>
-		<combo_box.item label="1024 x 768" name="item1"/>
-		<combo_box.item label="1280 x 720 (720p)" name="item2"/>
-		<combo_box.item label="1920 x 1080 (1080p)" name="item3"/>
+		<combo_box.item label="1000 x 700 (padrão)" name="item1"/>
+		<combo_box.item label="1024 x 768 (4:3 XGA)" name="item2"/>
+		<combo_box.item label="1280 x 720 (16:9 HDTV)" name="item3"/>
+		<combo_box.item label="1280 x 800 (5:8 WXGA)" name="item4"/>
+		<combo_box.item label="1280 x 1024 (5:4 SXGA)" name="item5"/>
+		<combo_box.item label="1440 x 900 (8:5 WSXGA)" name="item7"/>
+		<combo_box.item label="1600 x 900 (16:9 HD+)" name="item8"/>
+		<combo_box.item label="1600 x 1200 (4:3 UXGA)" name="item9"/>
+		<combo_box.item label="1680 x 1050 (8:5 WSXGA+)" name="item10"/>
+		<combo_box.item label="1920 x 1080 (16:9 HDTV)" name="item11"/>
+		<combo_box.item label="1920 x 1200 (8:5 WUXGA)" name="item12"/>
 	</combo_box>
 	<button label="Definir" name="set_btn"/>
 	<button label="Cancelar" name="cancel_btn"/>

indra/newview/skins/default/xui/pt/menu_viewer.xml

 			<menu_item_check label="Painel de textura" name="Texture Console"/>
 			<menu_item_check label="Console de depuração" name="Debug Console"/>
 			<menu_item_call label="Painel de avisos" name="Notifications"/>
-			<menu_item_check label="Painel de tamanho de textura" name="Texture Size"/>
-			<menu_item_check label="Painel de texturas" name="Texture Category"/>
 			<menu_item_check label="Tempos" name="Fast Timers"/>
 			<menu_item_check label="Memória" name="Memory"/>
 			<menu_item_check label="Estatísticas da cena" name="Scene Statistics"/>
+			<menu_item_call label="Painel de depuração de obtenção de textura" name="Texture Fetch Debug Console"/>
 			<menu_item_call label="Region Info to Debug Console" name="Region Info to Debug Console"/>
 			<menu_item_check label="Câmera:" name="Camera"/>
 			<menu_item_check label="Vento" name="Wind"/>
 			<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"/>
+				<menu_item_check label="Atual" name="Current"/>
+				<menu_item_check label="Desejada" name="Desired"/>
+				<menu_item_check label="Completa" name="Full"/>
+			</menu>
 		</menu>
 		<menu label="Rendering" name="Rendering">
 			<menu_item_check label="Axes" name="Axes"/>

indra/newview/skins/default/xui/pt/notifications.xml

 		</url>
 		<usetemplate ignoretext="O hardware do meu computador não é suportado" name="okcancelignore" notext="Não" yestext="Sim"/>
 	</notification>
+	<notification name="IntelOldDriver">
+		Provavelmente, há um driver mais recente para o seu chip gráfico.  A atualização dos drivers gráficos pode melhorar significativamente o desempenho.
+
+    Visitar [_URL] para verificar se há atualizações do driver?
+		<url name="url">