From 8b857580a82ba1b77318174df324d5ae244441be Mon Sep 17 00:00:00 2001
From: eli <none@none>
Date: Mon, 10 Sep 2012 12:58:53 -0700
Subject: FIX INTL-104 Translation of Set34 in 8 languages, including Steam
 content

---
 indra/newview/skins/default/xui/es/strings.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra/newview/skins/default/xui/es/strings.xml')

diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index d4698b8cb3..dcde68a93a 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -1390,6 +1390,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="InvFolder favorite">
 		Mis Favoritos
 	</string>
+	<string name="InvFolder Favorites">
+		Mis Favoritos
+	</string>
+	<string name="InvFolder favorites">
+		Mis Favoritos
+	</string>
 	<string name="InvFolder Current Outfit">
 		Vestuario actual
 	</string>
@@ -1405,6 +1411,12 @@ Intenta iniciar sesión de nuevo en unos instantes.
 	<string name="InvFolder Meshes">
 		Redes
 	</string>
+	<string name="InvFolder Received Items">
+		Objetos recibidos
+	</string>
+	<string name="InvFolder Merchant Outbox">
+		Buzón de salida de comerciante
+	</string>
 	<string name="InvFolder Friends">
 		Amigos
 	</string>
-- 
cgit v1.2.3


From 50c633bf3502c64ec486f62e9b3f55b411dee4b4 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 16 Oct 2012 21:10:54 -0400
Subject: Reference new "[sourceid]" substitution in "create_account_url".
 join.secondlife.com needs to know the sourceid as well as the user's language
 of choice. Ensure that sourceid gets passed with the URL.

---
 indra/newview/skins/default/xui/es/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/es/strings.xml')

diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index d4698b8cb3..f1eecdeba8 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -128,7 +128,7 @@
 		Salir
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=es-ES
+		http://join.secondlife.com/index.php?lang=es-ES&sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
-- 
cgit v1.2.3


From 0e03562950e5bc2e4a439967ee4cdf47fdca3d28 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 13 Nov 2012 22:03:05 -0500
Subject: DRTVWR-210: sanitize ampersand embedded in strings.xml messages

---
 indra/newview/skins/default/xui/es/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/es/strings.xml')

diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index c83bbb8a42..52bcab54e5 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -128,7 +128,7 @@
 		Salir
 	</string>
 	<string name="create_account_url">
-		http://join.secondlife.com/index.php?lang=es-ES&sourceid=[sourceid]
+		http://join.secondlife.com/index.php?lang=es-ES&amp;sourceid=[sourceid]
 	</string>
 	<string name="LoginFailedViewerNotPermitted">
 		Ya no puedes acceder a Second Life con el visor que estás utilizando. Visita la siguiente página para descargar un nuevo visor:
-- 
cgit v1.2.3