From 0243c61ea10bf515e238e9ed869d7fe9d1770997 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 15 Jul 2012 15:23:53 -0400
Subject: [PATCH] Spanish Translation is complete, add it to the completed
 combo_box area, and keep to alphabetical order.

---
 .../skins/default/xui/en-us/panel_preferences_general.xml | 2 +-
 .../skins/default/xui/es/panel_preferences_general.xml    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index fefaa6330..4784afe21 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -44,11 +44,11 @@
 		<combo_item name="System Default Language" value="default">System Default</combo_item>
 		<combo_item name="English" value="en-us">English</combo_item>		
 		<!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string.--> 
+		<combo_item name="Spanish" value="es">Español(Spanish)</combo_item>
 		<combo_item name="French" value="fr">Français(French)</combo_item>
 		<!-- Also, with the above advice in mind, keep completed UI translations above this line.-->
 		<combo_item name="Danish" value="da">Dansk(Danish)*</combo_item>
 		<combo_item name="Deutsch(German)" value="de">Deutsch(German)*</combo_item>
-		<combo_item name="Spanish" value="es">Español(Spanish)*</combo_item>
 		<combo_item name="Italian" value="it">Italiano(Italian)*</combo_item>
 		<combo_item name="Hungarian" value="hu">Magyar(Hungarian)*</combo_item>
 		<combo_item name="Dutch" value="nl">Nederlands(Dutch)*</combo_item>
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 748165b7f..ec345f37b 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -84,15 +84,15 @@
 					Predeterminado del Sistema
 			 </combo_item>
 			 <combo_item name="English">
-					Inglés
+					English(Inglés)
 			 </combo_item>		
 			 <!-- After "System Default" and "English", please keep the rest of these combo_items in alphabetical order by the first character in the string.--> 
+			 <combo_item name="Spanish">
+					Español
+			 </combo_item>
 			 <combo_item name="French">
 					Français(Francés)
 			 </combo_item>
-			 <combo_item name="Spanish">
-					Español(Spanish)
-			 </combo_item>						  
 			 <!-- Also, with the above advice in mind, keep completed UI translations above this line.-->
 			 <combo_item name="Danish">
 					Dansk(Danés)*