QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3

svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476

this is a composite of...

svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C      doc/contributions.txt
C      indra/llaudio/audioengine.cpp
C      indra/newview/CMakeLists.txt
C      indra/newview/llfloaterlandholdings.cpp
C      indra/newview/llpaneldirbrowser.cpp
C      indra/newview/llpanelgrouplandmoney.cpp
C      indra/newview/llpreviewscript.cpp
C      indra/newview/llviewermenu.cpp
C      indra/newview/skins/default/xui/en-us/notifications.xml

and...

svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C      indra/llcommon/llversionserver.h
C      indra/newsim/llrezdata.cpp
C      indra/newsim/llstate.cpp
C      indra/upgrade/schema_version/sequence/3/index_log_paypal.sql

1 files changed, 152 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/es/floater_lagmeter.xml b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
new file mode 100644
index 0000000000..76043423bc
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="floater_lagmeter" title="Medidor del lag">

+	<button label="" label_selected="" name="client_lagmeter" tool_tip="Estado del lag del cliente"/>

+	<text name="client">

+		Cliente:

+	</text>

+	<text name="client_text">

+		Normal

+	</text>

+	<button label="" label_selected="" name="network_lagmeter" tool_tip="Estado del lag de la red"/>

+	<text name="network">

+		Red:

+	</text>

+	<text name="network_text">

+		Normal

+	</text>

+	<button label="" label_selected="" name="server_lagmeter" tool_tip="Estado del lag del servidor"/>

+	<text name="server">

+		Servidor:

+	</text>

+	<text name="server_text">

+		Normal

+	</text>

+	<button label="?" name="server_help"/>

+	<button label="&gt;&gt;" name="minimize"/>

+	<string name="max_title_msg">

+		Medidor del lag

+	</string>

+	<string name="max_width_px">

+		360

+	</string>

+	<string name="min_title_msg">

+		Lag

+	</string>

+	<string name="min_width_px">

+		90

+	</string>

+	<string name="client_text_msg">

+		Cliente

+	</string>

+	<string name="client_frame_rate_critical_fps">

+		10

+	</string>

+	<string name="client_frame_rate_warning_fps">

+		15

+	</string>

+	<string name="client_frame_time_window_bg_msg">

+		Normal, ventana en segundo plano

+	</string>

+	<string name="client_frame_time_critical_msg">

+		Frames del cliente valorados por debajo de [CLIENT_FRAME_RATE_CRITICAL]

+	</string>

+	<string name="client_frame_time_warning_msg">

+		Frames del cliente valorados entre [CLIENT_FRAME_RATE_CRITICAL] y [CLIENT_FRAME_RATE_WARNING]

+	</string>

+	<string name="client_frame_time_normal_msg">

+		Normal

+	</string>

+	<string name="client_draw_distance_cause_msg">

+		Posible causa: distancia de dibujo fijada muy alta

+	</string>

+	<string name="client_texture_loading_cause_msg">

+		Posible causa: imágenes cargándose

+	</string>

+	<string name="client_texture_memory_cause_msg">

+		Posible causa: demasiadas imágenes en la memoria

+	</string>

+	<string name="client_complex_objects_cause_msg">

+		Posible causa: demasiados objetos complejos en la escena

+	</string>

+	<string name="network_text_msg">

+		Red

+	</string>

+	<string name="network_packet_loss_critical_pct">

+		10

+	</string>

+	<string name="network_packet_loss_warning_pct">

+		5

+	</string>

+	<string name="network_packet_loss_critical_msg">

+		La conexión deja caer más del [NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes

+	</string>

+	<string name="network_packet_loss_warning_msg">

+		La conexión deja caer [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes

+	</string>

+	<string name="network_performance_normal_msg">

+		Normal

+	</string>

+	<string name="network_ping_critical_ms">

+		600

+	</string>

+	<string name="network_ping_warning_ms">

+		300

+	</string>

+	<string name="network_ping_critical_msg">

+		El tiempo de conexión -ping- supera los [NETWORK_PING_CRITICAL] ms

+	</string>

+	<string name="network_ping_warning_msg">

+		El tiempo de conexión -ping- es de [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms

+	</string>

+	<string name="network_packet_loss_cause_msg">

+		Quizá una mala conexión o un ancho de banda fijado demasiado alto.

+	</string>

+	<string name="network_ping_cause_msg">

+		Quizá una mala conexión o una aplicación de archivos compartidos.

+	</string>

+	<string name="server_text_msg">

+		Servidor

+	</string>

+	<string name="server_frame_rate_critical_fps">

+		20

+	</string>

+	<string name="server_frame_rate_warning_fps">

+		30

+	</string>

+	<string name="server_single_process_max_time_ms">

+		20

+	</string>

+	<string name="server_frame_time_critical_msg">

+		Frecuencia del simulador -framerate- por debajo de [SERVER_FRAME_RATE_CRITICAL]

+	</string>

+	<string name="server_frame_time_warning_msg">

+		Frecuencia del simulador -framerate- entre [SERVER_FRAME_RATE_CRITICAL] y [SERVER_FRAME_RATE_WARNING]

+	</string>

+	<string name="server_frame_time_normal_msg">

+		Normal

+	</string>

+	<string name="server_physics_cause_msg">

+		Posible causa: demasiados objetos físicos

+	</string>

+	<string name="server_scripts_cause_msg">

+		Posible causa: demasiados objetos con script

+	</string>

+	<string name="server_net_cause_msg">

+		Posible causa: demasiado tráfico en la red

+	</string>

+	<string name="server_agent_cause_msg">

+		Posible causa: demasiada gente moviéndose en la región

+	</string>

+	<string name="server_images_cause_msg">

+		Posible causa: demasiados cálculos de imáganes

+	</string>

+	<string name="server_generic_cause_msg">

+		Posible causa: carga del simulador muy pesada

+	</string>

+	<string name="smaller_label">

+		&gt;&gt;

+	</string>

+	<string name="bigger_label">

+		&lt;&lt;

+	</string>

+</floater>