updated locales - big thank you to all people at 99translations

34 files changed, 607 insertions, 522 deletions

diff --git a/config/languages.yml b/config/languages.yml
index 50e717aa4..6c38ac848 100644
--- a/config/languages.yml
+++ b/config/languages.yml
@@ -1,5 +1,6 @@
 default: 'en'
 available:
+  ca: "Català"
   cs: 'Lietuviškai'
   cy: 'Cymraeg'
   de: 'Deutsch'
diff --git a/config/locales/devise/devise.ca.yml b/config/locales/devise/devise.ca.yml
index 83be71c9a..b2910c24b 100644
--- a/config/locales/devise/devise.ca.yml
+++ b/config/locales/devise/devise.ca.yml
@@ -6,91 +6,91 @@
 ca: 
   devise: 
     confirmations: 
-      confirmed: "Your account was successfully confirmed. You are now signed in."
+      confirmed: "El teu compte ha estat confirmat. Ja has accedit al teu compte."
       new: 
-        resend_confirmation: "Resend confirmation instructions"
-      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+        resend_confirmation: "Tornar a enviar instruccions de confirmació."
+      send_instructions: "Rebràs un e-mail amb instruccions per confirmar el teu compte en pocs minuts."
     failure: 
-      inactive: "Your account was not activated yet."
-      invalid: "Invalid email or password."
-      invalid_token: "Invalid authentication token."
-      locked: "Your account is locked."
-      timeout: "Your session expired, please sign in again to continue."
-      unauthenticated: "You need to sign in or sign up before continuing."
-      unconfirmed: "You have to confirm your account before continuing."
+      inactive: "El teu compte encara no ha estat activat."
+      invalid: "Contrasenya o E-Mail incorrectes."
+      invalid_token: "Identificador d'autenticació incorrecte."
+      locked: "El teu compte està bloquejat."
+      timeout: "La teva sessió ha caducat, si us plau accedeix de nou per continuar."
+      unauthenticated: "És necessari accedir al teu compte o registrar-te abans de continuar."
+      unconfirmed: "És necessari confirmar el teu compte abans de continuar."
     invitations: 
-      invitation_token_invalid: "The invitation token provided is not valid!"
-      send_instructions: "Your invitation has been sent."
-      updated: "Your password was set successfully. You are now signed in."
+      invitation_token_invalid: "L'identificador de la invitació no és vàlid!"
+      send_instructions: "La teva invitació ha estat enviada."
+      updated: "La teva contrasenya ha estat configurada correctament. Ara estàs connectat."
     mailer: 
       confirmation_instructions: 
-        confirm: "Confirm my account"
-        subject: "Confirmation instructions"
-        you_can_confirm: "You can confirm your account through the link below:"
-      hello: "Hello %{email}!"
+        confirm: "Confirmar el meu compte"
+        subject: "Instruccions de confirmació"
+        you_can_confirm: "Pots confirmar el teu compte a través del següent enllaç:"
+      hello: "Hola %{email}!"
       invitation: 
-        accept: "Accept invitation"
-        ignore: "If you don't want to accept the invitation, please ignore this email."
-        no_account_till: "Your account won't be created until you access the link above and sign up."
-        subject: "You've been invited to join Diaspora!"
+        accept: "Acceptar la invitació"
+        ignore: "Si no desitges acceptar la invitació, si us plau ignora aquest missatge."
+        no_account_till: "El teu compte no serà creat fins que accedeixis a l'enllaç superior i t'identifiquis."
+        subject: "Has estat convidat a participar a Diaspora!"
       inviters: 
-        accept_at: ", at %{url}, you can accept it through the link below."
-        has_invited_you: "%{name} has invited you to join Diaspora"
-        have_invited_you: "%{names} have invited you to join Diaspora"
+        accept_at: ", a %{url}, pots acceptar en el següent enllaç."
+        has_invited_you: "%{name} t'ha convidat a unir-te a Diaspora"
+        have_invited_you: "%{names} t'han convidat a unir-te a Diaspora"
       reset_password_instructions: 
-        change: "Change my password"
-        ignore: "If you didn't request this, please ignore this email."
-        someone_requested: "Someone has requested a link to change your password, and you can do this through the link below."
-        subject: "Reset password instructions"
-        wont_change: "Your password won't change until you access the link above and create a new one."
+        change: "Canviar la meva contrasenya"
+        ignore: "Si no has sol·licitat això, si us plau ignora auest missatge."
+        someone_requested: "Algú ha sol·licitat un enllaç per canviar la teva contrasenya, i tu pots fer-ho en el següent enllaç."
+        subject: "Instruccions per canviar la teva contrasenya"
+        wont_change: "La seva contrasenya no canviarà fins que accedeixi a l'enllaç anterior i en creï una de nova."
       unlock_instructions: 
-        account_locked: "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
-        click_to_unlock: "Click the link below to unlock your account:"
-        subject: "Unlock Instructions"
-        unlock: "Unlock my account"
-      welcome: "Welcome %{email}!"
+        account_locked: "El teu compte ha estat bloquejat degut a una excessiva quantitat d'intents d'accés fallits."
+        click_to_unlock: "Fes clic en l'enllaç d'abaix per desbloquejar el teu compte:"
+        subject: "Instruccions per desbloquejar el teu compte"
+        unlock: "Desbloquejar el meu compte"
+      welcome: "¡Benvingut %{email}!"
     passwords: 
       edit: 
-        change_password: "Change my password"
+        change_password: "Canviar la meva contrasenya"
       new: 
-        forgot_password: "Forgot your password?"
-        send_password_instructions: "Send me reset password instructions"
-      send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
-      updated: "Your password was changed successfully. You are now signed in."
+        forgot_password: "Has oblidat la teva contrasenya?"
+        send_password_instructions: "Enviam instruccions per reestablir la meva contrasenya"
+      send_instructions: "Rebràs un E-Mail amb instruccions per canviar la teva contrasenya en pocs minuts."
+      updated: "La teva contrasenya ha estat modificada. Ja has accedit al teu compte."
     registrations: 
-      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
-      signed_up: "You have signed up successfully. If enabled, a confirmation was sent to your e-mail."
-      updated: "You updated your account successfully."
+      destroyed: "!Adéu! El teu compte ha estat cancel·lat. Esperem tornar-te a veure aviat."
+      signed_up: "T'has registrat correctament. Si està disponible, t'haurem enviat un E-Mail de confirmació."
+      updated: "Has actualitzat el teu compte correctament."
     sessions: 
       new: 
-        alpha_software: "You are about to use alpha software."
-        bugs_and_feedback: "Be advised, you will experience bugs.  We encourage you to use the Feedback button on the right hand side of your browser to report any hiccups!  We will work as fast as we can to resolve any issues you report."
-        have_a_problem: "Have a problem? Find an answer here"
-        login: "Login"
-        modern_browsers: "only supports modern browsers."
-        password: "Password"
-        remember_me: "Remember me"
-        sign_in: "Sign in"
-        username: "Username"
-      signed_in: "Signed in successfully."
-      signed_out: "Signed out successfully."
+        alpha_software: "Estàs a punt d'utilizar software en versió alpha."
+        bugs_and_feedback: "Tingues present que pots experimentar errors. T'animem a que utilitzis el botó de Feedback situat a la dreta del teu navegador per informar de qualsevol error! Treballarem tan ràpid com sigui possible per resoldre qualsevol problema del que ens informis."
+        have_a_problem: "Tens un problema? Troba la resposta aquí"
+        login: "Iniciar sessió"
+        modern_browsers: "només és compatible amb navegadors actuals."
+        password: "Contrasenya"
+        remember_me: "Recordar-me"
+        sign_in: "Entrar"
+        username: "Nom d'usuari"
+      signed_in: "Has entrat correctament."
+      signed_out: "Has sortit correctament."
     shared: 
       links: 
-        forgot_your_password: "Forgot your password?"
-        receive_confirmation: "Didn't receive confirmation instructions?"
-        receive_unlock: "Didn't receive unlock instructions?"
-        sign_in: "Sign in"
-        sign_up: "Sign up"
-        sign_up_closed: "Open signups are closed at this time."
+        forgot_your_password: "Has oblidat la teva contrasenya?"
+        receive_confirmation: "No has rebut instruccions de confirmació?"
+        receive_unlock: "No has rebut les instruccions de desbloqueig?"
+        sign_in: "Entrar"
+        sign_up: "Regístra't"
+        sign_up_closed: "Els registres estan tancats temporalment."
       mail_signup_form: 
-        sign_up_for_an_invite: "Sign up for an invite!"
+        sign_up_for_an_invite: "Registra't per ser convidat!"
     unlocks: 
       new: 
-        resend_unlock: "Resend unlock instructions"
-      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
-      unlocked: "Your account was successfully unlocked. You are now signed in."
+        resend_unlock: "Tornar a enviar les instruccions de desbloqueig"
+      send_instructions: "Rebràs un E-Mail amb les instruccions per desbloquejar el teu compte en pocs minuts."
+      unlocked: "El teu compte ha estat desbloquejada. Ja has accedit al teu compte."
   errors: 
     messages: 
-      already_confirmed: "was already confirmed"
-      not_found: "not found"
-      not_locked: "was not locked"
+      already_confirmed: "ja ha estat confirmat"
+      not_found: "no trobat"
+      not_locked: "no ha estat bloquejat"
diff --git a/config/locales/devise/devise.es.yml b/config/locales/devise/devise.es.yml
index 2ec27ffdd..36512f191 100644
--- a/config/locales/devise/devise.es.yml
+++ b/config/locales/devise/devise.es.yml
@@ -83,7 +83,7 @@ es:
         sign_up: "Regístrate"
         sign_up_closed: "Los registros están cerrados temporalmente."
       mail_signup_form: 
-        sign_up_for_an_invite: "Sign up for an invite!"
+        sign_up_for_an_invite: "Regístrate para ser invitado!"
     unlocks: 
       new: 
         resend_unlock: "Volver a enviar las instrucciones de desbloqueo"
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index 1abbac516..70f86e2f8 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -21,7 +21,7 @@ fr:
     invitations: 
       invitation_token_invalid: "Le jeton d’invitation fourni n’est pas valide !"
       send_instructions: "Votre invitation a été envoyée."
-      updated: "Votre mot de passe a été réglé avec succès. Vous êtes à présent connecté."
+      updated: "Votre mot de passe a été créé avec succès. Vous êtes à présent connecté."
     mailer: 
       confirmation_instructions: 
         confirm: "Confirmer mon compte"
@@ -31,7 +31,7 @@ fr:
       invitation: 
         accept: "Accepter l'invitation"
         ignore: "Si vous ne souhaitez pas accepter l'invitation, merci d'ignorer cet e-mail."
-        no_account_till: "Votre compte ne sera pas créé avant que vous ne vous inscriviez en accédant au lien ci-dessus"
+        no_account_till: "Votre compte ne sera pas créé avant que vous ne vous inscriviez en accédant au lien ci-dessus."
         subject: "Vous avez été invité à rejoindre Diaspora !"
       inviters: 
         accept_at: ", sur %{url}, vous pouvez accepter à travers le lien ci-dessous."
@@ -41,10 +41,10 @@ fr:
         change: "Changer mon mot de passe"
         ignore: "Si vous n'avez pas demandé cela, merci d'ignorer cet e-mail."
         someone_requested: "Quelqu'un a demandé un lien pour changer votre mot de passe, vous pouvez effectuer cela à travers le lien ci-dessous."
-        subject: "Instructions de réinitialisation du mot de passe"
+        subject: "Instructions de réinitialisation de mot de passe"
         wont_change: "Votre mot de passe ne changera pas avant que vous n'en créiez un nouveau en accédant au lien ci-dessus. "
       unlock_instructions: 
-        account_locked: "Votre compte a été bloqué à cause d'un nombre excessif de tentatives infructueuses de connexion"
+        account_locked: "Votre compte a été bloqué à cause d'un nombre excessif de tentatives infructueuses de connexion."
         click_to_unlock: "Cliquez sur le lien ci-dessous pour débloquer votre compte :"
         subject: "Instructions de déverrouillage"
         unlock: "Débloquer mon compte"
@@ -64,7 +64,7 @@ fr:
     sessions: 
       new: 
         alpha_software: "Vous êtes sur le point d'utiliser une application en version alpha."
