diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 76e6c0dfc..7e246b4d9 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -244,8 +244,8 @@ cs:
         other: "%{count} nových oznámení"
         zero: "žádná nová oznámení"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
+      and: "a"
+      and_others: "a %{number} dalších"
       mark_all_as_read: "Označit vše jako přečtené"
       notifications: "Oznámení"
     mentioned: "vás zmínil v jejich"
@@ -320,7 +320,7 @@ cs:
       incoming_request: "%{name} s vámi chce sdílet"
       message: "Zpráva"
       no_posts: "žádné zprávy k zobrazení!"
-      not_connected: "Nesdílíte s %{name}"
+      not_connected: "Nesdílíte s touto osobou"
       recent_posts: "Poslední příspěvky"
       recent_public_posts: "Poslední veřejné příspěvky"
       return_to_aspects: "Návrat na vaši stránku s aspekty"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index e477e662d..73d5cb906 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -32,7 +32,7 @@ es:
               invalid: "no es válido."
             username: 
               taken: "ya está ocupado."
-  ago: "%{time} "
+  ago: "hace %{time} "
   application: 
     helper: 
       aspect_badge: 
@@ -244,8 +244,8 @@ es:
         other: "%{count} nuevas notificaciones"
         zero: "no hay notificaciones"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
+      and: "y"
+      and_others: "y otros %{number}"
       mark_all_as_read: "Marcar todo como leído"
       notifications: "Notificaciones"
     mentioned: "te nombró en su"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index fdd8dbde1..ca628dcc7 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -53,7 +53,7 @@ eu:
     aspect_contacts: 
       done_editing: "aldaketak gauzatu"
     aspect_stream: 
-      activity: "jarduera"
+      activity: "jardueraren arabera"
       post_time: "mezuaren dataren arabera"
       sort_by: "sailkatu:"
     contacts_not_visible: "Alderdi honetako adiskideak nor dagoen bere alderdian ezingo dute ikusi."
@@ -70,11 +70,11 @@ eu:
       aspect_list_is_visible: "alderdiaren zerrenda ikusgarria da aldediko besteengandik"
       confirm_remove_aspect: "Ziur al zaude alderdi hau ezabatu nahi duzunaz?"
       done: "Egina"
-      make_aspect_list_visible: "make aspect list visible?"
+      make_aspect_list_visible: "alderdiaren zerrenda publikoa egin?"
       remove_aspect: "Alderdi hau ezabatu"
       rename: "berrizendatu"
       update: "eguneratu"
-    few: "%{count} aspects"
+    few: "%{count} alderdi"
     helper: 
       are_you_sure: "Ziur al zaude alderdi hau ezabatu nahi duzunaz?"
       aspect_not_empty: "Alderdi ez hutsa"
@@ -89,7 +89,7 @@ eu:
       manage_aspects: "Alderdiak kudeatu"
       no_requests: "Ez duzu eskaera berririk"
       requests: "Eskaerak"
-    many: "%{count} aspects"
+    many: "%{count} alderdi"
     move_contact: 
       error: "Huts adiskidea mugitzean: %{inspect}"
       failure: "huts egin du %{inspect}"
@@ -105,8 +105,8 @@ eu:
       nobody_in_aspect: "Zure alderdi '%{aspect_name}' hutsik dago."
     no_posts_message: 
       start_talking: "Oraindik inork ez du ezer esan. Izan zaitez lehenengoa!"
-    one: "1 aspect"
-    other: "%{count} aspects"
+    one: "alderdi 1"
+    other: "%{count} alderdi"
     seed: 
       family: "Familia"
       work: "Lantokia"
@@ -115,18 +115,18 @@ eu:
     update: 
       failure: "Zure alderdiak, %{name}(e)k, izen luzeegia du."
       success: "Zure alderdia, %{name}, eraldatua izan da."
-    zero: "no aspects"
+    zero: "alderdirik ez"
   back: "Atzera"
   cancel: "Ezeztatu"
   comments: 
