From 6526e2f3058da2e900f77c32dfab38085b19273b Mon Sep 17 00:00:00 2001
From: Jonne Hass <mrzyx@mrzyx.de>
Date: Sun, 13 Nov 2011 22:37:18 +0100
Subject: [PATCH] fix #2392

---
 app/controllers/users_controller.rb | 4 ++--
 config/locale_settings.yml          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 018b4df76..c1215bdad 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -56,9 +56,9 @@ class UsersController < ApplicationController
       elsif u[:language]
         if @user.update_attributes(u)
           I18n.locale = @user.language
-          flash[:notice] = I18n.t 'users.update.language_updated'
+          flash[:notice] = I18n.t 'users.update.language_changed'
         else
-          flash[:error] = I18n.t 'users.update.language_not_updated'
+          flash[:error] = I18n.t 'users.update.language_not_changed'
         end
       elsif u[:email]
         @user.unconfirmed_email = u[:email]
diff --git a/config/locale_settings.yml b/config/locale_settings.yml
index 58c6700a4..1cd255340 100644
--- a/config/locale_settings.yml
+++ b/config/locale_settings.yml
@@ -15,9 +15,9 @@ available:
   en_pirate: "English (Pirate)"
   en_shaw: "𐑦𐑙𐑤𐑦𐑖"
   eo: "Esperanto"
-  es: "Español"
-  es-AR: "Castellano"
-  es-CL: "Español Chileno"
+  es: "Castellano"
+  es-AR: "Argentino"
+  es-CL: "Chileno"
   eu: "Euskara"
   fi: "Suomi"
   fr: "Français"