diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 97e4e5a70..0798da3db 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -510,6 +510,8 @@ ar:
     reshare: 
       reshare: "Reshare"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 577577045..21c24e77f 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -226,8 +226,8 @@ cs:
       code: "kód"
       login: "přihlášení"
       logout: "odhlásit"
-      profile: "profile"
-      settings: "settings"
+      profile: "profil"
+      settings: "nastavení"
   more: "Více"
   next: "další"
   notifications: 
@@ -292,7 +292,7 @@ cs:
   people: 
     aspect_list: 
       edit_membership: "upravit člena aspektu"
-    few: "%{count} people"
+    few: "%{count} lidi"
     helper: 
       people_on_pod_are_aware_of: " lidé na podu jsou si vědomi"
       results_for: " výsledky pro %{params}"
@@ -301,9 +301,9 @@ cs:
       no_one_found: "... a nikdo nebyl nalezen."
       no_results: "Hej! Musíte něco hledat."
       results_for: "výsledky hledání pro"
-    many: "%{count} people"
-    one: "1 person"
-    other: "%{count} people"
+    many: "%{count} lidí"
+    one: "1 osoba"
+    other: "%{count} lidí"
     person: 
       add_contact: "přidat kontakt"
       already_connected: "Již připojen"
@@ -319,11 +319,11 @@ cs:
       remove_contact: "odstranit kontakt"
       remove_from: "Odstranit %{name} z %{aspect}?"
     show: 
-      add_some: "add some"
+      add_some: "přidat nějaké"
       does_not_exist: "Osoba neexistuje!"
-      edit: "edit"
+      edit: "upravit"
       incoming_request: "%{name} s vámi chce sdílet"
-      mention: "Mention"
+      mention: "Zmínka"
       message: "Zpráva"
       no_posts: "žádné zprávy k zobrazení!"
       not_connected: "Nesdílíte s touto osobou"
@@ -333,10 +333,10 @@ cs:
       similar_contacts: "podobné kontakty"
       start_sharing: "začít sdílet"
       to_accept_or_ignore: "přijmout nebo ignorovat."
-      you_have_no_tags: "you have no tags!"
+      you_have_no_tags: "nemáte žádné značky!"
     webfinger: 
       fail: "Omlouváme se, ale %{handle} nebyl nalezen."
-    zero: "no people"
+    zero: "žádní lidé"
   photos: 
     create: 
       integrity_error: "Nahrání fotky selhalo. Jste si jist, že to byl obrázek?"
@@ -373,10 +373,10 @@ cs:
       error: "Nepodařilo se upravit fotku."
       notice: "Fotka úspěšně aktualizována."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    doesnt_exist: "tento příspěvek neexistuje!"
     index: 
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
+      nobody_talking: "Nikdo dosud nemluví o %{tag}."
+      people_tagged_with: "Lidé označeni %{tag}"
       posts_tagged_with: "Příspěvky označené #%{tag}"
       whatup: "Co se děje na %{pod}"
   previous: "předchozí"
@@ -393,10 +393,10 @@ cs:
       your_gender: "Vaše pohlaví"
       your_name: "Vaše jméno"
       your_photo: "Vaše fotografie"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_private_profile: "Váš soukromý profil"
+      your_public_profile: "Váš veřejný profil"
+      your_tags: "Vy: v 5 #značkách"
+      your_tags_placeholder: "např. #diaspora #žehlení #koťata #hudba"
     update: 
       failed: "Nepodařilo se aktualizovat profil"
       updated: "Profil aktualizován"
@@ -503,19 +503,21 @@ cs:
       mention_helper_text: "pokud chcete někoho zmínit, stiskněte tlačítko '@' a začněte psát jeho jméno"
       post_a_message_to: "Poslat zprávu do %{aspect}"
       posting: "Odesílání..."
-      publishing_to: "publishing to: "
+      publishing_to: "publikování na:"
       share: "Sdělit"
       share_with: "sdílet s"
       whats_on_your_mind: "co máte na mysli?"
     reshare: 
       reshare: "Přesdílet"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Nepodařilo se smazat příspěvek"
     helper: 
       no_message_to_display: "Není k zobrazení žádná zpráva."
     new: 
-      mentioning: "Mentioning: %{person}"
+      mentioning: "Zmínka: %{person}"
     show: 
       destroy: "Smazat"
       permalink: "trvalý odkaz"
@@ -545,7 +547,7 @@ cs:
       request_acceptence: "...je vaše žádost o sdílení akceptována?"
       request_received: "...obdržíte novou žádost o sdílení?"
       your_email: "Váš email"
-      your_handle: "Váše identifikace na Diaspoře"
+      your_handle: "Vaše identifikace na Diaspoře"
     getting_started: 
       connect_on_diaspora: "Připojit na Diaspoře"
       connect_services: "Připojit vaše další služby"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 6ddce9bfb..5ee212c63 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -510,6 +510,8 @@ cy:
     reshare: 
       reshare: "Reshare"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 0c653ca26..fda65e0e0 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -510,6 +510,8 @@ da:
     reshare: 
       reshare: "Del igen"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Kunne ikke slette post."
     helper: 
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index d1dbebd3a..f3af87a3c 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -226,8 +226,8 @@ de:
       code: "Code"
       login: "Anmelden"
       logout: "Abmelden"
-      profile: "profile"
-      settings: "settings"
+      profile: "Profil"
+      settings: "Einstellungen"
   more: "Mehr"
   next: "Nächste"
   notifications: 
@@ -292,7 +292,7 @@ de:
   people: 
     aspect_list: 
       edit_membership: "bearbeite die Aspekt-Zugehörigkeit"
-    few: "%{count} people"
+    few: "%{count} Personen"
     helper: 
       people_on_pod_are_aware_of: "Leute auf dem Pod wissen von"
       results_for: "Ergebnisse für %{params}"
@@ -301,9 +301,9 @@ de:
       no_one_found: "… und niemand wurde gefunden."
       no_results: "Hey! Du musst nach etwas suchen."
       results_for: "Suchergebnisse für"
-    many: "%{count} people"
-    one: "1 person"
-    other: "%{count} people"
+    many: "%{count} Personen"
+    one: "Eine Person"
+    other: "%{count} Personen"
     person: 
       add_contact: "Kontakt hinzufügen"
       already_connected: "Bereits verbunden"
@@ -319,11 +319,11 @@ de:
       remove_contact: "Kontakt entfernen"
       remove_from: "%{name} aus %{aspect} entfernen?"
     show: 
-      add_some: "add some"
+      add_some: "Ein paar hinzufügen"
       does_not_exist: "Person existiert nicht!"
-      edit: "edit"
+      edit: "Bearbeiten"
       incoming_request: "Du hast eine eingehende Anfrage von dieser Person."
-      mention: "Mention"
+      mention: "Erwähnung"
       message: "Nachricht"
       no_posts: "Keine Beiträge zum Anzeigen!"
       not_connected: "Du teilst nicht mit dieser Person"
@@ -333,10 +333,10 @@ de:
       similar_contacts: "ähnliche Kontakte"
       start_sharing: "Fang an zu teilen!"
       to_accept_or_ignore: "um zu akzeptieren oder zu ignorieren."
-      you_have_no_tags: "you have no tags!"
+      you_have_no_tags: "Du hast keine Tags!"
     webfinger: 
       fail: "Entschuldigung, wir konnten %{handle} nicht finden."