-        bugs_and_feedback: "Soyez bien conscient que vous serez confronté à des bugs. Nous vous encourageons à utiliser le bouton Feedback à la droite de votre navigateur pour reporter tout disfonctionnement ! Nous travaillerons au plus vite pour régler chaque problème que vous reportez."
+        bugs_and_feedback: "Soyez bien conscient que vous serez confronté à des bugs. Nous vous encourageons à utiliser le bouton Feedback à la droite de votre navigateur pour reporter tout disfonctionnement ! Nous travaillerons au plus vite pour régler chaque problème que vous reporterez."
         have_a_problem: "Un problème ? Trouvez une réponse ici"
         login: "Se connecter"
         modern_browsers: "supporte seulement des navigateurs modernes."
@@ -81,7 +81,7 @@ fr:
         receive_unlock: "Vous n'avez pas reçu les instructions de déblocage ?"
         sign_in: "Connexion"
         sign_up: "Inscription"
-        sign_up_closed: "Les inscriptions libres sont fermées pour l'instant."
+        sign_up_closed: "Les inscriptions sont fermées pour l'instant."
       mail_signup_form: 
         sign_up_for_an_invite: "Demander une invitation !"
     unlocks: 
diff --git a/config/locales/devise/devise.sk.yml b/config/locales/devise/devise.sk.yml
index 805d15e43..2c87fb673 100644
--- a/config/locales/devise/devise.sk.yml
+++ b/config/locales/devise/devise.sk.yml
@@ -32,11 +32,11 @@ sk:
         accept: "Potvrdiť pozvánku"
         ignore: "Ak nechcete potvrdiť pozvanie, tento e-mail prosím ignorujte."
         no_account_till: "Pre dokončenie registrácie kliknite prosím na odkaz uvedený nižšie."
-        subject: "Boli ste prizvaný k Diaspóre!"
+        subject: "Boli ste prizvaný k Diaspore!"
       inviters: 
         accept_at: ", na %{url}, akceptujte kliknutím na odkaz."
-        has_invited_you: "%{name} Vás prizval k Diaspóre"
-        have_invited_you: "%{names} Vás pozvali k Diaspóre"
+        has_invited_you: "%{name} Vás prizval k Diaspore"
+        have_invited_you: "%{names} Vás pozvali k Diaspore"
       reset_password_instructions: 
         change: "Zmeniť moje heslo"
         ignore: "Ak ste o to nežiadali, prosím tento e-mail ignorujte."
@@ -64,7 +64,7 @@ sk:
     sessions: 
       new: 
         alpha_software: "Používate testovaciu verziu."
-        bugs_and_feedback: "Tlačidlom Feedback, na pravej strane prehliadača upozornite prosím na chyby, ktoré pri používaní objavíte. Budeme sa ich snažiť odstrániť tak skoro, ako to len pôjde."
+        bugs_and_feedback: "Tlačidlom Feedback na pravej strane prehliadača upozornite prosím na chyby, ktoré pri používaní objavíte. Budeme sa ich snažiť odstrániť tak skoro, ako to len pôjde."
         have_a_problem: "Máte problém? Tu nájdete odpoveď"
         login: "Prihlasovacie meno"
         modern_browsers: "podporuje moderné prehliadače."
@@ -83,7 +83,7 @@ sk:
         sign_up: "Zaregistrovať"
         sign_up_closed: "Momentálne sú ďalšie registrácie pozastavené."
       mail_signup_form: 
-        sign_up_for_an_invite: "Sign up for an invite!"
+        sign_up_for_an_invite: "Požidať o pozvánku!"
     unlocks: 
       new: 
         resend_unlock: "Zaslať návod na odblokovanie"
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index d7243b6df..c68f5947d 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -64,7 +64,7 @@ sv:
     sessions: 
       new: 
         alpha_software: "Du är påväg att använda mjukvara i alpha-stadie."
-        bugs_and_feedback: "Var uppmärksam på att du kommer stöta på buggar. Använd gärna feedback-knappen till vänster för att rapportera eventuell teknisk hicka, vi kommer att försöka ordna problemen så snart som möjligt."
+        bugs_and_feedback: "Var beredd på att stöta på buggar och problem. Använd gärna feedback-knappen till vänster för att rapportera dessa, vi kommer att försöka ordna problemen så snart som möjligt."
         have_a_problem: "Har du problem att komma in? Klicka här"
         login: "Logga in"
         modern_browsers: "stöder endast moderna webbläsare."
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 8ef48fa8b..869f18f70 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -392,3 +392,6 @@ ar:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index f56ada3b1..531630301 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -4,391 +4,394 @@
 
 
 ca: 
-  _comments: "Comments"
-  _home: "Home"
-  _photos: "photos"
-  _services: "Services"
-  account: "Account"
+  _comments: "Comentaris"
+  _home: "Inici"
+  _photos: "fotografies"
+  _services: "Serveis"
+  account: "Compte"
   activemodel: 
     errors: 
       models: 
         person: 
           attributes: 
             diaspora_handle: 
-              taken: "is already taken"
+              taken: "Ja ha estat escollit"
         user: 
           attributes: 
             email: 
-              taken: "is already taken"
+              taken: "Ja ha estat escollit"
             person: 
-              invalid: "is invalid"
+              invalid: "no és vàlid"
             username: 
-              taken: "is already taken"
-  ago: "ago"
+              taken: "Ja ha estat escollit"
+  ago: "fa"
   application: 
     helper: 
-      unknown_person: "unknown person"
+      unknown_person: "persona desconeguda"
       youtube_title: 
-        unknown: "Unknown Video Title"
-  are_you_sure: "Are you sure?"
+        unknown: "Títol desconegut de vídeo"
+  are_you_sure: "N'estàs segur?"
   aspects: 
     add_to_aspect: 
-      failure: "Failed to add contact to aspect."
-      success: "Successfully added contact to aspect."
+      failure: "Error a l'afegir el contacte a aquest aspecte."
+      success: "S'ha agregat correctament el seu contacte a un aspecte."
     create: 
-      failure: "Aspect creation failed."
-      success: "Your new aspect %{name} was created"
+      failure: "Creació d'aspecte fallida."
+      success: "El teu nou aspecte %{name} ha estat creat"
     destroy: 
-      success: "%{name} was successfully removed."
+      success: "%{name} ha estat eliminat correctament."
     edit_aspect_pane: 
-      add_existing: "Add an existing contact"
-      confirm_remove_aspect: "Remove aspect?"
-      remove_aspect: "Remove Aspect"
+      add_existing: "Afegir un contacte existent"
+      confirm_remove_aspect: "Eliminar aspecte?"
+      remove_aspect: "Eliminar aspecte"
     helper: 
-      are_you_sure: "Are you sure you want to delete this aspect?"
-      aspect_not_empty: "Aspect not empty"
-      remove: "remove"
+      are_you_sure: "N'estàs segur que vols eliminar aquest aspecte?"
+      aspect_not_empty: "L'aspecte no és buit"
+      remove: "eliminar"
     index: 
-      handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
+      handle_explanation: "Aquesta és la teva direcció Diaspora. Com una direcció d'E-Mail, pots donar-la a gent perquè et trobi"
     manage: 
-      add_a_new_aspect: "Add a new aspect"
-      add_a_new_contact: "Add a new contact"
-      drag_to_add: "Drag to add people"
-      manage_aspects: "Manage aspects"
-      no_requests: "No new requests"
-      requests: "Requests"
+      add_a_new_aspect: "Afegir un nou aspecte"
+      add_a_new_contact: "Afegir un nou contacte"
+      drag_to_add: "Arrossega per afegir persones"
+      manage_aspects: "Gestionar aspectes"
+      no_requests: "No hi ha noves peticions"
+      requests: "Peticions"
     move_contact: 
-      error: "Error moving contact: %{inspect}"
-      failure: "didn't work %{inspect}"
-      success: "Person moved to new aspect"
+      error: "Error al moure el contacte: %{inspect}"
+      failure: "error %{inspect}"
+      success: "Persona moguda a un nou perfil"
     new_aspect: 
-      create: "Create"
-      name: "Name"
+      create: "Crear"
+      name: "Nom"
     no_contacts_message: 
-      add_contact: "Add a contact"
-      add_contact_to: "Add someone to %{aspect_name}"
-      invite: "Invite someone to join Diaspora!"
-      nobody: "Bring the people that matter in your life to Diaspora!"
-      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+      add_contact: "Afegur un contacte"
+      add_contact_to: "Afegir algú a %{aspect_name}"
+      invite: "Convida a altres persones a unir-se a Diaspora!"
+      nobody: "Sabem que coneixes a gent — porta'ls a Diaspora!"
+      nobody_in_aspect: "El teu aspecte '%{aspect_name}' està buit."
     no_posts_message: 
-      start_talking: "Nobody has said anything yet.  Get the conversation started!"
+      start_talking: "Ningú ha dit res encara, inicia la conversa!"
     remove_from_aspect: 
-      failure: "Failed to remove person from aspect"
-      success: "Successfully removed person from aspect"
+      failure: "No s'ha pogut eliminar a la persona de l'aspecte."
+      success: "Persona eliminada de l'aspecte correctament"
     seed: 
-      family: "Family"
-      work: "Work"
+      family: "Família"
+      work: "Feina"
     show: 
-      edit_aspect: "edit aspect"
+      edit_aspect: "editar l'aspecte"
     update: 
-      success: "Your aspect, %{name}, has been successfully edited."
-  back: "Back"
-  cancel: "Cancel"
+      success: "El teu aspecte, %{name}, ha estat editat correctament."
+  back: "Enrere"
+  cancel: "Cancel·lar"
   comments: 
     new_comment: 
-      comment: "Comment"
-      commenting: "Commenting..."
+      comment: "Comentar"
+      commenting: "Comentant..."
   contacts: 
-    few: "%{count} contacts"
-    one: "1 contact"
-    other: "%{count} contacts"
-    zero: "no contacts"
-  delete: "Delete"
-  email: "Email"
+    few: "%{count} contactes"
+    one: "1 contacte"
+    other: "%{count} contactes"
+    zero: "no hi ha contactes"
+  delete: "Borrar"
+  email: "Correu electrònic"
   error_messages: 
     helper: 
-      correct_the_following_errors_and_try_again: "Correct the following errors and try again."
-      invalid_fields: "Invalid Fields"
-  fill_me_out: "Fill me out"
+      correct_the_following_errors_and_try_again: "Corregeixi els següents errors i intenta-ho de nou."
+      invalid_fields: "Camps no vàlids"
+  fill_me_out: "Completa'm"
   home: 
     show: 
-      already_account: "already have an account?"
-      choice: "Choice"
-      choice_explanation: "Diaspora lets you sort your connections into groups called aspects. Unique to Diaspora, aspects ensure that your photos, stories and jokes are shared only with the people you intend."
-      learn_about_host: "Learn about how to host your own Diaspora server."
-      login_here: "log in here"
-      ownership: "Ownership"
-      ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it's distributed."
-      share_what_you_want: "Share what you want, with whom you want."
-      simplicity: "Simplicity"
-      simplicity_explanation: "Diaspora makes sharing clean and easy – and this goes for privacy too. Inherently private, Diaspora doesn’t make you wade through pages of settings and options just to keep your profile secure."
+      already_account: "Encara no disposes d'un compte?"
+      choice: "Elecció"
+      choice_explanation: "Diaspora et permet organitzar conenxions en grups anomenats Aspectes. A Diaspora, els aspectes asseguren que les teves fotografies, històries i bromes siguin compartides només amb les persones que tu vols."
+      learn_about_host: "Aprèn com allotjar el teu propi servidor Diaspora."
+      login_here: "Entra aquí"
+      ownership: "Propietat"
+      ownership_explanation: "Ets el propietari de les teves imatges, i ningú hauria de necessitar cedir-les només per compartir-les. Tu mantens la propietat sobre tot el que comparteixis a Diaspora, donan-te control total sobre el que distribueixes."
+      share_what_you_want: "Comparteix el que vulguis, amb qui vulguis"
+      simplicity: "Simplicitat"
+      simplicity_explanation: "Diaspora fa que compartir sigui transparent i fàcil - i aixì fa referència a la privacitat també. Inherentment privat, Diaspora no et fa anar a través de configuracions i opcions només per mantenir el teu perfil segur."
   invitations: 
     check_token: 
-      not_found: "Invitation token not found"
+      not_found: "Identificació d'invitació no trobada."
     create: 
-      already_contacts: "You are already connected with this person"
-      already_sent: "You already invited this person."
-      no_more: "You have no more invitations."
-      rejected: "The following email addresses had problems: "
-      sent: "Invitations have been sent to: "
+      already_contacts: "Ja estàs en contacte amb aquesta persona"
+      already_sent: "Ja has convidat a aquesta persona."
+      no_more: "No tens més invitacions."
+      rejected: "Las següents direccions d'E-mail han tingut problemes"
+      sent: "La teva invitació ha estat enviada a:"
     edit: 
