updated locales

config/locales/devise/devise.eu.yml

@@ -88,8 +88,8 @@ eu:
     unlocks: 
       new: 
         resend_unlock: "Desblokeatzeko argibideak bidali"
-      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
+      send_instructions: "Zure kontua berriro aktibatzeko argibidedun mezu bat jasoko duzu e-postan minutu batzuetan."
-      unlocked: "Your account was successfully unlocked. You are now signed in."
+      unlocked: "Zure kontua berraktibatu duzu. Orain sartu egin zara."
   errors: 
     messages: 
       already_confirmed: "jadanik baieztatua zegoen"

config/locales/diaspora/eu.yml

@@ -11,7 +11,7 @@ eu:
   _contact: "Adiskidea"
   _contacts: "Adiskideak"
   _home: "Hasiera"
-  _more: "More"
+  _more: "Gehiago"
   _photos: "argazkiak"
   _services: "Zerbitzuak"
   account: "Kontua"
@@ -21,23 +21,23 @@ eu:
         contact: 
           attributes: 
             person_id: 
-              taken: "must be unique among this user's contacts."
+              taken: "bakarra izan behar du erabiltzaile honen adiskideen artean."
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken."
+              taken: "erabilpenean dago jada."
         request: 
           attributes: 
             from_id: 
-              taken: "is a duplicate of a pre-existing request."
+              taken: "lehenago egindako eskaera baten bikoizketa bat da."
         user: 
           attributes: 
             email: 
-              taken: "is already taken."
+              taken: "erabilpenean dago jada."
             person: 
-              invalid: "is invalid."
+              invalid: "ez da erabilgarria."
             username: 
-              taken: "is already taken."
+              taken: "erabilpenean dago jada."
   ago: "%{time} d(ir)ela"
   application: 
     helper: 
@@ -52,7 +52,7 @@ eu:
       failure: "Akatsa adiskidea alderdira gehitzean."
       success: "Adiskidea arrakastaz gehitu da alderdira."
     aspect_contacts: 
-      done_editing: "aldaketa arrakastatsua"
+      done_editing: "aldaketak gauzatu"
     contacts_not_visible: "Alderdi honetako adiskideak nor dagoen bere alderdian ezingo dute ikusi."
     contacts_visible: "Alderdi honetako adiskideak jokingo dute nor dagoen alderdian."
     create: 
@@ -75,7 +75,7 @@ eu:
       handle_explanation: "Hau da zure Diaspora erabiltzailea. Zure adiskideei emaiezu zu aurkitzearren."
       no_contacts: "Adiskiderik ez"
     manage: 
-      add_a_new_aspect: "Alderdi berri sortu"
+      add_a_new_aspect: "Alderdi berri bat sortu"
       add_a_new_contact: "Adiskide berria gehitu"
       drag_to_add: "Herresta egin ezazu jendea gehitzearren"
       manage_aspects: "Alderdiak kudeatu"
@@ -105,13 +105,13 @@ eu:
     show: 
       edit_aspect: "alderdia aldatu"
     update: 
-      failure: "Zure alderdiak, %{name}, izen luzeegia du."
+      failure: "Zure alderdiak, %{name}(e)k, izen luzeegia du."
       success: "Zure alderdia, %{name}, eraldatua izan da."
   back: "Atzera"
   cancel: "Ezeztatu"
   comments: 
     new_comment: 
-      comment: "Iruzkina"
+      comment: "Iruzkindu"
       commenting: "Iruzkintzen..."
   contacts: 
     few: "%{count} adiskide"
@@ -162,7 +162,7 @@ eu:
       if_they_accept_info: "eskaera onartzen badute, gonbidatutako alderdira batuko dira"
       invite_someone_to_join: "Gonbida ezazu norbait Diasporan izen ematera!"
       personal_message: "Mezu pertsonala"
-      resend: "Resend"
+      resend: "Berbidali"
       send_an_invitation: "Gonbidapen bat bidali"
       send_invitation: "Gonbidapena bidali"
       to: "Jasotzailea:"