-    zero: "no people"
+    zero: "Keine Personen"
   photos: 
     create: 
       integrity_error: "Hochladen des Fotos fehlgeschlagen. Bist du sicher, dass es eine Bilddatei war?"
@@ -373,10 +373,10 @@ de:
       error: "Bearbeiten des Fotos fehlgeschlagen."
       notice: "Foto erfolgreich aktualisiert."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    doesnt_exist: "Dieser Post existiert nicht!"
     index: 
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
+      nobody_talking: "Zurzeit spricht niemand über %{tag}."
+      people_tagged_with: "Personen getaggt mit %{tag}"
       posts_tagged_with: "Posts, die mit #%{tag} getaggt sind"
       whatup: "Was auf %{pod} passiert"
   previous: "Vorherige"
@@ -393,10 +393,10 @@ de:
       your_gender: "Dein Geschlecht"
       your_name: "Dein Name"
       your_photo: "Dein Profilbild"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_private_profile: "Dein privates Profil"
+      your_public_profile: "Dein öffentliches Profil"
+      your_tags: "Du: in fünf #Tags"
+      your_tags_placeholder: "Zum Beispiel: #Diaspora #bügeln #Kätzchen #Musik"
     update: 
       failed: "Fehler beim aktualisieren deines Profils"
       updated: "Profil aktualisiert"
@@ -478,7 +478,7 @@ de:
       your_diaspora_username_is: "Dein Diaspora* Nutzername ist: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Alle Kontakte"
-      cannot_remove: "Kontakt kann nicht aus dem letzten Aspekt entfernt werden. Wenn du nicht länger verbunden sein willst, lösche den Kontakt."
+      cannot_remove: "Kontakt kann nicht aus dem letzten Aspekt entfernt werden. (Wenn du nicht länger verbunden sein willst, lösche den Kontakt.)"
     invitations: 
       by_email: "per E-Mail"
       dont_have_now: "Du hast im Moment keine, aber es wird bald wieder neue Einladungen geben!"
@@ -503,19 +503,21 @@ de:
       mention_helper_text: "um jemanden zu erwähnen, drücke '@' und beginne den Namen zu schreiben"
       post_a_message_to: "Sende eine Nachricht an %{aspect}"
       posting: "Senden …"
-      publishing_to: "publishing to: "
+      publishing_to: "Veröffentlichen an: "
       share: "Teilen"
       share_with: "Teile mit"
       whats_on_your_mind: "Woran denkst du gerade?"
     reshare: 
       reshare: "Erneut senden an"
   status_messages: 
+    create: 
+      success: "Erfolgreich erwähnt: %{names}"
     destroy: 
       failure: "Post löschen fehlgeschlagen"
     helper: 
       no_message_to_display: "Keine Nachricht zum Anzeigen."
     new: 
-      mentioning: "Mentioning: %{person}"
+      mentioning: "Erwähnt: %{person}"
     show: 
       destroy: "Entfernen"
       permalink: "Permalink"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 29d0218cf..8054b47dd 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -510,6 +510,8 @@ el:
     reshare: 
       reshare: "Μοιράσου και πάλι"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Αποτυχία διαγραφής δημοσίευσης"
     helper: 
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 32a5de31c..a66b03578 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -510,6 +510,8 @@ en_shaw:
     reshare: 
       reshare: "𐑮𐑦𐑖𐑺"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "𐑓𐑱𐑤𐑛 𐑑 𐑛𐑦𐑤𐑰𐑑 𐑐𐑴𐑕𐑑"
     helper: 
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 059cdecb8..8a48d7903 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -510,6 +510,8 @@ eo:
     reshare: 
       reshare: "Reshare"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 0888d4f7c..1a44b3ca7 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -226,8 +226,8 @@ es-CL:
       code: "codigo"
       login: "entrar"
       logout: "salir"
-      profile: "profile"
-      settings: "settings"
+      profile: "perfil"
+      settings: "Configuración"
   more: "Más"
   next: "Siguiente"
   notifications: 
@@ -292,7 +292,7 @@ es-CL:
   people: 
     aspect_list: 
       edit_membership: "Editar el Aspecto donde está el contacto"
-    few: "%{count} people"
+    few: "%{count} personas"
     helper: 
       people_on_pod_are_aware_of: "la gente en el servidor son conscientes de"
       results_for: "resultados para %{params}"
@@ -301,9 +301,9 @@ es-CL:
       no_one_found: "...y nadie fue encontrado."
       no_results: "¡Oye! Tienes que buscar algo."
       results_for: "resultados de búsqueda para"
-    many: "%{count} people"
-    one: "1 person"
-    other: "%{count} people"
+    many: "%{count} personas"
+    one: "1 persona"
+    other: "%{count} personas"
     person: 
       add_contact: "agregar contacto"
       already_connected: "Ya conectado"
@@ -319,11 +319,11 @@ es-CL:
       remove_contact: "eliminar contacto"
       remove_from: "¿Eliminar a %{name} de %{aspect}?"
     show: 
-      add_some: "add some"
+      add_some: "agrega algunas"
       does_not_exist: "¡La persona no existe!"
-      edit: "edit"
+      edit: "editar"
       incoming_request: "Tienes una solicitud pendiente de %{name}"
-      mention: "Mention"
+      mention: "Mencionar"
       message: "Mensaje"
       no_posts: "¡no hay posteos para mostrar!"
       not_connected: "No estás conectado con esa persona"
@@ -333,10 +333,10 @@ es-CL:
       similar_contacts: "Contactos similares"
       start_sharing: "Empezar a compartir"
       to_accept_or_ignore: "aceptar o ignorar."
-      you_have_no_tags: "you have no tags!"
+      you_have_no_tags: "No tienes ninguna etiqueta!"
     webfinger: 
       fail: "Lo siento, no pudimos encontrar %{handle}."
-    zero: "no people"
+    zero: "ninguna persona"
   photos: 
     create: 
       integrity_error: "Error al subir la foto.  ¿Estás seguro que eso era una imagen?"
@@ -373,10 +373,10 @@ es-CL:
       error: "Error al editar foto."
       notice: "Foto actualizada correctamente."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    doesnt_exist: "Ese post no existe!"
     index: 
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
+      nobody_talking: "Nadie está hablando de %{tag} todavia."
+      people_tagged_with: "Personas etiquetadas con %{tag}"
       posts_tagged_with: "Posts etiquetado en #%{tag}"
       whatup: "Que esta pasando en %{pod}"
   previous: "Anterior"
@@ -393,10 +393,10 @@ es-CL:
       your_gender: "Tu genero"
       your_name: "Tu nombre"
       your_photo: "Tu foto"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_private_profile: "Tú perfil privado"
+      your_public_profile: "Tú perfil publico"
+      your_tags: "Tú: en 5 #etiquetas"
+      your_tags_placeholder: "p.ej. #diaspora #carrete #gatitos #musica"
     update: 
       failed: "Error al actualizar perfil"
       updated: "Perfil actualizado"
@@ -503,19 +503,21 @@ es-CL:
       mention_helper_text: "para mencionar a alguien, usa '@' antes de su nombre"
       post_a_message_to: "Postear un mensaje a %{aspect}"
       posting: "Posteando..."
-      publishing_to: "publishing to: "
+      publishing_to: "publicar en: "
       share: "Compartir"
       share_with: "Compartir con "
       whats_on_your_mind: "¿Que pasa por tu cabeza?"
     reshare: 
       reshare: "Compartir de nuevo"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Error al eliminar el post"
     helper: 
       no_message_to_display: "No hay mensaje que mostrar."
     new: 