-    few: "%{count} comments"
-    many: "%{count} comments"
+    few: "%{count} iruzkin"
+    many: "%{count} iruzkin"
     new_comment: 
       comment: "Iruzkindu"
       commenting: "Iruzkintzen..."
-    one: "1 comment"
-    other: "%{count} comments"
-    zero: "no comments"
+    one: "iruzkin 1"
+    other: "%{count} iruzkin"
+    zero: "iruzkinik ez"
   contacts: 
     create: 
       failure: "Akatsa adiskide berria sortzean"
@@ -134,7 +134,7 @@ eu:
       failure: "Akatsa %{name} ezabatzean"
       success: "Arrakastaz ezabatu duzu %{name} adiskide zerrendatik"
     few: "%{count} adiskide"
-    many: "%{count} contacts"
+    many: "%{count} adiskide"
     one: "adiskide 1"
     other: "%{count} adiskide"
     share_with_pane: 
@@ -145,11 +145,11 @@ eu:
   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} mezu pribatu berri"
+        many: "%{count} mezu pribatu berri"
+        one: "mezu pribatu berri 1"
+        other: "%{count} mezu pribatu berri"
+        zero: "mezu pribatu berririk ez"
     index: 
       create_a_new_message: "mezu berria sortu"
       message_inbox: "Sarrera-ontzia"
@@ -159,7 +159,7 @@ eu:
     new: 
       no_results: "Ez da ezer aurkitu"
       send: "Bidali"
-      subject: "igorlea"
+      subject: "gaia"
       to: "nori:"
     show: 
       delete: "ezabatu eta giltzapetu elkarrizketa"
@@ -238,18 +238,18 @@ eu:
     deleted: "ezabatuta"
     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} jakinarazpen berri"
+        many: "%{count} jakinarazpen berri"
+        one: "jakinarazpen berri 1"
+        other: "%{count} jakinarazpen berri"
+        zero: "jakinarazpen berririk ez"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
+      and: "eta"
+      and_others: "eta beste %{number}(e)k"
       mark_all_as_read: "Guztiak irakurrita"
       notifications: "Jakinarazpenak"
     mentioned: "aipatu zaituzte bere"
-    new_request: "zurekin partekatzea eskatu dizu."
+    new_request: "(e)k zurekin partekatu nahi du."
     post: "berria"
     request_accepted: "zure partekatze eskaera onartu du."
   notifier: 
@@ -260,7 +260,7 @@ eu:
     comment_on_post: 
       commented: "zure mezua iruzkindu du:"
       sign_in: "Sartu zaitez ikusteko."
-      subject: "%{name} zure mezua iruzkindu du."
+      subject: "%{name}(e)k zure mezua iruzkindu du."
     diaspora: "diasporaren e-posta robota"
     hello: "Kaixo, %{name}!"
     love: "ikusi arte,"
@@ -304,7 +304,7 @@ eu:
     person: 
       add_contact: "adiskidea gehitu"
       already_connected: "Dagoeneko harremanetan"
-      pending_request: "eskaeraren zain"
+      pending_request: "onarpenaren zain"
       thats_you: "zu zeu zara!"
     profile_sidebar: 
       bio: "niri buruz"
@@ -318,7 +318,7 @@ eu:
     show: 
       does_not_exist: "Pertsona hau ez dago!"
       incoming_request: "%{name}(e)k zure adiskidea izan nahi du"
-      message: "Mezua"
+      message: "Mezu pribatua bidali"
       no_posts: "erakusteko sarrerarik ez dago!"
       not_connected: "Ez zaude partekatzen %{name}(r)ekin"
       recent_posts: "Mezu Berrienak"
@@ -366,8 +366,8 @@ eu:
       notice: "Argazkia arrakastaz eguneratua."
   posts: 
     index: 
