diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index f45ef618686acd076dcf3732655ac9bb1807e29b..133f0730ba72bb4aed5631fe9bf9d60dae44bf0b 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -541,6 +541,7 @@ ar:
       not_connected: "غير متصل"
     index: 
       connect_to_facebook: "إتصل بـ فسبوك"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "إتصل بتويتر"
       disconnect: "فصل الإتصال"
       edit_services: "تعديل الخدمات"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 99f04be4f4c4a4034d43beff059213ea3bb3b8a3..acb69f4e07567ac2e6abefef659fcebf836d08b4 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -541,6 +541,7 @@ bg:
       not_connected: "не съществува връзка"
     index: 
       connect_to_facebook: "Свързване с facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Свързване с twitter"
       disconnect: "изключване"
       edit_services: "Редактиране на услугите"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 665efcac9ae1cc56be2d6f7651a8d89591808469..5b8f1e0d72eaff71ca82de43b0ee7cb493de6cad 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -541,6 +541,7 @@ br:
       not_connected: "not connected"
     index: 
       connect_to_facebook: "Connect to facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Connect to twitter"
       disconnect: "disconnect"
       edit_services: "Edit services"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 68b3b6f498c7c868abf7ec9c589459a8fc608a90..ba6a89cd98d2f9b43e6cf997744b81241ab5fde1 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -541,6 +541,7 @@ cs:
       not_connected: "nepřipojen"
     index: 
       connect_to_facebook: "Připojit na facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Připojit na twitter"
       disconnect: "odpojit"
       edit_services: "Upravit služby"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 2164a82120c9a69901364edcd42b191ca83f6fe5..6691b650bdfc65259cd4a3b88296a6a78797b122 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -541,6 +541,7 @@ cy:
       not_connected: "not connected"
     index: 
       connect_to_facebook: "Connect to facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Connect to twitter"
       disconnect: "disconnect"
       edit_services: "Edit services"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 12111f368e06a060b2ab0221e5185d7791ac3d8c..490619837d0fe0a1653ef4f61206d10a038b9ccf 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -541,6 +541,7 @@ da:
       not_connected: "ikke forbundet"
     index: 
       connect_to_facebook: "Tilslut til Facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Tilslut til twitter"
       disconnect: "afbryd"
       edit_services: "Redigér tjenester"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 4564b825410d87f164f3939554f5d890bf141bc9..62d9f1375528e740571814c85db11ebac66a24ee 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -541,6 +541,7 @@ de:
       not_connected: "nicht verbunden"
     index: 
       connect_to_facebook: "Mit Facebook verbinden"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Mit Twitter verbinden"
       disconnect: "Verbindung entfernen"
       edit_services: "Dienste bearbeiten"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 4a34b238e6babc315cd40bab4ea18589b467abd9..2e1a679733c5e274d6aec444d30373e9a200526c 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -230,7 +230,7 @@ el:
       to: "Στον"
   layouts: 
     application: 
-      have_a_problem: "Έχετε κάποιο πρόβλημα; Βρείτε την απάντηση εδώ"
+      have_a_problem: "Έχετε κάποιο πρόβλημα; Βρείτε την απάντηση εδώ!"
       powered_by: "POWERED BY DIASPORA*"
       public_feed: "Δημόσια ανατροφοδότηση (feed) του Diaspora για τον χρήστη %{name}"
       toggle: "εναλλαγή ιστοσελίδας κινητού"
@@ -263,11 +263,11 @@ el:
   no_results: "Δεν βρέθηκαν αποτελέσματα"
   notifications: 
     also_commented: 
-      few: "Οι χρήστες %{actors} επίσης σχολίασαν τη δημοσίευση %{post_link} του %{post_author}."
-      many: "Οι χρήστες %{actors} επίσης σχολίασαν τη δημοσίευση %{post_link} του %{post_author}."
-      one: "Ο χρήστης %{actors} επίσης σχολίασε τη δημοσίευση %{post_link} του %{post_author}."
-      other: "Οι χρήστες %{actors} επίσης σχολίασαν τη δημοσίευση %{post_link} του %{post_author}."
-      zero: "Οι χρήστες %{actors} επίσης σχολίασαν τη δημοσίευση %{post_link} του %{post_author}"
+      few: "Οι χρήστες %{actors} επίσης σχολίασαν τη %{post_link} του %{post_author}."
+      many: "Οι χρήστες %{actors} επίσης σχολίασαν τη %{post_link} του %{post_author}."
+      one: "Ο χρήστης %{actors} επίσης σχολίασε τη %{post_link} του %{post_author}."
+      other: "Οι χρήστες %{actors} επίσης σχολίασαν τη %{post_link} του %{post_author}."
+      zero: "Οι χρήστες %{actors} επίσης σχολίασαν τη %{post_link} του %{post_author}"
     also_commented_deleted: 
       few: "Οι χρήστες %{actors} σχολίασαν μια διαγεγραμμένη δημοσίευση. "
       many: "Οι χρήστες %{actors} σχολίασαν μια διαγεγραμμένη δημοσίευση. "
@@ -275,9 +275,9 @@ el:
       other: "Οι χρήστες %{actors} σχολίασαν μια διαγεγραμμένη δημοσίευση. "
       zero: "Οι χρήστες %{actors} σχολίασαν μια διαγεγραμμένη δημοσίευση. "
     comment_on_post: 
-      few: "Οι χρήστες %{actors} σχολίασαν τη δημοσίευση %{post_link}."
-      many: "Οι χρήστες %{actors} σχολίασαν τη δημοσίευση %{post_link}."
-      one: "Ο χρήστης %{actors} σχολίασε τη δημοσίευση %{post_link}."
+      few: "Οι χρήστες %{actors} σχολίασαν τη %{post_link}."
+      many: "Οι χρήστες %{actors} σχολίασαν τη %{post_link}."
+      one: "Ο χρήστης %{actors} σχολίασε τη %{post_link}."
       other: "Οι χρήστες %{actors} σχολίασαν τη δημοσίευση %{post_link}."
       zero: "Οι χρήστες %{actors} σχολίασαν τη δημοσίευση %{post_link}."
     helper: 
@@ -298,11 +298,11 @@ el:
       mark_all_as_read: "Σήμανση όλων ως διαβασμένα"
       notifications: "Ειδοποιήσεις"
     liked: 
-      few: "Η δημοσίευση σας %{post_link} άρεσε στους χρήστες %{actors}."
-      many: "Η δημοσίευση σας %{post_link} άρεσε στους χρήστες %{actors}."
-      one: "Η δημοσίευση σας %{post_link} άρεσε στον χρήστη %{actors}."
-      other: "Η δημοσίευση σας %{post_link} άρεσε στους χρήστες %{actors}."
-      zero: "Η δημοσίευση σας %{post_link} άρεσε στους χρήστες %{actors}."
+      few: "Η %{post_link} άρεσε στους χρήστες %{actors}."
+      many: "Η %{post_link} άρεσε στους χρήστες %{actors}."
+      one: "Η %{post_link} άρεσε στον χρήστη %{actors}."
+      other: "Η %{post_link} άρεσε στους χρήστες %{actors}."
+      zero: "Η %{post_link} άρεσε στους χρήστες %{actors}."
     liked_post_deleted: 
       few: "Η διαγεγραμμένη δημοσίευσή σας άρεσε στους χρήστες %{actors}."
       many: "Η διαγεγραμμένη δημοσίευσή σας άρεσε στους χρήστες %{actors}."