@@ -170,8 +170,8 @@ eu:
     application: 
       have_a_problem: "Arazoren bat? Aurkitu erantzuna hemen"
       logged_in_as: "%{name} zara."
-      powered_by: "DIASPORA*K ESKAINIA"
+      powered_by: "DIASPORAK ESKAINIA"
-      toggle: "toggle mobile site"
+      toggle: "aldatu mugikorreko orrialdera"
       whats_new: "ezer berririk?"
       your_aspects: "zure alderdiak"
     header: 
@@ -182,42 +182,42 @@ eu:
       login: "sartu"
       logout: "irten"
       view_profile: "profila ikusi"
-  more: "More"
+  more: "Gehiago"
-  new_notifications: "%{count} new notifications"
+  new_notifications: "%{count} jakinarazpen berri"
   new_requests: 
     few: "%{count} eskaera berri!"
     one: "eskaera berria!"
     other: "%{count} esakaera berri!"
     zero: "eskaera berririk ez"
-  next: "next"
+  next: "hurrengoa"
   no_new_notifications: "jakinarazpen berririk ez"
   notifications: 
     also_commented: "iruzkindua baita zure kontaktuaren"
     comment_on_post: "iruzkindua zure"
-    deleted: "deleted"
+    deleted: "ezabatuta"
     index: 
-      mark_all_as_read: "Mark All as Read"
+      mark_all_as_read: "Guztiak irakurrita"
       notifications: "Jakinarazpenak"
-    mentioned: "has mentioned you in their"
+    mentioned: "aipatu zaituzte bere"
     new_request: "zurekin partekatzea eskatu dizu."
     post: "berria"
     request_accepted: "zure partekatze eskaera onartu du."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
+      commented: "(e)k ere iruzkindu du %{post_author}(r)en mezuan:"
-      sign_in: "Sign in to view it."
+      sign_in: "Sartu zaitez ikusteko."
       subject: "%{name}(e)k ere iruzkindu du."
     comment_on_post: 
       commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
+      sign_in: "Sartu zaitez ikusteko."
-      subject: "%{name} has commented on your post."
+      subject: "%{name} zure mezua iruzkindu du."
     diaspora: "diasporaren e-posta robota"
     hello: "Kaixo, %{name}!"
     love: "ikusi arte,"
     mentioned: 
-      mentioned: "mentioned you in a post:"
+      mentioned: "zu aipatu zaituzte mezu batean:"
-      sign_in: "Sign in to view it."
+      sign_in: "Sartu ikusteko."
-      subject: "%{name} has mentioned you on Diaspora*"
+      subject: "%{name}(e)k Diasporan aipatu zaitu"
     new_request: 
       just_sent_you: "oraintxe Diaspora* adiskide eskaera bidali zaizu"
       sign_in: "sartu hemen"
@@ -225,7 +225,7 @@ eu:
       try_it_out: "Hobe zenuke begiztatzea."
     request_accepted: 
       accepted: "(e)k zure adiskide eskaera onartu du. Orain hemen dago:"
-      sign_in: "Sign in here"
+      sign_in: "Sartu hemen"
       subject: "%{name}(e)k zure adiskide eskaera onartu du Diasporan"
     single_admin: 
       admin: "Zure Diaspora administratzailea"
@@ -280,7 +280,7 @@ eu:
       accepts: "Behin %{name}(e)k onartzen zaituela, bakoitzak bestearen berriak Diasporan ikusi ahalko dituzue"
       share_with: "%{name}(r)ekin hasi partekatzen"
     share_with_pane: 
-      add_new_aspect: "add new aspect"
+      add_new_aspect: "alderdi berria gehitu"
     show: 
       does_not_exist: "Pertsona hau ez dago!"
       incoming_request: "Adiskide eskaera bat bidali dizu pertsona honek."
@@ -290,7 +290,7 @@ eu:
       recent_public_posts: "Azken berri publikoak"
       return_to_aspects: "Zure alderdi orrialdera itzuli"
       similar_contacts: "antzeko adiskideak"