-      posts_tagged_with: "Posts tagged with #%{tag}"
-      whatup: "What's happening on %{pod}"
+      posts_tagged_with: "#%{tag}(r)ekin etiketatutako mezuak"
+      whatup: "Zer berri %{pod}(e)n"
   previous: "aurrekoa"
   profile: "Profila"
   profiles: 
@@ -385,7 +385,7 @@ eu:
       your_photo: "Zure argazkia"
       your_profile: "Zure profila"
     update: 
-      failed: "Akatsa profila eguneratzean"
+      failed: "Huts profila eguneratzean"
       updated: "Profila eguneratu duzu."
   registrations: 
     closed: "Izen emateak itxirik daude Diaspora zerbitzari hontan."
@@ -415,11 +415,11 @@ eu:
       success: "Orain adiskideak zarete."
     helper: 
       new_requests: 
-        few: "%{count} new requests!"
-        many: "%{count} new requests!"
-        one: "new request!"
-        other: "%{count} new requests!"
-        zero: "no new requests"
+        few: "%{count} eskaera berri!"
+        many: "%{count} eskaera berri!"
+        one: "eskaera berria!"
+        other: "%{count} eskaera berri!"
+        zero: "eskaera berririk ez"
     manage_aspect_contacts: 
       existing: "Adiskideak"
       manage_within: "Adiskideak kudeatu hemen:"
@@ -436,7 +436,7 @@ eu:
     finder: 
       friends: 
         few: "%{count} adiskide"
-        many: "%{count} friends"
+        many: "%{count} adiskide"
         one: "adiskide 1"
         other: "%{count} adiskide"
         zero: "adiskiderik ez"
@@ -514,23 +514,23 @@ eu:
   users: 
     destroy: "Kontua arrakastaz ezabatua."
     edit: 
-      also_commented: "...someone also comments on your contact's post?"
+      also_commented: "...beste norbaitek zure adiskide baten mezua iruzkintzen duenean?"
       change: "Aldatu"
       change_language: "Hizkuntza Aldatu"
       change_password: "Pasahitza aldatu"
       close_account: "Kontua Ezabatu"
-      comment_on_post: "...someone comments on your post?"
+      comment_on_post: "...norbaitek zure mezu bat iruzkintzen duenean?"
       current_password: "Oraingo pasahitza"
       download_photos: "nire argazkiak jaitsi"
       download_xml: "nire xml jaitsi"
       edit_account: "Kontua aldatu"
       export_data: "Datuak esportatu"
-      mentioned: "...you are mentioned in a post?"
+      mentioned: "...mezu batean aipatzen zaituztenean?"
       new_password: "Pasahitz Berria"
-      private_message: "...you receive a private message?"
+      private_message: "...mezu pribatu bat jasotzen duzunean?"
       receive_email_notifications: "E-posta jakinarazpenak jaso nahi dituzu?"
-      request_acceptence: "...your share request is accepted?"
-      request_received: "...you receive a new share request?"
+      request_acceptence: "...zure partekatze eskaerak onartuak izan direnean?"
+      request_received: "...partekatze eskaera berriak dituzunean?"
       your_email: "Zure e-posta"
       your_handle: "Zure Diaspora erabiltzailea"
     getting_started: 
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 46f059bd2..67e4b6230 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -244,8 +244,8 @@ fr:
         other: "%{count} nouvelles notifications"
         zero: "aucune nouvelle notification"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
+      and: "et"
+      and_others: "et %{number} autres"
       mark_all_as_read: "Tout marquer comme lu"
       notifications: "Notifications"
     mentioned: "vous a mentionné(e) dans son"
@@ -320,7 +320,7 @@ fr:
       incoming_request: "%{name} désire partager avec vous"
       message: "Message"
       no_posts: "aucun message à afficher !"
-      not_connected: "Vous n'êtes pas connecté(e) avec %{name}"
+      not_connected: "Vous n'êtes pas connecté(e) avec cette personne"
       recent_posts: "Messages récents"
       recent_public_posts: "Messages publics récents"
       return_to_aspects: "Retourner à votre page des aspects"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 5acb3abea..05960675a 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -29,10 +29,10 @@ nb:
             email: 
               taken: "er allerede tatt."
             person: 