@@ -541,6 +541,7 @@ el:
       not_connected: "δεν είναι συνδεδεμένο"
     index: 
       connect_to_facebook: "Σύνδεση με το facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Σύνδεση με το twitter"
       disconnect: "αποσύνδεση"
       edit_services: "Επεξεργασία υπηρεσιών"
@@ -633,17 +634,17 @@ el:
     show: 
       connect_to_cubbies: "Σύνδεση με Cubbi.es"
       connecting_is_simple: "Η σύνδεση του Diaspora λογαριασμού σας γίνεται απλά με τη συμπλήρωση των δύο πεδίων στην σελίδα σύνδεσης του Cubbi.es."
-      daniels_account: "Ο Diaspora λογαριασμός του Daniel"
+      daniels_account: "Diaspora λογαριασμό του Daniel"
       generate_a_token: "Δημιουργήστε ένα token"
       love_to_try: "Θα χαιρόμασταν αν το δοκιμάζατε."
-      making_the_connection: "Γίνεται η σύνδεση"
-      screenshot_explanation: "%{link1}.  Αυτό το συγκεκριμένο cubby συνδέεται στο %{link2}."
+      making_the_connection: "Σύνδεση"
+      screenshot_explanation: "%{link1}.  Αυτό το συγκεκριμένο cubby συνδέεται στον %{link2}."
       sign_up_today: "Συνδεθείτε σήμερα!"
       typical_userpage: "Μία τυπική cubbi.es σελίδα χρήστη"
       via: "(μέσω %{link})"
       were_working_hard: "Δουλεύουμε σκληρά για να παρέχουμε τη μέγιστη συνδεσιμότητα του Diaspora με άλλες εφαρμογές. Προς το παρόν, η σύνδεση του Diaspora λογαριασμού σας με το Cubbi.es γίνεται με την αντιγραφή και την επικόλληση δύο πεδίων."
       what_is_cubbies: "Το Cubbi.es είναι παγκοσμίως η πρώτη εφαρμογή για το Diaspora. Είναι επίσης ο καλύτερος τρόπος συλλογής φωτογραφιών στο διαδίκτυο."
-      your_diaspora_handle: "Το Diaspora αναγνωριστικό σας:"
+      your_diaspora_handle: "Το Diaspora Αναγνωριστικό σας:"
       your_diaspora_token: "Το Diaspora Token σας:"
   undo: "Αναίρεση;"
   username: "Όνομα Χρήστη"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index bcfc737bb4963686b598f1039187cc1c570c6c3a..ffec4a316050fcf9d2b5c10c1610be58d3e802e6 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -541,6 +541,7 @@ en_shaw:
       not_connected: "𐑯𐑪𐑑 𐑒𐑩𐑯𐑧𐑒𐑑𐑩𐑛"
     index: 
       connect_to_facebook: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 𐑓𐑱𐑕𐑚𐑫𐑒"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 𐑑𐑢𐑦𐑑𐑼"
       disconnect: "𐑛𐑦𐑕𐑒𐑩𐑯𐑧𐑒𐑑"
       edit_services: "𐑧𐑛𐑦𐑑 𐑕𐑻𐑝𐑦𐑕𐑩𐑟"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index f9109ad8b3d7347b7c405410b156c7cab9a32a7c..c5a99cbd9d34e262225fedea6f4f1523d6bb007a 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -541,6 +541,7 @@ eo:
       not_connected: "not connected"
     index: 
       connect_to_facebook: "Connect to facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Connect to twitter"
       disconnect: "disconnect"
       edit_services: "Edit services"
diff --git a/config/locales/diaspora/es-AR.yml b/config/locales/diaspora/es-AR.yml
index 0b41f1bbfc4e848da1fae66614d0124da0198f82..bc6e519b7e17339473041bcd34d7c5483fc68566 100644
--- a/config/locales/diaspora/es-AR.yml
+++ b/config/locales/diaspora/es-AR.yml
@@ -541,6 +541,7 @@ es-AR:
       not_connected: "sin conexión"
     index: 
       connect_to_facebook: "Conectar a Facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Conectar a Twitter"
       disconnect: "desconectar"
       edit_services: "Editar servicios"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index ced00ee14ee0f13920576d5dc95d44461333c0e7..5c58c23cd3188229f419adea46564069bb5b3dcf 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -541,6 +541,7 @@ es-CL:
       not_connected: "No Conectado"
     index: 
       connect_to_facebook: "Conectar a facebook"
+      connect_to_tumblr: "Conectar a Tumblr"
       connect_to_twitter: "Conectar a twitter"
       disconnect: "desconectar"
       edit_services: "Editar servicios"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 846f0ed8d02e7ccefff3a1f121e2df22b7a8db45..18ac404e3ef8183b69c94bc8acb97a514a968700 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -90,9 +90,9 @@ es:
       remove: "eliminar"
     index: 
       cubbies: 
-        explanation: "Cubbi.es es la primera aplicación de Diaspora en desarrollo."
-        heading: "Conectate a Cubbi.es"
-        learn_more: "Aprende mas"
+        explanation: "Cubbi.es es la primera aplicación de Diaspora* en desarrollo."
+        heading: "Conecta con Cubbi.es"
+        learn_more: "Ver más"
       handle_explanation: "Ésta es tu dirección Diaspora*. Como una dirección de correo, puedes dársela a la gente para que te encuentren."
       no_contacts: "No hay contactos"
       people_sharing_with_you: "Comparten contigo"
@@ -197,7 +197,7 @@ es:
       choice: "Elección"
       choice_explanation: "Diaspora* te permite organizar conexiones en grupos llamados aspectos. En Diaspora*, los aspectos aseguran que tus fotos, historias y bromas sean compartidas sólo con la gente que tu quieras."
       learn_about_host: "Aprende acerca de cómo hostear tu propio servidor Diaspora*."
-      login_here: "conectar aquí"
+      login_here: "Acceder aquí"
       ownership: "propiedad"
       ownership_explanation: "Eres dueño de tus imágenes, y no deberías tener que cederlas sólo para compartirlas. Tú mantienes la propiedad sobre todo lo que compartas en Diaspora*, dándote control total sobre lo que es distribuido."
       share_what_you_want: "Comparte lo que quieras, con quien quieras."
@@ -240,7 +240,7 @@ es:
       admin: "administrar"
       blog: "Blog"
       code: "Código"
-      login: "Conectarse"
+      login: "Acceder"
       logout: "salir"
       profile: "perfil"
       settings: "configuración"