-      mentioning: "Mentioning: %{person}"
+      mentioning: "Mencionar a: %{person}"
     show: 
       destroy: "Eliminar"
       permalink: "permalink"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 664ab0194..2035aa29e 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -226,14 +226,14 @@ es:
       code: "Código"
       login: "Conectarse"
       logout: "Desconectarse"
-      profile: "profile"
-      settings: "settings"
+      profile: "perfil"
+      settings: "Configuración"
   more: "Más"
   next: "Siguiente"
   notifications: 
     also_commented: "también ha comentado en la publicación de %{post_author}"
     also_commented_deleted: "comentó en una publicación eliminada"
-    comment_on_post: "escribió en tu"
+    comment_on_post: "comentó en tu"
     deleted: "eliminado"
     helper: 
       new_notifications: 
@@ -292,7 +292,7 @@ es:
   people: 
     aspect_list: 
       edit_membership: "editar el Aspecto donde está el contacto"
-    few: "%{count} people"
+    few: "%{count} personas"
     helper: 
       people_on_pod_are_aware_of: "La gente que está en POD son conscientes de"
       results_for: "Resultados para %{params}"
@@ -301,9 +301,9 @@ es:
       no_one_found: "...y nadie fue encontrado."
       no_results: "¡Eh! ¡Tienes que buscar algo!"
       results_for: "Resultados para"
-    many: "%{count} people"
-    one: "1 person"
-    other: "%{count} people"
+    many: "%{count} personas"
+    one: "1 persona"
+    other: "%{count} personas"
     person: 
       add_contact: "Añadir contacto"
       already_connected: "Ya está conectado"
@@ -319,11 +319,11 @@ es:
       remove_contact: "eliminar contacto"
       remove_from: "¿Eliminar a %{name} de %{aspect}?"
     show: 
-      add_some: "add some"
+      add_some: "agrega algunos"
       does_not_exist: "¡El usuario no existe!"
-      edit: "edit"
+      edit: "editar"
       incoming_request: "%{name} quisiera compartir contigo"
-      mention: "Mention"
+      mention: "Mencionar"
       message: "Mensaje"
       no_posts: "¡No hay publicaciones que mostrar!"
       not_connected: "No estás conectado con esta persona."
@@ -333,10 +333,10 @@ es:
       similar_contacts: "Contactos similares"
       start_sharing: "Empezar a compartir"
       to_accept_or_ignore: "Aceptar o ignorar"
-      you_have_no_tags: "you have no tags!"
+      you_have_no_tags: "No tienes etiquetas!"
     webfinger: 
       fail: "Perdona, no pudimos encontrar %{handle}"
-    zero: "no people"
+    zero: "sin personas"
   photos: 
     create: 
       integrity_error: "Subida de foto fallida. ¿Estás seguro de que era una imagen?"
@@ -373,10 +373,10 @@ es:
       error: "Falló la edición de la foto."
       notice: "Foto actualizada correctamente."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    doesnt_exist: "esa publicación no existe!"
     index: 
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
+      nobody_talking: "Todavía nadie esta hablando sobre %{tag}."
+      people_tagged_with: "Personas etiquetadas con %{tag}"
       posts_tagged_with: "La Publicación se ha etiquetado en #%{tag}"
       whatup: "Que esta pasando en %{pod}"
   previous: "Anterior"
@@ -393,10 +393,10 @@ es:
       your_gender: "Tu Género / Sexo"
       your_name: "Tu Nombre"
       your_photo: "Tu Foto"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_private_profile: "Tu perfil privado"
+      your_public_profile: "Tu perfil publico"
+      your_tags: "Tu: en 5 #etiquetas"
+      your_tags_placeholder: "p.ej. #diaspora #panqueque #gatitos #musica"
     update: 
       failed: "No se pudo actualizar el Perfil"
       updated: "Perfil actualizado"
@@ -503,19 +503,21 @@ es:
       mention_helper_text: "para nombrar a alguien, usa \"@\" justo antes"
       post_a_message_to: "Enviar un mensaje a %{aspect}"
       posting: "Publicando..."
-      publishing_to: "publishing to: "
+      publishing_to: "publicar en: "
       share: "Compartir"
       share_with: "compartir con"
       whats_on_your_mind: "¿Qué tal? ¡Qué pasa!"
     reshare: 
       reshare: "Publicar en..."
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Fallo elminando la publicación"
     helper: 
       no_message_to_display: "No hay mensajes que mostrar."
     new: 
-      mentioning: "Mentioning: %{person}"
+      mentioning: "Mencionar a: %{person}"
     show: 
       destroy: "Eliminar"
       permalink: "Enlace permanente"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index b5acaf773..618d783f6 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -167,7 +167,7 @@ eu:
   date: 
     formats: 
       birthday: "%B %d"
-      birthday_with_year: "%Y &B %d"
+      birthday_with_year: "%Y (e)ko &B ren %d an"
       fullmonth_day: "%B %d"
   delete: "Ezabatu"
   email: "E-posta"
@@ -226,14 +226,14 @@ eu:
       code: "kodea"
       login: "sartu"
       logout: "irten"
-      profile: "profile"
-      settings: "settings"
+      profile: "Profila"
+      settings: "Lehentasunak"
   more: "Gehiago"
   next: "hurrengoa"
   notifications: 
-    also_commented: "iruzkindua baita zure kontaktuaren"
+    also_commented: "(e)k iruzkindu du baita zure kontaktuaren"
     also_commented_deleted: "mezu ezabatu bat iruzkindu du"
-    comment_on_post: "iruzkindua zure"
+    comment_on_post: "(e)k iruzkindu du zure"
     deleted: "ezabatuta"
     helper: 
       new_notifications: 
@@ -249,7 +249,7 @@ eu:
       notifications: "Jakinarazpenak"
     mentioned: "aipatu zaituzte bere"
     new_request: "(e)k zurekin partekatu nahi du."
-    post: "berria"
+    post: "mezua"
     request_accepted: "zure partekatze eskaera onartu du."
   notifier: 
     also_commented: 
@@ -292,7 +292,7 @@ eu:
   people: 
     aspect_list: 
       edit_membership: "aldatu alderdiaren bazkidetza"
-    few: "%{count} people"
+    few: "%{count} pertsona"
     helper: 
       people_on_pod_are_aware_of: "zerbitzariko jendeak honen kontziente dira:"
       results_for: " %{params}(r)entzat emaitzak"
@@ -301,9 +301,9 @@ eu:
       no_one_found: "... ez da inor aurkitu."
       no_results: "Aizu! Zerbait bilatu behar duzu."
       results_for: "bilaketa emaitzak hontarako:"
-    many: "%{count} people"
-    one: "1 person"
-    other: "%{count} people"
+    many: "%{count} pertsona"
+    one: "pertsona 1"
+    other: "%{count} pertsona"
     person: 
       add_contact: "adiskidea gehitu"
       already_connected: "Dagoeneko harremanetan"
@@ -319,24 +319,24 @@ eu:
       remove_contact: "adiskidea ezabatu"
       remove_from: "%{name} ezabatu %{aspect} alderditik?"
     show: 
-      add_some: "add some"
+      add_some: "gehitu batzuk"
       does_not_exist: "Pertsona hau ez dago!"
-      edit: "edit"
+      edit: "aldatu"
       incoming_request: "%{name}(e)k zure adiskidea izan nahi du"