-      start_sharing: "start sharing"
+      start_sharing: "harremanetan hasi"
       to_accept_or_ignore: "onartu edo utzi"
     update: 
       failed: "Akatsa profila eguneratzean"
@@ -375,25 +375,25 @@ eu:
       error: "akatsa zerbitzu hori konektatzean"
     finder: 
       friends: 
-        few: "%{count} friends"
+        few: "%{count} adiskide"
-        one: "1 friend"
+        one: "adiskide 1"
-        other: "%{count} friends"
+        other: "%{count} adiskide"
-        zero: "no friends"
+        zero: "adiskiderik ez"
-      invite_your_friends_from: "Invite your friends from %{service}"
+      invite_your_friends_from: "Gonbidatu lagunak %{service}(e)tik"
-      not_connected: "not connected"
+      not_connected: "harremanik ez"
     index: 
       connect_to_facebook: "Facebookekin lotu"
       connect_to_twitter: "Twitterekin lotu"
       disconnect: "irten"
       edit_services: "Aldatu zerbitzuak"
-      logged_in_as: "logged in as"
+      logged_in_as: "zu zara:"
       really_disconnect: "irten %{service}(e)tik?"
     inviter: 
-      click_link_to_accept_invitation: "Click this link to accept your invitation"
+      click_link_to_accept_invitation: "Jarraitu esteka hau zure gonbidapena onartzeko"
-      join_me_on_diaspora: "Join me on DIASPORA*"
+      join_me_on_diaspora: "Bat egin nirekin DIASPORAN"
     remote_friend: 
-      invite: "invite"
+      invite: "gonbidapena"
-      resend: "resend"
+      resend: "berbidali"
   settings: "Lehentasunak"
   shared: 
     add_contact: 
@@ -406,12 +406,12 @@ eu:
       all_contacts: "Adiskide Guztiak"
       cannot_remove: "Ezin izan da pertsona azken alderditik ezabatu. (Pertsona honekin harremanak nahi ez badituzu, adiskidea ezabatu behar duzu.)"
     invitations: 
-      by_email: "by Email"
+      by_email: "e-posta bidez"
       dont_have_now: "Bat ere ez duzu, baina gonbidapen gehiago iritsiko dira laister!"
-      from_facebook: "From Facebook"
+      from_facebook: "Facebooketik"
       invitations_left: "(%{count} geratzen zai(zki)zu)"
       invite_someone: "Norbait gonbidatu"
-      invite_your_friends: "Invite your friends"
+      invite_your_friends: "Zure lagunak gonbidatu"
       invites: "Gonbidapenak"
       invites_closed: "Gonbidapenak itxita daude orain Diaspora zerbitzari hontan"
     notification: 
@@ -457,18 +457,18 @@ eu:
       change_language: "Hizkuntza aldatu"
       change_password: "Pasahitza aldatu"
       close_account: "Kontua ezabatu"
-      current_password: "Current password"
+      current_password: "Oraingo pasahitza"
       download_photos: "nire argazkiak jaitsi"
       download_xml: "nire xml jaitsi"
       edit_account: "Kontua aldatu"
       email_notifications: "E-posta bidezko jakinarazpenak"
       export_data: "Datuak esportatu"
-      new_password: "Pasaitza Berria"
+      new_password: "Pasahitz Berria"
       receive_email_notifications: "E-posta jakinarazpenak jaso nahi dituzu?"
       your_email: "Zure e-posta"
       your_handle: "Zure Diaspora erabiltzailea"
     getting_started: 
-      connect_on_diaspora: "Connect on Diaspora"
+      connect_on_diaspora: "Konektatu Diasporan"
       connect_services: "Beste zerbitzu batzuekin lotu"
       edit_profile: "Zure profila aldatu"
       finished: "Bukatuta!"
@@ -476,11 +476,11 @@ eu:
       signup_steps: "Zure izen ematea bukatu ezazu hiru pauso hauek emanez:"
       skip: "jauzi hastapenak"
       step_2: 