@@ -265,21 +265,21 @@ es:
     also_commented: 
       few: "%{actors} también comentaron en la %{post_link} de %{post_author}."
       many: "%{actors} también comentaron en la %{post_link} de %{post_author}."
-      one: "%{actors} también comentó en la %{post_link} de %{post_author}."
+      one: "%{actors} también comentó la %{post_link} de %{post_author}."
       other: "%{actors} también comentaron en la %{post_link} de %{post_author}."
-      zero: "%{actors} también comentó en la %{post_link} de %{post_author}."
+      zero: "%{actors} también comentó la %{post_link} de %{post_author}."
     also_commented_deleted: 
       few: "%{actors} comentaron en una publicación eliminada."
       many: "%{actors} comentaron en una publicación eliminada."
-      one: "%{actors} comentó en una publicación eliminada."
+      one: "%{actors} comentó una publicación eliminada."
       other: "%{actors} comentaron en una publicación eliminada."
-      zero: "%{actors} comentó en una publicación eliminada."
+      zero: "%{actors} comentó una publicación eliminada."
     comment_on_post: 
       few: "%{actors} comentaron en tu %{post_link}."
       many: "%{actors} comentaron en tu %{post_link}."
-      one: "%{actors} comentó en tu %{post_link}."
+      one: "%{actors} comentó tu %{post_link}."
       other: "%{actors} comentaron en tu %{post_link}."
-      zero: "%{actors} comentó en tu %{post_link}."
+      zero: "%{actors} comentó tu %{post_link}."
     helper: 
       new_notifications: 
         few: "%{count} nuevas notificaciones"
@@ -411,7 +411,7 @@ es:
       mention: "Mencionar"
       message: "Mensaje"
       no_posts: "¡No hay publicaciones que mostrar!"
-      not_connected: "No estás conectado con esta persona."
+      not_connected: "No estás compartiendo con esta persona."
       recent_posts: "Últimas publicaciones"
       recent_public_posts: "Últimas publicaciones (al mundo)"
       return_to_aspects: "Volver a tu página de aspectos"
@@ -447,13 +447,13 @@ es:
     show: 
       collection_permalink: "enlace permanente a la colección"
       delete_photo: "Eliminar foto"
-      edit: "Editar"
+      edit: "editar"
       edit_delete_photo: "Editar pie de foto / eliminar foto"
       make_profile_photo: "convertir en foto de perfil"
       original_post: "Publicación original"
       permalink: "Enlace permanente"
       update_photo: "Actualizar foto"
-      view: "Ver"
+      view: "ver"
     update: 
       error: "Error editando la foto."
       notice: "Foto actualizada con éxito."
@@ -540,8 +540,9 @@ es:
       invite_your_friends_from: "Invita a tus amigos desde %{service}"
       not_connected: "no conectado"
     index: 
-      connect_to_facebook: "Conectar a Facebook"
-      connect_to_twitter: "Conectar a Twitter"
+      connect_to_facebook: "Conecta con Facebook"
+      connect_to_tumblr: "Conecta con Tumblr"
+      connect_to_twitter: "Conecta con Twitter"
       disconnect: "desconectar"
       edit_services: "Editar servicios"
       logged_in_as: "Conectado como"
@@ -578,7 +579,7 @@ es:
       new: "Nuevo %{type} de %{from}"
     public_explain: 
       logged_in: "Conectado a %{service}"
-      manage: "Servicios conectados"
+      manage: "Gestión de servicios conectados"
       outside: "Las publicaciones para \"el mundo\" podrán verse fuera de Diaspora*."
       title: "Configurar los servicios conectados"
     publisher: 
@@ -622,7 +623,7 @@ es:
       zero: "Tu mensaje de estado debe tener menos de %{count} caracteres"
   stream_helper: 
     hide_comments: "Ocultar comentarios"
-    show_comments: "Mostrar comentarios"
+    show_comments: "ver todos los comentarios"
   tags: 
     show: 
       nobody_talking: "Nadie esta hablando de %{tag} todavía."
@@ -631,8 +632,8 @@ es:
   the_world: "el mundo"
   tokens: 
     show: 
-      connect_to_cubbies: "Conectar a Cubbi.es"
-      connecting_is_simple: "Conectar tu cuenta de Diaspora es tan simple como llenar dos campos en tu pagina de usuario de Cubbi.es"
+      connect_to_cubbies: "Conecta con Cubbi.es"
+      connecting_is_simple: "Conectar con tu cuenta de Diaspora es tan simple como completar dos campos en tu página de Cubbi.es."
       daniels_account: "La cuenta de Diaspora de Daniel"
       generate_a_token: "Generar un token"
       love_to_try: "Nos encantaría que lo pruebes."
@@ -641,8 +642,8 @@ es:
       sign_up_today: "Regístrate hoy mismo!"
       typical_userpage: "Una típica pagina de usuario de cubbi.es"
       via: "(via %{link})"
-      were_working_hard: "Estamos trabajando duro en ofrecer una conectividad sencilla entre los pods de Diaspora y las aplicaciones. Mientras tanto, la conexión de su cuenta de diáspora con Cubbi.es significa copiar y pegar dos campos."
-      what_is_cubbies: "Cubbi.es es la primera aplicación de Diaspora en el mundo.  Es, también, la mejor forma de coleccionar fotos en linea."
+      were_working_hard: "Estamos trabajando intensamente para ofrecer una conectividad sencilla entre servidores y aplicaciones de Diaspora. Mientras tanto, conectar Diaspora* con Cubbi.es solo es copiar y pegar dos campos."
+      what_is_cubbies: "Cubbi.es es la primera aplicación de Diaspora en el mundo.  Es también la mejor forma de coleccionar fotos en linea."
       your_diaspora_handle: "Tu cuenta de Diaspora:"
       your_diaspora_token: "Tu token en Diaspora:"
   undo: "¿Deshacer?"
@@ -671,7 +672,7 @@ es:
       your_handle: "Tu dirección Diaspora*"
     getting_started: 
       connect_on_diaspora: "Conectar en Diaspora*"
-      connect_services: "Conectar con otros servicios"
+      connect_services: "Conecta tus otros servicios"
       could_not_find_anyone: "No se pudo encontrar a ningún amigo en Diaspora*. Use el buscador de amigos para invitarlos."
       edit_profile: "Edita tu perfil"
       finished: "¡Terminado!"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 8f37e015fab41fb319062746ef87cff67d1569ed..693f552914cffaf2337ea7b3d66c6c7a51bf6868 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -540,8 +540,9 @@ eu:
       invite_your_friends_from: "Gonbidatu lagunak %{service}(e)tik"
       not_connected: "harremanik ez"
     index: 