-      mention: "Mention"
+      mention: "Aipatu"
       message: "Mezu pribatua bidali"
       no_posts: "erakusteko sarrerarik ez dago!"
-      not_connected: "Ez zaude partekatzen %{name}(r)ekin"
+      not_connected: "Ez zaude partekatzen pertsona honekin"
       recent_posts: "Mezu Berrienak"
       recent_public_posts: "Azken berri publikoak"
       return_to_aspects: "Zure alderdi orrialdera itzuli"
       similar_contacts: "antzeko adiskideak"
       start_sharing: "harremanetan hasi"
       to_accept_or_ignore: "onartu edo utzi."
-      you_have_no_tags: "you have no tags!"
+      you_have_no_tags: "ez duzu etiketarik!"
     webfinger: 
       fail: "%{handle} ezin izan dugu aurkitu."
-    zero: "no people"
+    zero: "jenderik ez"
   photos: 
     create: 
       integrity_error: "Argazki igoerak huts egin du. Ziur al zaude irudi bat zela?"
@@ -373,10 +373,10 @@ eu:
       error: "Huts argazkia aldatzean."
       notice: "Argazkia arrakastaz eguneratua."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    doesnt_exist: "mezu hori ez dago!"
     index: 
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
+      nobody_talking: "Inork ez du hitzegin %{tag}(r)i buruz oraindik."
+      people_tagged_with: "%{tag} etiketadun jendea"
       posts_tagged_with: "#%{tag}(r)ekin etiketatutako mezuak"
       whatup: "Zer berri %{pod}(e)n"
   previous: "aurrekoa"
@@ -393,10 +393,10 @@ eu:
       your_gender: "Zure sexua"
       your_name: "Zure izena"
       your_photo: "Zure argazkia"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_private_profile: "Zure profil pribatua"
+      your_public_profile: "Zure profil publikoa"
+      your_tags: "Zu: 5 #etiketetan"
+      your_tags_placeholder: "adib. #diaspora #lisatu #katakumeak #musika"
     update: 
       failed: "Huts profila eguneratzean"
       updated: "Profila eguneratu duzu."
@@ -460,7 +460,7 @@ eu:
       connect_to_twitter: "Twitterekin lotu"
       disconnect: "irten"
       edit_services: "Aldatu zerbitzuak"
-      logged_in_as: "zu zara:"
+      logged_in_as: "Lotuta duzun kontua honakoa da:"
       really_disconnect: "irten %{service}(e)tik?"
     inviter: 
       click_link_to_accept_invitation: "Jarraitu esteka hau zure gonbidapena onartzeko"
@@ -500,22 +500,24 @@ eu:
       all: "guztiak"
       all_contacts: "adiskide guztiak"
       make_public: "publikoa egin"
-      mention_helper_text: "norbait aipatzeko, idatzi '@' eta hasi adiskidearen izena idazten"
+      mention_helper_text: "norbait aipatzeko, sakatu '@' eta hasi adiskidearen izena idazten"
       post_a_message_to: "%{aspect}(e)n mezu bat partekatu"
       posting: "Partekatzen..."
-      publishing_to: "publishing to: "
+      publishing_to: "hemen partekatzen:"
       share: "Partekatu"
       share_with: "honekin partekatu:"
       whats_on_your_mind: "zer berri?"
     reshare: 
       reshare: "Berriz partekatu"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Akatsa mezua ezabatzean"
     helper: 
       no_message_to_display: "Erakusteko mezurik ez."
     new: 
-      mentioning: "Mentioning: %{person}"
+      mentioning: "Aipatzen: %{person}"
     show: 
       destroy: "Suntsitu"
       permalink: "permalink"
@@ -541,7 +543,7 @@ eu:
       mentioned: "...mezu batean aipatzen zaituztenean?"
       new_password: "Pasahitz Berria"
       private_message: "...mezu pribatu bat jasotzen duzunean?"
-      receive_email_notifications: "E-posta jakinarazpenak jaso nahi dituzu?"
+      receive_email_notifications: "E-posta jakinarazpenak jaso nahi dituzu..."
       request_acceptence: "...zure partekatze eskaerak onartuak izan direnean?"
       request_received: "...partekatze eskaera berriak dituzunean?"
       your_email: "Zure e-posta"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 554b37344..89f04ef1f 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -510,6 +510,8 @@ fi:
     reshare: 
       reshare: "Jaa uudelleen"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Viestin poisto epäonnistui"
     helper: 
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 156b8e636..5a3cb686e 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -510,6 +510,8 @@ fr:
     reshare: 
       reshare: "Repartager"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Impossible de supprimer le message"
     helper: 
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index c65d92a8e..80745ea00 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -510,6 +510,8 @@ ga:
     reshare: 
       reshare: "Roinn arís"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/gl.yml b/config/locales/diaspora/gl.yml
index 82bf8eb48..26161539d 100644
--- a/config/locales/diaspora/gl.yml
+++ b/config/locales/diaspora/gl.yml
@@ -510,6 +510,8 @@ gl:
     reshare: 
       reshare: "Recompartir "
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Fallo ao borrar publicación"
     helper: 
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index e4c7b6beb..1b206e9d3 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -510,6 +510,8 @@ he:
     reshare: 
       reshare: "שיתוף מחדש"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "אירע כשל במחיקת הרשומה"
     helper: 
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 1cb62729a..f534d3f28 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -66,15 +66,15 @@ hu:
       success: "%{name} csoport sikeresen törölve."
     edit: 
       add_existing: "Létező kapcsolat hozzáadása"
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
+      aspect_list_is_not_visible: "csoportlista rejtett a csoporttagok számára"
+      aspect_list_is_visible: "csoportlista látható a csoporttagok számára"
       confirm_remove_aspect: "Biztos, hogy törölni akarod a csoportot?"
-      done: "Done"
-      make_aspect_list_visible: "a csoporttagok láthassák egymást"
+      done: "Kész"
+      make_aspect_list_visible: "csoporttagok láthassák egymást?"
       remove_aspect: "Csoport törlése"
       rename: "átnevezés"
-      update: "update"
-    few: "%{count} aspects"
+      update: "frissítés"
+    few: "%{count} csoport"
     helper: 
       are_you_sure: "Biztos, hogy törlöd a csoportot?"
       aspect_not_empty: "A csoport nem üres"
@@ -89,7 +89,7 @@ hu:
       manage_aspects: "Csoportok kezelése"
       no_requests: "Nincs új felkérés"
       requests: "Felkérések"
-    many: "%{count} aspects"
+    many: "%{count} csoport"
     move_contact: 
       error: "Hiba a kapcsolat mozgatásakor: %{inspect}"
       failure: "nem működött: %{inspect}"
@@ -105,8 +105,8 @@ hu:
       nobody_in_aspect: "A '%{aspect_name}' csoportod üres."
     no_posts_message: 
       start_talking: "Mindenki hallgat. Kezd el te a beszélgetést."
-    one: "1 aspect"
-    other: "%{count} aspects"
+    one: "1 csoport"
+    other: "%{count} csoport"
     seed: 
       family: "Család"
       work: "Munka"
@@ -115,18 +115,18 @@ hu:
     update: 
       failure: "A %{name} nevű csoportodnak túl hosszú a neve."
       success: "%{name} csoport szerkesztve."
-    zero: "no aspects"
+    zero: "nincs csoport"
   back: "Vissza"
   cancel: "Mégsem"
   comments: 