-        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
+        find_your_friends_on_diaspora: "Gustatuko litzaizuke Facebookeko lagunak Diasporan aurkitzea?"
-        skip: "Skip"
+        skip: "Utzi"
       step_3: 
-        finish: "Finish"
+        finish: "Bukatu"
-        people_already_on_diaspora: "People already on Diaspora"
+        people_already_on_diaspora: "Diasporako jendea"
       welcome: "Ongi Etorri Diasporara!"
     public: 
       does_not_exist: "%{username}(r)ik ez dago!"
@@ -491,7 +491,7 @@ eu:
       password_changed: "Pasahitza aldatu duzu"
       password_not_changed: "Pasahitz Aldaketa Akatsduna"
   webfinger: 
-    fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
+    fetch_failed: "ezin izan da webfinger profila hartu %{profile_url} webgunetik"
     hcard_fetch_failed: "%{account} kontutik ezin izan da hcard sortu"
     no_person_constructed: "Ezin izan da pertsona sortu hcard erabiliz."
     not_enabled: "webfinger ez dago aktibatuta %{account} zerbitzariarengatik"

config/locales/diaspora/fi.yml

@@ -21,23 +21,23 @@ fi:
         contact: 
           attributes: 
             person_id: 
-              taken: "must be unique among this user's contacts."
+              taken: "on oltava yksilöllinen."
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken."
+              taken: "on jo varattu."
         request: 
           attributes: 
             from_id: 
-              taken: "is a duplicate of a pre-existing request."
+              taken: "on jo tehdyn pyynnön kaksoiskappale."
         user: 
           attributes: 
             email: 
-              taken: "is already taken."
+              taken: "on jo varattu."
             person: 
-              invalid: "is invalid."
+              invalid: "ei ole kelvollinen."
             username: 
-              taken: "is already taken."
+              taken: "on jo varattu."
   ago: "%{time} sitten"
   application: 
     helper: 
@@ -162,7 +162,7 @@ fi:
       if_they_accept_info: "jos he hyväksyvät kutsun, heidät lisätään siihen näkymään, johon heidät kutsuit."
       invite_someone_to_join: "Kutsu joku Diasporan käyttäjäksi!"
       personal_message: "Henkilökohtainen viesti"
-      resend: "Resend"
+      resend: "Lähetä uudelleen"
       send_an_invitation: "Lähetä kutsu"
       send_invitation: "Lähetä kutsu"
       to: "Vastaanottaja"
@@ -198,7 +198,7 @@ fi:
     index: 
       mark_all_as_read: "Merkitse kaikki luetuiksi"
       notifications: "Ilmoitukset"
-    mentioned: "has mentioned you in their"
+    mentioned: "on maininnut sinut heidän"
     new_request: "haluaa jakaa kanssasi."
     post: "viesti"
     request_accepted: "hyväksyi jakopyyntösi."
@@ -215,9 +215,9 @@ fi:
     hello: "Hei %{name}!"
     love: "terveisin,"
     mentioned: 
-      mentioned: "mentioned you in a post:"
+      mentioned: "mainitsi sinut viestissään:"
-      sign_in: "Sign in to view it."
+      sign_in: "Kirjaudu sisään nähdäksesi."
-      subject: "%{name} has mentioned you on Diaspora*"
+      subject: "%{name} on maininnut sinut Diaspora*:ssa"
     new_request: 
       just_sent_you: "lähetti juuri äsken sinulle kontaktipyynnön Diaspora*ssa"
       sign_in: "Kirjaudu sisään täältä"
@@ -280,7 +280,7 @@ fi:
       accepts: "Kun %{name} hyväksyy, alatte näkemään toistenne viestit Diasporassa."
       share_with: "Aloita jakaminen henkilölle %{name}"
     share_with_pane: 
-      add_new_aspect: "add new aspect"
+      add_new_aspect: "lisää näkymä"
     show: 
       does_not_exist: "Henkilöä ei ole olemassa!"
       incoming_request: "Tämä henkilö on lähettänyt sinulle pyynnön."