-      connect_to_facebook: "Facebookekin lotu"
-      connect_to_twitter: "Twitterekin lotu"
+      connect_to_facebook: "Facebookera lotu"
+      connect_to_tumblr: "Tumblrera lotu"
+      connect_to_twitter: "Twitterera lotu"
       disconnect: "irten"
       edit_services: "Aldatu zerbitzuak"
       logged_in_as: "Lotuta duzun kontua honakoa da:"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index e8e0adcee46561cea524cf0427dbb252d6f18e4c..45eccc215fe3ac009cd0701157009cbd45053876 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -541,6 +541,7 @@ fi:
       not_connected: "ei yhdistetty"
     index: 
       connect_to_facebook: "Yhdistä palveluun facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Yhdistä palveluun twitter"
       disconnect: "katkaise"
       edit_services: "Muokkaa palveluita"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index bdc8415cbb382277ebaa919a793a8b42ea2a1eb4..1e581a632cf8436bb87e1120ec126ad558e4193b 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -541,6 +541,7 @@ fr:
       not_connected: "non connecté"
     index: 
       connect_to_facebook: "Connecter à facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Connecter à twitter"
       disconnect: "déconnecter"
       edit_services: "Modifier les services"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 601b377c6bb24e8ec23a469773da30e9d4fa4cb0..1734e0d3716fe2e6fe5fbb8ce1f72a6ad94a4e0d 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -541,6 +541,7 @@ ga:
       not_connected: "not connected"
     index: 
       connect_to_facebook: "Nasc le facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Nasc let twitter"
       disconnect: "disconnect"
       edit_services: "Athraigh seirbhísí"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 346e2e6dc12019c0d1ed6abab980bec78ee03574..0c843e034bdd0ea8c1651ec455dce1670a09d90e 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -541,6 +541,7 @@ he:
       not_connected: "לא מחובר"
     index: 
       connect_to_facebook: "התחברות לפייסבוק"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "התחברות לטוויטר"
       disconnect: "ניתוק"
       edit_services: "עריכת שירותים"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 9ba6b6c644c6de29d14265517dbdd9b32dbaf317..a644353115bca489b52de36559098b2a91e4494d 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -541,6 +541,7 @@ hu:
       not_connected: "nem kapcsolódik"
     index: 
       connect_to_facebook: "Csatlakozás facebook-hoz"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Csatlakozás twitter-hez"
       disconnect: "Megszakít"
       edit_services: "Szolgáltatások szerkesztése"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 3be75816af8ac401f77fe08e81b4cb8edda4dd4f..f0d03dd50709e4682c7805c8c684a3b7014fa4a8 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -541,6 +541,7 @@ id:
       not_connected: "not connected"
     index: 
       connect_to_facebook: "Connect to facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Connect to twitter"
       disconnect: "disconnect"
       edit_services: "Edit services"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index af3e5ee81dd1c52490de0dc6666ddb6fcc2794d8..300936bf0fc8820cdc466b4c77127facc8e30a28 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -541,6 +541,7 @@ is:
       not_connected: "ekki tengt"
     index: 
       connect_to_facebook: "Tengja við facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Tengja við twitter"
       disconnect: "aftengja"
       edit_services: "Breyta þjónustum"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 7883779c6c815b21cc604eabf1feaa3a3f75737b..b803beed328c2d4c68217ee1fea6e33833911da1 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -90,9 +90,9 @@ it:
       remove: "rimuovi"
     index: 
       cubbies: 
-        explanation: "Cubbi.es is the first Diaspora application under development."
-        heading: "Connect to Cubbi.es"
-        learn_more: "Learn more"
+        explanation: "Cubbi.es è la prima applicazione in sviluppo per Diaspora."
+        heading: "Connettiti a Cubbi.es"
+        learn_more: "Per saperne di più"
       handle_explanation: "Questo è il tuo contatto Diaspora. Lo puoi dare alle persone per farti trovare, come un indirizzo email."
       no_contacts: "Nessun contatto"
       people_sharing_with_you: "Persone in condivisione con te"
@@ -129,7 +129,7 @@ it:
   bookmarklet: 
     explanation: "Condividi su Diaspora da ovunque aggiungendo come segnalibro %{link}."
     explanation_link_text: "questo link"
-    heading: "Diaspora Bookmarklet"
+    heading: "Bookmarklet di Diaspora"
     post_something: "Pubblica qualcosa su Diaspora"
     post_success: "Inviato! Sta per chiudersi!"
   cancel: "Annulla"
@@ -150,7 +150,7 @@ it:
     one: "1 contatto"
     other: "%{count} contatti"
     sharing: 
-      people_sharing: "Persone in condivisione con te:"
+      people_sharing: "Persone che condividono con te:"
     zero: "nessun contatto"
   conversations: 
     create: 
@@ -310,8 +310,8 @@ it:
       other: "A %{actors} piaceva il messaggio che hai eliminato."
       zero: "A %{actors} piaceva il messaggio che hai eliminato."
     mentioned: 
-      few: "%{actors} ti ha menzionato in un %{post_link}."
-      many: "%{actors} ti ha menzionato in un %{post_link}."
+      few: "%{actors} ti hanno menzionato in un %{post_link}."
+      many: "%{actors} ti hanno menzionato in un %{post_link}."
       one: "%{actors} ti ha menzionato in un %{post_link}."
       other: "%{actors} ti ha menzionato in un %{post_link}."
       zero: "%{actors} ti ha menzionato in un %{post_link}."
@@ -347,7 +347,7 @@ it:
     hello: "Ciao %{name}!"
     liked: 
       liked: "%{name} ha appena apprezzato il tuo post: "
-      sign_in: "Accedi per vedere l'elemento"
+      sign_in: "Per vedere è necessario accedere"
       subject: "%{name} ha appena apprezzato il tuo post"
     love: "pace e bene,"
     manage_your_email_settings: "gestisci le tue impostazioni email"
@@ -541,6 +541,7 @@ it:
       not_connected: "non connesso"
     index: 
       connect_to_facebook: "Connettiti a facebook"
+      connect_to_tumblr: "Connettiti a Tumblr"
       connect_to_twitter: "Connettiti a twitter"
       disconnect: "disconnetti"
       edit_services: "Modifica servizi"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index ef509d89951ed8f4ee118c12a6109e8dcf5b6c17..091c293391209f8d872c761e193b9fd8f7d3a2c8 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -541,6 +541,7 @@ ja:
       not_connected: "未接続"
     index: 
       connect_to_facebook: "Facebookに接続する"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "ツイッターに接続する"
       disconnect: "切断"
       edit_services: "サービスを編集する"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index a929bbf3d917b52e3c8fe9ca0c7280e4cf4e0bad..f42257ca281a9b843241f06dea3470890096a19c 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -541,6 +541,7 @@ ko:
       not_connected: "연결 없음"
     index: 
       connect_to_facebook: "페이스북에 연결"