-              invalid: "is invalid."
+              invalid: "er invalid."
             username: 
               taken: "er allerede tatt."
-  ago: "%{time} ago"
+  ago: "%{time} siden"
   application: 
     helper: 
       aspect_badge: 
@@ -43,9 +43,9 @@ nb:
   are_you_sure: "Er du sikker?"
   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: "Kunne ikke fjerne person fra aspekt"
+      no_membership: "Kunne ikke finne personen i det aspektet"
+      success: "Personen er fjernet fra aspektet"
   aspects: 
     add_to_aspect: 
       failure: "Failed to add friend to aspect."
@@ -53,9 +53,9 @@ nb:
     aspect_contacts: 
       done_editing: "done editing"
     aspect_stream: 
-      activity: "activity"
-      post_time: "post time"
-      sort_by: "sort by:"
+      activity: "aktivitet"
+      post_time: "tidspunkt"
+      sort_by: "sorter etter:"
     contacts_not_visible: "Kontakter i dette aspektet vil ikke kunne se hverandre."
     contacts_visible: "Kontakter i dette aspektet vil kunne se hverandre."
     create: 
@@ -70,18 +70,18 @@ nb:
       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"
-      make_aspect_list_visible: "make aspect list visible?"
-      remove_aspect: "Delete this aspect"
-      rename: "rename"
+      make_aspect_list_visible: "gjør aspektlisten synlig?"
+      remove_aspect: "Slett dette aspektet"
+      rename: "endre navn"
       update: "update"
-    few: "%{count} aspects"
+    few: "%{count} aspekter"
     helper: 
       are_you_sure: "Er du sikker på at du vil slette dette aspektet?"
       aspect_not_empty: "Aspektet er ikke tomt"
       remove: "fjern"
     index: 
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
-      no_contacts: "No contacts"
+      no_contacts: "Ingen kontakter"
     manage: 
       add_a_new_aspect: "Legg til et nytt aspekt"
       add_a_new_contact: "Legg til ny kontakt"
@@ -89,44 +89,44 @@ nb:
       manage_aspects: "Manage aspects"
       no_requests: "Ingen nye forespørsler"
       requests: "Forespørsler"
-    many: "%{count} aspects"
+    many: "%{count} aspekter"
     move_contact: 
-      error: "Error moving contact: %{inspect}"
+      error: "Feil ved flytting av kontakt: %{inspect}"
       failure: "didn't work %{inspect}"
       success: "Person moved to new aspect"
     new_aspect: 
       create: "Opprett"
       name: "Navn"
     no_contacts_message: 
-      add_contact: "Add a contact"
-      add_contact_to: "Add someone to %{aspect_name}"
-      invite: "Invite someone to join Diaspora!"
+      add_contact: "Legg til en kontakt"
+      add_contact_to: "Legg til en kontakt i %{aspect_name}"
+      invite: "Inviter noen til Diaspora!"
       nobody: "We know you know people — bring them to Diaspora!"
-      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
+      nobody_in_aspect: "Aspektet ditt '%{aspect_name}' er tomt."
     no_posts_message: 
       start_talking: "Ingen har sagt noe enda. Få samtalen i gang!"
-    one: "1 aspect"
-    other: "%{count} aspects"
+    one: "1 aspekt"
+    other: "%{count} aspekter"
     seed: 
       family: "Familie"
       work: "Jobb"
     show: 
       edit_aspect: "endre aspekt"
     update: 
-      failure: "Your aspect, %{name}, had too long name to be saved."
+      failure: "Aspektet ditt, %{name}, har for langt navn."
       success: "Aspektet ditt, %{name}, har blitt endra."
-    zero: "no aspects"
-  back: "Back"
+    zero: "ingen aspekter"
+  back: "Tilbake"
   cancel: "Avbryt"
   comments: 