-      sign_up: "sign_up"
+      sign_up: "conectar-se"
     new: 
-      comma_seperated_plz: "You can enter multiple email addresses separated by commas."
-      if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
-      invite_someone_to_join: "Invite someone to join Diaspora!"
-      message: "Message:"
-      send_an_invitation: "Send an invitation"
-      send_invitation: "Send invitation"
-      to: "To"
+      comma_seperated_plz: "Pots escriure múltiples direccions d'E-Mail separades per comes."
+      if_they_accept_info: "si accepten, seran afegits a l'aspecte al que l'hagis convidat."
+      invite_someone_to_join: "Convida algú a unir-se a Diaspora!"
+      message: "Missatge:"
+      send_an_invitation: "Enviar una invitació"
+      send_invitation: "Enviar invitació"
+      to: "Per"
   layouts: 
     application: 
-      powered_by: "POWERED BY DIASPORA*"
+      powered_by: "IMPULSAT PER DIASPORA*"
     header: 
-      account_settings: "account settings"
-      blog: "blog"
-      edit_profile: "edit profile"
-      login: "login"
-      logout: "logout"
-      view_profile: "view profile"
+      account_settings: "configurar compte"
+      blog: "Blog"
+      edit_profile: "editar perfil"
+      login: "Entrar"
+      logout: "desconectar-se"
+      view_profile: "veure perfil"
   new_requests: 
-    few: "%{count} new requests!"
-    one: "new request!"
-    other: "%{count} new requests!"
-    zero: "no new requests"
+    few: "%{count} noves peticions!"
+    one: "Nova petició!"
+    other: "%{count} noves peticions!"
+    zero: "no hi ha noves peticions"
   notifier: 
-    diaspora: "the diaspora email robot"
-    hello: "Hello %{name}!"
-    love: "love,"
+    diaspora: "Correu robot de Diaspora"
+    hello: "¡Hola %{name}!"
+    love: "amb amor,"
     new_request: 
-      just_sent_you: "just sent you a contact request on Diaspora*"
-      sign_in: "sign in here"
-      subject: "new Diaspora* contact request from %{from}"
-      try_it_out: "You should really think about checking it out."
+      just_sent_you: "acaben d'enviar-te una solicitut de contacte a Diaspora*"
+      sign_in: "registra't aquí"
+      subject: "nova petició de contacte de Diaspora* de %{from}"
+      try_it_out: "Hauries de pensar en corregir-ho."
     request_accepted: 
-      accepted: "has accepted your contact request. They are now in your"
-      aspect: "aspect."
-      subject: "%{name} has accepted your contact request on Diaspora*"
+      accepted: "ha acceptat la teva petició de contacte. Ara es troben en el teu"
+      aspect: "aspecte."
+      subject: "%{name} ha acceptat la teva petició de contacte a Diaspora*"
   ok: "OK"
-  or: "or"
+  or: "o"
   pagination: 
-    next: "Next"
-    previous: "Previous"
-  password: "Password"
-  password_confirmation: "Password confirmation"
+    next: "Següent"
+    previous: "Anterior"
+  password: "Contrasenya"
+  password_confirmation: "Confirmació de contrasenya"
   people: 
     edit: 
-      allow_search: "Allow for people to search for you within Diaspora"
-      first_name: "First name"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
-      last_name: "Last name"
-      update_profile: "Update Profile"
-      your_bio: "Your bio"
-      your_birthday: "Your birthday"
-      your_gender: "Your gender"
-      your_name: "Your name"
-      your_photo: "Your photo"
-      your_profile: "Your profile"
+      allow_search: "Permetre que la gent et busqui a Diaspora"
+      first_name: "Nom"
+      info_available_to: "Aquesta informació estarà disponible per qualsevol que es connecti a Diaspora."
+      last_name: "Cognoms"
+      update_profile: "Actualitzar perfil"
+      your_bio: "La teva biografia"
+      your_birthday: "El teu aniversari"
+      your_gender: "El teu sexe"
+      your_name: "El teu nom"
+      your_photo: "La teva fotografia"
+      your_profile: "El teu perfil"
     helper: 
-      people_on_pod_are_aware_of: " people on pod are aware of"
-      results_for: " results for %{params}"
+      people_on_pod_are_aware_of: "persones al \"pod\" són conscients de"
+      results_for: "resultats per %{params}"
     index: 
-      results_for: "search results for"
+      results_for: "resultats de la cerca per"
     person: 
-      add_contact: "add contact"
-      already_connected: "Already connected"
-      pending_request: "pending request"
-      thats_you: "thats you!"
+      add_contact: "afegir contacte"
+      already_connected: "Ja està conectat"
+      pending_request: "petició pendent"
+      thats_you: "Aquest ets tu!"
     profile_photo_upload: 
-      or_select_one: "or select one from your already existing"
+      or_select_one: "o selecciona un dels que ja existeixen"
     profile_sidebar: 
-      bio: "bio"
-      born: "born"
-      cannot_remove: "Cannot remove %{name} from last aspect. (If you want to disconnect from this person you must remove contact.)"
-      edit_my_profile: "Edit my profile"
-      gender: "gender"
-      in_aspects: "in aspects"
-      remove_contact: "remove contact"
-      remove_from: "Remove %{name} from %{aspect}?"
+      bio: "biografoa"
+      born: "nascut"
+      cannot_remove: "No es pot eliminar a %{name} de l'últim aspecte."
+      edit_my_profile: "Modificar el meu perfil"
+      gender: "sexe"
+      in_aspects: "a aspectes"
+      remove_contact: "eliminar contacte"
+      remove_from: "Eliminar a %{name} de %{aspect}?"
     show: 
-      already_requested: "You have already sent a request to %{name}."
-      does_not_exist: "Person does not exist!"
-      incoming_request: "You have an incoming request from this person."
-      no_posts: "no posts to display!"
-      not_connected: "You are not connected with this person"
-      request_people: "If you'd like, you can request to place him/her in one of your aspects."
-      return_to_aspects: "Return to your aspects page"
-      to_accept_or_ignore: "to accept or ignore it."
+      already_requested: "Ja has enviat una solicitut a %{name}."
+      does_not_exist: "L'usuari no existeix!"
+      incoming_request: "Tens una petició d'aquesta persona."
+      no_posts: "No hi ha publicacions a mostrar!"
+      not_connected: "No estàs conectat amb aquesta persona"
+      request_people: "Si ho desitges, pots demanar-li la col·locació en un dels teus aspectes."
+      return_to_aspects: "Tornar als teus aspectes"
+      to_accept_or_ignore: "acceptar o ignorar."
     update: 
-      failed: "Failed to update profile"
-      updated: "Profile updated"
+      failed: "No s'ha pogut actualitzar el teu perfil"
+      updated: "Perfil actualitzat"
   photos: 
     create: 
-      integrity_error: "Photo upload failed.  Are you sure that was an image?"
-      runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
-      type_error: "Photo upload failed.  Are you sure an image was added?"
+      integrity_error: "La càrrega de la fotografia ha fallat. Estàs segur de que era una imatge?"
+      runtime_error: "La càrrega de fotografies ha fallat. Estàs segur de que tens posat el cinturó de seguretat?"
+      type_error: "La càrrega de la fotografia ha fallat. Estàs segur de que s'ha afegit alguna imatge?"
     destroy: 
-      notice: "Photo deleted."
+      notice: "Fotografia eliminada."
     edit: 
-      editing: "Editing"
+      editing: "Editant"
     new: 
-      back_to_list: "Back to List"
-      new_photo: "New Photo"
-      post_it: "post it!"
+      back_to_list: "Tornar a la llista"
+      new_photo: "Nova fotografia"
+      post_it: "¡Postegeu!"
     new_photo: 
-      empty: "{file} is empty, please select files again without it."
-      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
-      size_error: "{file} is too large, maximum file size is {sizeLimit}."
+      empty: "{file} està buit, si us plau selecciona els arxius sense aquest últim."
+      invalid_ext: "{file} té una extensió no vàlida. Només {extensions} estnn permeses."
+      size_error: "{file} és massa llarg, la mida màxima per arxiu és de {sizeLimit}."
     photo: 
-      view_all: "view all of %{name}'s photos"
+      view_all: "veure totes les fotografies de %{name}"
     show: 
-      delete_photo: "Delete Photo"
-      edit: "edit"
-      edit_delete_photo: "Edit photo description / delete photo"
-      make_profile_photo: "make profile photo"
-      original_post: "Original Post"
-      update_photo: "Update Photo"
-      view: "view"
+      delete_photo: "Eliminar fotografia"
+      edit: "editar"
+      edit_delete_photo: "Editar peu de fotografia / eliminar fotografia"
+      make_profile_photo: "convertir en fotografia de perfil"
+      original_post: "Post original"
+      update_photo: "Actualitzar fotografia"
+      view: "veure"
     update: 
-      error: "Failed to edit photo."
-      notice: "Photo successfully updated."
-  profile: "Profile"
+      error: "Ha fallat l'edició de la fotografia."
+      notice: "Fotografia actualitzada correctament."
+  profile: "Perfil"
   registrations: 
-    closed: "Signups are closed on this Diaspora pod."
+    closed: "Los registros están cerrados en este servidor Diaspora"
     create: 
-      success: "You've joined Diaspora!"
+      success: "¡Te has unido a Diaspora!"
     edit: 
-      cancel_my_account: "Cancel my account"
-      edit: "Edit %{name}"
-      leave_blank: "(leave blank if you don't want to change it)"
-      password_to_confirm: "(we need your current password to confirm your changes)"
-      unhappy: "Unhappy?"
-      update: "Update"
+      cancel_my_account: "Eliminar mi cuenta"
+      edit: "Editar %{name}"
+      leave_blank: "(déjalo en blanco si no quieres cambiarlo)"
+      password_to_confirm: "(necesitamos tu contraseña actual para confirmar los cambios)"
+      unhappy: "¿Triste?"
+      update: "Actualizar"
     new: 
-      sign_up: "Sign up"
-      sign_up_for_diaspora: "Sign up for Diaspora"
+      sign_up: "Regístrate"
+      sign_up_for_diaspora: "Regístrate en Diaspora"
   requests: 
     create: 
-      sending: "Sending"
-      sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
+      sending: "Enviando..."
+      sent: "Has solicitado compartir con %{name}. Deberían verlo la próxima vez que se conecten a Diaspora."
     destroy: 
-      error: "Please select an aspect!"
-      ignore: "Ignored contact request."
-      success: "You are now friends."
+      error: "¡Selecciona un aspecto!"
+      ignore: "Petición de contacto ignorada."
+      success: "Ahora son amigos."
     manage_aspect_contacts: 
-      existing: "Existing contacts"
-      manage_within: "Manage contacts within"
+      existing: "Contactos existentes"
+      manage_within: "Gestione los contactos en"
     new_request_to_person: 
-      sent: "sent!"
-  search: "Search"
+      sent: "¡enviado!"
+  search: "Buscar"
   services: 
     create: 
-      success: "Authentication successful."
+      success: "Autenticación correcta."
     destroy: 
-      success: "Successfully destroyed authentication."
+      success: "Autenticación destruida con éxito."
     index: 
-      connect_to_facebook: "Connect to facebook"
-      connect_to_twitter: "Connect to twitter"
-      disconnect: "disconnect"
-      logged_in_as: "logged in as"
-      really_disconnect: "disconnect %{service}?"
-  settings: "Settings"
+      connect_to_facebook: "Conectar a facebook"
+      connect_to_twitter: "Conectar a twitter"
+      disconnect: "desconectar"
+      logged_in_as: "registrado como"
+      really_disconnect: "¿desconectar %{service}?"
+  settings: "Configuración"
   shared: 
     add_contact: 
-      create_request: "Find by Diaspora handle"
-      diaspora_handle: "Diaspora Handle"
-      enter_a_diaspora_username: "Enter a Diaspora username:"
-      know_email: "Know their email address? You should invite them"
-      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+      create_request: "Buscar por la dirección Diaspora"
+      diaspora_handle: "Dirección Diaspora"
+      enter_a_diaspora_username: "Introduzca su nombre de usuario Diaspora:"
+      know_email: "Sabes su dirección de email? Deberías invitarlos"
+      your_diaspora_username_is: "Su nombre de usuario Diaspora es: %{diaspora_handle}"
     aspect_contacts: 