@@ -325,7 +325,7 @@ fi:
       edit: "muokkaa"
       edit_delete_photo: "Muokkaa kuvan kuvausta / poista kuva"
       make_profile_photo: "laita profiilikuvaksi"
-      original_post: "Original Post"
+      original_post: "Alkuperäinen viesti"
       permalink: "pysyvä linkki"
       update_photo: "Päivitä kuva"
       view: "näytä"
@@ -426,7 +426,7 @@ fi:
       all: "kaikki"
       all_contacts: "kaikki kontaktit"
       make_public: "tee julkiseksi"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
+      mention_helper_text: "mainitaksesi jonkun, valitse '@' ja kirjoita nimen alku"
       post_a_message_to: "Lähetä viesti näkymään %{aspect}"
       posting: "Lähetetään..."
       share: "Jaa"

config/locales/diaspora/gl.yml

@@ -162,7 +162,7 @@ gl:
       if_they_accept_info: "se aceptan, serán engadidos ao aspecto ao que os convidaches."
       invite_someone_to_join: "Convida a alguén a participar en Diaspora!"
       personal_message: "Mensaxe persoal"
-      resend: "Resend"
+      resend: "Reenviar"
       send_an_invitation: "Mensaxe persoal"
       send_invitation: "Enviar unha invitación"
       to: "a"
@@ -240,7 +240,7 @@ gl:
   password_confirmation: "Confirmación do contrasinal"
   people: 
     aspect_list: 
-      edit_membership: "editar membresía de aspecto"
+      edit_membership: "Editar membresía de aspecto"
     edit: 
       allow_search: "Permitir á xente buscarte dentro de Diaspora"
       edit_profile: "Editar perfil"
@@ -268,11 +268,11 @@ gl:
       pending_request: "solicitude pendente"
       thats_you: "es ti!"
     profile_sidebar: 
-      bio: "biografia"
+      bio: "Biografia"
-      born: "aniversario"
+      born: "Aniversario"
       cannot_remove: "Non se pode eliminar %{name} do último aspecto. (Se te queres desvincular desta persoa tes que eliminar o contacto.)"
       edit_my_profile: "Editar o meu perfil"
-      gender: "xénero"
+      gender: "Xénero"
       in_aspects: "en aspectos"
       remove_contact: "borrar contacto"
       remove_from: "Eliminar %{name} de %{aspect}?"
@@ -284,7 +284,7 @@ gl:
     show: 
       does_not_exist: "Esa persoa non existe!"
       incoming_request: "%{name} quere compartir contigo"
-      no_posts: "non hai mensaxes que amosar!"
+      no_posts: "Non hai mensaxes que amosar!"
       not_connected: "Non estás conectado a %{name}"
       recent_posts: "Publicacións recentes"
       recent_public_posts: "Publicacións Públicas Recentes"
@@ -431,7 +431,7 @@ gl:
       posting: "Publicando..."
       share: "Compartir"
       share_with: "Compartir con %{aspect}"
-      whats_on_your_mind: "que tes en mente?"
+      whats_on_your_mind: "Que tes en mente?"
     reshare: 
       reshare: "Recompartir "
   status_messages: 
@@ -440,7 +440,7 @@ gl:
     helper: 
       no_message_to_display: "Non hai mensaxes para amosar"
     new_status_message: 
-      oh_yeah: "e logo!!"
+      oh_yeah: "e logo!"
       tell_me_something_good: "cóntame algo bo"
     show: 
       destroy: "Borrar"
@@ -464,7 +464,7 @@ gl:
       email_notifications: "Notificacións de correo-e"
       export_data: "Exportar datos"
       new_password: "Novo contrasinal"
-      receive_email_notifications: "Receibir notificacións por correo?"
+      receive_email_notifications: "Recibir notificacións por correo?"
       your_email: "O teu correo"
       your_handle: "A túa tarxeta diaspora"
     getting_started: 

config/locales/diaspora/hu.yml

