diff --git a/config/locales/devise/devise.nb.yml b/config/locales/devise/devise.nb.yml
index 09401d090fdf07ebd545258a3447f175cb1b6083..8b6b94954f27aac6057bbb36a06abc0ff671ce2f 100644
--- a/config/locales/devise/devise.nb.yml
+++ b/config/locales/devise/devise.nb.yml
@@ -8,7 +8,7 @@ nb:
     confirmations: 
       confirmed: "Brukeren din er nå bekrefta, og du er logga inn."
       new: 
-        resend_confirmation: "Resend confirmation instructions"
+        resend_confirmation: "Send bekreftelses-instruksjoner på nytt"
       send_instructions: "Du vil få en e-post med instrukser om hvordan du bekrefter brukeren din om kort tid."
     failure: 
       inactive: "Brukeren din er ikke aktivert ennå."
@@ -20,42 +20,42 @@ nb:
       unconfirmed: "Du må bekrefte brukeren din før du kan fortsette."
     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."
+      send_instructions: "Invitasjonen er sendt."
+      updated: "Passordet ble satt vellykket. Du er nå logget inn"
     mailer: 
       confirmation_instructions: 
-        confirm: "Confirm my account"
+        confirm: "Bekreft kontoen min"
         subject: "Confirmation instructions"
-        you_can_confirm: "You can confirm your account through the link below:"
-      hello: "Hello %{email}!"
+        you_can_confirm: "Du kan bekrefte kontoen via linken nedenfor:"
+      hello: "Hei %{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."
+        accept: "Godta invitasjon"
+        ignore: "Hvis du ikke vil godta invitasjonen, kan du overse denne e-posten."
+        no_account_till: "Kontoen din vil ikke bli opprettet før du åpner linken ovenfor og registrerer deg."
         subject: "A friend wants you to join 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"
+        has_invited_you: "%{name} har invitert deg til å bli med på Diaspora"
+        have_invited_you: "%{names} har invitert deg til å bli med på 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: "Endre passordet mitt"
+        ignore: "Hvis du ikke har bedt om det, kan du overse denne e-posten."
+        someone_requested: "Noen har bedt om en lenke for å endre passordet ditt, og du kan gjøre dette via linken nedenfor."
+        subject: "Instruksjoner for å tilbakestille passord"
+        wont_change: "Ditt passord vil ikke endres før du klikker på linken over og lager et nytt."
       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:"
+        account_locked: "Kontoen din er låst på grunn av for mange mislykkede påloggingsforsøk"
+        click_to_unlock: "Klikk på linken nedenfor for å låse opp kontoen:"
         subject: "Unlock Instructions"
-        unlock: "Unlock my account"
-      welcome: "Welcome %{email}!"
+        unlock: "LÃ¥s opp kontoen min"
+      welcome: "Velkommen %{email}!"
     passwords: 
       edit: 
-        change_password: "Change my password"
+        change_password: "Endre passordet mitt"
       new: 
-        forgot_password: "Forgot your password?"
+        forgot_password: "Glemt passordet?"
         no_account: "No account with this email exsists.  If you are waiting for an invite, we are rolling them out as soon as possible"
-        send_password_instructions: "Send me reset password instructions"
+        send_password_instructions: "Send meg instruksjoner for å tilbakestille passordet"
       send_instructions: "Du vil få en e-post med instrukser om hvordan du tilbakestiller passordet ditt om kort tid."
       updated: "Passordet ditt er nå endra, og du har logga inn."
     registrations: 
@@ -64,27 +64,27 @@ nb:
       updated: "Du har oppdatert brukeren din."
     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."
-        bugs_and_feedback_mobile: "Be advised, you will experience bugs.  We encourage you to report any hiccups!  We will work as fast as we can to resolve any issues you report."
-        login: "Login"
-        modern_browsers: "only supports modern browsers."
-        password: "Password"
-        remember_me: "Remember me"
-        sign_in: "Sign in"
-        username: "Username"
+        alpha_software: "Du er i ferd med å bruke alpha-programvare."
+        bugs_and_feedback: "Vær advart, du vil oppleve feil. Vi oppfordrer deg til å bruke feedback knappen på høyre side av nettleseren til å melde feil! Vi vil arbeide så fort vi kan for å løse eventuelle problemer du rapporterer."
+        bugs_and_feedback_mobile: "Vær advart, du vil oppleve bugs. Vi oppfordrer deg til å rapportere feil! Vi vil arbeide så fort vi kan for å løse eventuelle problemer du rapporterer."
+        login: "Logg inn"
+        modern_browsers: "støtter bare moderne nettlesere."
+        password: "Passord"
+        remember_me: "Husk meg"
+        sign_in: "Logg inn"
+        username: "Brukernavn"
       signed_in: "Innlogginga var vellykka."
       signed_out: "Utlogginga var vellykka."
     shared: 
       links: 
-        forgot_your_password: "Forgot your password?"
+        forgot_your_password: "Glemt passordet?"
         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."
+        sign_in: "Logg inn"
+        sign_up: "Registrer deg"
+        sign_up_closed: "Åpen påmelding er stengt."
       mail_signup_form: 
-        sign_up_for_an_invite: "Sign up for an invite!"
+        sign_up_for_an_invite: "Registrer deg for en invitasjon!"
     unlocks: 
       new: 
         resend_unlock: "Resend unlock instructions"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 2d7d6e241bb4a3be48681d1f3c1afe9a9efb4f3b..1814699f97b6bb224130c05abcdf104a829c758b 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -33,7 +33,7 @@ da:
             username: 
               taken: "er allerede taget."
   ago: "%{time} siden"
-  all_aspects: "All aspects"
+  all_aspects: "Alle aspekter"
   application: 
     helper: 
       aspect_badge: 
@@ -261,7 +261,7 @@ da:
     mentioned: "har omtalt dig i deres"
     new_request: "tilbød at dele med dig."
     post: "indlæg"
-    private_message: "sent you a message."
+    private_message: "har sendt dig en besked."
     request_accepted: "accepterede din anmodning."
   notifier: 
     also_commented: 
@@ -331,7 +331,7 @@ da:
       edit_my_profile: "Redigér min profil"
       gender: "køn"
       in_aspects: "i aspekter"
-      location: "location"
+      location: "placering"
       remove_contact: "fjern kontaktperson"
       remove_from: "Fjern %{name} fra %{aspect}?"
     show: 
@@ -402,7 +402,7 @@ da:
       your_bio: "Din bio"
       your_birthday: "Din fødselsdag"
       your_gender: "Dit køn"
-      your_location: "Your location"
+      your_location: "Din placering"
       your_name: "Dit navn"
       your_photo: "Dit foto"
       your_private_profile: "Din private profil"
@@ -511,7 +511,7 @@ da:
       add_photos: "Tilføj billeder"
       all: "alle"
       all_contacts: "alle kontaktpersoner"
-      click_to_share_with: "Click to share with: "
+      click_to_share_with: "Klik for at dele med:"
       make_public: "offentliggør"
       post_a_message_to: "Send en besked til %{aspect}"
       posting: "Sender..."
@@ -573,7 +573,7 @@ da:
     getting_started: 
       connect_on_diaspora: "Forbind på Diaspora"
       connect_services: "Tilslut dine eksisterende tjenester"
-      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
+      could_not_find_anyone: "Kunne ikke finde nogle venner på Diaspora*. Brug vennefinderen for at invitere dem."
       edit_profile: "Redigér din profil"
       finished: "Færdig!"
       save_and_continue: "Gem og fortsæt"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index dac32662ca8f0316314d8cc6d272f0ca346e0aed..41be70d30670feec1f0c6487015ed39cc8d153fb 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -304,7 +304,7 @@ de:
   password_confirmation: "Passwort-Bestätigung"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "Fügr Kontakt über Tag hinzu"
+      add_contact_from_tag: "Füge Kontakt über Tag hinzu"
     aspect_list: 
       edit_membership: "bearbeite die Aspekt-Zugehörigkeit"
     few: "%{count} Personen"