-    few: "%{count} comments"
-    many: "%{count} comments"
+    few: "%{count} kommentarer"
+    many: "%{count} kommentarer"
     new_comment: 
       comment: "Kommenter"
       commenting: "Kommenterer..."
-    one: "1 comment"
-    other: "%{count} comments"
-    zero: "no comments"
+    one: "1 kommentar"
+    other: "%{count} kommentarer"
+    zero: "ingen kommentarer"
   contacts: 
     create: 
       failure: "Failed to create contact"
@@ -138,22 +138,22 @@ nb:
     one: "1 contact"
     other: "%{count} contacts"
     share_with_pane: 
-      accepts: "Once %{name} accepts, you'll start seeing each other's posts on Diaspora"
-      add_new_aspect: "add to new aspect"
+      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"
   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} nye meldinger"
+        many: "%{count} nye meldinger"
+        one: "1 ny melding"
+        other: "%{count} nye meldinger"
+        zero: "ingen nye meldinger"
     index: 
-      create_a_new_message: "create a new message"
-      message_inbox: "Message Inbox"
-      new_message: "New Message"
+      create_a_new_message: "skriv en ny melding"
+      message_inbox: "Meldingsinnboks"
+      new_message: "Ny Melding"
       no_conversation_selected: "ingen samtaler valgt"
       no_messages: "ingen meldinger"
     new: 
@@ -178,18 +178,18 @@ nb:
   fill_me_out: "Fill me out"
   home: 
     show: 
-      already_account: "already have an account?"
+      already_account: "har du allerede en konto?"
       choice: "Valg"
       choice_explanation: "Diaspora allows you to sort your connections into groups called Aspects. Unique to Diaspora, Aspects ensure your photos, stories and jokes are shared with only the people you want them to be."
       learn_about_host: "Learn about how to host your own Diaspora server"
-      login_here: "log in here"
+      login_here: "logg inn her"
       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_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: "Share what you want,"
-      tagline_second_half: "with whom you want."
+      tagline_first_half: "Del hva du vil,"
+      tagline_second_half: "med hvem du vil."
   invitations: 
     check_token: 
       not_found: "Invitation token not found"
@@ -205,16 +205,16 @@ nb:
       already_invited: "Allerede innvitert"
       aspect: "Aspekt"
       comma_seperated_plz: "Du kan skrive inn flere epostadresser delt med komma."
-      if_they_accept_info: "if they accept, they will be added to the aspect you invited them."
+      if_they_accept_info: "Hvis de aksepterer, vil de bli lagt til i aspektet du valgte."
       invite_someone_to_join: "Inviter noen til Diaspora!"
       personal_message: "Personlig melding"
-      resend: "Resend"
+      resend: "Send på nytt"
       send_an_invitation: "Send en invitasjon"
       send_invitation: "Send invitasjon"
       to: "Til"
   layouts: 
     application: 
-      have_a_problem: "Have a problem? Find an answer here"
+      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}"
@@ -226,9 +226,9 @@ nb:
       blog: "blogg"
       code: "code"
       edit_profile: "rediger profil"
-      login: "login"
-      logout: "logout"
-      view_profile: "se profil"
+      login: "logg inn"
+      logout: "logg ut"
+      view_profile: "vis profil"
   more: "Mer"
   next: "neste"
   notifications: 
@@ -254,36 +254,36 @@ nb:
     request_accepted: "accepted your share request."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
+      commented: "har også kommentert på %{post_author} sitt innlegg:"
       sign_in: "Sign in to view it."
       subject: "%{name} has also commented."
     comment_on_post: 
       commented: "has commented on your post!"
       sign_in: "Sign in to view it."
-      subject: "%{name} has commented on your post."
+      subject: "%{name} har kommentert på ditt innlegg."
     diaspora: "the diaspora email robot"
     hello: "Hei %{name}!"
     love: "love,"
     mentioned: 