@@ -162,7 +162,7 @@ hu:
       if_they_accept_info: "Ha elfogadják felkérésed, akkor belekerülnek abba a csoportba amelyikbe meghívtad őket."
       invite_someone_to_join: "Hívj meg valakit, hogy csatlakozzon a Diaspora-hoz!"
       personal_message: "Személyes üzenet"
-      resend: "Resend"
+      resend: "Újraküld"
       send_an_invitation: "Küldj egy meghívót"
       send_invitation: "Meghívás küldése"
       to: "Címzett"

config/locales/diaspora/nl.yml

@@ -121,7 +121,7 @@ nl:
   date: 
     formats: 
       birthday: "%B %d"
-      birthday_with_year: "%B %d %J"
+      birthday_with_year: "%B %d %Y"
       fullmonth_day: "%B %d"
   delete: "Verwijderen"
   email: "E-mail"

config/locales/javascript/javascript.eu.yml

@@ -0,0 +1,31 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+eu: 
+  javascripts: 
+    confirm_dialog: "Ziur al zaude?"
+    search_for: "Bilatu {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Ezin izan da adiskidea azken alderditik ezabatu. (Pertsona honekin harremanak bukatu nahi badituzu, hura ezabatu behar duzu.)"
+    timeago: 
+      day: "egun bat"
+      days: "%d egun"
+      hour: "ordu bat"
+      hours: "%d ordu"
+      minute: "minutu bat"
+      minutes: "%d minutu"
+      month: "hilabete bat"
+      months: "%d hilabete"
+      prefixAgo: "duela"
+      prefixFromNow: ""
+      seconds: "minutu bat baino gutxiago"
+      suffixAgo: ""
+      suffixFromNow: "barru"
+      year: "urte bat"
+      years: "%d urte"
+    videos: 
+      unknown: "Bideo mota ezezaguna"
+      watch: "Ikusi bideo hau {{provider}}(e)n"

config/locales/javascript/javascript.gl.yml

@@ -19,7 +19,7 @@ gl:
       minutes: "%d minutos"
       month: "sobre un mes"
       months: "%d meses"
-      prefixAgo: "hai"
+      prefixAgo: "Hai"
       prefixFromNow: "javascripts:timeago:prefixDendeAgora"
       seconds: "menos dun minuto"
       suffixAgo: ""

config/locales/rails-i18n/es-CO.yml

@@ -1,5 +1,4 @@
 # Spanish as spoken in Colombia (es-CO) translations for Rails
-# by Christian A. Rojas G (christianrojas@mac.com)
 
 es-CO:
   number:
@@ -7,23 +6,26 @@ es-CO:
       format:
         delimiter: ","
     currency:
-      format: # Pesos Colombianos
+      format:
         format: "%u%n"
         unit: "$"
-        precision: 2
-        delimiter: ","
         separator: "."
+        delimiter: ","
+        precision: 0
+        significant: false
+        strip_insignificant_zeros: false
     format:
       delimiter: ","
       precision: 2
+      significant: false
+      strip_insignificant_zeros: false
       separator: "."
     human:
       format:
         delimiter: ","
-        precision: 2
+        precision: 3
-      # Rails <= v2.2.2
+        significant: true
-      # storage_units: [Bytes, KB, MB, GB, TB]
+        strip_insignificant_zeros: true
-      # Rails >= v2.3
       storage_units:
         format: "%n %u"
         units:
@@ -34,6 +36,15 @@ es-CO:
           mb: "MB"
           gb: "GB"
           tb: "TB"
+      decimal_units:
+        format: "%n %u"
+        units:
+          unit: ""
+          thousand: "Mil"
+          million: "Millón"
+          billion: "Billón"
+          trillion: "Trillón"
+          quadrillion: "Cuatrillón"
     precision:
       format:
         delimiter: ","
@@ -56,6 +67,15 @@ es-CO:
     am: "am"
     pm: "pm"
 
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " y "
+      last_word_connector: " y "
+
+    select:
+      prompt: "Por favor selecciona"
+
   datetime:
     distance_in_words:
       half_a_minute: "medio minuto"