@@ -536,7 +536,7 @@ de:
       mentioning: "Erwähnt: %{person}"
     show: 
       destroy: "Entfernen"
-      not_found: "Es tut und Leid aber wir konnten den Post nicht finden."
+      not_found: "Es tut uns Leid, aber wir konnten den Post nicht finden."
       permalink: "Permalink"
   stream_helper: 
     hide_comments: "Kommentare verbergen"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 83dcd8581a143bd9a6ccf945f37b61961bfc678a..9ca9b19a7d82df3d98f1a76b43bbecad4f8963f6 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -33,7 +33,7 @@ fr:
             username: 
               taken: "est déjà pris."
   ago: "Il y a %{time}"
-  all_aspects: "All aspects"
+  all_aspects: "Tous les aspects"
   application: 
     helper: 
       aspect_badge: 
@@ -75,7 +75,7 @@ fr:
       remove_aspect: "Supprimer cet aspect"
       rename: "renommer"
       update: "mettre à jour"
-      updating: "updating"
+      updating: "mise à jour"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Voulez-vous vraiment supprimer cet aspect ?"
@@ -228,17 +228,17 @@ fr:
   likes: 
     likes: 
       people_dislike_this: 
-        few: "%{count} people disliked this"
-        many: "%{count} people disliked this"
-        one: "1 person disliked this"
-        other: "%{count} people disliked this"
-        zero: "no people disliked this"
+        few: "%{count} personnes n'aiment pas"
+        many: "%{count} personnes n'aiment pas"
+        one: "1 personne n'aime pas"
+        other: "%{count} personnes n'aiment pas"
+        zero: "Personne n'aime pas"
       people_like_this: 
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        zero: "no people liked this"
+        few: "%{count} personnes n'aiment pas"
+        many: "%{count} personnes aiment"
+        one: "1 personne aime"
+        other: "%{count} personnes aiment"
+        zero: "Personne n'aime"
   more: "Plus"
   next: "suivant"
   notifications: 
@@ -261,7 +261,7 @@ fr:
     mentioned: "vous a mentionné(e) dans son"
     new_request: "a proposé de partager avec vous."
     post: "message"
-    private_message: "sent you a message."
+    private_message: "vous a envoyé un message."
     request_accepted: "a accepté votre demande de partage."
   notifier: 
     also_commented: 
@@ -275,7 +275,7 @@ fr:
     diaspora: "le robot de messagerie électronique de Diaspora"
     hello: "Bonjour %{name} !"
     love: "affectueusement,"
-    manage_your_email_settings: "manage your email settings"
+    manage_your_email_settings: "modifier vos paramètres de courriel"
     mentioned: 
       mentioned: "vous a mentionné(e) dans un message :"
       sign_in: "Connectez-vous pour le/la voir."
@@ -304,7 +304,7 @@ fr:
   password_confirmation: "Confirmation du mot de passe"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "ajouter ce contact à partir de ce tag"
     aspect_list: 
       edit_membership: "modifier l'appartenance à vos aspects"
     few: "%{count} personnes"
@@ -322,8 +322,8 @@ fr:
     person: 
       add_contact: "ajouter un contact"
       already_connected: "Déjà connecté"
-      pending_request: "requête en attente"
-      thats_you: "c'est vous !"
+      pending_request: "Requête en attente"
+      thats_you: "C'est vous !"
     profile_sidebar: 
       bio: "bio"
       born: "anniversaire"
@@ -331,7 +331,7 @@ fr:
       edit_my_profile: "Modifier mon profil"
       gender: "sexe"
       in_aspects: "dans les aspects"
-      location: "location"
+      location: "localisation"
       remove_contact: "supprimer le contact"
       remove_from: "Supprimer %{name} de %{aspect} ?"
     show: 
@@ -402,7 +402,7 @@ fr:
       your_bio: "Votre biographie"
       your_birthday: "Votre anniversaire"
       your_gender: "Votre sexe"
-      your_location: "Your location"
+      your_location: "Votre localisation"
       your_name: "Votre nom"
       your_photo: "Votre photo"
       your_private_profile: "Votre profil privé"
@@ -511,7 +511,7 @@ fr:
       add_photos: "ajouter des photos"
       all: "tous"
       all_contacts: "tous les contacts"
-      click_to_share_with: "Click to share with: "
+      click_to_share_with: "Cliquez pour partager avec : "
       make_public: "rendre public"
       post_a_message_to: "Publier un message dans %{aspect}"
       posting: "Publication…"
@@ -523,8 +523,8 @@ fr:
     reshare: 
       reshare: "Repartager"
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "Je n'aime pas"
+      like: "J'aime"
   status_messages: 
     create: 
       success: "Mention de : %{names}"
@@ -536,7 +536,7 @@ fr:
       mentioning: "Mentionne : %{person}"
     show: 
       destroy: "Supprimer"
-      not_found: "Sorry, we couldn't find that post."
+      not_found: "Désolé, nous ne trouvons pas ce message."
       permalink: "permalien"
   stream_helper: 
     hide_comments: "masquer les commentaires"
@@ -573,7 +573,7 @@ fr:
     getting_started: 
       connect_on_diaspora: "Se connecter sur Diaspora"
       connect_services: "Connectez vos autres services"
-      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
+      could_not_find_anyone: "Impossible de trouver d'amis sur Diaspora *. Utilisez la recherche d'amis pour les inviter."
       edit_profile: "Modifiez votre profil"
       finished: "Terminé !"
       save_and_continue: "Enregistrer et continuer"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index b827924f5ff95e3e075ff6a594d04e227e497193..e16c91f49395201749a8f42f26345b86b719edef 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -289,7 +289,7 @@ it:
       message_subject: "Subject: %{subject}"
       private_message: "has sent you a private message:"
       sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      subject: "%{name} ti ha inviato un messaggio privato su Diaspora*"
     request_accepted: 
       accepted: "ha accettato la tua richiesta di contatto!"
       sign_in: "Registrati qui"
@@ -558,7 +558,7 @@ it:
       close_account: "Chiudi Account"
       comment_on_post: "...someone comments on your post?"
       current_password: "Password attuale"
-      download_photos: "scarica le mie"
+      download_photos: "scarica le mie foto"
       download_xml: "scarica il mio xml"
       edit_account: "Modifica account"
       export_data: "Esporta Dati"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 3a4f351a6f1f3452bcf7dfd0064b6cfb0ca301f5..3b4ab4ae4940fa308546267d4309232852af1e51 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -4,7 +4,7 @@
 
 
 nb: 
-  _comments: "Comments"
+  _comments: "Kommentarer"
   _home: "Hjem"
   _photos: "bilder"
   _services: "Tjenester"
@@ -15,7 +15,7 @@ nb:
         contact: 
           attributes: 
             person_id: 
-              taken: "must be unique among this user's contacts."
+              taken: "må være unikt blant denne brukerens kontakter."
         person: 
           attributes: 
             diaspora_handle: 
@@ -23,7 +23,7 @@ nb:
         request: 
           attributes: 
             from_id: 
-              taken: "is a duplicate of a pre-existing request."
+              taken: "er en kopi av en pre-eksisterende forespørsel."
         user: 
           attributes: 
             email: 
@@ -33,7 +33,7 @@ nb:
             username: 
               taken: "er allerede tatt."
   ago: "%{time} siden"
-  all_aspects: "All aspects"
+  all_aspects: "Alle aspekter"
   application: 
     helper: 
       aspect_badge: 
@@ -52,7 +52,7 @@ nb:
       failure: "Failed to add friend to aspect."
       success: "Successfully added friend to aspect."
     aspect_contacts: 
-      done_editing: "done editing"
+      done_editing: "ferdig med å redigere"
     aspect_stream: 
       activity: "aktivitet"
       post_time: "tidspunkt"
@@ -63,19 +63,19 @@ nb:
       failure: "Greide ikke å opprette aspektet."
       success: "Klikk på plusstegnet på venstre side for å fortelle Diaspora hvem som kan se det nye aspektet ditt."
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "%{Name} er ikke tom, og kunne ikke fjernes."
       success: "%{name} har blitt fjerna."
     edit: 