-      mentioned: "mentioned you in a post:"
+      mentioned: "nevnte deg i et innlegg:"
       sign_in: "Sign in to view it."
-      subject: "%{name} has mentioned you on Diaspora*"
+      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."
     private_message: 
-      message_subject: "Subject: %{subject}"
-      private_message: "has sent you a private message:"
-      sign_in: "Sign in to view it."
+      message_subject: "Emne: %{subject}"
+      private_message: "har sendt deg en privat melding:"
+      sign_in: "Logg inn for å se den."
       subject: "%{name} has sent you a private message yon Diaspora*"
     request_accepted: 
       accepted: "has accepted your friend request. They are now in your"
       sign_in: "Sign in here"
       subject: "%{name} has accepted your friend request on Diaspora*"
     single_admin: 
-      admin: "Your Diaspora administrator"
+      admin: "Din Diaspora administrator"
       subject: "A message from your Diaspora administrator:"
     thanks: "Thanks,"
   ok: "OK"
@@ -308,20 +308,20 @@ nb:
       thats_you: "det er deg!"
     profile_sidebar: 
       bio: "bio"
-      born: "born"
-      cannot_remove: "Cannot remove %{name} from last aspect."
+      born: "født"
+      cannot_remove: "Kan ikke fjerne %{name} fra siste aspekt."
       edit_my_profile: "Endre profilen min"
       gender: "kjønn"
-      in_aspects: "in aspects"
+      in_aspects: "i aspekt"
       remove_contact: "fjern kontakt"
       remove_from: "Fjern %{name} fra %{aspect}?"
     show: 
       does_not_exist: "Personen eksisterer ikke!"
       incoming_request: "You have an incoming request from this person."
-      message: "Message"
-      no_posts: "ingen poster å vise!"
+      message: "Melding"
+      no_posts: "ingen innlegg å vise!"
       not_connected: "You are not connected with this person"
-      recent_posts: "Recent Posts"
+      recent_posts: "Nylige Innlegg"
       recent_public_posts: "Recent Public Posts"
       return_to_aspects: "Return to your aspects page"
       similar_contacts: "lignende kontakter"
@@ -331,7 +331,7 @@ nb:
       fail: "Beklager, vi kunne ikke finne %{handle}."
   photos: 
     create: 
-      integrity_error: "Photo upload failed.  Are you sure that was an image?"
+      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?"
     destroy: 
@@ -343,18 +343,18 @@ nb:
       new_photo: "Nytt bilde"
       post_it: "legg ut!"
     new_photo: 
-      empty: "{file} is empty, please select files again without it."
+      empty: "{file} er tom, vennligst velg filer igjen uten den"
       invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
       size_error: "{file} er for stor, maks filstørrelse er {sizeLimit}."
     new_profile_photo: 
       or_select_one: "or select one from your already existing"
-      upload: "Upload a new profile photo!"
+      upload: "Last opp et nytt profilbilde!"
     photo: 
-      view_all: "view all of %{name}'s photos"
+      view_all: "se alle bildene til %{name}"
     show: 
       collection_permalink: "collection permalink"
       delete_photo: "Slett bilde"
-      edit: "edit"
+      edit: "rediger"
       edit_delete_photo: "Edit photo description / delete photo"
       make_profile_photo: "gjør til profilbilde"
       original_post: "Original Post"
@@ -366,29 +366,29 @@ nb:
       notice: "Bildet er oppdatert."
   posts: 
     index: 
-      posts_tagged_with: "Posts tagged with #%{tag}"
-      whatup: "What's happening on %{pod}"
+      posts_tagged_with: "Innlegg tagget med #%{tag}"
+      whatup: "Hva skjer på %{pod}"
   previous: "forrige"
   profile: "Profil"
   profiles: 
     edit: 