-    few: "%{count} comments"
-    many: "%{count} comments"
+    few: "%{count} hozzászólás"
+    many: "%{count} hozzászólás"
     new_comment: 
       comment: "Hozzászólás"
       commenting: "Hozzászólok.."
-    one: "1 comment"
-    other: "%{count} comments"
-    zero: "no comments"
+    one: "1 hozzászólás"
+    other: "%{count} hozzászólás"
+    zero: "nincs hozzászólás"
   contacts: 
     create: 
       failure: "Kapcsolat létrehozása sikertelen"
@@ -134,7 +134,7 @@ hu:
       failure: "Sikertelen a kapcsolat megszakítása vele: %{name}"
       success: "Kapcsolat megszakítva vele: %{name}"
     few: "%{count} ismerős"
-    many: "%{count} contacts"
+    many: "%{count} ismerős"
     one: "1 ismerős"
     other: "%{count} ismerős"
     share_with_pane: 
@@ -145,25 +145,25 @@ hu:
   conversations: 
     helper: 
       new_messages: 
-        few: "%{count} new messages"
-        many: "%{count} new messages"
-        one: "1 new messages"
-        other: "%{count} new messages"
-        zero: "no new messages"
+        few: "%{count} új üzenet"
+        many: "%{count} új üzenet"
+        one: "1 új üzenet"
+        other: "%{count} új üzenet"
+        zero: "nincs új üzenet"
     index: 
-      create_a_new_message: "create a new message"
-      message_inbox: "Message Inbox"
-      new_message: "New Message"
-      no_conversation_selected: "no conversation selected"
-      no_messages: "no messages"
+      create_a_new_message: "új üzenet írása"
+      message_inbox: "Bejövő üzenetek"
+      new_message: "Új üzenet"
+      no_conversation_selected: "nincs beszélgetés kiválasztva"
+      no_messages: "nincs üzenet"
     new: 
-      no_results: "No Results Found"
-      send: "Send"
-      subject: "subject"
-      to: "to"
+      no_results: "Nincs eredmény"
+      send: "Küldés"
+      subject: "tárgy"
+      to: "címzett"
     show: 
-      delete: "delete and block conversation"
-      reply: "reply"
+      delete: "beszélgetés törlése és blokkolása"
+      reply: "válasz"
   date: 
     formats: 
       birthday: "%B %d"
@@ -217,7 +217,7 @@ hu:
       have_a_problem: "Problémád van?"
       logged_in_as: "bejelentkezve, mint %{name}"
       powered_by: "DIASPORA* fordította ADAMEX"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "Nyílvános Diaspora hírfolyam neki: %{name}"
       toggle: "mobil változat"
       whats_new: "Újdonságok"
       your_aspects: "csoportjaid"
@@ -226,8 +226,8 @@ hu:
       code: "kód"
       login: "belépés"
       logout: "kilépés"
-      profile: "profile"
-      settings: "settings"
+      profile: "profil"
+      settings: "beállítások"
   more: "Bővebben"
   next: "következő"
   notifications: 
@@ -237,14 +237,14 @@ hu:
     deleted: "törölve"
     helper: 
       new_notifications: 
-        few: "%{count} new notifications"
-        many: "%{count} new notifications"
-        one: "1 new notifications"
-        other: "%{count} new notifications"
-        zero: "no new notifications"
+        few: "%{count} új értesítés"
+        many: "%{count} új értesítés"
+        one: "1 új értesítés"
+        other: "%{count} új értesítések"
+        zero: "nincs új értesítés"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
+      and: "és"
+      and_others: "és %{number} másik"
       mark_all_as_read: "Mind megjelölése olvasottként"
       notifications: "Értesítések"
     mentioned: "megemlítettek téged a"
@@ -273,10 +273,10 @@ hu:
       subject: "új Diaspora* ismerősnek jelölt: %{from}"
       try_it_out: "Tényleg ki kellene próbálnod."
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      message_subject: "Tárgy: %{subject}"
+      private_message: "egy személyes üzenetet küldött neked:"
+      sign_in: "Jelentkezz be, hogy megnézd."
+      subject: "%{name} egy személyes üzenetet küldött neked a Diaspora-n"
     request_accepted: 
       accepted: "elfogadta a jelölésed."
       sign_in: "Jelentkezz be"
@@ -292,7 +292,7 @@ hu:
   people: 
     aspect_list: 
       edit_membership: "csoport tagság szerkesztése"
-    few: "%{count} people"
+    few: "%{count} személy"
     helper: 
       people_on_pod_are_aware_of: "az emberek tisztában vannak"
       results_for: "eredmények %{params}"
@@ -301,9 +301,9 @@ hu:
       no_one_found: "...és nem találni senkit."
       no_results: "Hé! Valamit keresned kell."
       results_for: "találatok keresése"
-    many: "%{count} people"
-    one: "1 person"
-    other: "%{count} people"
+    many: "%{count} személy"
+    one: "1 személy"
+    other: "%{count} személy"
     person: 
       add_contact: "Kapcsolat hozzáadása"
       already_connected: "Már csatlakozott"
@@ -319,24 +319,24 @@ hu:
       remove_contact: "kapcsolat törlése"
       remove_from: "Törlöd %{name}-t a %{aspect} csoportból?"
     show: 
-      add_some: "add some"
+      add_some: "hozzáad"
       does_not_exist: "Személy nem létezik!"
-      edit: "edit"
+      edit: "szerkeszt"
       incoming_request: "%{name} megosztást kezdeményezett veled."
-      mention: "Mention"
-      message: "Message"
+      mention: "Megemlít"
+      message: "Üzenet"
       no_posts: "nincs bejegyzés!"
-      not_connected: "Nem ismerősöd"
+      not_connected: "Nem az ismerősöd"
       recent_posts: "Legutóbbi bejegyzések"
       recent_public_posts: "Legutóbbi nyilvános bejegyzések"
       return_to_aspects: "Menj vissza a csoportokhoz"
       similar_contacts: "hasonló kapcsolatok"
       start_sharing: "Megosztás indítása"
       to_accept_or_ignore: "hogy elfogadd vagy elutasítsd."
-      you_have_no_tags: "you have no tags!"
+      you_have_no_tags: "nincs címkéd!"
     webfinger: 
       fail: "Sajnáljuk, de nem találjuk őt: %{handle}."
-    zero: "no people"
+    zero: "nincs személy"
   photos: 
     create: 
       integrity_error: "Kép feltöltése nem sikerült. Biztos vagy benne, hogy ez egy kép?"
@@ -373,12 +373,12 @@ hu:
       error: "Nem sikerült szerkeszteni a képet."
       notice: "Kép szerkesztése sikerült."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    doesnt_exist: "ez a bejegyzés nem létezik!"
     index: 
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
-      posts_tagged_with: "Posts tagged with #%{tag}"
-      whatup: "What's happening on %{pod}"
+      nobody_talking: "Senki nem beszélt még erről: %{tag}."
+      people_tagged_with: "Személy felcímkézve %{tag}"
+      posts_tagged_with: "Bejegyzés felcímkézve: #%{tag}"
+      whatup: "Mi folyik itt: %{pod}"
   previous: "előző"
   profile: "Profil"
   profiles: 
@@ -393,10 +393,10 @@ hu:
       your_gender: "Nem"
       your_name: "Nevem"
       your_photo: "Fényképem"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_private_profile: "Személyes profilod"