-      add_existing: "Add an existing contact"
-      aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
-      confirm_remove_aspect: "Are you sure you want to delete this aspect?"
-      done: "Done"
+      add_existing: "Legg til en eksisterende kontakt"
+      aspect_list_is_not_visible: "aspektlisten er skjult for andre i aspektet"
+      aspect_list_is_visible: "aspektlisten er synlig for andre i aspektet"
+      confirm_remove_aspect: "Er du sikker på at du vil slette dette aspektet?"
+      done: "Ferdig"
       make_aspect_list_visible: "gjør aspektlisten synlig?"
       remove_aspect: "Slett dette aspektet"
       rename: "endre navn"
-      update: "update"
-      updating: "updating"
+      update: "oppdater"
+      updating: "oppdaterer"
     few: "%{count} aspekter"
     helper: 
       are_you_sure: "Er du sikker på at du vil slette dette aspektet?"
@@ -87,15 +87,15 @@ nb:
     manage: 
       add_a_new_aspect: "Legg til et nytt aspekt"
       add_a_new_contact: "Legg til ny kontakt"
-      drag_to_add: "Drag to add people"
-      manage_aspects: "Manage aspects"
+      drag_to_add: "Dra hit for å legge til"
+      manage_aspects: "Behandle aspekter"
       no_requests: "Ingen nye forespørsler"
       requests: "Forespørsler"
     many: "%{count} aspekter"
     move_contact: 
       error: "Feil ved flytting av kontakt: %{inspect}"
-      failure: "didn't work %{inspect}"
-      success: "Person moved to new aspect"
+      failure: "fungerte ikke % {inspisere}"
+      success: "Person flyttet til nytt aspekt"
     new_aspect: 
       create: "Opprett"
       name: "Navn"
@@ -125,19 +125,19 @@ nb:
     zero: "ingen kommentarer"
   contacts: 
     create: 
-      failure: "Failed to create contact"
+      failure: "Kunne ikke opprette kontakt"
     destroy: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
-    few: "%{count} contacts"
-    many: "%{count} contacts"
-    one: "1 contact"
-    other: "%{count} contacts"
+      failure: "Kunne ikke koble fra % {name}"
+      success: "Vellykket koblet fra % {name}"
+    few: "%{count} kontakter"
+    many: "%{count} kontakter"
+    one: "1 kontakt"
+    other: "%{count} kontakter"
     share_with_pane: 
       accepts: "Straks %{name} aksepterer, vil dere se hverandres innlegg på Diaspora"
       add_new_aspect: "legg til i nytt aspekt"
-      share_with: "Start sharing with %{name}"
-    zero: "no contacts"
+      share_with: "Begynn å dele med % {name}"
+    zero: "ingen kontakter"
   conversations: 
     helper: 
       new_messages: 
@@ -148,18 +148,18 @@ nb:
         zero: "ingen nye meldinger"
     index: 
       create_a_new_message: "skriv en ny melding"
-      inbox: "Inbox"
+      inbox: "Innboks"
       message_inbox: "Meldingsinnboks"
       new_message: "Ny Melding"
       no_conversation_selected: "ingen samtaler valgt"
       no_messages: "ingen meldinger"
     new: 
-      no_results: "No Results Found"
+      no_results: "Ingen resultater funnet"
       send: "Send"
-      subject: "subject"
+      subject: "emne"
       to: "til"
     show: 
-      delete: "delete and block conversation"
+      delete: "slett og blokkér samtalen"
       reply: "svar"
   date: 
     formats: 
@@ -172,7 +172,7 @@ nb:
     helper: 
       correct_the_following_errors_and_try_again: "Rett opp de følgende feilene og prøv igjen."
       invalid_fields: "Ugyldige felter"
-  fill_me_out: "Fill me out"
+  fill_me_out: "Fortell meg"
   home: 
     show: 
       already_account: "har du allerede en konto?"
@@ -183,7 +183,7 @@ nb:
       ownership: "Eierskap"
       ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just in order to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it is distributed."
       share_what_you_want: "Share what you want, with whom you want."
-      simplicity: "Simplicity"
+      simplicity: "Enkelhet"
       simplicity_explanation: "Diaspora makes sharing clean and easy – this goes doubly so for privacy. Innherently private, Diaspora doesn’t have pages of settings and options to wade through to keep your profile secure and to your liking."
       tagline_first_half: "Del hva du vil,"
       tagline_second_half: "med hvem du vil."
@@ -191,13 +191,13 @@ nb:
     check_token: 
       not_found: "Invitation token not found"
     create: 
-      already_contacts: "You are already connected with this person"
+      already_contacts: "Du er allerede tilknyttet denne personen"
       already_sent: "Du har allerede invitert denne personen."
       no_more: "Du har ikke flere invitasjoner."
-      rejected: "The following email addresses had problems: "
+      rejected: "Følgende e-postadresser hadde problemer:"
       sent: "Your invitation has been sent."
     edit: 
-      sign_up: "sign_up"
+      sign_up: "registrer deg"
     new: 
       already_invited: "Allerede innvitert"
       aspect: "Aspekt"
@@ -214,77 +214,77 @@ nb:
       have_a_problem: "Har du et problem? FÃ¥ svar her"
       logged_in_as: "logget inn som %{name}"
       powered_by: "DREVET AV DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
-      toggle: "toggle mobile site"
-      whats_new: "what's new?"
+      public_feed: "Offentlig Diaspora feed for %{name}"
+      toggle: "vis mobilsiden"
+      whats_new: "hva er nytt?"
       your_aspects: "dine aspekt"
     header: 
       blog: "blogg"
-      code: "code"
+      code: "kode"
       login: "logg inn"
       logout: "logg ut"
-      profile: "profile"
-      settings: "settings"
+      profile: "profil"
+      settings: "innstillinger"
   likes: 
     likes: 
       people_dislike_this: 
-        few: "%{count} people disliked this"
-        many: "%{count} people disliked this"
-        one: "1 person disliked this"
-        other: "%{count} people disliked this"
-        zero: "no people disliked this"
+        few: "%{count} folk misliker dette"
+        many: "%{count} folk misliker dette"
+        one: "1 person misliker dette"
+        other: "%{count} folk misliker dette"
+        zero: "ingen misliker dette"
       people_like_this: 
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        zero: "no people liked this"
+        few: "%{count} folk liker dette"
+        many: "%{count} folk liker dette"
+        one: "1 person liker dette"
+        other: "%{count} folk liker dette"
+        zero: "ingen liker dette"
   more: "Mer"
   next: "neste"
   notifications: 
     also_commented: "also commented on"
-    also_commented_deleted: "commented on a deleted post"
-    comment_on_post: "commented on your"
+    also_commented_deleted: "kommenterte et slettet innlegg"
+    comment_on_post: "kommenterte ditt"
     deleted: "slettet"
     helper: 
       new_notifications: 
-        few: "%{count} new notifications"
-        many: "%{count} new notifications"
-        one: "1 new notifications"
-        other: "%{count} new notifications"
-        zero: "no new notifications"
+        few: "%{count} nye varsler"
+        many: "%{count} nye varsler"
+        one: "1 nytt varsel"
+        other: "%{count} nye varsler"
+        zero: "ingen nye varsler"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
+      and: "og"
+      and_others: "og %{number} andre"
       mark_all_as_read: "Merk alle som leste"
       notifications: "Varsler"
     mentioned: "har nevnt deg i sin"
-    new_request: "offered to share with you."
-    post: "post"
-    private_message: "sent you a message."
-    request_accepted: "accepted your share request."
+    new_request: "spør om å få dele med deg."
+    post: "innlegg"
+    private_message: "sendte deg en melding."
+    request_accepted: "aksepterte din forespørsel om å dele."
   notifier: 
     also_commented: 
       commented: "har også kommentert på %{post_author} sitt innlegg:"
-      sign_in: "Sign in to view it."
+      sign_in: "Logg inn for å se det."
       subject: "%{name} has also commented."
     comment_on_post: 
       commented: "has commented on your post!"