-      allow_search: "Allow for people to search for you within Diaspora"
-      edit_profile: "Edit profile"
-      first_name: "First name"
+      allow_search: "Tillat folk å søke på deg i Diaspora"
+      edit_profile: "Endre profil"
+      first_name: "Fornavn"
       info_available_to: "This info will be available to whomever you connect with on Diaspora."
       last_name: "Etternavn"
-      update_profile: "Update Profile"
-      your_bio: "Your bio"
-      your_birthday: "Din Bursdag"
+      update_profile: "Oppdater Profil"
+      your_bio: "Om meg"
+      your_birthday: "Din Fødselsdato"
       your_gender: "Ditt kjønn"
       your_name: "Ditt navn"
-      your_photo: "Your photo"
+      your_photo: "Ditt profilbilde"
       your_profile: "Din profil"
     update: 
-      failed: "Failed to update profile"
-      updated: "Profile updated"
+      failed: "Kunne ikke oppdatere profil"
+      updated: "Profil oppdatert"
   registrations: 
-    closed: "Signups are closed on this Diaspora pod."
+    closed: "Registreringer er stengt på denne Diaspora poden."
     create: 
       success: "Du er nå med i Diaspora!"
     edit: 
@@ -415,13 +415,13 @@ nb:
       success: "Dere er nå venner."
     helper: 
       new_requests: 
-        few: "%{count} new requests!"
-        many: "%{count} new requests!"
-        one: "new request!"
-        other: "%{count} new requests!"
-        zero: "no new requests"
+        few: "%{count} nye forespørsler!"
+        many: "%{count} nye forespørsler!"
+        one: "nye forespørsler!"
+        other: "%{count} nye forespørsler!"
+        zero: "ingen nye forespørsler"
     manage_aspect_contacts: 
-      existing: "Existing contacts"
+      existing: "Eksisterende kontakter"
       manage_within: "Manage contacts within"
     new_request_to_person: 
       sent: "sendt!"
@@ -453,8 +453,8 @@ nb:
       click_link_to_accept_invitation: "Klikk denne linken for å akseptere invitasjonen din"
       join_me_on_diaspora: "Join me on DIASPORA*"
     remote_friend: 
-      invite: "invite"
-      resend: "resend"
+      invite: "inviter"
+      resend: "send på nytt"
   settings: "Innstillinger"
   shared: 
     add_contact: 
@@ -462,21 +462,21 @@ nb:
       diaspora_handle: "Diaspora handle"
       enter_a_diaspora_username: "Enter a Diaspora username:"
       know_email: "Kan du epostadressen deres? Inviter dem!"
-      your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
+      your_diaspora_username_is: "Ditt Diaspora brukernavn er: %{diaspora_handle}"
     contact_list: 
       all_contacts: "All contacts"
       cannot_remove: "Cannot remove person from last aspect."
     invitations: 
-      by_email: "by Email"
+      by_email: "via Epost"
       dont_have_now: "Du har ingen akkurat nå, men flere invitasjoner kommer snart!"
       from_facebook: "Fra Facebook"
       invitations_left: "(%{count} igjen)"
-      invite_someone: "Invite someone"
+      invite_someone: "Inviter noen"
       invite_your_friends: "Innviter vennene dine"
-      invites: "Invites"
+      invites: "Invitasjoner "
       invites_closed: "Invites are currently closed on this Diaspora seed"
     notification: 
-      new: "New %{type} from %{from}"
+      new: "Ny %{type} fra %{from}"
     public_explain: 
       logged_in: "innlogget på %{service}"
       manage: "manage connected services"
@@ -488,13 +488,13 @@ nb:
       all_contacts: "alle kontakter"
       make_public: "gjør offentlig"
       mention_helper_text: "for å nevne noen, skriv '@' og begynn å skriv navnet deres"
-      post_a_message_to: "Post a message to %{aspect}"
+      post_a_message_to: "Post et innlegg til %{aspect}"
       posting: "Poster..."
       share: "Del"
       share_with: "Share with %{aspect}"
       whats_on_your_mind: "Hva tenker du på?"
     reshare: 