+      your_public_profile: "Nyilvános profilod"
+      your_tags: "Te: 5 #címkében"
+      your_tags_placeholder: "pl: #diaspora #buli #cica #zene"
     update: 
       failed: "Profil frissítése sikertelen"
       updated: "Profil frissítve"
@@ -428,11 +428,11 @@ hu:
       success: "Barátok lettek."
     helper: 
       new_requests: 
-        few: "%{count} new requests!"
-        many: "%{count} new requests!"
-        one: "new request!"
-        other: "%{count} new requests!"
-        zero: "no new requests"
+        few: "%{count} új felkérés!"
+        many: "%{count} új felkérés!"
+        one: "új felkérések!"
+        other: "%{count} új felkérés!"
+        zero: "nincs új felkérés"
     manage_aspect_contacts: 
       existing: "Meglévő kapcsolatok"
       manage_within: "Kapcsolatok kezelése"
@@ -449,7 +449,7 @@ hu:
     finder: 
       friends: 
         few: "%{count} barát"
-        many: "%{count} friends"
+        many: "%{count} barát"
         one: "1 barát"
         other: "%{count} barát"
         zero: "itt nincs barátod"
@@ -503,19 +503,21 @@ hu:
       mention_helper_text: "valaki megemlítéséhez írj '@' jelet, és kezd el írni a nevet"
       post_a_message_to: "Bejegyzés küldése ennek a csoportnak: %{aspect}"
       posting: "Küldés..."
-      publishing_to: "publishing to: "
+      publishing_to: "Publikálás:"
       share: "Megosztás"
       share_with: "Megosztás vele: %{aspect}"
       whats_on_your_mind: "Mi jár a fejedben?"
     reshare: 
       reshare: "Újraosztás"
   status_messages: 
+    create: 
+      success: "Megemlítetted: %{names}"
     destroy: 
       failure: "Bejegyzés törlése sikertelen"
     helper: 
       no_message_to_display: "Nincs üzenet."
     new: 
-      mentioning: "Mentioning: %{person}"
+      mentioning: "Megemlít: %{person}"
     show: 
       destroy: "Töröl"
       permalink: "permalink"
@@ -527,23 +529,23 @@ hu:
   users: 
     destroy: "Fiók sikeresen lezárult."
     edit: 
-      also_commented: "...someone also comments on your contact's post?"
+      also_commented: "...más is hozzászólt az ismerősöd bejegyzéséhez?"
       change: "Módosítás"
       change_language: "Nyelv megváltoztatása"
       change_password: "Jelszó módosítása"
       close_account: "Fiók bezárása"
-      comment_on_post: "...someone comments on your post?"
+      comment_on_post: "...valaki hozzászólt egy bejegyzésedhez?"
       current_password: "Jelenlegi jelszó"
       download_photos: "Képeim letöltése"
       download_xml: "Saját XML letöltése"
       edit_account: "Fiók szerkesztése"
       export_data: "Adatok exportálása"
-      mentioned: "...you are mentioned in a post?"
+      mentioned: "...meg vagy említve egy bejegyzésben?"
       new_password: "Új jelszó"
-      private_message: "...you receive a private message?"
-      receive_email_notifications: "Kérsz e-mail értesítéseket?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      private_message: "...privát üzenetet kaptál?"
+      receive_email_notifications: "Email értesítést kérek amikor..."
+      request_acceptence: "...elfogadta a kérelmed?"
+      request_received: "...valaki meg szeretne osztani veled?"
       your_email: "E-mail címed"
       your_handle: "Diaspora felhasználóneved"
     getting_started: 
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index a7b7de538..811be4808 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -510,6 +510,8 @@ id:
     reshare: 
       reshare: "Reshare"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index cd7b534a2..67b118c7f 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -510,6 +510,8 @@ is:
     reshare: 
       reshare: "Endurdeila"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Ekki tókst að eyða færslu"
     helper: 
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 3fd1839a4..67baae4fe 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -510,6 +510,8 @@ it:
     reshare: 
       reshare: "Ricondividi"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Eliminazione post non riuscita"
     helper: 
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 19860d1a6..b7da45480 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -510,6 +510,8 @@ lt:
     reshare: 
       reshare: "Skelbti papildomai"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 88232e14d..a7854bf3e 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -510,6 +510,8 @@ mk:
     reshare: 
       reshare: "Сподели повторно"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index 89043033a..266ba2c4c 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -510,6 +510,8 @@ ml:
     reshare: 
       reshare: "വീണ്ടും പങ്കിടുക"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index e57321da9..84cfce45e 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -510,6 +510,8 @@ nb:
     reshare: 
       reshare: "Del på nytt"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index e1492e4e8..610c8ecac 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -226,8 +226,8 @@ nl:
       code: "code"
       login: "inloggen"
       logout: "log uit"
-      profile: "profile"
-      settings: "settings"
+      profile: "profiel"
+      settings: "instellingen"
   more: "Meer"
   next: "volgende"
   notifications: 
@@ -292,7 +292,7 @@ nl:
   people: 
     aspect_list: 
       edit_membership: "bewerk aspect lidmaatschap"
-    few: "%{count} people"
+    few: "%{count} mensen"
     helper: 
       people_on_pod_are_aware_of: "mensen op de pod zich bewust van zijn"
       results_for: "resultaten voor %{params}"
@@ -301,9 +301,9 @@ nl:
       no_one_found: "...en je hebt niemand gevonden."
       no_results: "Heey! Je moet wel ergens naar zoeken."
       results_for: "zoekresultaten voor"
-    many: "%{count} people"
-    one: "1 person"
-    other: "%{count} people"
+    many: "%{count} mensen"
+    one: "1 persoon"
+    other: "%{count} mensen"
     person: 
       add_contact: "voeg contact toe"
       already_connected: "Al verbonden"
@@ -319,11 +319,11 @@ nl:
       remove_contact: "verwijder contact"
       remove_from: "Verwijder %{name} uit %{aspect}?"
     show: 
-      add_some: "add some"
+      add_some: "Voeg wat"
       does_not_exist: "Die persoon bestaat niet!"
-      edit: "edit"
+      edit: "bewerk"
       incoming_request: "% {name} wil met je delen"
-      mention: "Mention"
+      mention: "Noemen"
       message: "Bericht"
       no_posts: "geen berichten om weer te geven!"
       not_connected: "Je deelt niet met deze persoon"
@@ -333,10 +333,10 @@ nl:
       similar_contacts: "vergelijkbare contacten"
       start_sharing: "start met delen"
       to_accept_or_ignore: "om te accepteren of te negeren."
-      you_have_no_tags: "you have no tags!"
+      you_have_no_tags: "je hebt geen tags!"
     webfinger: 
       fail: "Sorry, we konden %{handle} niet vinden."
-    zero: "no people"
+    zero: "geen mensen"
   photos: 
     create: 
       integrity_error: "Foto uploaden mislukt. Weet je zeker dat het een afbeelding was?"
@@ -373,10 +373,10 @@ nl:
       error: "Foto veranderen niet gelukt."
       notice: "Foto succesvol veranderd."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    doesnt_exist: "die post bestaat niet!"
     index: 
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
+      nobody_talking: "Er is nog niemand die het over %{tag} heeft gehad."
+      people_tagged_with: "Mensen getagged met %{tag}"
       posts_tagged_with: "Posts getagged met #%{tag}"
       whatup: "Nu op %{pod}"
   previous: "vorige"
@@ -393,10 +393,10 @@ nl:
       your_gender: "Je geslacht"
       your_name: "Je naam"
       your_photo: "Je profielfoto"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_private_profile: "Je privé-profiel"