-      sign_in: "Sign in to view it."
+      sign_in: "Logg inn for å se det."
       subject: "%{name} har kommentert på ditt innlegg."
-    diaspora: "the diaspora email robot"
+    diaspora: "diasporas epostrobot"
     hello: "Hei %{name}!"
-    love: "love,"
-    manage_your_email_settings: "manage your email settings"
+    love: "vennlig hilsen,"
+    manage_your_email_settings: "administrer e-postinnstillingene"
     mentioned: 
       mentioned: "nevnte deg i et innlegg:"
-      sign_in: "Sign in to view it."
+      sign_in: "Logg inn for å se det."
       subject: "%{name} har nevnt deg på Diaspora*"
     new_request: 
       just_sent_you: "just sent you a friend request on Diaspora*"
       sign_in: "sign in here"
       subject: "new Diaspora* friend request from %{from}"
-      try_it_out: "You should really think about checking it out."
+      try_it_out: "Du burde virkelig tenke på å sjekke det ut."
     private_message: 
       message_subject: "Emne: %{subject}"
       private_message: "har sendt deg en privat melding:"
@@ -297,31 +297,31 @@ nb:
     single_admin: 
       admin: "Din Diaspora administrator"
       subject: "A message from your Diaspora administrator:"
-    thanks: "Thanks,"
+    thanks: "Takk,"
   ok: "OK"
   or: "eller"
   password: "Passord"
   password_confirmation: "Passord bekreftelse"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "legg til kontakt fra tag"
     aspect_list: 
-      edit_membership: "edit aspect membership"
-    few: "%{count} people"
+      edit_membership: "endre aspektmedlemskap"
+    few: "%{count} folk"
     helper: 
       people_on_pod_are_aware_of: " people on pod are aware of"
       results_for: " resultater for %{params}"
     index: 
-      couldnt_find_them_send_invite: "Couldn't find them?  Send an invite!"
+      couldnt_find_them_send_invite: "Finner du dem ikke? Send en invitasjon!"
       no_one_found: "...og ingen ble funnet."
-      no_results: "Hey! You need to search for something."
+      no_results: "Hei! Du må søke etter noe."
       results_for: "søkeresultater for"
-    many: "%{count} people"
+    many: "%{count} folk"
     one: "1 person"
-    other: "%{count} people"
+    other: "%{count} folk"
     person: 
       add_contact: "legg til kontakt"
-      already_connected: "Already connected"
+      already_connected: "Allerede tilkoblet"
       pending_request: "venter på svar"
       thats_you: "det er deg!"
     profile_sidebar: 
@@ -331,33 +331,33 @@ nb:
       edit_my_profile: "Endre profilen min"
       gender: "kjønn"
       in_aspects: "i aspekt"
-      location: "location"
+      location: "sted"
       remove_contact: "fjern kontakt"
       remove_from: "Fjern %{name} fra %{aspect}?"
     show: 
-      add_some: "add some"
+      add_some: "legg til noen"
       does_not_exist: "Personen eksisterer ikke!"
-      edit: "edit"
+      edit: "rediger"
       incoming_request: "You have an incoming request from this person."
-      mention: "Mention"
+      mention: "Nevn"
       message: "Melding"
       no_posts: "ingen innlegg å vise!"
       not_connected: "You are not connected with this person"
       recent_posts: "Nylige Innlegg"
-      recent_public_posts: "Recent Public Posts"
-      return_to_aspects: "Return to your aspects page"
+      recent_public_posts: "Nylige Offentlige Innlegg"
+      return_to_aspects: "Tilbake til aspektene"
       similar_contacts: "lignende kontakter"
-      start_sharing: "start sharing"
+      start_sharing: "begynn å dele"
       to_accept_or_ignore: "to accept or ignore it."
-      you_have_no_tags: "you have no tags!"
+      you_have_no_tags: "du har ingen tagger!"
     webfinger: 
       fail: "Beklager, vi kunne ikke finne %{handle}."
-    zero: "no people"
+    zero: "ingen folk"
   photos: 
     create: 
       integrity_error: "Bildeopplastning mislyktes. Er du sikker på det var et bilde?"
-      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?"
+      runtime_error: "Bildeopplastning mislyktes. Har du festet sikkerhetsbeltet?"
+      type_error: "Bildeopplastning mislyktes. ER du sikker på at et bilde ble lagt til?"
     destroy: 
       notice: "Bildet er sletta."
     edit: 
@@ -368,10 +368,10 @@ nb:
       post_it: "legg ut!"
     new_photo: 
       empty: "{file} er tom, vennligst velg filer igjen uten den"
-      invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
+      invalid_ext: "{file} er en ugyldig filtype. Bare {extensions} er tillatt."
       size_error: "{file} er for stor, maks filstørrelse er {sizeLimit}."
     new_profile_photo: 
-      or_select_one: "or select one from your already existing"
+      or_select_one: "eller velg fra dine allerede eksisterende"
       upload: "Last opp et nytt profilbilde!"
     photo: 
       view_all: "se alle bildene til %{name}"
@@ -379,17 +379,17 @@ nb:
       collection_permalink: "collection permalink"
       delete_photo: "Slett bilde"
       edit: "rediger"
-      edit_delete_photo: "Edit photo description / delete photo"
+      edit_delete_photo: "Rediger bildebeskrivelse / slett bilde"
       make_profile_photo: "gjør til profilbilde"
-      original_post: "Original Post"
+      original_post: "Orginalt Innlegg"
       permalink: "permalink"
       update_photo: "Oppdater Bilde"
-      view: "view"
+      view: "vis"
     update: 
       error: "Greide ikke å endre bildet."
       notice: "Bildet er oppdatert."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    doesnt_exist: "det innlegget finnes ikke!"
   previous: "forrige"
   profile: "Profil"
   profiles: 
@@ -402,13 +402,13 @@ nb:
       your_bio: "Om meg"
       your_birthday: "Din Fødselsdato"
       your_gender: "Ditt kjønn"
-      your_location: "Your location"
+      your_location: "Hvor bor du?"
       your_name: "Ditt navn"
       your_photo: "Ditt profilbilde"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
+      your_private_profile: "Din private profil"
+      your_public_profile: "Din offentlige profil"
       your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_tags_placeholder: "f.eks. #diaspora #matlaging #skiskyting #musikk"
     update: 
       failed: "Kunne ikke oppdatere profil"
       updated: "Profil oppdatert"
@@ -417,19 +417,19 @@ nb:
     create: 
       success: "Du er nå med i Diaspora!"
     edit: 
-      cancel_my_account: "Cancel my account"
+      cancel_my_account: "Avbryt kontoen min"
       edit: "Endre %{name}"
-      leave_blank: "(leave blank if you don't want to change it)"
+      leave_blank: "(La stå tom hvis du ikke ønsker å endre det)"
       password_to_confirm: "(vi trenger ditt nåværende passord for å bekrefte endringene)"
-      unhappy: "Unhappy?"
+      unhappy: "Ulykkelig?"
       update: "Oppdater"
     new: 
-      enter_email: "Enter an e-mail"
-      enter_password: "Enter a password"
-      enter_password_again: "Enter the same password as before"
+      enter_email: "Skriv en e-post"
+      enter_password: "Skriv inn et passord"
+      enter_password_again: "Skriv inn samme passord som før"
       enter_username: "Velg et brukernavn (kun bokstaver, nummer og understreker)"
       sign_up: "Registrer deg"
-      sign_up_for_diaspora: "Sign up for Diaspora"
+      sign_up_for_diaspora: "Registrer deg på Diaspora"
   requests: 
     create: 
       sending: "Sending..."
@@ -447,49 +447,49 @@ nb:
         zero: "ingen nye forespørsler"
     manage_aspect_contacts: 
       existing: "Eksisterende kontakter"
-      manage_within: "Manage contacts within"
+      manage_within: "Administrer kontakter innen"
     new_request_to_person: 
       sent: "sendt!"
   search: "Søk"
   services: 
     create: 
-      success: "Authentication successful."
+      success: "Autentisering vellykket."
     destroy: 
       success: "Successfully destroyed authentication."
     failure: 