-      add_aspect: "add aspect"
-      add_existing: "Add an existing contact"
-      add_to: "add to %{aspect}"
-      all_contacts: "All contacts"
-      aspect_settings: "Aspect settings"
-      aspects: "Aspects"
-      confirm_remove_aspect: "Remove aspect?"
-      done_editing: "done editing"
-      invites: "Invites"
-      no_contacts: "You currently have no contacts.  Find your contacts here."
-      remove_aspect: "Remove Aspect"
+      add_aspect: "agregar aspecto"
+      add_existing: "Añadir un contacto existente"
+      add_to: "añadir a %{aspect}"
+      all_contacts: "Todos los contactos"
+      aspect_settings: "Configuración de aspecto"
+      aspects: "Aspectos"
+      confirm_remove_aspect: "Remover aspecto?"
+      done_editing: "editado"
+      invites: "Invitaciones"
+      no_contacts: "Actualmente no tienes contactos. Búscalos aquí."
+      remove_aspect: "Remover aspecto"
     contact_list: 
-      all_contacts: "All contacts"
-      cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+      all_contacts: "Todos los contactos"
+      cannot_remove: "No se puede eliminar a la persona del último aspecto. (Si quieres desconectar a esta persona debes removerla de tus contactos.)"
     invitations: 
-      dont_have_now: "You don't have any right now, but more invites are coming soon!"
-      invitations_left: "(%{count} left)"
-      invite_someone: "Invite someone"
-      invites_closed: "Invites are currently closed on this Diaspora seed"
+      dont_have_now: "No tienes ninguna ahora mismo, pero pronto llegarán más invitaciones!"
+      invitations_left: "(quedan %{count})"
+      invite_someone: "Invita a alguien"
+      invites_closed: "Las invitaciones en este servidor Diaspora están actualmente cerradas"
     notification: 
-      new: "New %{type} from %{from}"
+      new: "Nuevo %{type} de %{from}"
     public_explain: 
-      logged_in: "logged in to %{service}"
-      manage: "manage connected services"
-      outside: "Public messages will be available for others outside of Diaspora to see."
-      title: "You are about to post a public message!"
+      logged_in: "conectar a %{service}"
+      manage: "gestión de los servicios conectados"
+      outside: "Los mensajes públicos estarán disponibles para que otros usuarios de Diaspora los puedan ver."
+      title: "¡Estás a punto de publicar un mensaje!"
     publisher: 
-      add_photos: "add photos"
-      all: "all"
-      all_contacts: "all contacts"
-      make_public: "make public"
-      post_a_message_to: "Post a message to %{aspect}"
-      posting: "Posting..."
-      share: "Share"
-      share_with: "Share with %{aspect}"
-      share_with_all: "share across all of your aspects"
+      add_photos: "añadir fotografías"
+      all: "todo"
+      all_contacts: "todos los contactos"
+      make_public: "hacer público"
+      post_a_message_to: "Publicar un mensaje a %{aspect}"
+      posting: "Posteando..."
+      share: "Compartir"
+      share_with: "Compartir con %{aspect}"
+      share_with_all: "Compartir con todos los aspectos"
     reshare: 
-      reshare: "Reshare"
+      reshare: "Compartir de nuevo"
   status_messages: 
     helper: 
-      no_message_to_display: "No message to display."
+      no_message_to_display: "No hay mensajes que mostrar."
     new_status_message: 
-      oh_yeah: "oh yeah!"
-      tell_me_something_good: "tell me something good"
+      oh_yeah: "¡Oh sí!"
+      tell_me_something_good: "dime algo bueno"
     show: 
-      destroy: "Destroy"
+      destroy: "Destruir"
   stream_helper: 
-    hide_comments: "hide comments"
-    show_comments: "show comments"
-  the_world: "the world"
-  username: "Username"
+    hide_comments: "ocultar comentarios"
+    show_comments: "mostrar comentarios"
+  the_world: "el mundo"
+  username: "Nombre de usuario"
   users: 
-    destroy: "Account successfully closed."
+    destroy: "Cuenta cerrada con éxito."
     edit: 
-      change_language: "Change Language"
-      change_password: "Change Password"
-      close_account: "Close Account"
-      download_photos: "download my photos"
-      download_xml: "download my xml"
-      export_data: "Export Data"
-      new_password: "New Password"
-      your_email: "Your email"
-      your_handle: "Your diaspora handle"
+      change_language: "Cambiar idioma"
+      change_password: "Cambiar contraseña"
+      close_account: "Cerrar cuenta"
+      download_photos: "Descargar mis fotos"
+      download_xml: "Descargar mi xml"
+      export_data: "Exportar datos"
+      new_password: "Nueva contraseña"
+      your_email: "Tu email"
+      your_handle: "Tu dirección Diaspora"
     getting_started: 
-      connect_services: "Connect your other services"
-      define_aspects: "Define your aspects"
-      edit_profile: "Edit your profile"
-      finished: "Finished!"
-      save_and_continue: "Save and continue"
-      signup_steps: "Finish your sign up by completing these three steps:"
-      skip: "skip getting started"
+      connect_services: "Conectar a otros servicios"
+      define_aspects: "Define tus aspectos"
+      edit_profile: "Editar tu perfil"
+      finished: "Finalizado!"
+      save_and_continue: "Guardar y continuar"
+      signup_steps: "Completa tu inscripción completando estos tres pasos:"
+      skip: "saltarse la configuración inicial"
       step_2: 
-        add: "Add"
-        aspect_name: "Aspect name"
-        description: "Tell Diaspora what different aspects of you are seen by different contacts. You can manage these later through your account menu at the top right. Your aspects are unique to you and not visible by others."
-        drag_to_add: "Drag them to the aspect of yourself they know"
-        no_requests: "You have no requests"
-        your_aspects: "Your aspects"
-        your_inviter: "Here are the people who are waiting for you:"
+        add: "Añadir"
+        aspect_name: "Nombre del aspecto"
+        description: "Dile a Diaspora qué aspectos diferentes de ti serán vistos por diferentes contactos. Puedes manejar estos aspectos luego en tu menú de cuenta, arriba a la derecha. Tus aspectos son solamente vistos por ti, y no por otros."
+        drag_to_add: "Arrastralos al aspecto de ti al que pertenezcan"
+        no_requests: "No tienes nuevas peticiones"
+        your_aspects: "Tus aspectos"
+        your_inviter: "Estas son las personas que estan esperando por ti:"
       step_3: 
-        description: "You are able to connect your existing social networks to your Diaspora account. You will be able to post publically through your Home page when you select “make public\""
-        your_services: "Your services"
+        description: "Puedes conectar tus redes sociales existentes con tu cuenta Diaspora. Podrás realizar posts públicos desde tu Inicio cuando selecciones \"hacer público\""
+        your_services: "Tus servicios"
       step_4: 
-        change_profile: "You can edit your profile and manage your connected services at any time through "
-        continue: "Continue on to your Home page, an overview of all of your aspects."
-        finish: "Finish"
-        manage_aspects: "You can also add contacts while on any aspect page."
-        ready_to_share: "You're now ready to start sharing with "
-        set_up: "You're all set up, %{name}!"
-        user_menu: "the user menu located at the top right."
-      welcome: "Welcome to Diaspora!"
+        change_profile: "Puedes editar tu perfil y configurar tus servicios conectados en cualquier momento."
+        continue: "Continúa en tu página de Inicio, un resumen de todos tus aspectos."
+        finish: "Finalizar"
+        manage_aspects: "También puedes agregar varios contactos al mismo tiempo en una página de aspecto."
+        ready_to_share: "Ya puedes comenzar a compartir con"
+        set_up: "Ya estás listo, %{name}!"
+        user_menu: "el menú de usuario está localizado arriba a la derecha."
+      welcome: "¡Bienvenido a Diaspora!"
     public: 
-      does_not_exist: "User %{username} does not exist!"
+      does_not_exist: "¡El usuario %{username} no existe!"
     update: 
-      language_changed: "Language Changed"
-      language_not_changed: "Language Change Failed"
-      password_changed: "Password Changed"
-      password_not_changed: "Password Change Failed"
+      language_changed: "Idioma Cambiado"
+      language_not_changed: "Cambio de Idioma Fallido"
+      password_changed: "Contraseña Cambiada"
+      password_not_changed: "Cambio de Contraseña Fallido"
   webfinger: 
-    fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
-    hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    fetch_failed: "error al buscar el perfil webfinger de %{profile_url}"
+    hcard_fetch_failed: "hubo un problema al buscar el hcard para #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "el webfinger parece no estar habilitado para el host de %{account}"
+    xrd_fetch_failed: "hubo un error al recibir el xrd desde la cuenta %{account}"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 410630f6c..a9ae2f808 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -392,3 +392,6 @@ cs:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 1072c070c..12858f6d4 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -51,18 +51,18 @@ cy:
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
     manage: 
-      add_a_new_aspect: "Ychwanegwch agwedd"
+      add_a_new_aspect: "Add a new aspect"
       add_a_new_contact: "Add a new contact"
       drag_to_add: "Drag to add people"
       manage_aspects: "Manage aspects"
       no_requests: "No new requests"
-      requests: "Ceisiadau"
+      requests: "Requests"
     move_contact: 
       error: "Error moving contact: %{inspect}"
       failure: "didn't work %{inspect}"
       success: "Person moved to new aspect"
     new_aspect: 
-      create: "Creu"
+      create: "Create"
       name: "Name"
     no_contacts_message: 
       add_contact: "Add a contact"
@@ -220,11 +220,11 @@ cy:
     destroy: 
       notice: "Photo deleted."
     edit: 
-      editing: "Golygu"
+      editing: "Editing"
     new: 
       back_to_list: "Nol i'r Rhestr"
-      new_photo: "Llun Newydd"
-      post_it: "postiwch e!"
+      new_photo: "New Photo"
+      post_it: "post it!"
     new_photo: 
       empty: "{file} is empty, please select files again without it."
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
@@ -232,7 +232,7 @@ cy:
     photo: 
       view_all: "view all of %{name}'s photos"
     show: 
-      delete_photo: "Dileu Llun"
+      delete_photo: "Delete Photo"
       edit: "edit"
       edit_delete_photo: "Edit photo description / delete photo"
       make_profile_photo: "make profile photo"
@@ -324,7 +324,7 @@ cy:
       make_public: "make public"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
-      share: "Rhannu"
+      share: "Share"
       share_with: "Share with %{aspect}"
       share_with_all: "Share with all aspects"
     reshare: 
@@ -334,9 +334,9 @@ cy:
       no_message_to_display: "No message to display."
     new_status_message: 
       oh_yeah: "oh yeah!"
-      tell_me_something_good: "Dwi eisiau clywed rhwbeth da"
+      tell_me_something_good: "tell me something good"
     show: 
-      destroy: "Dinistrio"
+      destroy: "Destroy"
   stream_helper: 
     hide_comments: "hide comments"
     show_comments: "show comments"
@@ -392,3 +392,6 @@ cy:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 11d178ed1..158255d36 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -392,3 +392,6 @@ da:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 82cb2e0b2..ace9ec6a0 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -391,4 +391,7 @@ de:
       password_not_changed: "Ändern des Passworts fehlgeschlagen"
   webfinger: 
     fetch_failed: "konnte Webfinger-Profil für %{profile_url} nicht laden"
-    hcard_fetch_failed: "es gab Probleme beim Beziehen der hcard für #{@account}"
+    hcard_fetch_failed: "es gab Probleme beim Beziehen der hcard für %{account}"
+    no_person_constructed: "Konnte keine Person von dieser hcard erstellen."
+    not_enabled: "Webfinger scheint nicht führ den Server von %{account} verfügbar zu sein."
+    xrd_fetch_failed: "Konnte  XRD Datei von %{account} nicht herunterladen"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 900307516..20281bea0 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -392,3 +392,6 @@ el:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index c98f65348..7c2e27a14 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -392,3 +392,6 @@ eo:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 8f13ea5eb..efa2cdfd9 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -37,7 +37,7 @@ es-CL:
       success: "Contacto agregado correctamente al aspecto."
     create: 
       failure: "Error al crear el aspecto."
-      success: "Tu nuevo aspecto %{name} fue creado"
+      success: "Tu nuevo aspecto %{name} fué creado"
     destroy: 
       success: "%{name} fue correctamente eliminado."
     edit_aspect_pane: 
@@ -54,7 +54,7 @@ es-CL:
       add_a_new_aspect: "Agregar un nuevo aspecto"
       add_a_new_contact: "Agregar un nuevo contacto"
       drag_to_add: "Arrastrar para agregar personas"