+      your_public_profile: "Je openbare profiel"
+      your_tags: "Jezelf: in 5 #tags"
+      your_tags_placeholder: "b.v. #diaspora #strijken #kittens #muziek"
     update: 
       failed: "Profiel bijwerken mislukt"
       updated: "Profiel bijgewerkt"
@@ -503,19 +503,21 @@ nl:
       mention_helper_text: "om iemand te noemen, typ '@' gevolgd door zijn of haar naam"
       post_a_message_to: "Plaats een bericht aan %{aspect}"
       posting: "Plaatsen..."
-      publishing_to: "publishing to: "
+      publishing_to: "delen met: "
       share: "Delen"
       share_with: "deel met"
       whats_on_your_mind: "waar denk je aan?"
     reshare: 
       reshare: "Herdeel"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Verwijderen van post mislukt"
     helper: 
       no_message_to_display: "Geen bericht om te weergeven."
     new: 
-      mentioning: "Mentioning: %{person}"
+      mentioning: "Noem: %{person}"
     show: 
       destroy: "Verwijderen"
       permalink: "permalink"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 8051dd75b..6d9edb743 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -510,6 +510,8 @@ pa:
     reshare: 
       reshare: "Reshare"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 92a84a721..0fad06dbc 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -510,6 +510,8 @@ pl:
     reshare: 
       reshare: "Podziel się ponownie"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Błąd podczas usuwania wpisu"
     helper: 
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 1004e75d5..7476a8dad 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -510,6 +510,8 @@ pt-BR:
     reshare: 
       reshare: "Compartilhar novamente"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index d10c9e20f..6bac561cf 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -510,6 +510,8 @@ pt-PT:
     reshare: 
       reshare: "Partilhar Novamente"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 3d8aaab84..0fead6b9a 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -510,6 +510,8 @@ ro:
     reshare: 
       reshare: "Reshare"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index ae2a61e76..7a588785f 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -510,6 +510,8 @@ ru:
     reshare: 
       reshare: "Поделиться повторно"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index dac7e717e..a2338129a 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -510,6 +510,8 @@ sk:
     reshare: 
       reshare: "Znovu zdieľať"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Odstránenie príspevku zlyhalo"
     helper: 
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 89e513843..c2e37d18e 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -510,6 +510,8 @@ sl:
     reshare: 
       reshare: "Deli znova"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 0065f448a..ee3fe271d 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -510,6 +510,8 @@ sv:
     reshare: 
       reshare: "Återdela"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 33aedb06c..664070b3d 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -510,6 +510,8 @@ tr:
     reshare: 
       reshare: "Yeniden Paylaş"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index d74036162..3ac81be1f 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -226,8 +226,8 @@ zh-TW:
       code: "源碼"
       login: "登入"
       logout: "登出"
-      profile: "profile"
-      settings: "settings"
+      profile: "個人檔案"
+      settings: "設定"
   more: "更多"
   next: "後面"
   notifications: 
@@ -292,7 +292,7 @@ zh-TW:
   people: 
     aspect_list: 
       edit_membership: "編輯所屬面向"
-    few: "%{count} people"
+    few: "%{count} 個聯絡人"
     helper: 
       people_on_pod_are_aware_of: "Pod 上已知的人"
       results_for: "%{params} 的搜尋結果"
@@ -301,9 +301,9 @@ zh-TW:
       no_one_found: "...找不到任何東西."
       no_results: "嘿! 搜尋要有目標."
       results_for: "搜尋結果:"
-    many: "%{count} people"
-    one: "1 person"
-    other: "%{count} people"
+    many: "%{count} 個聯絡人"
+    one: "一個聯絡人"
+    other: "%{count} 個聯絡人"
     person: 
       add_contact: "加入聯繫"
       already_connected: "已建立連結"
@@ -319,11 +319,11 @@ zh-TW:
       remove_contact: "刪除聯繫"
       remove_from: "要從 %{aspect} 刪除 %{name} 嗎?"
     show: 
-      add_some: "add some"
+      add_some: "新增一些"
       does_not_exist: "聯絡人不存在!"
-      edit: "edit"
+      edit: "編輯"
       incoming_request: "%{name} 希望能和你分享"
-      mention: "Mention"
+      mention: "提及"
       message: "訊息"
       no_posts: "沒有貼文可顯示!"
       not_connected: "你不跟這個人分享"
@@ -333,10 +333,10 @@ zh-TW:
       similar_contacts: "相似的聯繫"
       start_sharing: "開始分享"
       to_accept_or_ignore: "接受或不管它."
-      you_have_no_tags: "you have no tags!"
+      you_have_no_tags: "你沒有標籤!"
     webfinger: 
       fail: "抱歉, 找不到 %{handle}."
-    zero: "no people"
+    zero: "沒有聯絡人"
   photos: 
     create: 
       integrity_error: "相片上傳失敗. 你確定它是圖片嗎?"
@@ -373,10 +373,10 @@ zh-TW:
       error: "相片編輯失敗."
       notice: "相片更新成功."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    doesnt_exist: "貼文不存在!"
     index: 
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
+      nobody_talking: "還沒有人提到 %{tag}."
+      people_tagged_with: "標記為 %{tag} 的人"
       posts_tagged_with: "標記為#%{tag}的貼文"
       whatup: "%{pod}的新鮮事"
   previous: "前面"
@@ -393,10 +393,10 @@ zh-TW:
       your_gender: "你的性別"
       your_name: "你的名字"
       your_photo: "你的相片"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_private_profile: "你的私人檔案"
+      your_public_profile: "你的公開檔案"
+      your_tags: "你: 可以有 5 個\"#標籤\""
+      your_tags_placeholder: "像是: #diaspora #燙髮 #貓咪 #音樂"
     update: 
       failed: "個人檔案更新失敗"
       updated: "個人檔案已更新"
@@ -503,19 +503,21 @@ zh-TW:
       mention_helper_text: "想提到某人的話, 先敲 '@' 再接著打他們的名字"
       post_a_message_to: "在 %{aspect} 發表訊息"
       posting: "發表中..."
-      publishing_to: "publishing to: "
+      publishing_to: "發表至: "
       share: "分享"
       share_with: "與他/她分享:"
       whats_on_your_mind: "在想什麼?"
     reshare: 
       reshare: "重新分享"
   status_messages: 
+    create: 
+      success: "成功推薦了: %{names}"
     destroy: 
       failure: "刪除貼文失敗"
     helper: 
       no_message_to_display: "沒有訊息可顯示."
     new: 
-      mentioning: "Mentioning: %{person}"
+      mentioning: "提及發表中: %{person}"
     show: 
       destroy: "刪除"
       permalink: "靜態連結"
diff --git a/config/locales/diaspora/zh.yml b/config/locales/diaspora/zh.yml
index dcf930617..544a3fde2 100644
--- a/config/locales/diaspora/zh.yml
+++ b/config/locales/diaspora/zh.yml
@@ -510,6 +510,8 @@ zh:
     reshare: 
       reshare: "再次分享"
   status_messages: 
+    create: 
+      success: "Successfully mentioned: %{names}"
     destroy: 
       failure: "Failed to delete post"
     helper: 