-      error: "there was an error connecting that service"
+      error: "feil under tilkobling av tjenesten"
     finder: 
       friends: 
         few: "%{count} venner"
-        many: "%{count} friends"
+        many: "%{count} venner"
         one: "1 venn"
         other: "%{count} venner"
         zero: "ingen venner"
       invite_your_friends_from: "Inviter dine venner fra  %{service}"
-      not_connected: "not connected"
+      not_connected: "ikke tilkoblet"
     index: 
       connect_to_facebook: "Koble til facebook"
       connect_to_twitter: "Koble til twitter"
       disconnect: "koble fra"
-      edit_services: "Edit services"
+      edit_services: "Rediger tjenester"
       logged_in_as: "logget inn som"
       really_disconnect: "koble fra %{service}?"
     inviter: 
       click_link_to_accept_invitation: "Klikk denne linken for å akseptere invitasjonen din"
-      join_me_on_diaspora: "Join me on DIASPORA*"
+      join_me_on_diaspora: "Bli med meg på DIASPORA*"
     remote_friend: 
       invite: "inviter"
       resend: "send på nytt"
   settings: "Innstillinger"
   shared: 
     add_contact: 
-      create_request: "Find by Diaspora handle"
+      create_request: "Finn etter Diaspora brukernavn"
       diaspora_handle: "Diaspora handle"
-      enter_a_diaspora_username: "Enter a Diaspora username:"
+      enter_a_diaspora_username: "Skriv inn et Diaspora brukernavn:"
       know_email: "Kan du epostadressen deres? Inviter dem!"
       your_diaspora_username_is: "Ditt Diaspora brukernavn er: %{diaspora_handle}"
     contact_list: 
-      all_contacts: "All contacts"
+      all_contacts: "Alle kontakter"
       cannot_remove: "Cannot remove person from last aspect."
     invitations: 
       by_email: "via Epost"
@@ -504,54 +504,54 @@ nb:
       new: "Ny %{type} fra %{from}"
     public_explain: 
       logged_in: "innlogget på %{service}"
-      manage: "manage connected services"
+      manage: "behandle tilkoblede tjenester"
       outside: "Offentlige meldinger vil være synlige for personer utenfor Diaspora."
-      title: "You are about to post a public message!"
+      title: "Du er i ferd med å poste et offentlig innlegg!"
     publisher: 
       add_photos: "legg til bilder"
-      all: "all"
+      all: "alle"
       all_contacts: "alle kontakter"
-      click_to_share_with: "Click to share with: "
+      click_to_share_with: "Klikk for å dele med:"
       make_public: "gjør offentlig"
       post_a_message_to: "Post et innlegg til %{aspect}"
       posting: "Poster..."
-      public: "Public"
-      publishing_to: "publishing to: "
+      public: "Offentlig"
+      publishing_to: "publiserer til:"
       share: "Del"
       share_with: "Share with %{aspect}"
       whats_on_your_mind: "Hva tenker du på?"
     reshare: 
       reshare: "Del på nytt"
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "Jeg misliker dette"
+      like: "Jeg liker dette"
   status_messages: 
     create: 
-      success: "Successfully mentioned: %{names}"
+      success: "Nevnte :%{navn}"
     destroy: 
-      failure: "Failed to delete post"
+      failure: "Kunne ikke slette innlegget"
     helper: 
       no_message_to_display: "Ingen melding å vise."
     new: 
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Utslett"
-      not_found: "Sorry, we couldn't find that post."
+      not_found: "Beklager, vi kunne ikke finne innlegget."
       permalink: "permalink"
   stream_helper: 
-    hide_comments: "hide comments"
+    hide_comments: "skjul kommentarer"
     show_comments: "show comments"
   tags: 
     show: 
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
-      posts_tagged_with: "Posts tagged with #%{tag}"
+      nobody_talking: "Ingen snakker om %{tag} ennå."
+      people_tagged_with: "Personer tagget med %{tag}"
+      posts_tagged_with: "Innlegg tagget med #%{tag}"
   the_world: "verden"
   username: "Brukernavn"
   users: 
     destroy: "Kontoen er stengt."
     edit: 
-      also_commented: "...someone also comments on your contact's post?"
+      also_commented: "...noen andre også kommenterte på din kontakts innlegg?"
       change: "Endre"
       change_language: "Endre Språk"
       change_password: "Endre Passord"
@@ -566,24 +566,24 @@ nb:
       new_password: "Nytt Passord"
       private_message: "...du mottar en privat melding?"
       receive_email_notifications: "Motta varsler på epost når:"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      request_acceptence: "...din delingsforespørsel blir godkjent?"
+      request_received: "...du mottar en ny forespørsel om å dele?"
       your_email: "Din epost"
       your_handle: "Ditt Diaspora brukernavn"
     getting_started: 
-      connect_on_diaspora: "Connect on Diaspora"
+      connect_on_diaspora: "Kontakt på Diaspora"
       connect_services: "Connect your services"
-      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
+      could_not_find_anyone: "Kunne ikke finne noen venner på Diaspora*. Bruk vennefinneren for å invitere dem."
       edit_profile: "Rediger profilen"
       finished: "Ferdig!"
       save_and_continue: "Lagre og fortsett"
       signup_steps: "Complete your sign-up by doing these things:"
-      skip: "skip getting started"
+      skip: "hopp over introduskjonen"
       step_2: 
-        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
-        skip: "Skip"
+        find_your_friends_on_diaspora: "Vil du finne dine Facebook-venner på Diaspora?"
+        skip: "Hopp over"
       step_3: 
-        finish: "Finish"
+        finish: "Fullfør"
         people_already_on_diaspora: "Personer allerede på Diaspora"
       welcome: "Velkommen til Diaspora!"
     public: 
@@ -595,8 +595,8 @@ nb:
       password_changed: "Passord Endret"
       password_not_changed: "Endring av Passord mislyktes"
   webfinger: 
-    fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
+    fetch_failed: "klarte ikke å hente webfinger profil 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}"
+    no_person_constructed: "Ingen personer kunne konstrueres fra dette hCard."
+    not_enabled: "det virker ikke som webfinger er aktivert for % {account}'s vert"
+    xrd_fetch_failed: "kunne ikke få xrd fra kontoen %{account}"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 31d40321951e46074e848aff4a56b618aaf062df..657c26af7f6be908aefa9631dcecd33a6c7752cb 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -33,7 +33,7 @@ nl:
             username: 
               taken: "is al bezet."
   ago: "%{time} geleden"
-  all_aspects: "All aspects"
+  all_aspects: "Alle aspecten"
   application: 
     helper: 
       aspect_badge: 
@@ -261,7 +261,7 @@ nl:
     mentioned: "heeft je genoemd in zijn/haar"
     new_request: "bood aan om met jou te delen."
     post: "post"
-    private_message: "sent you a message."
+    private_message: "heeft je een bericht gestuurd."
     request_accepted: "heeft je verzoek geaccepteerd."
   notifier: 
     also_commented: 
@@ -331,7 +331,7 @@ nl:
       edit_my_profile: "Bewerk mijn profiel"
       gender: "geslacht"
       in_aspects: "in de aspecten"
-      location: "location"
+      location: "locatie"
       remove_contact: "verwijder contact"
       remove_from: "Verwijder %{name} uit %{aspect}?"
     show: 
@@ -402,7 +402,7 @@ nl:
       your_bio: "Jouw bio"
       your_birthday: "Je verjaardag"
       your_gender: "Je geslacht"
-      your_location: "Your location"
+      your_location: "Jou locatie"
       your_name: "Je naam"
       your_photo: "Je profielfoto"
       your_private_profile: "Je privé-profiel"
@@ -511,7 +511,7 @@ nl:
       add_photos: "+ foto's"
       all: "al"
       all_contacts: "alle contacten"
-      click_to_share_with: "Click to share with: "
+      click_to_share_with: "Klik om te delen met: "
       make_public: "maak openbaar"
       post_a_message_to: "Plaats een bericht aan %{aspect}"
       posting: "Plaatsen..."