-      manage_aspects: "Gestionar aspectos"
+      manage_aspects: "Manejar aspectos"
       no_requests: "No hay nuevas solicitudes"
       requests: "Solicitudes"
     move_contact: 
@@ -69,7 +69,7 @@ es-CL:
       add_contact_to: "Agregar a alguien a %{aspect_name}"
       invite: "¡Invita a alguien a unirse a Diaspora!"
       nobody: "¡Invita a toda esa gente importante en tu vida a Diaspora!"
-      nobody_in_aspect: "Tu aspecto '%{aspect_name}' esta vacío."
+      nobody_in_aspect: "Tu aspecto '%{aspect_name}' está vacío."
     no_posts_message: 
       start_talking: "Nadie ha dicho nada aún.  ¡Que comiense la conversación!"
     remove_from_aspect: 
@@ -106,7 +106,7 @@ es-CL:
       choice: "Opció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 como hostear tu propio servidor Diaspora."
-      login_here: "inicia sesión aquí"
+      login_here: "iniciar sesión 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."
@@ -142,18 +142,18 @@ es-CL:
       logout: "salir"
       view_profile: "ver perfil"
   new_requests: 
-    few: "%{count} ¡nuevas solicitudes!"
+    few: "¡%{count} nuevas solicitudes!"
     one: "¡nueva solicitud!"
-    other: "%{count} ¡nuevas solicitudes!"
+    other: "¡%{count} nuevas solicitudes!"
     zero: "no hay nuevas solicitudes"
   notifier: 
     diaspora: "correo robot de diaspora"
-    hello: "Hola %{name}!"
-    love: "amor,"
+    hello: "¡Hola %{name}!"
+    love: "cariño,"
     new_request: 
       just_sent_you: "acaban de enviarte una solicitud de contacto en Diaspora*"
       sign_in: "regístrate aquí"
-      subject: "nueva solicitud de contacto de Diaspora* %{from}"
+      subject: "nueva solicitud de contacto Diaspora* de %{from}"
       try_it_out: "Deberías pensar en echarle un vistazo."
     request_accepted: 
       accepted: "ha aceptado tu solicitud de contacto. Ahora están en tu"
@@ -173,14 +173,14 @@ es-CL:
       info_available_to: "Esta informacion estará disponible para cualquiera que se conecte en Diaspora."
       last_name: "Apellido"
       update_profile: "Actualizar Perfil"
-      your_bio: "Tu bio"
+      your_bio: "Tu biografía"
       your_birthday: "Tu cumpleaños"
       your_gender: "Tu sexo"
       your_name: "Tu nombre"
       your_photo: "Tu foto"
       your_profile: "Tu perfil"
     helper: 
-      people_on_pod_are_aware_of: "la gente en el pod están conscientes de"
+      people_on_pod_are_aware_of: "la gente en el servidor son conscientes de"
       results_for: "resultados para %{params}"
     index: 
       results_for: "resultados de búsqueda para"
@@ -192,14 +192,14 @@ es-CL:
     profile_photo_upload: 
       or_select_one: "o selecciona uno de los que ya existen"
     profile_sidebar: 
-      bio: "bio"
+      bio: "biografía"
       born: "nacido"
       cannot_remove: "No se puede eliminar a %{name} del último aspecto. (Si quieres desconectarte de esta persona primero debes eliminar al contacto.)"
       edit_my_profile: "Editar mi perfil"
       gender: "sexo"
       in_aspects: "en aspectos"
       remove_contact: "eliminar contacto"
-      remove_from: "Eliminar %{name} de %{aspect}?"
+      remove_from: "¿Eliminar a %{name} de %{aspect}?"
     show: 
       already_requested: "Ya le has enviado una solicitud a %{name}."
       does_not_exist: "¡La persona no existe!"
@@ -215,8 +215,8 @@ es-CL:
   photos: 
     create: 
       integrity_error: "Error al subir la foto.  ¿Estás seguro/a que era una imagen?"
-      runtime_error: "Error al subir la foto. ¿Estás seguro que tienes puesto el cinturon de seguridad?"
-      type_error: "Error al subir la foto.  ¿Estás seguro que agregaste una imagen?"
+      runtime_error: "Error al subir la foto. ¿Estás seguro/a que tienes puesto el cinturon de seguridad?"
+      type_error: "Error al subir la foto.  ¿Estás seguro/a que agregaste una imagen?"
     destroy: 
       notice: "Foto eliminada."
     edit: 
@@ -224,19 +224,19 @@ es-CL:
     new: 
       back_to_list: "Volver a la lista"
       new_photo: "Nueva Foto"
-      post_it: "¡Postéalo!"
+      post_it: "¡postéalo!"
     new_photo: 
-      empty: "{file} está vacio, por favor, seleccione los archivos nuevamente sin éste último"
-      invalid_ext: "{file} tiene una extension no válida. Solo {extensions} están permitidas."
+      empty: "{file} está vacío, por favor, seleccione los archivos nuevamente sin éste último"
+      invalid_ext: "{file} tiene una extensión no válida. Solo {extensions} están permitidas."
       size_error: "{file} es demasiado grande, el tamaño máximo por archivo es {sizeLimit}."
     photo: 
       view_all: "ver todas las fotos de %{name}"
     show: 
       delete_photo: "Borrar Foto"
       edit: "editar"
-      edit_delete_photo: "Editar descripcion de la foto / borrar foto"
+      edit_delete_photo: "Editar descripción de foto / borrar foto"
       make_profile_photo: "convertir en foto de perfil"
-      original_post: "Posteo original"
+      original_post: "Posteo Original"
       update_photo: "Actualizar Foto"
       view: "ver"
     update: 
@@ -250,7 +250,7 @@ es-CL:
     edit: 
       cancel_my_account: "Cerrar mi cuenta"
       edit: "Editar %{name}"
-      leave_blank: "(Déjalo en blanco si no quieres cambiarlo)"
+      leave_blank: "(déjalo en blanco si no quieres cambiarlo)"
       password_to_confirm: "(necesitamos tu contraseña actual para confirmar los cambios)"
       unhappy: "¿Triste?"
       update: "Actualizar"
@@ -260,14 +260,14 @@ es-CL:
   requests: 
     create: 
       sending: "Enviando"
-      sent: "Has solicitado compartir con %{name}.  Deberían verlo la próxima ves que inicien sesión en Diaspora."
+      sent: "Has solicitado compartir con %{name}.  Deberían verlo la próxima ves que entren a Diaspora."
     destroy: 
       error: "¡Por favor selecciona un aspecto!"
       ignore: "Ignorar la solicitud de contacto."
       success: "Ahora son amigos."
     manage_aspect_contacts: 
       existing: "Los contactos existen"
-      manage_within: "Gestionar contactos en"
+      manage_within: "Manejar los contactos en"
     new_request_to_person: 
       sent: "¡enviado!"
   search: "Buscar"
@@ -288,7 +288,7 @@ es-CL:
       create_request: "Encontrar por la dirección Diaspora"
       diaspora_handle: "diaspora@handle.org"
       enter_a_diaspora_username: "Ingresa tu nombre de usuario Diaspora:"
-      know_email: "¿Conóces su direccion de correo? Deberías invitarlo"
+      know_email: "¿Conóces su dirección de correo? Deberías invitarlo"
       your_diaspora_username_is: "Tu nombre de usuario Diaspora es: %{diaspora_handle}"
     aspect_contacts: 
       add_aspect: "agregar un aspecto"
@@ -309,12 +309,12 @@ es-CL:
       dont_have_now: "No tienes ninguna ahora, ¡pero pronto vendrán mas invitaciones!"
       invitations_left: "(quedan %{count})"
       invite_someone: "Invita a alguien"
-      invites_closed: "Las invitaciones están temporalmente cerradas"
+      invites_closed: "Las invitaciones están temporalmente cerradas en este servidor de Diaspora"
     notification: 
       new: "Nuevo %{type} de %{from}"
     public_explain: 
       logged_in: "entrar a %{service}"
-      manage: "gestión de servicios conectados"
+      manage: "manejar los servicios conectados"
       outside: "Los mensajes públicos estarán disponibles para que otros fuera de Diaspora los puedan ver."
       title: "¡Estás a punto de postear un mensaje público!"
     publisher: 
@@ -388,7 +388,10 @@ es-CL:
       language_changed: "Idioma Cambiado"
       language_not_changed: "Error al cambiar de idioma"
       password_changed: "Contraseña Cambiada"
-      password_not_changed: "Error al cambiar la Contraseña"
+      password_not_changed: "Error al cambiar la contraseña"
   webfinger: 
-    fetch_failed: "error al buscar la dirección de correo de %{profile_url}"
-    hcard_fetch_failed: "hubo un problema al buscar la hcard de #{@account}"
+    fetch_failed: "error al buscar el perfil webfinger para %{profile_url}"
+    hcard_fetch_failed: "hubo un problema buscando la hcard de %{account}"
+    no_person_constructed: "Ninguna persona puede ser construida a partir de ésta hcard"
+    not_enabled: "el webfinger parece no estar disponible para el host de %{account}"
+    xrd_fetch_failed: "hubo un error al recibir el crd desde la cuenta %{account}"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index e6d6de131..947963bee 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -42,12 +42,12 @@ es:
       success: "%{name} fue eliminado correctamente."
     edit_aspect_pane: 
       add_existing: "Añadir un contacto existente"
-      confirm_remove_aspect: "Eliminar aspecto?"
-      remove_aspect: "Eliminar Aspecto"
+      confirm_remove_aspect: "Remover aspecto?"
+      remove_aspect: "Remover Aspecto"
     helper: 
-      are_you_sure: "¿Seguro que deseas eliminar este aspecto?"
+      are_you_sure: "¿Seguro que deseas remover este aspecto?"
       aspect_not_empty: "Aspecto no vacío"
-      remove: "eliminar"
+      remove: "remover"
     index: 
       handle_explanation: "Esta es tu dirección Diaspora. Como una dirección de email, puedes dársela a gente para que te encuentren"
     manage: 
@@ -89,10 +89,10 @@ es:
       comment: "Comentar"
       commenting: "Comentando..."
   contacts: 
-    few: "%{count} contacts"
-    one: "1 contact"
-    other: "%{count} contacts"
-    zero: "no contacts"
+    few: "%{count} contactos"
+    one: "1 contacto"
+    other: "%{count} contactos"
+    zero: "no hay contactos"
   delete: "Borrar"
   email: "Correo electrónico"
   error_messages: 
@@ -142,10 +142,10 @@ es:
       logout: "desconectarse"
       view_profile: "ver perfil"
   new_requests: 
-    few: "%{count} new requests!"
-    one: "new request!"
-    other: "%{count} new requests!"
-    zero: "no new requests"
+    few: "%{count} nuevas peticiones!"
+    one: "Nueva petición!"
+    other: "%{count} nuevas peticiones!"
+    zero: "no hay nuevas peticiones"
   notifier: 
     diaspora: "Correo robot de Diaspora"
     hello: "¡Hola %{name}!"
@@ -162,8 +162,8 @@ es:
   ok: "OK"
   or: "o"
   pagination: 
-    next: "Next"
-    previous: "Previous"
+    next: "Siguiente"
+    previous: "Anterior"
   password: "Contraseña"
   password_confirmation: "Confirmación de contraseña"
   people: 
@@ -301,7 +301,7 @@ es:
       done_editing: "editado"
       invites: "Invitaciones"
       no_contacts: "Actualmente no tienes contactos. Búscalos aquí."
-      remove_aspect: "Eliminar aspecto"
+      remove_aspect: "Remover aspecto"
     contact_list: 
       all_contacts: "Todos los contactos"
       cannot_remove: "No se puede eliminar a la persona del último aspecto. (Si quieres desconectar a esta persona debes removerla de tus contactos.)"
@@ -309,7 +309,7 @@ es:
       dont_have_now: "No tienes ninguna ahora mismo, pero pronto llegarán más invitaciones!"
       invitations_left: "(quedan %{count})"
       invite_someone: "Invita a alguien"
-      invites_closed: "Invites are currently closed on this Diaspora seed"
+      invites_closed: "Las invitaciones en este servidor Diaspora están actualmente cerradas"
     notification: 
       new: "Nuevo %{type} de %{from}"
     public_explain: 
@@ -338,7 +338,7 @@ es:
     show: 
       destroy: "Destruir"
   stream_helper: 
-    hide_comments: "hide comments"
+    hide_comments: "ocultar comentarios"
     show_comments: "mostrar comentarios"
   the_world: "el mundo"
   username: "Nombre de usuario"