diff --git a/config/locales/javascript/javascript.cs.yml b/config/locales/javascript/javascript.cs.yml
index 38e3a7dbb..c95d25810 100644
--- a/config/locales/javascript/javascript.cs.yml
+++ b/config/locales/javascript/javascript.cs.yml
@@ -7,7 +7,7 @@ cs:
   javascripts: 
     confirm_dialog: "Jste si jisti?"
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
+      at_least_one_aspect: "Musíte publikovat alespoň do jednoho aspektu"
     search_for: "Hledat {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index 4e39cfe68..99f245486 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -7,7 +7,7 @@ de:
   javascripts: 
     confirm_dialog: "Bist du dir sicher?"
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
+      at_least_one_aspect: "Du musst zumindest zu einem Aspekt posten"
     search_for: "Nach {{name}} suchen"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 7f8489e1d..e668e9631 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -7,7 +7,7 @@ es:
   javascripts: 
     confirm_dialog: "¿Estás seguro?"
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
+      at_least_one_aspect: "Debes publicarlo en al menos un aspecto"
     search_for: "Buscar a {{name}}"
     shared: 
       contact_list: 
@@ -21,10 +21,10 @@ es:
       minutes: "%d minutos"
       month: "un mes aproximadamente"
       months: "%d meses"
-      prefixAgo: "javascripts:timeago:prefixAgo"
-      prefixFromNow: "javascripts:timeago:prefixFromNow"
+      prefixAgo: "hace"
+      prefixFromNow: "desde ahora"
       seconds: "menos de un minuto"
-      suffixAgo: "hace"
+      suffixAgo: ""
       suffixFromNow: "desde ahora"
       year: "un año aproximadamente"
       years: "%d años"
diff --git a/config/locales/javascript/javascript.eu.yml b/config/locales/javascript/javascript.eu.yml
index 5c452f18c..1532e2a6a 100644
--- a/config/locales/javascript/javascript.eu.yml
+++ b/config/locales/javascript/javascript.eu.yml
@@ -7,7 +7,7 @@ eu:
   javascripts: 
     confirm_dialog: "Ziur al zaude?"
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
+      at_least_one_aspect: "Gutxienez alderdi batean partekatu behar duzu"
     search_for: "Bilatu {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.hu.yml b/config/locales/javascript/javascript.hu.yml
index c0447e585..160cdde51 100644
--- a/config/locales/javascript/javascript.hu.yml
+++ b/config/locales/javascript/javascript.hu.yml
@@ -7,7 +7,7 @@ hu:
   javascripts: 
     confirm_dialog: "Biztos vagy benne?"
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
+      at_least_one_aspect: "Minimum 1 csoportnak meg kell osztanod!"
     search_for: "{{name}} keresése."
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.ml.yml b/config/locales/javascript/javascript.ml.yml
new file mode 100644
index 000000000..daa3d10ee
--- /dev/null
+++ b/config/locales/javascript/javascript.ml.yml
@@ -0,0 +1,33 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+
+ml: 
+  javascripts: 
+    confirm_dialog: "Are you sure?"
+    publisher: 
+      at_least_one_aspect: "You must publish to at least one aspect"
+    search_for: "Search for {{name}}"
+    shared: 
+      contact_list: 
+        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+    timeago: 
+      day: "a day"
+      days: "%d days"
+      hour: "about an hour"
+      hours: "about %d hours"
+      minute: "about a minute"
+      minutes: "%d minutes"
+      month: "about a month"
+      months: "%d months"
+      prefixAgo: ""
+      prefixFromNow: ""
+      seconds: "less than a minute"
+      suffixAgo: "ago"
+      suffixFromNow: "from now"
+      year: "about a year"
+      years: "%d years"
+    videos: 
+      unknown: "Unknown video type"
+      watch: "Watch this video on {{provider}}"
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index 71e9016ee..35ae67662 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -7,7 +7,7 @@ zh-TW:
   javascripts: 
     confirm_dialog: "你確定嗎?"
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
+      at_least_one_aspect: "發表時請至少選擇一個面向"
     search_for: "搜尋 {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/rails-i18n/sv-SE.yml b/config/locales/rails-i18n/sv-SE.yml
index 058c74210..ddc835fa3 100644
--- a/config/locales/rails-i18n/sv-SE.yml
+++ b/config/locales/rails-i18n/sv-SE.yml
@@ -3,6 +3,7 @@
 # With contributions by:
 #   * Sven Dahlstrand (sven.dahlstrand@gmail.com)
 #   * Henrik Nyh (henrik@nyh.se)
+#   * Magnus Bergmark (magnus.bergmark@gmail.com)
 
 "sv-SE":
   number:
@@ -12,25 +13,20 @@
       # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
       separator: ","
       # Delimits thousands (e.g. 1,000,000 is a million) (always in groups of three)
-      delimiter: " "
+      delimiter: " " # non-breaking space
       # Number of decimals after the separator (the number 1 with a precision of 2 gives: 1.00)
       precision: 2
       significant: false
       strip_insignificant_zeros: false
-      
 
     # Used in number_to_currency()
     currency:
       format:
         # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
         format: "%n %u"
+        negative_format: "-%n %u"
         unit: "kr"
-        separator: ","
-        delimiter: " "
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
-        
+
     percentage:
       format:
          delimiter: ""
@@ -39,24 +35,19 @@
       format:
         delimiter: ""
 
-
     # Used in number_to_human_size()
     human:
       format:
-        # These three are to override number.format and are optional
-        # separator:
         delimiter: ""
         precision: 1
-        significant: false
-        strip_insignificant_zeros: false
-        
+
       storage_units:
         # Storage units output formatting.
         # %u is the storage unit, %n is the number (default: 2 MB)
         format: "%n %u"
         units:
           byte:
-            one:   "Byte"
+            one: "Byte"
             other: "Bytes"
           kb: "KB"
           mb: "MB"
@@ -70,8 +61,7 @@
           million: "Miljon"
           billion: "Miljard"
           trillion: "Biljon"
-          quadrillion: "Biljard"
-
+          quadrillion: "Triljon"
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
@@ -110,6 +100,7 @@
       almost_x_years:
         one:   "nästan ett år"
         other: "nästan %{count} år"
+
     prompts:
       year:   "År"
       month:  "Månad"
@@ -118,15 +109,14 @@
       minute: "Minut"
       second: "Sekund"
 
-
   helpers:
     select:
       prompt: "Välj"
 
     submit:
-      create: 'Skapa %{model}'
-      update: 'Ändra %{model}'
-      submit: 'Spara %{model}'
+      create: "Skapa %{model}"
+      update: "Ändra %{model}"
+      submit: "Spara %{model}"
 
   errors:
     format: "%{attribute} %{message}"
@@ -154,7 +144,6 @@
       even: "måste vara jämnt"
       record_invalid: "Ett fel uppstod: %{errors}"
 
-
   activerecord:
     errors:
       # model.errors.full_messages format.
@@ -165,14 +154,13 @@
         body: "Det var problem med följande fält:"
 
       messages:
-        taken: "has already been taken"
-        record_invalid: "Validation failed: %{errors}"
+        taken: "är upptaget"
+        record_invalid: "Validering misslyckades: %{errors}"
         <<: *errors_messages
 
       full_messages:
         format: "%{attribute} %{message}"
 
-      
       # The values :model, :attribute and :value are always available for interpolation
       # The value :count is available when applicable. Can be used for pluralization.
         # Append your own errors here or at the model/attributes scope.
@@ -233,7 +221,7 @@
     am: ""
     pm: ""
 
-# Used in array.to_sentence.
+  # Used in array.to_sentence.
   support:
     array:
       words_connector: ", "