@@ -573,7 +573,7 @@ nl:
     getting_started: 
       connect_on_diaspora: "Verbind op Diaspora"
       connect_services: "Verbind met je andere services"
-      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
+      could_not_find_anyone: "Kon geen vrienden vinden op Diaspora*. Gebruik de Friend Finder om ze uit te nodigen."
       edit_profile: "Bewerk je profiel"
       finished: "Klaar!"
       save_and_continue: "Sla op en ga verder"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 444de25e0e18caf99ccdeb2fc8648066ec4fac73..3e2a2b95375def529e3fe714c7966da5ee3d6897 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -15,7 +15,7 @@ sv:
         contact: 
           attributes: 
             person_id: 
-              taken: "must be unique among this user's contacts."
+              taken: "måste vara unik i den här användarens kontakter."
         person: 
           attributes: 
             diaspora_handle: 
@@ -23,144 +23,144 @@ sv:
         request: 
           attributes: 
             from_id: 
-              taken: "is a duplicate of a pre-existing request."
+              taken: "är en kopia av en redan existerande förfrågan."
         user: 
           attributes: 
             email: 
-              taken: "is already taken."
+              taken: "är redan tagen."
             person: 
-              invalid: "is invalid."
+              invalid: "är ogiltig."
             username: 
-              taken: "is already taken."
+              taken: "är redan taget."
   ago: "%{time} sedan"
-  all_aspects: "All aspects"
+  all_aspects: "Alla aspekter"
   application: 
     helper: 
       aspect_badge: 
-        all_aspects: "Alla sidor"
+        all_aspects: "Alla aspekter"
       unknown_person: "okänd person"
       video_title: 
         unknown: "Okänd videotitel"
   are_you_sure: "Är du säker?"
   aspect_memberships: 
     destroy: 
-      failure: "Failed to remove person from aspect"
-      no_membership: "Could not find the selected person in that aspect"
-      success: "Successfully removed person from aspect"
+      failure: "Misslyckades med att ta bort personen från aspekten"
+      no_membership: "Kunde inte hitta den valda personen i aspekten"
+      success: "Lyckades att ta bort personen från aspekten"
   aspects: 
     add_to_aspect: 
-      failure: "Personen kunde inte läggas till på sidan."
-      success: "Personen tillagd på sidan."
+      failure: "Personen kunde inte läggas till på aspekten."
+      success: "Personen tillagd på aspekten."
     aspect_contacts: 
       done_editing: "dölj"
     aspect_stream: 
       activity: "aktivitet"
       post_time: "skickat "
       sort_by: "sortera efter:"
-    contacts_not_visible: "Kontakterna på den här sidan kommer inte kunna se varandra."
-    contacts_visible: "Kontakterna på den här sidan kommer kunna se varandra."
+    contacts_not_visible: "Kontakterna på den här aspekten kommer inte kunna se varandra."
+    contacts_visible: "Kontakterna på den här aspekten kommer kunna se varandra."
     create: 
-      failure: "Sidan kunde inte skapas."
-      success: "Din nya sida %{name} har skapats"
+      failure: "Aspekten kunde inte skapas."
+      success: "Din nya aspekt %{name} har skapats"
     destroy: 
-      failure: "%{name} is not empty and could not be removed."
+      failure: "%{name} är inte tom och kunde då inte tas bort"
       success: "%{name} är nu borttagen."
     edit: 
       add_existing: "Lägg till en befintlig kontakt"
       aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
-      aspect_list_is_visible: "aspect list is visible to others in aspect"
-      confirm_remove_aspect: "Är du säker på att du vill ta bort den här sidan?"
-      done: "Done"
-      make_aspect_list_visible: "make aspect list visible?"
-      remove_aspect: "Ta bort den här sidan"
+      aspect_list_is_visible: "aspektlistan är synlig för andra i aspekten"
+      confirm_remove_aspect: "Är du säker på att du vill ta bort den här aspekten?"
+      done: "Färdigt"
+      make_aspect_list_visible: "gör en aspektlista synlig?"
+      remove_aspect: "Ta bort den här aspekten"
       rename: "byt namn"
-      update: "update"
-      updating: "updating"
-    few: "%{count} aspects"
+      update: "uppdatera"
+      updating: "uppdaterar"
+    few: "%{count} aspekter"
     helper: 
-      are_you_sure: "Är du säker på att du vill tabort den här sidan?"
-      aspect_not_empty: "Sidan är inte tom"
+      are_you_sure: "Är du säker på att du vill ta bort den här aspekten?"
+      aspect_not_empty: "Aspekten är inte tom"
       remove: "ta bort"
     index: 
       handle_explanation: "Det här är ditt Diaspora-användarnamn. Det är den här du ska ge till dina vänner om du vill att de ska lägga till dig på Diaspora."
       no_contacts: "Inga kontakter"
     manage: 
-      add_a_new_aspect: "Lägg till en ny sida"
+      add_a_new_aspect: "Lägg till en ny aspekt"
       add_a_new_contact: "Lägg till en ny kontakt"
       drag_to_add: "Dra för att lägga till personer"
-      manage_aspects: "Hantera sidor"
+      manage_aspects: "Hantera aspekter"
       no_requests: "Inga nya förfrågningar"
       requests: "Kontaktförfrågningar"
-    many: "%{count} aspects"
+    many: "%{count} aspekter"
     move_contact: 
       error: "Kunde inte flytta kontakt: %{inspect}"
       failure: "fungerade inte %{inspect}"
-      success: "Personen flyttades till den nya sidan"
+      success: "Personen flyttades till den nya aspekten"
     new_aspect: 
       create: "Skapa"
       name: "Namn"
     no_posts_message: 
       start_talking: "Ingen har sagt något än. Bli först!"
-    one: "1 aspect"
-    other: "%{count} aspects"
+    one: "1 aspekt"
+    other: "%{count} aspekter"
     seed: 
       family: "Familj"
       work: "Arbete"
     show: 
-      edit_aspect: "ändra sida"
+      edit_aspect: "ändra aspekt"
     update: 
-      failure: "Din sida, %{name}, hade för långt namn för att kunna sparas."
-      success: "Din sida %{name} är nu ändrad."
-    zero: "no aspects"
+      failure: "Din aspekt, %{name}, hade ett för långt namn för att kunna sparas."
+      success: "Din aspekt %{name} är nu ändrad."
+    zero: "inga aspekter"
   back: "Tillbaka"
   cancel: "Avbryt"
   comments: 
-    few: "%{count} comments"
-    many: "%{count} comments"
+    few: "%{count} kommentarer"
+    many: "%{count} kommentarer"
     new_comment: 
-      comment: "Kommentar"
+      comment: "kommentar"
       commenting: "Kommenterar..."
-    one: "1 comment"
-    other: "%{count} comments"
-    zero: "no comments"
+    one: "1 kommentar"
+    other: "%{count} kommentarer"
+    zero: "inga kommentarer"
   contacts: 
     create: 
-      failure: "Failed to create contact"
+      failure: "Misslyckades med att skapa kontakt"
     destroy: 
-      failure: "Failed to disconnect from %{name}"
-      success: "Successfully disconnected from %{name}"
+      failure: "Misslyckades med att koppla från %{name}"
+      success: "Lyckades koppla från %{name}"
     few: "%{count} kontakter"
-    many: "%{count} contacts"
+    many: "%{count} kontakter"
     one: "1 kontakt"
     other: "%{count} kontakter"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
-      add_new_aspect: "lägg till på ny sida"
-      share_with: "Start sharing with %{name}"
+      accepts: "När %{name} accepterar så kommer ni börja se varandras inlägg på Diaspora"
+      add_new_aspect: "lägg till på ny aspekt"
+      share_with: "Börja dela med %{name}"
     zero: "inga kontakter"
   conversations: 
     helper: 
       new_messages: 
-        few: "%{count} new messages"
-        many: "%{count} new messages"
-        one: "1 new messages"
-        other: "%{count} new messages"
-        zero: "no new messages"
+        few: "%{count} nya meddelanden"
+        many: "%{count} nya meddelanden"
+        one: "1 nytt meddelande"
+        other: "%{count} nya meddelanden"
+        zero: "inga nya meddelanden"
     index: 