@@ -367,7 +367,7 @@ es:
         aspect_name: "Nombre del aspecto"
         description: "Dile a Diaspora qué aspectos diferentes de ti serán vistos por diferentes contactos. Puedes manejar estos aspectos luego en tu menú de cuenta, arriba a la derecha. Tus aspectos son solamente vistos por ti, y no por otros."
         drag_to_add: "Arrastralos al aspecto de ti al que pertenezcan"
-        no_requests: "You have no requests"
+        no_requests: "No tienes nuevas peticiones"
         your_aspects: "Tus aspectos"
         your_inviter: "Estas son las personas que estan esperando por ti:"
       step_3: 
@@ -390,5 +390,8 @@ es:
       password_changed: "Contraseña Cambiada"
       password_not_changed: "Cambio de Contraseña Fallido"
   webfinger: 
-    fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
-    hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    fetch_failed: "error al buscar el perfil webfinger de %{profile_url}"
+    hcard_fetch_failed: "hubo un problema al buscar el hcard para #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "el webfinger parece no estar habilitado para el host de %{account}"
+    xrd_fetch_failed: "hubo un error al recibir el xrd desde la cuenta %{account}"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index e892c919a..bf526496e 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -392,3 +392,6 @@ fi:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 1cf4ddbe8..0b6224540 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -6,7 +6,7 @@
 fr: 
   _comments: "Commentaires"
   _home: "Accueil"
-  _photos: "Photos"
+  _photos: "photos"
   _services: "Services"
   account: "Compte"
   activemodel: 
@@ -43,13 +43,13 @@ fr:
     edit_aspect_pane: 
       add_existing: "Ajouter un contact existant"
       confirm_remove_aspect: "Supprimer l'aspect ?"
-      remove_aspect: "Supprimer l'Aspect"
+      remove_aspect: "Supprimer l'aspect"
     helper: 
       are_you_sure: "Êtes-vous sûr(e) de vouloir supprimer cet aspect ?"
       aspect_not_empty: "L’aspect n’est pas vide"
       remove: "supprimer"
     index: 
-      handle_explanation: "Ceci est votre diaspora handle.  Comme une adresse e-mail, vous pouvez le donner à des personnes pour vous joindre."
+      handle_explanation: "Ceci est votre diaspora handle.  Comme une adresse e-mail, vous pouvez le donner à des personnes pour leur permettre de vous joindre."
     manage: 
       add_a_new_aspect: "Ajouter un nouvel aspect"
       add_a_new_contact: "Ajouter un nouveau contact"
@@ -59,7 +59,7 @@ fr:
       requests: "Requêtes"
     move_contact: 
       error: "Erreur lors du déplacement du contact : %{inspect}"
-      failure: "ne fonctionne pas %{inspect}"
+      failure: "n'a pas fonctionné %{inspect}"
       success: "Personne déplacée vers le nouvel aspect"
     new_aspect: 
       create: "Créer"
@@ -68,10 +68,10 @@ fr:
       add_contact: "Ajouter un contact"
       add_contact_to: "Ajouter quelqu'un à %{aspect_name}"
       invite: "Inviter quelqu'un à rejoindre Diaspora !"
-      nobody: "Amenez des personnes qui comptent dans votre vie sur Diaspora !"
+      nobody: "Invitez les personnes qui comptent dans votre vie sur Diaspora !"
       nobody_in_aspect: "Votre aspect '%{aspect_name}' est vide."
     no_posts_message: 
-      start_talking: "Personne n’a encore rien dit.  Commencez dès à présent la conversation !"
+      start_talking: "Personne n’a encore rien dit.  Engagez dès à présent la conversation !"
     remove_from_aspect: 
       failure: "Impossible de supprimer la personne de l'aspect"
       success: "Personne supprimée de l'aspect avec succès"
@@ -81,12 +81,12 @@ fr:
     show: 
       edit_aspect: "éditer l'aspect"
     update: 
-      success: "Votre aspect, %{name}, a été édité avec succès."
+      success: "Votre aspect '%{name}' a été édité avec succès."
   back: "Retour"
   cancel: "Annuler"
   comments: 
     new_comment: 
-      comment: "Commentaire"
+      comment: "Commenter"
       commenting: "Commentaire en cours d'envoi..."
   contacts: 
     few: "%{count} contacts"
@@ -111,20 +111,20 @@ fr:
       ownership_explanation: "Vous êtes le propriétaire de vos images, et vous ne devriez pas être obligé de renoncer à cela juste pour les partager. Vous conservez la propriété de tout ce que vous partagez sur Diaspora, ce qui vous donne le contrôle total de la manière dont cela est distribué."
       share_what_you_want: "Partagez ce que vous voulez, avec qui vous voulez."
       simplicity: "Simplicité"
-      simplicity_explanation: "Diaspora rend le partage propre et facile - et cela est également valable pour la vie privée. Intrinsèquement privé, Diaspora ne vous contraint pas à vous frayer un chemin à travers des pages de configuration et d'options uniquement pour maintenir la sécurité de votre profil."
+      simplicity_explanation: "Diaspora rend le partage propre et facile - et cela est également valable pour la vie privée. Intrinsèquement privé, Diaspora ne vous contraint pas à vous frayer un chemin à travers des pages de configuration et d'options uniquement pour maintenir votre profil sécurisé."
   invitations: 
     check_token: 
-      not_found: "Jeton d'authentification introuvable"
+      not_found: "Jeton d'invitation introuvable"
     create: 
       already_contacts: "Vous êtes déjà connecté avec cette personne"
       already_sent: "Vous avez déjà invité cette personne."
       no_more: "Vous n’avez plus d’invitation."
-      rejected: "L'adresse e-mail suivante a rencontré des problèmes :"
-      sent: "Des invitations ont été envoyées à :"
+      rejected: "Les adresses e-mail suivantes ont rencontré des problèmes :"
+      sent: "Les invitations ont été envoyées à :"
     edit: 
       sign_up: "inscription"
     new: 
-      comma_seperated_plz: "Vous pouvez entrer plusieurs adresse e-mail séparées par des virgules."
+      comma_seperated_plz: "Vous pouvez entrer plusieurs adresses e-mail séparées par des virgules."
       if_they_accept_info: "s'ils acceptent, ils seront ajoutés à l'aspect auquel vous les avez invités"
       invite_someone_to_join: "Inviter quelqu'un à rejoindre Diaspora !"
       message: "Message :"
@@ -151,13 +151,13 @@ fr:
     hello: "Bonjour %{name} !"
     love: "affectueusement,"
     new_request: 
-      just_sent_you: "vient juste de vous envoyez une requête de contact sur Diaspora*"
+      just_sent_you: "vient juste de vous envoyer une requête de contact sur Diaspora*"
       sign_in: "connectez-vous ici"
       subject: "nouvelle requête de contact Diaspora* de %{from}"
       try_it_out: "Vous devriez vraiment envisager de l'essayer."
     request_accepted: 
-      accepted: "a accepté votre requête de contact. Ils sont maintenant dans votre"
-      aspect: "aspect."
+      accepted: "a accepté votre requête de contact. Il est maintenant dans votre aspect"
+      aspect: "."
       subject: "%{name} a accepté votre requête de contact sur Diaspora*"
   ok: "OK"
   or: "ou"
@@ -180,8 +180,8 @@ fr:
       your_photo: "Votre photo"
       your_profile: "Votre profil"
     helper: 
-      people_on_pod_are_aware_of: " les personnes sur le pod sont au courant de"
-      results_for: " résultats pour %{params}"
+      people_on_pod_are_aware_of: "les personnes sur le pod sont au courant de"
+      results_for: "résultats pour %{params}"
     index: 
       results_for: "résultats de la recherche pour"
     person: 
@@ -206,9 +206,9 @@ fr:
       incoming_request: "Vous avez une requête venant de cette personne."
       no_posts: "aucun message à afficher !"
       not_connected: "Vous n'êtes pas connecté à cet personne"
-      request_people: "Si vous le voulez, vous pouvez demander à le/la placer dans vos aspects."
+      request_people: "Si vous le voulez, vous pouvez demander à le/la placer dans un de vos aspects."
       return_to_aspects: "Retourner à votre page des aspects"
-      to_accept_or_ignore: "l'accepter ou l'ignorer."
+      to_accept_or_ignore: "pour l'accepter ou l'ignorer."
     update: 
       failed: "La mise à jour du profil a échoué"
       updated: "Profil mis à jour"
@@ -285,11 +285,11 @@ fr:
   settings: "Options"
   shared: 
     add_contact: 
-      create_request: "Trouver par Diaspora handle"
-      diaspora_handle: "Identifiant Diaspora"
-      enter_a_diaspora_username: "Enter a Diaspora username:"
+      create_request: "Trouver à l'aide du Diaspora handle"
+      diaspora_handle: "diaspora@handle.org"
+      enter_a_diaspora_username: "Entrez un nom d'utilisateur Diaspora :"
       know_email: "Vous connaissez leur adresse e-mail ? Vous devriez les inviter"
-      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+      your_diaspora_username_is: "Votre nom d'utilisateur diaspora est : %{diaspora_handle}"
     aspect_contacts: 
       add_aspect: "ajouter un aspect"
       add_existing: "Ajouter un contact existant"
@@ -309,7 +309,7 @@ fr:
       dont_have_now: "Vous n'avez aucun droit pour l'instant, mais plus d'invitations arriveront bientôt !"
       invitations_left: "(%{count} restant(s))"
       invite_someone: "Inviter quelqu'un"
-      invites_closed: "Invites are currently closed on this Diaspora seed"
+      invites_closed: "Les invitations sont présentement fermées sur ce pod"
     notification: 
       new: "Nouveau/nouvelle %{type} de %{from}"
     public_explain: 
@@ -358,7 +358,7 @@ fr:
       connect_services: "Connectez vos autres services"
       define_aspects: "Définissez vos aspects"
       edit_profile: "Éditez votre profil"
-      finished: "Fin!"
+      finished: "Terminé !"
       save_and_continue: "Enregistrer et continuer"
       signup_steps: "Complétez votre inscription en suivant ces trois étapes :"
       skip: "passer la présentation"
@@ -366,7 +366,7 @@ fr:
         add: "Ajouter"
         aspect_name: "Nom de l'aspect"
         description: "Signalez à Diaspora quels différents aspects sont vus par différents contacts. Vous pourrez plus tard gérer ceux-ci en allant sur votre menu de compte en haut à droite. Vos aspects vous sont spécifiques et ne sont pas visibles pour les autres."
-        drag_to_add: "Déplacez les dans l'aspect qui leur correspond"
+        drag_to_add: "Déplacez les dans l'aspect de votre vie qui leur correspond"
         no_requests: "Vous n'avez pas de requêtes"
         your_aspects: "Vos aspects"
         your_inviter: "Personnes en attente d'une réponse de votre part :"
@@ -379,7 +379,7 @@ fr:
         finish: "Terminer"
         manage_aspects: "Vous pouvez également ajouter des contacts sur chacune de vos pages d'aspect."
         ready_to_share: "Vous êtes maintenant prêt à partager avec "
-        set_up: "Vous êtes entièrement configuré, %{name}!"
+        set_up: "Vous êtes entièrement configuré, %{name} !"
         user_menu: "le menu utilisateur situé en haut à droite."
       welcome: "Bienvenue sur Diaspora !"
     public: 
@@ -391,4 +391,7 @@ fr:
       password_not_changed: "Échec de la mise à jour du mot de passe"
   webfinger: 
     fetch_failed: "impossible de télécharger le profil webfinger pour %{profile_url}"
-    hcard_fetch_failed: "une erreur est survenue lors du téléchargement de la hcard de #{@account}"
+    hcard_fetch_failed: "une erreur est survenue lors du téléchargement de la hcard de %{account}"
+    no_person_constructed: "Cette hcard semble être invalide."
+    not_enabled: "webfinger ne semble pas être activé sur l'hôte de %{account}'s"
+    xrd_fetch_failed: "une erreur est survenue lors de la récupération du xrd du compte %{account}"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index c65e6e7e3..9528118ed 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -309,7 +309,7 @@ he:
       dont_have_now: "אין לך כרגע, אך יתווספו לך הזמנות בקרוב!"
       invitations_left: "(%{count} נותרו)"
       invite_someone: "להזמין מישהו"
-      invites_closed: "Invites are currently closed on this Diaspora seed"
+      invites_closed: "נכון לעכשיו ההזמנות לפוד זה של דיאספורה סגורות"
     notification: 
       new: "%{type} חדש מאת %{from}"
     public_explain: 
