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, 10 insertions, 13 deletions

diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml
index 1df58464bd..fff60e64e1 100644
--- a/indra/newview/skins/default/xui/es/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_gesture.xml
@@ -1,18 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>

-<floater name="gestures" title="Posturas activas">

+<?xml version="1.0" encoding="utf-8" standalone="yes"?>

+<floater name="gestures" title="Gestos disponibles">

 	<text name="help_label">

-		En el chat, una frase o tecla toca animaciones

-y sonidos.

+		Pulse dos veces en un gesto para reproducir las animaciones y sonidos.

 	</text>

 	<scroll_list name="gesture_list">

-		<column label="Trigger" name="trigger" />

-		<column label="Key" name="shortcut" />

-		<column label="" name="key" />

-		<column label="Name" name="name" />

+		<column label="Botón" name="trigger"/>

+		<column label="Tecla" name="shortcut"/>

+		<column label="Nombre" name="name"/>

 	</scroll_list>

-	<button label="Nueva" name="new_gesture_btn" />

-	<button label="Inventario" name="inventory_btn" />

-	<button label="Editar" name="edit_btn" />

-	<button label="Reproducir" name="play_btn" />

-	<button label="Parar" name="stop_btn" />

+	<button label="Nuevo" name="new_gesture_btn"/>

+	<button label="Editar" name="edit_btn"/>

+	<button label="Reproducir" name="play_btn"/>

+	<button label="Parar" name="stop_btn"/>

 </floater>