-      create_a_new_message: "create a new message"
-      inbox: "Inbox"
-      message_inbox: "Message Inbox"
-      new_message: "New Message"
-      no_conversation_selected: "no conversation selected"
-      no_messages: "no messages"
+      create_a_new_message: "skapa ett nytt meddelande"
+      inbox: "Inlåda"
+      message_inbox: "Meddelande Inkorg"
+      new_message: "Nytt Meddelande"
+      no_conversation_selected: "ingen konversation vald"
+      no_messages: "inga meddelanden"
     new: 
-      no_results: "No Results Found"
-      send: "Send"
-      subject: "subject"
-      to: "to"
+      no_results: "Inga Resultat Hittades"
+      send: "Skicka"
+      subject: "ämne"
+      to: "till"
     show: 
-      delete: "delete and block conversation"
-      reply: "reply"
+      delete: "ta bort och blockera konversation"
+      reply: "svara"
   date: 
     formats: 
       birthday: "%B %d"
@@ -205,7 +205,7 @@ sv:
       if_they_accept_info: "om de accepterar, kommer de bli med på den sida du har bjudit in dem till."
       invite_someone_to_join: "Bjud in en vän till Diaspora!"
       personal_message: "Personligt meddelande"
-      resend: "Resend"
+      resend: "Skicka igen"
       send_an_invitation: "Skicka en inbjudan"
       send_invitation: "Skicka inbjudan"
       to: "Till"
@@ -214,60 +214,60 @@ sv:
       have_a_problem: "Stött på problem? Hitta lösningen här"
       logged_in_as: "inloggad som %{name}"
       powered_by: "POWERED BY DIASPORA*"
-      public_feed: "Public Diaspora Feed for %{name}"
+      public_feed: "Offentligt Diaspora flöde för %{name}"
       toggle: "byt till mobil version"
       whats_new: "några nyheter?"
-      your_aspects: "dina sidor"
+      your_aspects: "dina aspekter"
     header: 
       blog: "blogg"
       code: "källkod"
       login: "logga in"
       logout: "logga ut"
-      profile: "profile"
-      settings: "settings"
+      profile: "profil"
+      settings: "inställningar"
   likes: 
     likes: 
       people_dislike_this: 
-        few: "%{count} people disliked this"
-        many: "%{count} people disliked this"
-        one: "1 person disliked this"
-        other: "%{count} people disliked this"
-        zero: "no people disliked this"
+        few: "%{count} personer ogillade dethär"
+        many: "%{count} personer ogillade dethär"
+        one: "1 person ogillade dethär"
+        other: "%{count} person ogillade dethär"
+        zero: "inga personer ogillade dethär"
       people_like_this: 
-        few: "%{count} people liked this"
-        many: "%{count} people liked this"
-        one: "1 person liked this"
-        other: "%{count} people liked this"
-        zero: "no people liked this"
+        few: "%{count} personer gillade dethär"
+        many: "%{count} personer gillade dethär"
+        one: "1 person gillade dethär"
+        other: "%{count} personer gillade dethär"
+        zero: "inga personer gillade dethär"
   more: "Mer"
   next: "nästa"
   notifications: 
-    also_commented: "kommenterade även din kontakts"
-    also_commented_deleted: "commented on a deleted post"
+    also_commented: "kommenterade även %{post_author}s"
+    also_commented_deleted: "kommenterade ett borttaget inlägg"
     comment_on_post: "kommenterade din"
     deleted: "borttaget"
     helper: 
       new_notifications: 
-        few: "%{count} new notifications"
-        many: "%{count} new notifications"
-        one: "1 new notifications"
-        other: "%{count} new notifications"
-        zero: "no new notifications"
+        few: "%{count} nya meddelanden"
+        many: "%{count} nya meddelanden"
+        one: "1 nya meddelanden"
+        other: "%{count} nya meddelanden"
+        zero: "inga nya meddelanden"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
+      and: "och"
+      and_others: "och %{number} andra"
       mark_all_as_read: "Markera alla som läst"
       notifications: "Notifieringar"
     mentioned: "har nämnt dig i deras"
     new_request: "erbjöd sig att dela med dig."
     post: "meddelande"
-    private_message: "sent you a message."
+    private_message: "skickade dig ett meddelande."
     request_accepted: "accepterade din förfrågan om att dela."
   notifier: 
     also_commented: 
       commented: "har också kommenterat %{post_author}'s inlägg:"
       sign_in: "Logga in för att se den."
-      subject: "%{name} has also commented."
+      subject: "%{name} har också kommenterat %{post_author}s inlägg."
     comment_on_post: 
       commented: "Har kommenterat ditt inlägg"
       sign_in: "Logga in för att visa den."
@@ -275,7 +275,7 @@ sv:
     diaspora: "Diasporas mailrobot"
     hello: "Hej %{name}!"
     love: "hälsningar,"
-    manage_your_email_settings: "manage your email settings"
+    manage_your_email_settings: "administrera dina epost-inställningar"
     mentioned: 
       mentioned: "nämnde dig i ett inlägg:"
       sign_in: "Logga in för att kunna se det."
@@ -286,10 +286,10 @@ sv:
       subject: "ny kontaktförfrågan från %{from}"
       try_it_out: "Du borde verkligen överväga att kolla upp detta."
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      message_subject: "Ämne: %{subject}"
+      private_message: "har skickat dig ett private meddelande:"
+      sign_in: "Logga in för att se det."
+      subject: "%{name} har skickat ett privat meddelande till dig på Diaspora*"
     request_accepted: 
       accepted: "har accepterat din kontaktförfrågan!"
       sign_in: "Logga in här"
@@ -304,10 +304,10 @@ sv:
   password_confirmation: "Bekräfta lösenord"
   people: 
     add_contact_small: 
-      add_contact_from_tag: "add contact from tag"
+      add_contact_from_tag: "lägg till kontakt från tagg"
     aspect_list: 
-      edit_membership: "flytta mellan sidor"
-    few: "%{count} people"
+      edit_membership: "redigera medlemskap för aspekt"
+    few: "%{count} människor"
     helper: 
       people_on_pod_are_aware_of: " personer på denna plats är medvetna om att"
       results_for: " resultat för %{params}"
@@ -316,13 +316,13 @@ sv:
       no_one_found: "...och ingen hittades."
       no_results: "Du måste söka efter något."
       results_for: "Sökresultat för"
-    many: "%{count} people"
+    many: "%{count} människor"
     one: "1 person"
-    other: "%{count} people"
+    other: "%{count} personer"
     person: 
       add_contact: "lägg till kontakt"
       already_connected: "Redan ansluten"
-      pending_request: "väntande förfrågningar"
+      pending_request: "Väntande förfrågningar"
       thats_you: "Detta är du!"
     profile_sidebar: 
       bio: "bio"
@@ -330,29 +330,29 @@ sv:
       cannot_remove: "Kan inte ta bort %{name} från den sista sidan. Du måste ta bort personen om du inte längre vill vara ansluten till denne."
       edit_my_profile: "Ändra min profil"
       gender: "kön"
-      in_aspects: "på sidor"
-      location: "location"
+      in_aspects: "i aspekter"
+      location: "plats"
       remove_contact: "ta bort kontakt"
       remove_from: "Ta bort %{name} från %{aspect}?"
     show: 
-      add_some: "add some"
+      add_some: "lägg till några"
       does_not_exist: "Den här personen finns inte!"
-      edit: "edit"
+      edit: "redigera"
       incoming_request: "%{name} vill dela med dig"
-      mention: "Mention"
-      message: "Message"
+      mention: "Nämna"
+      message: "Meddelande"
       no_posts: "inga meddelanden att visa!"
-      not_connected: "Du är inte ansluten till %{name}"
+      not_connected: "Du delar inte med dig till den här personen"
       recent_posts: "Postat nyligen"
       recent_public_posts: "Senaste publika inlägg"
       return_to_aspects: "Återgå till översikten"
       similar_contacts: "liknande kontakter"
       start_sharing: "börja dela"
       to_accept_or_ignore: "for att acceptera eller ignorera."