+      connect_to_tumblr: "Tumblr에 연결하기"
       connect_to_twitter: "트위터에 연결"
       disconnect: "끊기"
       edit_services: "서비스 설정"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index aa9f1cf2fa4e2b354f77b8d65ebe7d591732b62e..884c080d69ac3f48f6a311df5a4ce002382586d8 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -541,6 +541,7 @@ lt:
       not_connected: "not connected"
     index: 
       connect_to_facebook: "Prijungti facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Prijungti twitter"
       disconnect: "atjungti"
       edit_services: "Edit services"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index a8f1478cec05b113252d6a6fc91a0776f0d0fef8..a647bb7e9262d7c696b136ae64afeac9e0167eb1 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -541,6 +541,7 @@ mk:
       not_connected: "not connected"
     index: 
       connect_to_facebook: "Конектирај се со facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Конектирај се со twitter"
       disconnect: "прекини"
       edit_services: "Edit services"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index fae775ed5e53188e5b370b757ecc9925ed527f08..54d1c26f8dd7d18a58c48a342af4cb24ceecd12b 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -541,6 +541,7 @@ nb:
       not_connected: "ikke tilkoblet"
     index: 
       connect_to_facebook: "Koble til facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Koble til twitter"
       disconnect: "koble fra"
       edit_services: "Rediger tjenester"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index b3ae3ffa83b26e22ad86bd9d3ee83e4fa63187b5..5f5438ee70e76b42a47105433ca1e5f4be416319 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -541,6 +541,7 @@ nl:
       not_connected: "niet verbonden"
     index: 
       connect_to_facebook: "Verbind met Facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Verbind met Twitter"
       disconnect: "koppel los"
       edit_services: "Bewerk services"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 356f6eea268a0baa36d1ef1ba8c37e12230e5b41..a6a773383804a63e287ed01d307e53bb9fb7d416 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -541,6 +541,7 @@ pa:
       not_connected: "not connected"
     index: 
       connect_to_facebook: "ਫੇਸਬੁੱਕ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "ਟਵਿੱਟਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰੋ"
       disconnect: "ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਕਰੋ"
       edit_services: "ਸਰਵਿਸ ਸੋਧ"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 1cecb31ee157ffc026b206c4447a4e8044dad2c7..21f8fb7825596125a08c75d71b11c93bb85a4c08 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -541,6 +541,7 @@ pl:
       not_connected: "nie połączono"
     index: 
       connect_to_facebook: "Połącz z Facebookiem"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Połącz z Twitterem"
       disconnect: "rozłącz"
       edit_services: "Edytuj usługi"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 780df4f8876e8892da664312852e60ffdb05db51..ee438f3506dc2c8d81d96b675fc43b6cd78a9f95 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -541,6 +541,7 @@ pt-BR:
       not_connected: "desconectado"
     index: 
       connect_to_facebook: "Conectar com o Facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Conectar com o Twitter"
       disconnect: "desvincular"
       edit_services: "Editar serviços"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 203d4bc7c4b6bec6116fefbc9f28084c39fa0772..cc029f7ae9c9f95369ffaf9e4642f6fff796d170 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -541,6 +541,7 @@ pt-PT:
       not_connected: "desligado"
     index: 
       connect_to_facebook: "Ligar ao Facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Ligar ao Twitter"
       disconnect: "desligar"
       edit_services: "Editar serviços"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 8fda96d5bbf8e5e5e1629748925564289f8b297e..9ccdab36d505b2484d4856a2cfef33f7caf5ace3 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -541,6 +541,7 @@ ro:
       not_connected: "nu este conectat"
     index: 
       connect_to_facebook: "Conectează cu Facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Conectează cu Twitter"
       disconnect: "desconectează"
       edit_services: "Edit services"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 7011678cde5dc3a250c26ba24173bbe43b13ecce..cb4bfff030fdac7e64e41b3f74bd925a9b99b8d4 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -541,6 +541,7 @@ ru:
       not_connected: "не соединён"
     index: 
       connect_to_facebook: "Подключение к Facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Подключение к Twitter"
       disconnect: "разъединить"
       edit_services: "Редактировать сервисы"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 2ca9db0e8246f1a5a4230f6b97b789a95b84e232..c258efb3bae8da3d4c9ca33ef91df3ed5ead2814 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -541,6 +541,7 @@ sk:
       not_connected: "nepripojený"
     index: 
       connect_to_facebook: "Pripojiť k Facebooku"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Pripojiť k Twitteru"
       disconnect: "odpojiť"
       edit_services: "Upraviť služby"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index c3ee6bd4b5383daab243ca86249b0104af5de1fc..fca463fe963ae7df4a674b533c8d83dafc27bdb0 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -541,6 +541,7 @@ sl:
       not_connected: "ni povezano"
     index: 
       connect_to_facebook: "Poveži se s facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Poveži se s twitter"
       disconnect: "povezava prekinjena"
       edit_services: "Uredi servise"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 35350a0cda0afeb8e4bd86afea7267cb6dae86b6..deff0bde01480a936feb2e422fb46edd90448f40 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -541,6 +541,7 @@ sv:
       not_connected: "inte ansluten"
     index: 
       connect_to_facebook: "Anslut till facebook"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "Anslut till twitter"
       disconnect: "koppla från"
       edit_services: "Anslutna tjänster"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index bed8eb9b148ccf2668b4e2a9f9cd9722e5aaa8a0..55c8b3fd97e305932376f34fddbe746eed5e655c 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -541,6 +541,7 @@ tr:
       not_connected: "not connected"
     index: 
       connect_to_facebook: "facebook baÄŸlan"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "twitter baÄŸlan"
       disconnect: "çık"
       edit_services: "Edit services"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 65c7bc88210f45a1ff6ad343c470918396b575fa..8e90fbe4525fd9fd1c8633b2260e838baee68e6e 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -541,6 +541,7 @@ zh-CN:
       not_connected: "未连接"
     index: 
       connect_to_facebook: "与 facebook 连接"
+      connect_to_tumblr: "Connect to Tumblr"
       connect_to_twitter: "与 twitter 连接"
       disconnect: "断开连接"
       edit_services: "编辑服务"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 1db5492cb771c2b837eb805af33f311b7c0f5444..2e2f11d4712bdbe315cf62b7d2e825532aff730f 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -540,8 +540,9 @@ zh-TW:
       invite_your_friends_from: "邀請你在 %{service} 的朋友"
       not_connected: "未連結"
     index: 
-      connect_to_facebook: "與 facebook 連結"
-      connect_to_twitter: "與 twitter 連結"
+      connect_to_facebook: "與 Facebook 連結"
+      connect_to_tumblr: "與 Tumblr 連結"
+      connect_to_twitter: "與 Twitter 連結"
       disconnect: "切斷連結"
       edit_services: "編輯服務"
       logged_in_as: "登入為"
@@ -643,8 +644,8 @@ zh-TW:
       via: "(經由%{link})"
       were_working_hard: "我們正努力使 Diaspora pod 和應用程式能輕鬆連結. 在這段期間, 請用複製後貼上這兩個欄位來讓你的 Diaspora 帳號與 Cubbi.es 連結."
       what_is_cubbies: "Cubbi.es 是世界上第一個 Diaspora 應用程式. 它也是收集線上照片的最佳方式."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
+      your_diaspora_handle: "Diaspora handle:"
+      your_diaspora_token: "Diaspora token:"
   undo: "復原?"
   username: "用戶名稱"
   users: 
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 763fd5f666fa60fadb451666007584944c739f88..f2ed4beafaced8cd0af6ba9d059ea73259e65d46 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -14,17 +14,17 @@ es:
         other: "En {{count}} aspectos"
         zero: "Añadir al aspecto"
     comments: 