-      reshare: "Reshare"
+      reshare: "Del på nytt"
   status_messages: 
     destroy: 
       failure: "Failed to delete post"
@@ -509,30 +509,30 @@ nb:
   stream_helper: 
     hide_comments: "hide comments"
     show_comments: "show comments"
-  the_world: "the world"
+  the_world: "verden"
   username: "Brukernavn"
   users: 
-    destroy: "Account successfully closed."
+    destroy: "Kontoen er stengt."
     edit: 
       also_commented: "...someone also comments on your contact's post?"
-      change: "Change"
+      change: "Endre"
       change_language: "Endre Språk"
       change_password: "Endre Passord"
       close_account: "Steng Konto"
-      comment_on_post: "...someone comments on your post?"
+      comment_on_post: "...noen kommenterer på dine innlegg?"
       current_password: "Nåverende passord"
-      download_photos: "download my photos"
-      download_xml: "download my xml"
+      download_photos: "last ned mine bilder"
+      download_xml: "last ned min xml"
       edit_account: "Endre konto"
       export_data: "Eksporter Data"
-      mentioned: "...you are mentioned in a post?"
+      mentioned: "...du nevnes i et innlegg?"
       new_password: "Nytt Passord"
-      private_message: "...you receive a private message?"
-      receive_email_notifications: "Receive email notificaions?"
+      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?"
       your_email: "Din epost"
-      your_handle: "Your diaspora handle"
+      your_handle: "Ditt Diaspora brukernavn"
     getting_started: 
       connect_on_diaspora: "Connect on Diaspora"
       connect_services: "Connect your services"
@@ -546,14 +546,14 @@ nb:
         skip: "Skip"
       step_3: 
         finish: "Finish"
-        people_already_on_diaspora: "People already on Diaspora"
+        people_already_on_diaspora: "Personer allerede på Diaspora"
       welcome: "Velkommen til Diaspora!"
     public: 
-      does_not_exist: "User %{username} does not exist!"
+      does_not_exist: "Bruker %{username} finnes ikke!"
     update: 
       email_notifications_changed: "Language Change Failed"
       language_changed: "Språk Endret"
-      language_not_changed: "Language Change Failed"
+      language_not_changed: "Endring av språk mislyktes"
       password_changed: "Passord Endret"
       password_not_changed: "Endring av Passord mislyktes"
   webfinger: 
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index f3c67eb98..3dc1a8b20 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -244,8 +244,8 @@ zh-TW:
         other: "%{count} 個新消息"
         zero: "沒有新消息"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
+      and: "和"
+      and_others: "和其他 %{number} 個人"
       mark_all_as_read: "全部標示為已讀"
       notifications: "消息"
     mentioned: "提到了你, 在他們的"
@@ -320,7 +320,7 @@ zh-TW:
       incoming_request: "%{name} 希望能和你分享"
       message: "訊息"
       no_posts: "沒有貼文可顯示!"
-      not_connected: "你不跟 %{name} 分享"
+      not_connected: "你不跟這個人分享"
       recent_posts: "近來貼文"
       recent_public_posts: "近來公開貼文"
       return_to_aspects: "回你的面向主頁"
diff --git a/config/locales/javascript/javascript.es.yml b/config/locales/javascript/javascript.es.yml
index 8010836b0..6f9b99b35 100644
--- a/config/locales/javascript/javascript.es.yml
+++ b/config/locales/javascript/javascript.es.yml
@@ -19,8 +19,8 @@ es:
       minutes: "%d minutos"
       month: "un mes aproximadamente"
       months: "%d meses"
-      prefixAgo: "Hace"
-      prefixFromNow: "dentro de"
+      prefixAgo: "javascripts:timeago:prefixAgo"
+      prefixFromNow: "javascripts:timeago:prefixFromNow"
       seconds: "menos de un minuto"
       suffixAgo: "hace"
       suffixFromNow: "desde ahora"