-      you_have_no_tags: "you have no tags!"
+      you_have_no_tags: "du har inga taggar!"
     webfinger: 
       fail: "Förlåt, vi kunde inte hitta %{handle}."
-    zero: "no people"
+    zero: "inga personer"
   photos: 
     create: 
       integrity_error: "Fotouppladdning misslyckades. Är du säker på att det var en bild?"
@@ -376,7 +376,7 @@ sv:
     photo: 
       view_all: "visa alla foton som %{name} laddat upp"
     show: 
-      collection_permalink: "collection permalink"
+      collection_permalink: "permanent samlingslänk"
       delete_photo: "Ta bort foto"
       edit: "ändra"
       edit_delete_photo: "Ändra beskrivning / ta bort bild"
@@ -389,26 +389,26 @@ sv:
       error: "Misslyckades med att ändra fotot."
       notice: "Fotot är nu uppdaterat."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    doesnt_exist: "den posten finns inte!"
   previous: "föregående"
   profile: "Profil"
   profiles: 
     edit: 
       allow_search: "Tillåter andra att söka efter dig inom Diaspora"
-      edit_profile: "Edit profile"
+      edit_profile: "Redigera profil"
       first_name: "Förnamn"
-      last_name: "Last name"
+      last_name: "Efternamn"
       update_profile: "Uppdatera profil"
       your_bio: "Din biografi"
-      your_birthday: "Your birthday"
-      your_gender: "Your gender"
-      your_location: "Your location"
-      your_name: "Your name"
-      your_photo: "Your photo"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_birthday: "Din födelsedag"
+      your_gender: "Ditt kön"
+      your_location: "Din plats"
+      your_name: "Ditt namn"
+      your_photo: "Ditt foto"
+      your_private_profile: "Din privata profil"
+      your_public_profile: "Din publika profil"
+      your_tags: "Du: i 5 #taggar"
+      your_tags_placeholder: "t.ex. #diaspora #stryka #katter #musik"
     update: 
       failed: "Misslyckades att uppdatera profil"
       updated: "Profilen uppdaterades"
@@ -440,11 +440,11 @@ sv:
       success: "Kontakten är nu tillagd."
     helper: 
       new_requests: 
-        few: "%{count} new requests!"
-        many: "%{count} new requests!"
-        one: "new request!"
-        other: "%{count} new requests!"
-        zero: "no new requests"
+        few: "%{count} nya förfrågningar!"
+        many: "%{count} nya förfrågningar!"
+        one: "ny förfrågan!"
+        other: "%{count} nya förfrågningar!"
+        zero: "inga nya förfrågningar"
     manage_aspect_contacts: 
       existing: "Befintliga kontakter"
       manage_within: "Hantera kontakter i "
@@ -461,7 +461,7 @@ sv:
     finder: 
       friends: 
         few: "%{count} vänner"
-        many: "%{count} friends"
+        many: "%{count} vänner"
         one: "1 vän"
         other: "%{count} vänner"
         zero: "inga vänner"
@@ -511,69 +511,69 @@ sv:
       add_photos: "lägg till bilder"
       all: "alla"
       all_contacts: "alla kontakter"
-      click_to_share_with: "Click to share with: "
+      click_to_share_with: "Klicka för att dela med: "
       make_public: "gör publik"
       post_a_message_to: "Skicka ett meddelande till %{aspect}"
       posting: "Skickar..."
-      public: "Public"
-      publishing_to: "publishing to: "
+      public: "Publik"
+      publishing_to: "publicerar till: "
       share: "Dela"
       share_with: "dela med"
       whats_on_your_mind: "vad har du på hjärtat?"
     reshare: 
       reshare: "Ã…terdela"
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "Jag ogillar dethär"
+      like: "Jag gillar dethär"
   status_messages: 
     create: 
-      success: "Successfully mentioned: %{names}"
+      success: "Lyckades omnämna: %{names}"
     destroy: 
       failure: "Misslyckades att ta bort inlägg"
     helper: 
       no_message_to_display: "Inget meddelande att visa."
     new: 
-      mentioning: "Mentioning: %{person}"
+      mentioning: "Omnämner: %{person}"
     show: 
       destroy: "Ta bort"
-      not_found: "Sorry, we couldn't find that post."
+      not_found: "Ursäkta, vi hittar inte den posten."
       permalink: "permalänk"
   stream_helper: 
     hide_comments: "dölj kommentarer"
     show_comments: "visa alla kommentarer"
   tags: 
     show: 
-      nobody_talking: "Nobody is talking about %{tag} yet."
-      people_tagged_with: "People tagged with %{tag}"
-      posts_tagged_with: "Posts tagged with #%{tag}"
+      nobody_talking: "Ingen talar om %{tag} än."
+      people_tagged_with: "Personer taggade med %{tag}"
+      posts_tagged_with: "Poster taggade med #%{tag}"
   the_world: "världen"
   username: "Användarnamn"
   users: 
     destroy: "Ditt konto är nu stängt."
     edit: 
-      also_commented: "...someone also comments on your contact's post?"
+      also_commented: "...någon har också kommenterat på din kontakts post?"
       change: "Ändra"
       change_language: "Ändra språk"
       change_password: "Ändra lösenord"
       close_account: "Stäng kontot"
-      comment_on_post: "...someone comments on your post?"
+      comment_on_post: "...någon kommenterar på din post?"
       current_password: "Nuvarande lösenord"
       download_photos: "Ladda ner mina foton"
       download_xml: "Ladda ner min xml"
       edit_account: "Ändra konto"
       export_data: "Exportera data"
-      mentioned: "...you are mentioned in a post?"
+      mentioned: "...du är omnämnd i en post?"
       new_password: "Nytt lösenord"
-      private_message: "...you receive a private message?"
-      receive_email_notifications: "Vill du få meddelande via e-post?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      private_message: "...du mottar ett privat meddelande?"
+      receive_email_notifications: "Skicka meddelanden via e-post när..."
+      request_acceptence: "...din delningsförfrågan är accepterad?"
+      request_received: "...du mottar en delningsförfrågan?"
       your_email: "Din epost"
       your_handle: "Ditt Diaspora-användarnamn"
     getting_started: 
-      connect_on_diaspora: "Connect on Diaspora"
+      connect_on_diaspora: "Anslut på Diaspora"
       connect_services: "Anslut till andra tjänster"
-      could_not_find_anyone: "Could not find any friends on Diaspora*. Use the friend finder to invite them."
+      could_not_find_anyone: "Kunde inte hitta några vänner i Diaspora*. Använd vän-hittaren för att bjuda in dom."
       edit_profile: "Ändra din profil"
       finished: "Slutfört!"
       save_and_continue: "Spara och fortsätt"
diff --git a/config/locales/javascript/javascript.sv.yml b/config/locales/javascript/javascript.sv.yml
index 4bc0c3ed0f15909c06959bb4012bd49229e14fd0..51ec24e6877a88d8aff169b5bad5f542d55718c2 100644
--- a/config/locales/javascript/javascript.sv.yml
+++ b/config/locales/javascript/javascript.sv.yml
@@ -5,13 +5,13 @@
 
 sv: 
   javascripts: 
-    confirm_dialog: "Are you sure?"
+    confirm_dialog: "Är du säker?"
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
-    search_for: "Search for {{name}}"
+      at_least_one_aspect: "Du måste publicera till minst en aspekt."
+    search_for: "Sök efter {{name}}"
     shared: 
       contact_list: 
-        cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
+        cannot_remove: "Kan inte ta bort person från tidigare aspekt. (Om du vill koppla bort från denhär personen måste du ta bort kontakten.)"
     timeago: 
       day: "en dag"
       days: "%d dagar"
@@ -29,5 +29,5 @@ sv:
       year: "ungefär ett år"
       years: "%d år"
     videos: 
-      unknown: "Unknown video type"
-      watch: "Watch this video on {{provider}}"
+      unknown: "Okänd videotyp"
+      watch: "Se denhär videon på {{provider}}"