-      hide: "hide comments"
-      show: "show all comments"
+      hide: "ocultar comentarios"
+      show: "ver todos los comentarios"
     confirm_dialog: "¿Estás seguro?"
     failed_to_like: "Failed to like!"
-    failed_to_post_message: "Failed to post message!"
+    failed_to_post_message: "¡Fallo al publicar el mensaje!"
     infinite_scroll: 
       no_more: "No hay más publicaciones."
     publisher: 
       at_least_one_aspect: "Debes publicarlo en al menos un aspecto"
     search_for: "Buscar a {{name}}"
-    show_more: "show more"
+    show_more: "ver más"
     timeago: 
       day: "un día"
       days: "%d días"
diff --git a/config/locales/rails-i18n/ca.yml b/config/locales/rails-i18n/ca.yml
index 6c1b3950e41582c3b9e7a6c1ae7d1dc585b703c8..a11f68b96d812984694759df4649065348dc16c8 100644
--- a/config/locales/rails-i18n/ca.yml
+++ b/config/locales/rails-i18n/ca.yml
@@ -2,6 +2,46 @@
 # by Emili Parreño (emili@eparreno.com - www.eparreno.com)
 
 ca:
+  date:
+    formats:
+      # Use the strftime parameters for formats.
+      # When no format has been given, it uses default.
+      # You can provide other formats here if you like!
+      default: "%Y-%m-%d"
+      short: "%d de %b"
+      long: "%d de %B de %Y"
+
+    day_names: [Diumenge, Dilluns, Dimarts, Dimecres, Dijous, Divendres, Dissabte]
+    abbr_day_names: [Dg, Dl, Dm, Dc, Dj, Dv, Ds]
+
+    # Don't forget the nil at the beginning; there's no such thing as a 0th month
+    month_names: [~, Gener, Febrer, Març, Abril, Maig, Juny, Juliol, Agost, Setembre, Octubre, Novembre, Desembre]
+    abbr_month_names: [~, Gen, Feb, Mar, Abr, Mai, Jun, Jul, Ago, Set, Oct, Nov, Des]
+    # Used in date_select and datime_select.
+    order:
+      - :day
+      - :month
+      - :year
+
+  time:
+    formats:
+      default: "%A, %d de %B de %Y %H:%M:%S %z"
+      short: "%d de %b %H:%M"
+      long: "%d de %B de %Y %H:%M"
+    am: "am"
+    pm: "pm"
+
+# Used in array.to_sentence.
+  support:
+    array:
+      sentence_connector: "i"
+      words_connector: ", "
+      two_words_connector: " i "
+      last_word_connector: ", i "
+
+    select:
+      prompt: "Si us plau tria"
+
   number:
     # Used in number_with_delimiter()
     # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
@@ -12,6 +52,8 @@ ca:
       delimiter: "."
       # Number of decimals, behind the separator (1 with a precision of 2 gives: 1.00)
       precision: 3
+      significant: false
+      strip_insignificant_zeros: false
 
     # Used in number_to_currency()
     currency:
@@ -23,6 +65,8 @@ ca:
         separator: ","
         delimiter: "."
         precision: 2
+        significant: false
+        strip_insignificant_zeros: false
 
     # Used in number_to_percentage()
     percentage:
@@ -47,6 +91,8 @@ ca:
         # separator:
         delimiter: ""
         precision: 1
+        significant: true
+        strip_insignificant_zeros: true
       storage_units:
         # Storage units output formatting.
         # %u is the storage unit, %n is the number (default: 2 MB)
@@ -59,6 +105,15 @@ ca:
           mb: "MB"
           gb: "GB"
           tb: "TB"
+      decimal_units:
+        format: "%n %u"
+        units:
+          unit: ""
+          thousand: "Mil"
+          million: "Milió"
+          billion: "Bilió"
+          trillion: "Trilió"
+          quadrillion: "Quatrilió"
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
@@ -94,6 +149,52 @@ ca:
       over_x_years:
         one:  "més d'1 any"
         other: "més de %{count} anys"
+      almost_x_years:
+        one:   "casi 1 any"
+        other: "casi %{count} anys"
+    prompts:
+      year: "Any"
+      month: "Mes"
+      day: "Dia"
+      hour: "Hora"
+      minute: "Minut"
+      second: "Segun"
+
+  helpers:
+    select:
+      prompt: "Si us plau tria"
+
+    submit:
+      create: 'Crear %{model}'
+      update: 'Actualizar %{model}'
+      submit: 'Guardar %{model}'
+
+
+  errors:
+    format: "%{attribute} %{message}"
+
+    messages: &errors_messages
+      inclusion: "no està incluós a la llista"
+      exclusion: "està reservat"
+      invalid: "no és vàlid"
+      confirmation: "no coincideix"
+      accepted: "ha de ser acceptat"
+      empty: "no pot estar buit"
+      blank: "no pot estar en blanc"
+      too_long: "és massa llarg (%{count} caràcters màxim)"
+      too_short: "és massa curt (%{count} caràcters mínim)"
+      wrong_length: "no té la longitud correcte (%{count} caràcters exactament)"
+      not_a_number: "no és un número"
+      not_an_integer: "ha de ser un enter"
+      taken: "no està disponible"
+      not_a_number: "no és un número"
+      greater_than: "ha de ser més gran que %{count}"
+      greater_than_or_equal_to: "ha de ser més gran o igual a %{count}"
+      equal_to: "ha de ser igual a %{count}"
+      less_than: "ha de ser menor que %{count}"
+      less_than_or_equal_to: "ha de ser menor o igual a %{count}"
+      odd: "ha de ser imparell"
+      even: "ha de ser parell"
 
   activerecord:
     errors:
@@ -101,70 +202,12 @@ ca:
         header:
           one:   "No s'ha pogut desar aquest/a %{model} perquè hi ha 1 error"
           other:  "No s'ha pogut desar aquest/a %{model} perquè hi ha hagut %{count} errors"
-        # The variable :count is also available
         body: "Hi ha hagut problemes amb els següents camps:"
 
-      # The values :model, :attribute and :value are always available for interpolation
-      # The value :count is available when applicable. Can be used for pluralization.
       messages:
-        inclusion: "no està incluós a la llista"
-        exclusion: "està reservat"
-        invalid: "no és vàlid"
-        confirmation: "no coincideix"
-        accepted: "ha de ser acceptat"
-        empty: "no pot estar buit"
-        blank: "no pot estar en blanc"
-        too_long: "és massa llarg (%{count} caràcters màxim)"
-        too_short: "és massa curt (%{count} caràcters mínim)"
-        wrong_length: "no té la longitud correcte (%{count} caràcters exactament)"
-        taken: "no està disponible"
-        not_a_number: "no és un número"
-        greater_than: "ha de ser més gran que %{count}"
-        greater_than_or_equal_to: "ha de ser més gran o igual a %{count}"
-        equal_to: "ha de ser igual a %{count}"
-        less_than: "ha de ser menor que %{count}"
-        less_than_or_equal_to: "ha de ser menor o igual a %{count}"
-        odd: "ha de ser imparell"
-        even: "ha de ser parell"
-
-        # Append your own errors here or at the model/attributes scope.
-
-      models:
-        # Overrides default messages
-
-      attributes:
-        # Overrides model and default messages.
-
-  date:
-    formats:
-      # Use the strftime parameters for formats.
-      # When no format has been given, it uses default.
-      # You can provide other formats here if you like!
-      default: "%Y-%m-%d"
-      short: "%d de %b"
-      long: "%d de %B de %Y"
-
-    day_names: [diumenge, dilluns, dimarts, dimecres, dijous, divendres, dissabte]
-    abbr_day_names: [dg, dl, dm, dc, dj, dv, ds]
-
-    # Don't forget the nil at the beginning; there's no such thing as a 0th month
-    month_names: [~, gener, febrer, març, abril, maig, juny, juliol, agost, setembre, octubre, novembre, desembre]
-    abbr_month_names: [~, Gen, Feb, Mar, Abr, Mai, Jun, Jul, Ago, Set, Oct, Nov, Des]
-    # Used in date_select and datime_select.
-    order:
-      - :day
-      - :month
-      - :year
-
-  time:
-    formats:
-      default: "%A, %d de %B de %Y %H:%M:%S %z"
-      short: "%d de %b %H:%M"
-      long: "%d de %B de %Y %H:%M"
-    am: "am"
-    pm: "pm"
+        taken: "ja està fet servir"
+        record_invalid: "La validació ha fallat: %{errors}"
+        <<: *errors_messages
 
-# Used in array.to_sentence.
-  support:
-    array:
-      sentence_connector: "i"
+      full_messages:
+        format: "%{attribute} %{message}"
\ No newline at end of file
diff --git a/config/locales/rails-i18n/es-AR.yml b/config/locales/rails-i18n/es-AR.yml
index 2fe807c103f28e082464d97c151cbdf76425a0ed..63457b363398aa64c011960ac3933682ce7e0659 100644
--- a/config/locales/rails-i18n/es-AR.yml
+++ b/config/locales/rails-i18n/es-AR.yml
@@ -1,3 +1,5 @@
+# Corrected by Eloy Serra Labán: http://goo.gl/i9Kts, /nQ928, /XfKaX
+
 es-AR:
   number:
     percentage:
@@ -38,11 +40,11 @@ es-AR:
         format: "%n %u"
         units:
           unit: ""
-          thousand: "Mil"
-          million: "Millón"
-          billion: "Mil Millones"
-          trillion: "Billón"
-          quadrillion: "Mil Billones"
+          thousand: "mil"
+          million: "millón"
+          billion: "mil millones"
+          trillion: "billón"
+          quadrillion: "mil billones"
     precision:
       format:
         delimiter: ","
@@ -52,10 +54,10 @@ es-AR:
       - :day
       - :month
       - :year
-    abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab]
-    abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic]
-    day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado]
-    month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre]
+    abbr_day_names: [dom, lun, mar, mié, jue, vie, sáb]
+    abbr_month_names: [~, ene, feb, mar, abr, may, jun, jul, ago, sep, oct, nov, dic]
+    day_names: [domingo, lunes, martes, miércoles, jueves, viernes, sábado]
+    month_names: [~, enero, febrero, marzo, abril, mayo, junio, julio, agosto, septiembre, octubre, noviembre, diciembre]
     formats:
       short: "%d de %b"
       default: "%d/%m/%Y"
diff --git a/config/locales/rails-i18n/es-CL.yml b/config/locales/rails-i18n/es-CL.yml
index 1cfc207bcc2eb313dbd80a785427463277f1f7b6..8f9d4fd4f3da5a26bc3e8e55ab95e884533633c4 100644
--- a/config/locales/rails-i18n/es-CL.yml
+++ b/config/locales/rails-i18n/es-CL.yml
@@ -1,6 +1,7 @@
 # Spanish translations for Rails as spoken in Chile
 # Based in the original Spanish translation by Francisco Fernando García Nieto
 # and Tsutomu Kuroda
+# Corrected by Eloy Serra Labán: http://goo.gl/i9Kts, /nQ928, /XfKaX
 
 es-CL:
   date:
@@ -9,11 +10,11 @@ es-CL:
       short: "%d de %b"
       long: "%A %d de %B de %Y"
 
-    day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado]
-    abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab]
+    day_names: [domingo, lunes, martes, miércoles, jueves, viernes, sábado]
+    abbr_day_names: [dom, lun, mar, mié, jue, vie, sáb]
 
-    month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre]
-    abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic]
+    month_names: [~, enero, febrero, marzo, abril, mayo, junio, julio, agosto, septiembre, octubre, noviembre, diciembre]
+    abbr_month_names: [~, ene, feb, mar, abr, may, jun, jul, ago, sep, oct, nov, dic]
     order:
       - :day
       - :month
@@ -82,11 +83,11 @@ es-CL:
         format: "%n %u"
         units:
           unit: ""
-          thousand: "Mil"
-          million: "Millón"
-          billion: "Mil millones"
-          trillion: "Trillón"
-          quadrillion: "Cuatrillón"
+          thousand: "mil"
+          million: "millón"
+          billion: "mil millones"
+          trillion: "billón"
+          quadrillion: "mil billones"
 
   datetime:
     distance_in_words:
diff --git a/config/locales/rails-i18n/es-CO.yml b/config/locales/rails-i18n/es-CO.yml
index 950a12b29e47ded6f9307d6ea87533adcd678825..bb4dfc3d6a8d7607462faac852bc190cfd24af92 100644
--- a/config/locales/rails-i18n/es-CO.yml
+++ b/config/locales/rails-i18n/es-CO.yml
@@ -1,4 +1,5 @@
 # Spanish as spoken in Colombia (es-CO) translations for Rails
+# Corrected by Eloy Serra Labán: http://goo.gl/i9Kts, /nQ928, /XfKaX
 
 es-CO:
   number:
@@ -40,11 +41,11 @@ es-CO:
         format: "%n %u"
         units:
           unit: ""
-          thousand: "Mil"
-          million: "Millón"
-          billion: "Billón"
-          trillion: "Trillón"
-          quadrillion: "Cuatrillón"
+          thousand: "mil"
+          million: "millón"
+          billion: "mil millones"
+          trillion: "billón"
+          quadrillion: "mil billones"
     precision:
       format:
         delimiter: ","
@@ -54,10 +55,10 @@ es-CO:
       - :day
       - :month
       - :year
-    abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab]
-    abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic]
-    day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado]
-    month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre]
+    abbr_day_names: [dom, lun, mar, mié, jue, vie, sáb]
+    abbr_month_names: [~, ene, feb, mar, abr, may, jun, jul, ago, sep, oct, nov, dic]
+    day_names: [domingo, lunes, martes, miércoles, jueves, viernes, sábado]
+    month_names: [~, enero, febrero, marzo, abril, mayo, junio, julio, agosto, septiembre, octubre, noviembre, diciembre]
     formats:
       short: "%d de %b"
       default: "%d/%m/%Y"