@@ -391,4 +391,7 @@ he:
       password_not_changed: "החלפת הססמה נכשלה"
   webfinger: 
     fetch_failed: "אירע כשל בקבלת פרופיל ה־webfinger שלך ל־%{profile_url}"
-    hcard_fetch_failed: "אירעה שגיאה בעת קבלת ה־hcard למספר {@account}"
+    hcard_fetch_failed: "אירעה שגיאה בעת קבלת ה־hcard לחשבון %{account}"
+    no_person_constructed: "לא ניתן להרכיב איש קשר מ־hcard זה."
+    not_enabled: "נראה כי webfinger אינו פעיל עבור המארח של %{account}"
+    xrd_fetch_failed: "אירעה שגיאה בקבלת ה־xrd מהחשבון %{account}"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 8f54f8d85..4d6b54bd2 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -309,7 +309,7 @@ hu:
       dont_have_now: "Nincs több meghívód, de hamarosan kapsz még!"
       invitations_left: "(%{count} maradt)"
       invite_someone: "Hívj meg valakit"
-      invites_closed: "Invites are currently closed on this Diaspora seed"
+      invites_closed: "A meghívás jelenleg szünetel erre a Diaspora* kiszolgálóra."
     notification: 
       new: "Új %{type}. Feladó: %{from}"
     public_explain: 
@@ -392,3 +392,6 @@ hu:
   webfinger: 
     fetch_failed: "Nem sikerült lekérni webfinger profilt %{profile_url} számára"
     hcard_fetch_failed: "nem sikerült lekérni a hCard-ot #{@account} számára"
+    no_person_constructed: "Ebből a hCard névjegyből nem lehet személyt létrehozni."
+    not_enabled: "a webfinger nincs engedélyezve %{account} kiszolgálóján"
+    xrd_fetch_failed: "%{account} fiókjából nem sikerült az XRD kiolvasása"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 857eeb714..09afd7a72 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -392,3 +392,6 @@ id:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 0c986e0cd..3e13cc2d1 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -392,3 +392,6 @@ it:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index eaf3455e4..c4bf9b7eb 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -392,3 +392,6 @@ lt:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 923f2d884..f62549fa6 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -392,3 +392,6 @@ mk:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index a96aba453..abe050479 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -392,3 +392,6 @@ nb:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index a0cf930e6..daa132f63 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -143,7 +143,7 @@ nl:
       view_profile: "bekijk profiel"
   new_requests: 
     few: "%{count} nieuwe verzoeken!"
-    one: "nieuwe verzoek!"
+    one: "nieuw verzoek!"
     other: "%{count} nieuwe verzoeken!"
     zero: "geen nieuwe verzoeken"
   notifier: 
@@ -309,7 +309,7 @@ nl:
       dont_have_now: "Momenteel heb je er geen maar meer uitnodigingen volgen spoedig!"
       invitations_left: "(%{count} over)"
       invite_someone: "Nodig iemand uit"
-      invites_closed: "Invites are currently closed on this Diaspora seed"
+      invites_closed: "Uitnodigingen zijn momenteel gesloten voor deze Diaspora pod"
     notification: 
       new: "Nieuw %{type} van %{from}"
     public_explain: 
@@ -318,7 +318,7 @@ nl:
       outside: "Openbare berichten zijn zichtbaar voor mensen buiten Diaspora."
       title: "Je staat op het punt om een openbaar bericht te plaatsen!"
     publisher: 
-      add_photos: "voeg foto's toe"
+      add_photos: "+ foto's"
       all: "al"
       all_contacts: "alle contacten"
       make_public: "maak openbaar"
@@ -391,4 +391,7 @@ nl:
       password_not_changed: "Wachtwoord wijzigen mislukt"
   webfinger: 
     fetch_failed: "ophalen van webfinger profiel is mislukt voor %{profile_url}"
-    hcard_fetch_failed: "er was een probleem bij het ophalen van de hcard voor #{@account}"
+    hcard_fetch_failed: "er was een probleem bij het ophalen van de hcard voor %{account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger lijkt niet aan te staan voor %{account}'s provider"
+    xrd_fetch_failed: "er was een probleem bij het verkrijgen van de xrd van het account %{account}"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 66acbf139..8a4989cea 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -133,7 +133,7 @@ pl:
       to: "Do"
   layouts: 
     application: 
-      powered_by: "NAPĘDZANE PRZEZ DIASPORĘ *"
+      powered_by: "POWERED BY DIASPORA*"
     header: 
       account_settings: "ustawienia konta"
       blog: "blog"
@@ -206,7 +206,7 @@ pl:
       incoming_request: "Masz nowe zaproszenie od tej osoby."
       no_posts: "brak wpisów!"
       not_connected: "Nie jesteś połączony(-a) z tą osobą"
-      request_people: "Jeśli chcesz, możesz zaprosić jego/ją do jednego ze swoich aspektów."
+      request_people: "Jeśli chcesz, możesz zaprosić tę osobę do jednego ze swoich aspektów."
       return_to_aspects: "Wróć do strony aspektów"
       to_accept_or_ignore: "by je przyjąć lub zignorować."
     update: 
@@ -309,7 +309,7 @@ pl:
       dont_have_now: "Nie masz wolnych zaproszeń, ale niebawem się pojawią!"
       invitations_left: "(pozostało %{count} zaproszeń)"
       invite_someone: "Zaproś kogoś"
-      invites_closed: "Invites are currently closed on this Diaspora seed"
+      invites_closed: "Wysyłanie zaproszeń jest obecnie wyłączony na tym podzie Diaspora"
     notification: 
       new: "Nowy(-a,-e) %{type} od %{from}"
     public_explain: 
@@ -392,3 +392,6 @@ pl:
   webfinger: 
     fetch_failed: "Nie udało się pobrać profilu Webfinger dla %{profile_url}"
     hcard_fetch_failed: "Wystąpił problem podczas pobierania zbioru hcard dla #{@account}"
+    no_person_constructed: "Nie udało się stworzyć osoby używając tego zbioru hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "wystąpił błąd podczas pobierania xrd z konta %{account}"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 0f31c21ef..c5310f79a 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -392,3 +392,6 @@ pt-BR:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 384ec98cd..dbec423a8 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -392,3 +392,6 @@ pt-PT:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 942fa79f5..5b1d2c282 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -392,3 +392,6 @@ ro:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 1e408bd46..0890d3bb7 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -392,3 +392,6 @@ ru:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index dc5b5710b..9a24974c8 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -23,8 +23,8 @@ sk:
             person: 
               invalid: "je neplatný"
             username: 
-              taken: "is already taken"
-  ago: ""
+              taken: "je už obsadené"
+  ago: "dozadu"
   application: 
     helper: 
       unknown_person: "neznáma osoba"
@@ -41,9 +41,9 @@ sk:
     destroy: 
       success: "Užívateľ %{name} bol úspešne odstránený."
     edit_aspect_pane: 
-      add_existing: "Add an existing contact"
-      confirm_remove_aspect: "Remove aspect?"
-      remove_aspect: "Remove Aspect"
+      add_existing: "Pridať existujúci kontakt"
+      confirm_remove_aspect: "Odstrániť aspekt?"
+      remove_aspect: "Odstrániť aspekt"
     helper: 
       are_you_sure: "Skutočne chcete odstrániť tento aspekt?"
       aspect_not_empty: "Aspekt nie je prázdny"
@@ -67,8 +67,8 @@ sk:
     no_contacts_message: 
       add_contact: "Pridať kontakt"
       add_contact_to: "Pridať niekoho k aspektu %{aspect_name}"
-      invite: "Prizvať niekoho k Diaspóre!"
-      nobody: "Pozvite do Diaspóry ľudí, na ktorých Vám záleží!"
+      invite: "Prizvať niekoho k Diaspore!"
+      nobody: "Pozvite do Diaspory ľudí, na ktorých Vám záleží!"
       nobody_in_aspect: "Váš aspekt '%{aspect_name}' je prázdny."
     no_posts_message: 
       start_talking: "Nikto nič nevraví. Začnite Vy!"
@@ -89,29 +89,29 @@ sk:
       comment: "Komentár"
       commenting: "Komentuje..."
   contacts: 
-    few: "%{count} contacts"
-    one: "1 contact"
-    other: "%{count} contacts"
-    zero: "no contacts"
+    few: "kontakty (%{count})"
+    one: "1 kontakt"
+    other: "kontakty (%{count})"
+    zero: "žiadne kontakty"
   delete: "Zmazať"
   email: "e-mail"
   error_messages: 
     helper: 
       correct_the_following_errors_and_try_again: "Upravte nasledujúce chyby a skúste znova."
       invalid_fields: "Chybné polia"
-  fill_me_out: "Vyplni ma"
+  fill_me_out: "Vyplň ma"
   home: 
     show: 
       already_account: "Máte už vytvorený účet?"
       choice: "Možnosť"
-      choice_explanation: "Diaspóra Vám umožňuje priradiť si všetky Vaše spojenia do skupín, ktoré sa volajú Aspekty. Je unikátna  práve tým, že dokáže zabezpečiť, aby k fotkám, správam a statusom mali prístup len tí, ktorých si v aspektoch určíte."
-      learn_about_host: "Dozvedieť sa o viac o tom, ako hostiť vlastný Diaspóra server."
+      choice_explanation: "Diaspora Vám umožňuje priradiť si všetky Vaše spojenia do skupín, ktoré sa volajú Aspekty. Je unikátna  práve tým, že dokáže zabezpečiť, aby k fotkám, správam a statusom mali prístup len tí, ktorých si v aspektoch určíte."
+      learn_about_host: "Dozvedieť sa o viac o tom, ako hostiť vlastný Diaspora server."
       login_here: "Prihlásiť sa tu"
       ownership: "Vlastníctvo"
       ownership_explanation: "Vaše obrázky sú Vašim vlastníctvom. Nemali by ste sa ho zriekať len kvôli tomu, že ich chcete zdieľať. Zachovajte si preto právo na všetko, čo zverejňujete. Len to Vám dá plnú kontrolu nad tým, ako sa s tým nakladá."
       share_what_you_want: "Zdieľajte čo chcete a s kým chcete."
       simplicity: "Jednoduchosť"
-      simplicity_explanation: "Zdieľanie v Diaspóre je veľmi ľahké a transparenté – je to dvojitá záruka ochrany súkromia. Ohľadom súkromia, Diaspóra neobsahuje žiadne zložité stránky s nastavením, ktorými by ste sa museli prelúskať, aby ste uchovali bezpečnosť Vášho profilu podľa svojich predstáv."
+      simplicity_explanation: "Zdieľanie v Diaspore je veľmi ľahké a transparentné – je to dvojitá záruka ochrany súkromia. Ohľadom súkromia, Diaspora neobsahuje žiadne zložité stránky s nastavením, ktorými by ste sa museli prelúskať, aby ste uchovali bezpečnosť Vášho profilu podľa svojich predstáv."
   invitations: 
     check_token: 
       not_found: "Pozývací token nenájdený"
@@ -119,14 +119,14 @@ sk:
       already_contacts: "S touto osobou už ste v kontakte"
       already_sent: "Tejto osobe ste už pozvánku zaslali."
       no_more: "Nemáte žiadné nové pozvania."
-      rejected: "Problém s nasledujúcimi adresami : "
+      rejected: "Problém s nasledujúcimi adresami: "
       sent: "Vaše pozvanie bolo odoslané."
     edit: 
       sign_up: "Zaregistrovať sa"
     new: 
       comma_seperated_plz: "Môžete vložiť viacero adries oddelených čiarkou."
       if_they_accept_info: "ak budú súhlasiť, pridajú sa k aspektu, do ktorého ste ich pozvali."
-      invite_someone_to_join: "Pozvite niekoho do Diaspóry*!"
+      invite_someone_to_join: "Pozvite niekoho do Diaspory*!"
       message: "Správa:"
       send_an_invitation: "Send an invitation"
       send_invitation: "Poslať pozvánku"
@@ -142,35 +142,35 @@ sk:
       logout: "odhlásiť sa"
       view_profile: "pozrieť profil"
   new_requests: 
-    few: "%{count} new requests!"
-    one: "new request!"
-    other: "%{count} new requests!"
-    zero: "no new requests"
+    few: "nové žiadosti (%{count})"
+    one: "jedna nová žiadosť"
+    other: "nové žiadosti (%{count})"
+    zero: "žiadne nové žiadosti"
   notifier: 
-    diaspora: "e-mail robot Diaspóry"
+    diaspora: "e-mail robot Diaspory"
     hello: "Ahoj %{name}!"
     love: "miluje,"
     new_request: 
-      just_sent_you: "Vám zaslal žiadosť v Diaspóre*"
+      just_sent_you: "Vám zaslal žiadosť v Diaspore*"
       sign_in: "Prihláste sa"
       subject: "Nová žiadosť o kontakt od %{from}"
       try_it_out: "Mali by ste to skontrolovať."
     request_accepted: 
       accepted: "prijal Vašu žiadosť. Teraz je vo Vašich"
       aspect: "aspekt."
-      subject: "Užívateľ %{name} prijal Vašu žiadosť a pripojil sa k Diaspóre*"
+      subject: "Užívateľ %{name} prijal Vašu žiadosť a pripojil sa k Diaspore*"
   ok: "OK"
   or: "alebo"
   pagination: 
-    next: "Next"
-    previous: "Previous"
+    next: "Ďalšie"
+    previous: "Predchádzajúce"
   password: "Heslo"
   password_confirmation: "Potvrdenie hesla"
   people: 
     edit: 
-      allow_search: "Dovoliť ostatným vyhľadať Vás v Diaspóre"
+      allow_search: "Dovoliť ostatným vyhľadať Vás v Diaspore"
       first_name: "Meno"
-      info_available_to: "This info will be available to whomever you connect with on Diaspora."
+      info_available_to: "Tieto informácie budú dostupné komukoľvek, s kým sa spojíte na Diaspore."
       last_name: "Priezvisko"
       update_profile: "Aktualizovať profil"
       your_bio: "O Vás"
@@ -190,7 +190,7 @@ sk:
       pending_request: "čakajúce žiadosti"
       thats_you: "To si ty!"
     profile_photo_upload: 
-      or_select_one: "alebo vyberte jeden už z existujúcich"
+      or_select_one: "alebo vyberte jeden z už existujúcich"
     profile_sidebar: 
       bio: "Niečo o Vás"
       born: "dátum narodenia"
@@ -203,20 +203,20 @@ sk:
     show: 
       already_requested: "Žiadosť uživateľovi %{name} ste už zaslali."
       does_not_exist: "Osoba neexistuje!"
-      incoming_request: "You have an incoming request from this person."
+      incoming_request: "Od tejto osoby máte prichádzajúcu žiadosť."
       no_posts: "Žiadne príspevky na zobrazenie!"
-      not_connected: "S touto osobou nieste prepojený"
+      not_connected: "S touto osobou nie ste prepojený"
       request_people: "Ak si prajete, môžete požiadať o umiestnenie osoby v jednom z Vašich aspektov."
-      return_to_aspects: "Return to your aspects page"
-      to_accept_or_ignore: "to accept or ignore it."
+      return_to_aspects: "Vrátiť sa na stránku aspektov"
+      to_accept_or_ignore: "akceptovať, alebo ignorovať."
     update: 
       failed: "Aktualizácia profilu zlyhala"
       updated: "Profil upravený"
   photos: 
     create: 
       integrity_error: "Načítanie fotky zlyhalo. Ste si istý, že to bol obrázok?"
-      runtime_error: "Načítanie fotky zlyhalo.  Are you sure that your seatbelt is fastened?"
-      type_error: "Načítanie fotky zlyhalo.  Are you sure an image was added?"
+      runtime_error: "Načítanie fotky zlyhalo.  Ste si istý, že ste zapásaný?"
+      type_error: "Načítanie fotky zlyhalo.  Ste si istý, že to bol obrázok?"
     destroy: 
       notice: "Fotka zmazaná."
     edit: 
@@ -226,8 +226,8 @@ sk:
       new_photo: "Nová fotka"
       post_it: "poslať!"
     new_photo: 
-      empty: "{file} je prázdny, please select files again without it."
-      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      empty: "{file} je prázdny, prosím, vyberte súbory znovu bez tohto."
+      invalid_ext: "{file} má neplatnú príponu. Povolené sú len prípony {extensions}."
       size_error: "{file} je príliš veľký, maximálna veľkosť súboru je {sizeLimit}."
     photo: 
       view_all: "pozrieť všetky fotky užívateľa %{name}"
@@ -246,20 +246,20 @@ sk:
   registrations: 
     closed: "Registrácie sú zatvorené"
     create: 
-      success: "Pripojili ste sa k Diaspóre!"
+      success: "Pripojili ste sa k Diaspore!"
     edit: 
       cancel_my_account: "Zrušiť môj účet"
       edit: "Upraviť %{name}"
-      leave_blank: "(Ak si neželáte upraviť, nechajte prosím políčko prázdne)"
+      leave_blank: "(Ak si neželáte upraviť, nechajte prosím pole prázdne)"
       password_to_confirm: "(Pre potvrdenie zmien budeme potrebovať Vaše heslo)"
       unhappy: "Nešťastný?"
       update: "Aktualizovať"
     new: 
       sign_up: "Zaregistruj sa"
-      sign_up_for_diaspora: "Pridaj sa k Diaspóre"
+      sign_up_for_diaspora: "Pridaj sa k Diaspore"
   requests: 
     create: 
-      sending: "Posielanie..."
+      sending: "Posielam..."
       sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
     destroy: 
       error: "Vyberte aspekt prosím!"
@@ -286,7 +286,7 @@ sk:
   shared: 
     add_contact: 
       create_request: "Find by Diaspora handle"
-      diaspora_handle: "Užívateľská príručka Diaspóry"
+      diaspora_handle: "Užívateľská príručka Diaspory"
       enter_a_diaspora_username: "Zadajte užívateľské meno:"
       know_email: "Poznáte ich e-mail? Mali by ste ich pozvať."
       your_diaspora_username_is: "Vaše užívateľské meno je %{diaspora_handle}"
@@ -303,19 +303,19 @@ sk:
       no_contacts: "Momentálne nemáte žiadne kontakty. Nájdite ich tu."
       remove_aspect: "Odstrániť aspekt"
     contact_list: 
-      all_contacts: "All contacts"
+      all_contacts: "Všetky kontakty"
       cannot_remove: "Nie je možné osobu odstrániť z posledného aspektu. (Ak s ňou chcete nadobro prerušiť kontakt, odstráňte ju prosím z Vášho zoznamu osôb.)"
     invitations: 
-      dont_have_now: "Momentálne už nemáte žiadnu pozvánku. Ďalšie pribudnú už čoskoro."
+      dont_have_now: "Momentálne už nemáte žiadnu pozvánku. Ďalšie pribudnú čoskoro."
       invitations_left: "(%{count} ostáva)"
       invite_someone: "Pozvať niekoho"
-      invites_closed: "Invites are currently closed on this Diaspora seed"
+      invites_closed: "Pozvánky sú na tomto seede momentálne uzavreté"
     notification: 
       new: "Nový %{type} od %{from}"
     public_explain: 
       logged_in: "Prihlásenie k %{service}"
       manage: "Spravovať pripojené služby"
-      outside: "Verejnú správu môžu vidieť aj užívatelia mimo Diaspóry."
+      outside: "Verejnú správu môžu vidieť aj užívatelia mimo Diaspory."
       title: "Práve posielate verejnú správu!"
     publisher: 
       add_photos: "Pridať fotky"
@@ -331,15 +331,15 @@ sk:
       reshare: "Znovu zdieľať"
   status_messages: 
     helper: 
-      no_message_to_display: "Źiadne správy na zobrazenie."
+      no_message_to_display: "Žiadne správy na zobrazenie."
     new_status_message: 
       oh_yeah: "Skvelé!"
       tell_me_something_good: "Povedz niečo dobré"
     show: 
       destroy: "Zničiť"
   stream_helper: 
-    hide_comments: "hide comments"
-    show_comments: "show comments"
+    hide_comments: "skyť komentáre"
+    show_comments: "zobraziť komentáre"
   the_world: "svet"
   username: "Užívateľské meno"
   users: 
@@ -353,25 +353,25 @@ sk:
       export_data: "Exportovať dáta"
       new_password: "Nové heslo"
       your_email: "Váš e-mail"
-      your_handle: "Príručka k Diaspóre"
+      your_handle: "Príručka k Diaspore"
     getting_started: 
       connect_services: "Pripojiť Vaše služby"
       define_aspects: "Definujte Váš aspekt"
       edit_profile: "Upraviť Váš profil"
       finished: "Dokončené!"
       save_and_continue: "Uložiť a pokračovať"
-      signup_steps: "Dokončite svoju registráciu týmito troma krokmi :"
-      skip: "skip getting started"
+      signup_steps: "Dokončite svoju registráciu týmito troma krokmi:"
+      skip: "Preskočiť"
       step_2: 
         add: "Pridať"
         aspect_name: "Názov aspektu"
-        description: "Prezraďte Diaspóre, kto môže vidieť Vaše aspekty. Neskôr ich môžete spravovať kliknutím na tlačidlo - nastavenia účtu, vpravo hore."
-        drag_to_add: "Drag them to the aspect of yourself they know"
-        no_requests: "You have no requests"
+        description: "Prezraďte Diaspore, kto môže vidieť Vaše aspekty. Neskôr ich môžete spravovať kliknutím na tlačidlo - nastavenia účtu, vpravo hore."
+        drag_to_add: "Potiahniťe ich do aspektov, ktoré poznajú"
+        no_requests: "Nemáte žiadne žiadosti."
         your_aspects: "Váš aspekt"
-        your_inviter: "Here are the people who are waiting for you:"
+        your_inviter: "Toto sú ľudia, ktorí na Vás čakajú:"
       step_3: 
-        description: "Diaspóru môžete prepojiť s Vašimi sociálnymi sieťami v nastaveniach. Vaše statusy uverejníte mimo Diaspóry vybratím možnosti \"zverejniť\"."
+        description: "Diasporu môžete prepojiť s Vašimi sociálnymi sieťami v nastaveniach. Vaše statusy uverejníte mimo Diaspory vybratím možnosti \"zverejniť\"."
         your_services: "Vaše služby"
       step_4: 
         change_profile: "Váš profil, ako aj iné nastavenia môžete kedykoľvek upraviť."
@@ -381,7 +381,7 @@ sk:
         ready_to_share: "Teraz už môžte zdieľať s"
         set_up: "Gratulujeme %{name}, všetko ste úspešne nastavili!"
         user_menu: "užívateľské menu je situované vpravo hore."
-      welcome: "Vitajte v Diaspóre!"
+      welcome: "Vitajte v Diaspore!"
     public: 
       does_not_exist: "Užívateľ %{username} neexistuje!"
     update: 
@@ -390,5 +390,8 @@ sk:
       password_changed: "Heslo zmenené"
       password_not_changed: "Zmena hesla zlyhala"
   webfinger: 
-    fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
-    hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    fetch_failed: "Nepodarilo sa získať webfinger profil pre %{profile_url}"
+    hcard_fetch_failed: "Nepodarilo sa získať hcard pre %{@account}"
+    no_person_constructed: "Žiadna osoba nemôže byť vytvorená z tejto hcard."
+    not_enabled: "Zdá sa, že webfinger nie je povolený pre hostiteľa %{account}"
+    xrd_fetch_failed: "Nastala chyba pri získavaní xrd z konta %{account}"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 07c3b422f..63b9fed44 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -309,7 +309,7 @@ sv:
       dont_have_now: "Du har inga inbjudningar just nu, men fler kommer delas ut inom kort!"
       invitations_left: "(%{count} kvar)"
       invite_someone: "Bjud in en kontakt"
-      invites_closed: "Invites are currently closed on this Diaspora seed"
+      invites_closed: "Inbjudningar är för närvarande stängd på denna Diaspora server"
     notification: 
       new: "Ny %{type} från %{from}"
     public_explain: 
@@ -392,3 +392,6 @@ sv:
   webfinger: 
     fetch_failed: "Kunde inte hämta webfinger-profil för %{profile_url}"
     hcard_fetch_failed: "Kunde inte hämta hcard för #{@account}"
+    no_person_constructed: "Den här personen kunde inte hittas (hcard-fel)."
+    not_enabled: "Webfinger verkar inte vara påslaget på %{account}'s server"
+    xrd_fetch_failed: "kunde inte hämta xrd-fil från kontot %{account}"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 35afa6407..5ef96251a 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -392,3 +392,6 @@ tr:
   webfinger: 
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
     hcard_fetch_failed: "there was a problem fetching the hcard for #{@account}"
+    no_person_constructed: "No person could be constructed from this hcard."
+    not_enabled: "webfinger does not seem to be enabled for %{account}'s host"
+    xrd_fetch_failed: "there was an error getting the xrd from account %{account}"