@@ -93,14 +113,51 @@ es-CO:
         one:   "casi 1 año"
         other: "casi %{count} años"
     prompts:
-      year:   "Año"
+      year: 'Año'
-      month:  "Mes"
+      month: 'Mes'
-      day:    "Día"
+      day: 'Día'
-      hour:   "Hora"
+      hour: 'Hora'
-      minute: "Minutos"
+      minute: 'Minuto'
-      second: "Segundos"
+      second: 'Segundos'
 
-  # Active Record
+  helpers:
+    select:
+      prompt: "Por favor selecciona"
+
+    submit:
+      create: 'Crear %{model}'
+      update: 'Actualizar %{model}'
+      submit: 'Guardar %{model}'
+
+  errors:
+      format: "%{attribute} %{message}"
+
+      messages: &errors_messages
+        inclusion: "no está incluído en la lista"
+        exclusion: "está reservado"
+        invalid: "es inválido"
+        confirmation: "no coincide con la confirmación"
+        blank: "no puede estar en blanco"
+        empty: "no puede estar vacío"
+        not_a_number: "no es un número"
+        not_an_integer: "debe ser un entero"
+        less_than: "debe ser menor que %{count}"
+        less_than_or_equal_to: "debe ser menor o igual que %{count}"
+        greater_than: "debe ser mayor que %{count}"
+        greater_than_or_equal_to: "debe ser mayor o igual que %{count}"
+        too_short:
+          one: "es demasiado corto (mínimo 1 caracter)"
+          other: "es demasiado corto (mínimo %{count} caracteres)"
+        too_long:
+          one: "es demasiado largo (máximo 1 caracter)"
+          other: "es demasiado largo (máximo %{count} caracteres)"
+        equal_to: "debe ser igual a %{count}"
+        wrong_length:
+          one: "longitud errónea (debe ser de 1 caracter)"
+          other: "longitud errónea (debe ser de %{count} caracteres)"
+        accepted: "debe ser aceptado"
+        even: "debe ser un número par"
+        odd: "debe ser un número impar"
 
   activerecord:
     errors:
@@ -109,38 +166,11 @@ es-CO:
           one: "%{model} no pudo guardarse debido a 1 error"
           other: "%{model} no pudo guardarse debido a %{count} errores"
         body: "Revise que los siguientes campos sean válidos:"
-      messages:
-        record_invalid: "Falla de validación: %{errors}"
-        inclusion: "no está incluído en la lista"
-        exclusion: "está reservado"
-        invalid: "es inválido"
-        invalid_date: "es una fecha inválida"
-        confirmation: "no coincide con la confirmación"
-        accepted: "debe ser aceptado"
-        blank: "no puede estar en blanco"
-        empty: "no puede estar vacío"
-        not_a_number: "no es un número"
-        taken: "ya ha sido tomado"
-        less_than: "debe ser menor que %{count}"
-        less_than_or_equal_to: "debe ser menor o igual que %{count}"
-        greater_than: "debe ser mayor que %{count}"
-        greater_than_or_equal_to: "debe ser mayor o igual que %{count}"
-        too_short: "es demasiado corto (mínimo %{count} caracteres)"
-        too_long: "es demasiado largo (máximo %{count} caracteres)"
-        equal_to: "debe ser igual a %{count}"
-        wrong_length: "longitud errónea (debe ser de %{count} caracteres)"
-        even: "debe ser un número par"
-        odd: "debe ser un número non"
 
-# Used in array.to_sentence.
+      messages:
-  support:
+        taken: "ya ha sido tomado"
-    select:
+        record_invalid: "La validación falló: %{errors}"
-      # default value for :prompt => true in FormOptionsHelper
+        <<: *errors_messages
-      prompt: "Por favor seleccione"
+
-    array:
+      full_messages:
-      # Rails <= v.2.2.2
+        format: "%{attribute}%{message}"
-      # sentence_connector: "y"
-      # Rails >= v.2.3
-      words_connector: ", "
-      two_words_connector: " y "
-      last_word_connector: " y "