diff --git a/config/locales/rails-i18n/es-MX.yml b/config/locales/rails-i18n/es-MX.yml
index 3f6d35de66f83c407192630f5c62a348f7e3727e..955bd7072505ea45be12867fe3315fd888bf0b66 100644
--- a/config/locales/rails-i18n/es-MX.yml
+++ b/config/locales/rails-i18n/es-MX.yml
@@ -6,6 +6,7 @@
 # by Daniel Roux ( daniel.roux@gmail.com)
 # Added missing translations for Rails 2 and 3
 # by Carlos González ( carlosdavid.gonzalez@gmail.com)
+# Corrected by Eloy Serra Labán: http://goo.gl/i9Kts, /nQ928, /XfKaX
 
 es-MX:
   number:
@@ -47,11 +48,11 @@ es-MX:
         format: "%n %u"
         units:
           unit: ""
-          thousand: "Mil"
-          million: "Millón"
-          billion: "Mil millones"
-          trillion: "Trillón"
-          quadrillion: "Cuatrillón"
+          thousand: "mil"
+          million: "millón"
+          billion: "mil millones"
+          trillion: "billón"
+          quadrillion: "mil billones"
     precision:
       format:
         delimiter: ","
@@ -61,10 +62,10 @@ es-MX:
       - :day
       - :month
       - :year
-    abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab]
-    abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic]
-    day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado]
-    month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre]
+    abbr_day_names: [dom, lun, mar, mié, jue, vie, sáb]
+    abbr_month_names: [~, ene, feb, mar, abr, may, jun, jul, ago, sep, oct, nov, dic]
+    day_names: [domingo, lunes, martes, miércoles, jueves, viernes, sábado]
+    month_names: [~, enero, febrero, marzo, abril, mayo, junio, julio, agosto, septiembre, octubre, noviembre, diciembre]
     formats:
       short: "%d de %b"
       default: "%d/%m/%Y"
diff --git a/config/locales/rails-i18n/es-PE.yml b/config/locales/rails-i18n/es-PE.yml
index 64ca7466dc92620a492060151858e9bff3a3a373..7dec57ea1f188da5d36b78d86a8da3300cd2bf76 100644
--- a/config/locales/rails-i18n/es-PE.yml
+++ b/config/locales/rails-i18n/es-PE.yml
@@ -1,6 +1,7 @@
 # Spanish as spoken in Perú (es-PE) translations for Rails
 # by Peter Baker (pcbaker@gmail.com)
 # modificado por CCP
+# Corrected by Eloy Serra Labán: http://goo.gl/i9Kts, /nQ928, /XfKaX
 
 es-PE:
   number:
@@ -28,10 +29,10 @@ es-PE:
       - :day
       - :month
       - :year
-    abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab]
-    abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic]
-    day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado]
-    month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre]
+    abbr_day_names: [dom, lun, mar, mié, jue, vie, sáb]
+    abbr_month_names: [~, ene, feb, mar, abr, may, jun, jul, ago, sep, oct, nov, dic]
+    day_names: [domingo, lunes, martes, miércoles, jueves, viernes, sábado]
+    month_names: [~, enero, febrero, marzo, abril, mayo, junio, julio, agosto, septiembre, octubre, noviembre, diciembre]
     formats:
       month_and_year: "%B %Y"
       date_and_day: "%A %d"
diff --git a/config/locales/rails-i18n/es.yml b/config/locales/rails-i18n/es.yml
index 970975d90f5119f2f1d4792b4cc8680ebf82b546..51ef0db695cfc3fcc31591f40af4e0ec7a2498ad 100644
--- a/config/locales/rails-i18n/es.yml
+++ b/config/locales/rails-i18n/es.yml
@@ -2,6 +2,7 @@
 # by Francisco Fernando García Nieto (ffgarcianieto@gmail.com)
 # contributors:
 #  - Tsutomu Kuroda - http://github.com/kuroda (t-kuroda@oiax.jp)
+# Corrected by Eloy Serra Labán: http://goo.gl/i9Kts, /nQ928, /XfKaX
 
 "es":
   date:
@@ -10,11 +11,11 @@
       short: "%d de %b"
       long: "%d de %B de %Y"
 
-    day_names: [Domingo, Lunes, Martes, Miércoles, Jueves, Viernes, Sábado]
-    abbr_day_names: [Dom, Lun, Mar, Mie, Jue, Vie, Sab]
+    day_names: [domingo, lunes, martes, miércoles, jueves, viernes, sábado]
+    abbr_day_names: [dom, lun, mar, mié, jue, vie, sáb]
 
-    month_names: [~, Enero, Febrero, Marzo, Abril, Mayo, Junio, Julio, Agosto, Septiembre, Octubre, Noviembre, Diciembre]
-    abbr_month_names: [~, Ene, Feb, Mar, Abr, May, Jun, Jul, Ago, Sep, Oct, Nov, Dic]
+    month_names: [~, enero, febrero, marzo, abril, mayo, junio, julio, agosto, septiembre, octubre, noviembre, diciembre]
+    abbr_month_names: [~, ene, feb, mar, abr, may, jun, jul, ago, sep, oct, nov, dic]
     order:
       - :day
       - :month
@@ -83,11 +84,11 @@
         format: "%n %u"
         units:
           unit: ""
-          thousand: "Mil"
-          million: "Millón"
-          billion: "Mil millones"
-          trillion: "Trillón"
-          quadrillion: "Cuatrillón"
+          thousand: "mil"
+          million: "millón"
+          billion: "mil millones"
+          trillion: "billón"
+          quadrillion: "mil billones"
 
   datetime:
     distance_in_words:
diff --git a/config/locales/rails-i18n/is.yml b/config/locales/rails-i18n/is.yml
index c49b4a10bb25109010054d5b9b4f7323765fb5e3..7e1960b5fa0f07061fcf1903a72e450dafc5c0ee 100644
--- a/config/locales/rails-i18n/is.yml
+++ b/config/locales/rails-i18n/is.yml
@@ -1,4 +1,5 @@
 # Icelandic, by Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+# Corrections by Ásgeir Bjarni Ingvarsson
 
 "is":
   date:
@@ -82,10 +83,18 @@
         units:
           unit: ""
           thousand: þúsund
-          million: milljón
-          billion: billjón
-          trillion: trilljón
-          quadrillion: grasilljón
+          million:
+            one: milljón
+            other: milljónir
+          billion:
+            one: milliarður
+            other: milliarðar
+          trillion:
+            one: billjón
+            other: billjónir
+          quadrillion:
+            one: billjarður
+            other: billjarðar
 
   datetime:
     distance_in_words:
@@ -129,7 +138,7 @@
       day:    "Dagur"
       hour:   "Klukkustund"
       minute: "Mínúta"
-      second: "Sekónda"
+      second: "Sekúnda"
 
   helpers:
     select: