diff --git a/client/src/nls/locale.js b/client/src/nls/locale.js
index aa468ba831c..e2bdae5c293 100644
--- a/client/src/nls/locale.js
+++ b/client/src/nls/locale.js
@@ -458,4 +458,5 @@ define({
     ja: true,
     fr: true,
     zh: true,
+    es: true,
 });
diff --git a/lib/galaxy/config/sample/user_preferences_extra_conf.yml.sample b/lib/galaxy/config/sample/user_preferences_extra_conf.yml.sample
index b63fe294943..464696a5929 100644
--- a/lib/galaxy/config/sample/user_preferences_extra_conf.yml.sample
+++ b/lib/galaxy/config/sample/user_preferences_extra_conf.yml.sample
@@ -59,10 +59,11 @@ preferences:
               required: False
               options:
                   - [Navigator default, auto]
-                  - [Chinese, zh]
+                  - [中文, zh]
                   - [English, en]
-                  - [French, fr]
-                  - [Japanese, ja]
+                  - [Español, es]
+                  - [Français, fr]
+                  - [日本語, ja]
 
     # Used in file_sources_conf.yml
     dropbox: