diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 8fb7e480fbd5007eacf954bf079beb4e15945b79..668bca86fbf0987d8a3abc7d766f33cf16bdff1c 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -74,6 +74,7 @@ ar:
       remove_aspect: "Delete this aspect"
       rename: "rename"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index ecf4aac14d90c4e9a3aed7a8963dbfd5e9e2b2a8..4bb2fe8a370e19560f65953ae8c511437cec8b78 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -66,14 +66,15 @@ cs:
       success: "%{name} byl úspěšně odebrán."
     edit: 
       add_existing: "Přidat existující kontakt"
-      aspect_list_is_not_visible: "seznam aspektů je skryt ostatním v aspektu"
-      aspect_list_is_visible: "seznam aspektů je viditelný pro ostatní v aspektu"
+      aspect_list_is_not_visible: "seznam kontaktů je skryt ostatním v aspektu"
+      aspect_list_is_visible: "seznam kontaktů je viditelný pro ostatní v aspektu"
       confirm_remove_aspect: "Opravdu chcete odstranit tento aspekt?"
       done: "Hotovo"
-      make_aspect_list_visible: "zviditelnit seznam apektů?"
+      make_aspect_list_visible: "zviditelnit seznam kontaktů?"
       remove_aspect: "Odstranit tento aspekt"
       rename: "přejmenovat"
       update: "aktualizovat"
+      updating: "aktualizace"
     few: "%{count} aspekty"
     helper: 
       are_you_sure: "Opravdu chcete odstranit tento aspekt?"
@@ -122,7 +123,7 @@ cs:
     few: "%{count} komentáře"
     many: "%{count} komentářů"
     new_comment: 
-      comment: "Komentář"
+      comment: "komentář"
       commenting: "Komentování..."
     one: "1 komentář"
     other: "%{count} komentářů"
@@ -138,7 +139,7 @@ cs:
     one: "1 kontakt"
     other: "%{count} kontaktů"
     share_with_pane: 
-      accepts: "Jakmile %{name} přijme, uvidíte jeho další příspěvky na Diaspoře"
+      accepts: "Jakmile %{name} pozvání přijme, uvidíte jeho další příspěvky na Diaspoře"
       add_new_aspect: "přidat do nového aspektu"
       share_with: "Začít sdílet s %{name}"
     zero: "žádné kontakty"
@@ -232,17 +233,17 @@ cs:
   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} lidem se to nelíbí"
+        many: "%{count} lidem se to nelíbí"
+        one: "1 osobě se to nelíbí"
+        other: "%{count} lidem se to nelíbí"
+        zero: "žádná záporná hodnocení"
       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} lidem se to líbí"
+        many: "%{count} lidem se to líbí"
+        one: "1 osobě se to líbí"
+        other: "%{count} lidem se to líbí"
+        zero: "žádná kladná hodnocení"
   more: "Více"
   next: "další"
   notifications: 
@@ -322,8 +323,8 @@ cs:
     person: 
       add_contact: "přidat kontakt"
       already_connected: "Již připojen"
-      pending_request: "nevyřízené žádosti"
-      thats_you: "to jste vy!"
+      pending_request: "Nevyřízená žádost"
+      thats_you: "To jste vy!"
     profile_sidebar: 
       bio: "životopis"
       born: "datum narození"
@@ -518,10 +519,10 @@ cs:
       share_with: "sdílet s"
       whats_on_your_mind: "co máte na mysli?"
     reshare: 
-      reshare: "Přesdílet"
+      reshare: "Sdílet jinam"
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "to se mi nelíbí"
+      like: "to se mi líbí"
   status_messages: 
     create: 
       success: "Úspěšně zmíněno: %{names}"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index d830e3f8b4a718dfc87b6aad64912db2186a8722..4c2cd440efcc80d5825c78fb54e0a41e395b541e 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -74,6 +74,7 @@ cy:
       remove_aspect: "Delete this aspect"
       rename: "rename"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index fbaf47b8e5500af1061426bad160caa0527dec5c..2047886f6f47fa46ab2b4fdb40ea05d539fe9646 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -74,6 +74,7 @@ da:
       remove_aspect: "Slet dette aspekt"
       rename: "omdøb"
       update: "Opdater"
+      updating: "updating"
     few: "%{count} aspekter"
     helper: 
       are_you_sure: "Er du sikker på at du vil fjerne dette aspekt?"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 02cf6bdf64c529879588e12aebc8a30b46814134..961df63585a39175ae289162fa880b269ccfa11b 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -74,6 +74,7 @@ de:
       remove_aspect: "Aspekt löschen"
       rename: "umbenennen"
       update: "Aktualisieren"
+      updating: "updating"
     few: "%{count} Aspekte"
     helper: 
       are_you_sure: "Möchtest du diesen Aspekt wirklich löschen?"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 98611d753f32f8f9d0afe13327e27073bbba7bed..f9d06b5cef7475084e756bf55efd493329f065b8 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -74,6 +74,7 @@ el:
       remove_aspect: "Διαγραφή αυτής της πτυχής"
       rename: "μετονομασία"
       update: "ενημέρωση"
+      updating: "updating"
     few: "%{count} πτυχές"
     helper: 
       are_you_sure: "Είστε σίγουρος/η πως θέλετε να διαγράψετε αυτή την πτυχή;"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index a08dbe02b265d61365f903f05d57864ff45a48d2..6f0557c6e4ffa0d72c9e02614bf1a1a483ca9f00 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -70,10 +70,11 @@ en_shaw:
       aspect_list_is_visible: "𐑨𐑕𐑐𐑧𐑒𐑑 𐑤𐑦𐑕𐑑 𐑦𐑟 𐑝𐑦𐑟𐑦𐑚𐑩𐑤 𐑑 𐑳𐑞𐑼𐑟 𐑦𐑯 𐑨𐑕𐑐𐑧𐑒𐑑"
       confirm_remove_aspect: "𐑸 𐑿 𐑖𐑻 𐑿 𐑢𐑳𐑯𐑑 𐑑 𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑?"
       done: "𐑛𐑳𐑯"
-      make_aspect_list_visible: "𐑥𐑱𐑒 𐑨𐑕𐑐𐑧𐑒𐑑 𐑤𐑦𐑕𐑑 𐑝𐑦𐑟𐑦𐑚𐑩𐑤 𐑑 𐑳𐑞𐑼𐑟 𐑦𐑯 𐑨𐑕𐑐𐑧𐑒𐑑"
+      make_aspect_list_visible: "𐑥𐑱𐑒 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑 𐑤𐑦𐑕𐑑 𐑝𐑦𐑟𐑦𐑚𐑩𐑤?"
       remove_aspect: "𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑"
       rename: "𐑮𐑦𐑯𐑱𐑥"
       update: "𐑳𐑐𐑛𐑱𐑑"
+      updating: "𐑳𐑐𐑛𐑱𐑑𐑦𐑙"
     few: "%{count} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
     helper: 
       are_you_sure: "𐑸 𐑿 𐑖𐑻 𐑿 𐑢𐑳𐑯𐑑 𐑑 𐑛𐑦𐑤𐑰𐑑 𐑞𐑦𐑕 𐑨𐑕𐑐𐑧𐑒𐑑?"
@@ -152,7 +153,7 @@ en_shaw:
         zero: "𐑯𐑴 𐑯𐑿 𐑥𐑧𐑕𐑩𐑡𐑩𐑟"
     index: 
       create_a_new_message: "𐑒𐑮𐑦𐑱𐑑 𐑩 𐑯𐑿 𐑥𐑧𐑕𐑩𐑡"
-      inbox: "Inbox"
+      inbox: "𐑦𐑯𐑚𐑪𐑒𐑕"
       message_inbox: "𐑥𐑧𐑕𐑩𐑡 𐑦𐑯𐑚𐑪𐑒𐑕"
       new_message: "𐑯𐑿 𐑥𐑧𐑕𐑩𐑡"
       no_conversation_selected: "𐑯𐑴 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑕𐑩𐑤𐑧𐑒𐑑𐑩𐑛"
@@ -227,22 +228,22 @@ en_shaw:
       code: "𐑒𐑴𐑛"
       login: "𐑤𐑪𐑜𐑦𐑯"
       logout: "𐑤𐑪𐑜𐑬𐑑"
-      profile: "profile"
-      settings: "settings"
+      profile: "𐑐𐑮𐑴𐑓𐑲𐑤"
+      settings: "𐑕𐑧𐑑𐑦𐑙𐑟"
   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} 𐑐𐑰𐑐𐑩𐑤 𐑛𐑦𐑕𐑤𐑲𐑒𐑑 𐑞𐑦𐑕"
+        many: "%{count} 𐑐𐑰𐑐𐑩𐑤 𐑛𐑦𐑕𐑒𐑲𐑒𐑑 𐑞𐑦𐑕"
+        one: "1 𐑐𐑻𐑕𐑩𐑯 𐑛𐑦𐑕𐑤𐑲𐑒𐑑 𐑞𐑦𐑕"
+        other: "%{count} 𐑐𐑰𐑐𐑩𐑤 𐑛𐑦𐑕𐑤𐑲𐑒𐑑 𐑞𐑦𐑕"
+        zero: "𐑯𐑴 𐑐𐑰𐑐𐑩𐑤 𐑛𐑦𐑕𐑤𐑲𐑒𐑑 𐑞𐑦𐑕"
       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} 𐑐𐑰𐑐𐑩𐑤 𐑤𐑲𐑒𐑑 𐑞𐑦𐑕"
+        many: "%{count} 𐑐𐑰𐑐𐑩𐑤 𐑤𐑲𐑒 𐑞𐑦𐑕"
+        one: "1 𐑐𐑻𐑕𐑩𐑯 𐑤𐑲𐑒𐑑 𐑞𐑦𐑕"
+        other: "%{count} 𐑐𐑰𐑐𐑩𐑤 𐑤𐑲𐑒𐑑 𐑞𐑦𐑕"
+        zero: "𐑯𐑴 𐑐𐑰𐑐𐑩𐑤 𐑤𐑲𐑒𐑑 𐑞𐑦𐑕"
   more: "𐑥𐑹"
   next: "𐑯𐑧𐑒𐑕𐑑"
   notifications: 
@@ -258,8 +259,8 @@ en_shaw:
         other: "%{count} 𐑯𐑿 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
         zero: "𐑯𐑴 𐑯𐑿 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
     index: 
-      and: "and"
-      and_others: "and %{number} others"
+      and: "𐑯"
+      and_others: "𐑯 %{number} 𐑳𐑞𐑼𐑟"
       mark_all_as_read: "𐑥𐑸𐑒 𐑷𐑤 𐑨𐑟 𐑮𐑧𐑛"
       notifications: "𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
     mentioned: "𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑞𐑺"
@@ -291,7 +292,7 @@ en_shaw:
       message_subject: "𐑕𐑳𐑚𐑡𐑧𐑒𐑑: %{subject}"
       private_message: "𐑣𐑨𐑟 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡:"
       sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑."
-      subject: "%{name} has sent you a private message yon Diaspora*"
+      subject: "%{name} 𐑣𐑨𐑟 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡 𐑪𐑯 *𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
     request_accepted: 
       accepted: "𐑣𐑨𐑟 𐑩𐑒𐑕𐑧𐑐𐑑𐑩𐑛 𐑿𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑 𐑮𐑦𐑒𐑢𐑧𐑕𐑑!"
       sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑣𐑽"
@@ -307,7 +308,7 @@ en_shaw:
   people: 
     aspect_list: 
       edit_membership: "𐑧𐑛𐑦𐑑 𐑨𐑕𐑐𐑧𐑒𐑑 𐑥𐑧𐑥𐑚𐑼𐑖𐑦𐑐"
-    few: "%{count} people"
+    few: "%{count} 𐑐𐑰𐑐𐑩𐑤"
     helper: 
       people_on_pod_are_aware_of: " 𐑐𐑰𐑐𐑤 𐑪𐑯 𐑐𐑪𐑛 𐑸 𐑩𐑢𐑺 𐑝"
       results_for: " 𐑮𐑦𐑟𐑫𐑤𐑑 𐑓𐑹 %{params}"
@@ -316,8 +317,8 @@ en_shaw:
       no_one_found: "...𐑯 𐑯𐑴 𐑢𐑳𐑯 𐑢𐑪𐑟 𐑓𐑬𐑯𐑛."
       no_results: "𐑣𐑱! 𐑿 𐑯𐑰𐑛 𐑑 𐑕𐑻𐑗 𐑓𐑹 𐑕𐑳𐑥𐑔𐑦𐑙."
       results_for: "𐑕𐑻𐑗 𐑮𐑦𐑟𐑫𐑤𐑑𐑕 𐑓𐑹"
-    many: "%{count} people"
-    one: "1 person"
+    many: "%{count} 𐑐𐑰𐑐𐑩𐑤"
+    one: "1 𐑐𐑻𐑕𐑩𐑯"
     other: "%{count} 𐑐𐑰𐑐𐑩𐑤"
     person: 
       add_contact: "𐑨𐑛 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
@@ -334,21 +335,21 @@ en_shaw:
       remove_contact: "𐑮𐑦𐑥𐑵𐑝 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
       remove_from: "𐑮𐑦𐑥𐑵𐑝 %{name} 𐑓𐑮𐑪𐑥 %{aspect}?"
     show: 
-      add_some: "add some"
+      add_some: "𐑨𐑛 𐑕𐑳𐑥"
       does_not_exist: "𐑐𐑻𐑕𐑩𐑯 𐑛𐑳𐑟 𐑯𐑪𐑑 𐑧𐑜𐑟𐑦𐑕𐑑!"
-      edit: "edit"
+      edit: "𐑧𐑛𐑦𐑑"
       incoming_request: "%{name} 𐑢𐑳𐑯𐑑𐑕 𐑑 𐑖𐑺 𐑢𐑦𐑞 𐑿"
-      mention: "Mention"
+      mention: "𐑥𐑧𐑯𐑖𐑩𐑯"
       message: "𐑥𐑧𐑕𐑩𐑡"
       no_posts: "𐑯𐑴 𐑐𐑴𐑕𐑑𐑕 𐑑 𐑛𐑦𐑕𐑐𐑤𐑱!"
-      not_connected: "𐑿 𐑸 𐑯𐑪𐑑 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 %{name}"
+      not_connected: "𐑿 𐑸 𐑯𐑪𐑑 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑞𐑦𐑕 𐑐𐑻𐑕𐑩𐑯 %{name}"
       recent_posts: "𐑮𐑰𐑕𐑩𐑯𐑑 𐑐𐑴𐑕𐑑𐑕"
       recent_public_posts: "𐑮𐑰𐑕𐑩𐑯𐑑 𐑐𐑳𐑚𐑤𐑦𐑒 𐑐𐑴𐑕𐑑𐑕"
       return_to_aspects: "𐑮𐑦𐑑𐑻𐑯 𐑑 𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑𐑕 𐑐𐑱𐑡"
       similar_contacts: "𐑕𐑦𐑥𐑦𐑤𐑼 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
       start_sharing: "𐑕𐑑𐑸𐑑 𐑖𐑺𐑦𐑙"
       to_accept_or_ignore: "𐑑 𐑩𐑒𐑕𐑧𐑐𐑑 𐑹 𐑦𐑜𐑯𐑹 𐑦𐑑."
-      you_have_no_tags: "you have no tags!"
+      you_have_no_tags: "𐑿 𐑣𐑨𐑝 𐑯𐑴 𐑑𐑨𐑜𐑟!"
     webfinger: 
       fail: "𐑕𐑪𐑮𐑦, 𐑢𐑰 𐑒𐑫𐑛𐑯𐑑 𐑓𐑲𐑯𐑛 %{handle}."
     zero: "𐑯𐑴 𐑐𐑰𐑐𐑩𐑤"
@@ -388,7 +389,7 @@ en_shaw:
       error: "𐑓𐑱𐑤𐑛 𐑑 𐑧𐑛𐑦𐑑 𐑓𐑴𐑑𐑴."
       notice: "𐑓𐑴𐑑𐑴 𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑳𐑐𐑛𐑱𐑑𐑩𐑛."
   posts: 
-    doesnt_exist: "that post does not exist!"
+    doesnt_exist: "𐑞𐑨𐑑 𐑐𐑴𐑕𐑑 𐑛𐑳𐑟 𐑯𐑪𐑑 𐑧𐑜𐑟𐑦𐑕𐑑!"
   previous: "𐑐𐑮𐑰𐑝𐑾𐑕"
   profile: "𐑐𐑮𐑴𐑓𐑲𐑤"
   profiles: 
@@ -403,10 +404,10 @@ en_shaw:
       your_gender: "𐑿𐑼 𐑡𐑧𐑯𐑛𐑼"
       your_name: "𐑿𐑼 𐑯𐑱𐑥"
       your_photo: "𐑿𐑼 𐑓𐑴𐑑𐑴"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
-      your_tags: "You: in 5 #tags"
-      your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
+      your_private_profile: "𐑿𐑼 𐑐𐑮𐑲𐑝𐑩𐑑 𐑐𐑮𐑴𐑓𐑲𐑤"
+      your_public_profile: "𐑿𐑼 𐑐𐑳𐑚𐑤𐑦𐑒 𐑐𐑮𐑴𐑓𐑲𐑤"
+      your_tags: "𐑿: 𐑦𐑯 5 #𐑑𐑨𐑜𐑟"
+      your_tags_placeholder: "𐑦.𐑧. #diaspora #ironing #kittens #music #𐑖𐑱𐑝𐑾𐑯"
     update: 
       failed: "𐑓𐑱𐑤𐑛 𐑑 𐑳𐑐𐑛𐑱𐑑 𐑐𐑮𐑴𐑓𐑲𐑤"
       updated: "𐑐𐑮𐑴𐑓𐑲𐑤 𐑳𐑐𐑛𐑱𐑑𐑩𐑛"
@@ -513,24 +514,24 @@ en_shaw:
       mention_helper_text: "𐑑 𐑥𐑧𐑯𐑖𐑩𐑯 𐑕𐑳𐑥𐑢𐑩𐑯, 𐑐𐑮𐑧𐑕 '@' 𐑯 𐑕𐑑𐑸𐑑 𐑑𐑲𐑐𐑦𐑙 𐑞𐑺 𐑯𐑱𐑥"
       post_a_message_to: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 %{aspect}"
       posting: "𐑐𐑴𐑕𐑑𐑦𐑙..."
-      publishing_to: "publishing to: "
+      publishing_to: "𐑐𐑳𐑚𐑤𐑦𐑖𐑦𐑙 𐑑: "
       share: "𐑖𐑺"
       share_with: "𐑖𐑺 𐑢𐑦𐑞 %{aspect}"
       whats_on_your_mind: "𐑢𐑪𐑑𐑕 𐑪𐑯 𐑿𐑼 𐑥𐑲𐑯𐑛?"
     reshare: 
       reshare: "𐑮𐑦𐑖𐑺"
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "𐑲 𐑛𐑦𐑕𐑤𐑲𐑒 𐑞𐑦𐑕"
+      like: "𐑲 𐑤𐑲𐑒 𐑞𐑦𐑕"
   status_messages: 
     create: 
-      success: "Successfully mentioned: %{names}"
+      success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑥𐑧𐑯𐑖𐑩𐑯𐑛: %{names}"
     destroy: 
       failure: "𐑓𐑱𐑤𐑛 𐑑 𐑛𐑦𐑤𐑰𐑑 𐑐𐑴𐑕𐑑"
     helper: 
       no_message_to_display: "𐑯𐑴 𐑥𐑧𐑕𐑩𐑡 𐑑 𐑛𐑦𐑕𐑐𐑤𐑱."
     new: 
-      mentioning: "Mentioning: %{person}"
+      mentioning: "𐑥𐑧𐑯𐑖𐑩𐑯𐑦𐑙: %{person}"
     show: 
       destroy: "𐑛𐑦𐑤𐑰𐑑"
       permalink: "𐑐𐑻𐑥𐑩𐑤𐑦𐑙𐑒"
@@ -539,9 +540,9 @@ en_shaw:
     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: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑦𐑟 𐑑𐑷𐑒𐑦𐑙 𐑩𐑚𐑬𐑑 %{tag} 𐑘𐑧𐑑."
+      people_tagged_with: "𐑐𐑰𐑐𐑩𐑤 𐑑𐑨𐑜𐑛 𐑢𐑦𐑞 %{tag}"
+      posts_tagged_with: "𐑐𐑴𐑕𐑑𐑕 𐑑𐑨𐑜𐑛 𐑢𐑦𐑞 #%{tag}"
   the_world: "𐑞 𐑢𐑻𐑤𐑛"
   username: "𐑿𐑟𐑼𐑯𐑱𐑥"
   users: 
@@ -561,7 +562,7 @@ en_shaw:
       mentioned: "...𐑿 𐑸 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑?"
       new_password: "𐑯𐑿 𐑐𐑨𐑕𐑢𐑼𐑛"
       private_message: "...𐑿 𐑮𐑦𐑕𐑰𐑝 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡?"
-      receive_email_notifications: "𐑮𐑦𐑕𐑰𐑝 𐑦-𐑥𐑱𐑤 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟?"
+      receive_email_notifications: "𐑮𐑦𐑕𐑰𐑝 𐑦-𐑥𐑱𐑤 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟 𐑢𐑧𐑯..."
       request_acceptence: "...𐑿𐑼 𐑖𐑺 𐑮𐑦𐑒𐑢𐑧𐑕𐑑 𐑦𐑟 𐑩𐑒𐑕𐑧𐑐𐑑𐑩𐑛?"
       request_received: "...𐑿 𐑮𐑦𐑕𐑰𐑝 𐑩 𐑯𐑿 𐑖𐑺 𐑮𐑦𐑒𐑢𐑧𐑕𐑑?"
       your_email: "𐑿𐑼 𐑦-𐑥𐑱𐑤"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index ced38a4eda1ece1af9e2edc5142b6b3e106502bd..9fcfa20b319ed06aa1c637c1948c87e7d3cf0449 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -74,6 +74,7 @@ eo:
       remove_aspect: "Delete this aspect"
       rename: "rename"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index f6f35d5bfd89e2348661d45404460e2693737bf4..e44745e8ca5789cafcb5b7dcba80ec23f573efce 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -74,6 +74,7 @@ es-CL:
       remove_aspect: "Eliminar este aspecto"
       rename: "renombrar"
       update: "Actualizar"
+      updating: "actualizando"
     few: "%{count} aspectos"
     helper: 
       are_you_sure: "¿Estás seguro que quieres eliminar este aspecto?"
@@ -232,17 +233,17 @@ es-CL:
   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} personas no les gusta esto"
+        many: "%{count} personas no les gusta esto"
+        one: "1 persona no le gusta esto"
+        other: "%{count} personas no les gusta esto"
+        zero: "a ninguna persona le disgusta esto"
       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} personas les gusta esto"
+        many: "%{count} personas les gusta esto"
+        one: "1 persona le gusta esto"
+        other: "%{count} personas les gusta esto"
+        zero: "a ninguna persona le gusta esto"
   more: "Más"
   next: "Siguiente"
   notifications: 
@@ -322,8 +323,8 @@ es-CL:
     person: 
       add_contact: "agregar contacto"
       already_connected: "Ya conectado"
-      pending_request: "solicitud pendiente"
-      thats_you: "¡ese eres tú!"
+      pending_request: "Solicitud pendiente"
+      thats_you: "¡Ese eres tú!"
     profile_sidebar: 
       bio: "biografía"
       born: "Cumpleaños"
@@ -520,8 +521,8 @@ es-CL:
     reshare: 
       reshare: "Compartir de nuevo"
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "No me gusta esto"
+      like: "Me gusta esto"
   status_messages: 
     create: 
       success: "Se ha mencionado con éxito a: %{names}"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 4f41874d8696a33036dd23a918fb3124d7efd982..0a19f328b9cca7840a655ee19d293e392a16828b 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -74,6 +74,7 @@ es:
       remove_aspect: "Eliminar este Aspecto"
       rename: "renombrar"
       update: "Actualizar"
+      updating: "actualizando"
     few: "%{count} aspectos"
     helper: 
       are_you_sure: "¿Seguro que quieres eliminar este Aspecto?"
@@ -232,17 +233,17 @@ es:
   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} personas no les gusta esto"
+        many: "%{count} personas no les gusta esto"
+        one: "1 persona no le gusta esto"
+        other: "%{count} personas no les gusta esto"
+        zero: "a ninguna persona le disgusta esto"
       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} personas les gusta eso"
+        many: "%{count} personas les gusta esto"
+        one: "1 persona le gusta esto"
+        other: "%{count} personas les gusta esto"
+        zero: "a ninguna persona le gusta esto"
   more: "Más"
   next: "Siguiente"
   notifications: 
@@ -520,8 +521,8 @@ es:
     reshare: 
       reshare: "Publicar en..."
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "No me gusta esto"
+      like: "Me gusta esto"
   status_messages: 
     create: 
       success: "Se ha mencionado con éxito a: %{names}"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index ced32b82e5347fbc52f6edf10f6f1d9b62f6db7a..c9b4d05ccdd6d77252445b41b2084618e71aff9a 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -74,6 +74,7 @@ eu:
       remove_aspect: "Alderdi hau ezabatu"
       rename: "berrizendatu"
       update: "eguneratu"
+      updating: "updating"
     few: "%{count} alderdi"
     helper: 
       are_you_sure: "Ziur al zaude alderdi hau ezabatu nahi duzunaz?"
@@ -232,17 +233,17 @@ eu:
   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} pertsonek ez dute hau gustuko"
+        many: "%{count} pertsonek ez dute hau gustuko"
+        one: "pertsona batek ez du hau gustuko"
+        other: "%{count} pertsonek ez dute hau gustuko"
+        zero: "gusoko ez duen pertsonarik ez dago"
       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} pertsonek gustoko dute hau"
+        many: "%{count} pertsonek gustoko dute hau"
+        one: "pertsona batek gustoko du hau"
+        other: "%{count} pertsonek gustoko dute hau"
+        zero: "hau ez du inork gustoko"
   more: "Gehiago"
   next: "hurrengoa"
   notifications: 
@@ -520,8 +521,8 @@ eu:
     reshare: 
       reshare: "Berriz partekatu"
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "Ez dut gustoko"
+      like: "Gustoko dut"
   status_messages: 
     create: 
       success: "Arrakastaz aipatu dituzu: %{names}"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index a0f44c788568bd1ab7fb34e43e2757ee887f65bf..6bce37bb2a729657a5b2f3d0ab705dd1b5cf9c6b 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -74,6 +74,7 @@ fi:
       remove_aspect: "Poista näkymä"
       rename: "nimeä uudelleen"
       update: "päivitä"
+      updating: "updating"
     few: "%{count} näkymää"
     helper: 
       are_you_sure: "Haluatko varmasti poistaa tämän näkymän?"
@@ -227,8 +228,8 @@ fi:
       code: "lähdekoodi"
       login: "kirjaudu sisään"
       logout: "kirjaudu ulos"
-      profile: "profile"
-      settings: "settings"
+      profile: "Profiili"
+      settings: "Asetukset"
   likes: 
     likes: 
       people_dislike_this: 
@@ -322,7 +323,7 @@ fi:
     person: 
       add_contact: "lisää kontakti"
       already_connected: "Yhteys jo olemassa"
-      pending_request: "odottaa vastausta"
+      pending_request: "Odottaa vastausta"
       thats_you: "Olet sinä!"
     profile_sidebar: 
       bio: "Biografia"
@@ -336,19 +337,19 @@ fi:
     show: 
       add_some: "add some"
       does_not_exist: "Henkilöä ei ole olemassa!"
-      edit: "edit"
+      edit: "muokkaa"
       incoming_request: "Tämä henkilö on lähettänyt sinulle pyynnön."
-      mention: "Mention"
+      mention: "Mainitse"
       message: "Viesti"
       no_posts: "Ei näytettäviä viestejä!"
-      not_connected: "Et ole yhteydessä henkilöön %{name}"
+      not_connected: "Et ole yhteydessä tähän henkilöön "
       recent_posts: "Viimeisimmät tapahtumat"
       recent_public_posts: "Viimeisimmät julkiset tapahtumat"
       return_to_aspects: "Palaa näkymiin"
       similar_contacts: "Yhteiset kontaktit"
       start_sharing: "aloita jakamaan"
       to_accept_or_ignore: "hyväksyäksesi, tai hylätäksesi sen."
-      you_have_no_tags: "you have no tags!"
+      you_have_no_tags: "Sinulla ei ole tageja!"
     webfinger: 
       fail: "Valitettavasti tunnusta %{handle} ei löytynyt."
     zero: "no people"
@@ -403,8 +404,8 @@ fi:
       your_gender: "Sukupuolesi"
       your_name: "Nimesi"
       your_photo: "Profiili kuva"
-      your_private_profile: "Your private profile"
-      your_public_profile: "Your public profile"
+      your_private_profile: "Yksityinen profiilisi"
+      your_public_profile: "Julkinen profiilisi"
       your_tags: "You: in 5 #tags"
       your_tags_placeholder: "i.e. #diaspora #ironing #kittens #music"
     update: 
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index e9a832e018e0f34c8f8f828008351d9d437d0071..6383373f6fd4717c36807a5bd7ed69344ae4c07e 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -74,6 +74,7 @@ fr:
       remove_aspect: "Supprimer cet aspect"
       rename: "renommer"
       update: "mettre à jour"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Voulez-vous vraiment supprimer cet aspect ?"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 9b821718e575c85476f6d91f9d1254f8f959ee15..c3305e8f9cf3fce4b19d00bf3b885a4e2cbf75a3 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -74,6 +74,7 @@ ga:
       remove_aspect: "Delete this aspect"
       rename: "rename"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
diff --git a/config/locales/diaspora/gl.yml b/config/locales/diaspora/gl.yml
index 9b50f0df6c33f0f918a3b436a703c34931d06580..8349ae4b75acb03778150d2469cbb13537b07d31 100644
--- a/config/locales/diaspora/gl.yml
+++ b/config/locales/diaspora/gl.yml
@@ -55,7 +55,7 @@ gl:
     aspect_stream: 
       activity: "actividade"
       post_time: "tempo de publicación"
-      sort_by: "ordear por:"
+      sort_by: "Ordear por:"
     contacts_not_visible: "Os contactos deste aspecto non se poderán ver os uns aos outros."
     contacts_visible: "Os contactos neste aspecto poderanse ver os uns aos outros."
     create: 
@@ -74,6 +74,7 @@ gl:
       remove_aspect: "Borrar este aspecto"
       rename: "renomear"
       update: "actualizar"
+      updating: "actualizando"
     few: "%{count} aspectos"
     helper: 
       are_you_sure: "Estás seguro de querer borrar este aspecto?"
@@ -141,7 +142,7 @@ gl:
       accepts: "Unha vez que %{name} acepte, xa poderedes ver as vosas publicacións en Diaspora"
       add_new_aspect: "engadir ao novo aspecto"
       share_with: "Comezar a compartir con %{name}"
-    zero: "non hai contactos"
+    zero: "Non hai contactos"
   conversations: 
     helper: 
       new_messages: 
@@ -227,22 +228,22 @@ gl:
       code: "código"
       login: "Identificarse"
       logout: "Saír"
-      profile: "perfil"
-      settings: "opcións"
+      profile: "Perfil"
+      settings: "Opcións"
   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: "Non lle gustou a %{count} persoas."
+        many: "Non lle gustou a %{count} persoas."
+        one: "Non lle gustou a unha persoa"
+        other: "Non lle gustou a %{count} persoas."
+        zero: "A ninguén non lle gustou"
       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: "Gustoulle a %{count} persoas."
+        many: "Gustoulle a %{count} persoas."
+        one: "Gustoulle a unha persoa"
+        other: "Gustoulle a %{count} persoas."
+        zero: "A ninguén lle gustou"
   more: "Máis"
   next: "seguinte"
   notifications: 
@@ -322,8 +323,8 @@ gl:
     person: 
       add_contact: "engadir contacto"
       already_connected: "Xa conectado"
-      pending_request: "solicitude pendente"
-      thats_you: "es ti!"
+      pending_request: "Solicitude Pendente"
+      thats_you: "Es ti!"
     profile_sidebar: 
       bio: "Biografia"
       born: "Aniversario"
@@ -338,7 +339,7 @@ gl:
       does_not_exist: "Esa persoa non existe!"
       edit: "editar"
       incoming_request: "%{name} quere compartir contigo"
-      mention: "Mención"
+      mention: "Mencionar"
       message: "Mensaxe"
       no_posts: "Non hai mensaxes que amosar!"
       not_connected: "Non estás compartindo con %{name}"
@@ -510,18 +511,18 @@ gl:
       all: "todos"
       all_contacts: "todos os contactos"
       make_public: "facer público"
-      mention_helper_text: "para citar a alguén, pon \"@\" e teclea o seu nome"
+      mention_helper_text: "Para citar a alguén, pon \"@\" e teclea o seu nome"
       post_a_message_to: "Deixar un mensaxe en %{aspect}"
       posting: "Publicando..."
-      publishing_to: "publicar a: "
+      publishing_to: "publicar en: "
       share: "Compartir"
       share_with: "Compartir con %{aspect}"
       whats_on_your_mind: "Que tes en mente?"
     reshare: 
       reshare: "Recompartir "
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "Non me gusta"
+      like: "Gústame"
   status_messages: 
     create: 
       success: "%{names} mencionados correctamente"
@@ -555,7 +556,7 @@ gl:
       comment_on_post: "...alguén comenta na túa publicación?"
       current_password: "Contrasinal actual"
       download_photos: "Descargar as miñas imaxes"
-      download_xml: "descargar o meu xml"
+      download_xml: "Descargar o meu xml"
       edit_account: "Editar conta"
       export_data: "Exportar datos"
       mentioned: "...estás mencionado nunha publicación?"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 9eddb8497a733239e1a772a96e6969aa90cde31c..7026f65c15e4c95fb8131c95d4ef745ba8f408f5 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -74,6 +74,7 @@ he:
       remove_aspect: "מחיקת היבט זה"
       rename: "שינוי שם"
       update: "עדכון"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "האם אכן ברצונך למחוק היבט זה?"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 84511a721a3163008cd2f7ec5311360a37e0dde8..36768ef0ce80b3d7a94a68a2c5e956817f5ad5e6 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -74,6 +74,7 @@ hu:
       remove_aspect: "Csoport törlése"
       rename: "átnevezés"
       update: "frissítés"
+      updating: "updating"
     few: "%{count} csoport"
     helper: 
       are_you_sure: "Biztos, hogy törlöd a csoportot?"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index d099e98994640e1930815e0bf07f8652c6cd14e9..643853c41b6b05f8959aca7276f0086c72209a11 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -74,6 +74,7 @@ id:
       remove_aspect: "Delete this aspect"
       rename: "rename"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 3e2c6227b4a53eb38b56565c1f0b9ed4280615a0..6413765716ff90c6894ef4e26a237d9517da7279 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -74,6 +74,7 @@ is:
       remove_aspect: "Eyða þessari ásýnd"
       rename: "breyta nafni"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Ertu viss um að þú viljir eyða þessari ásýnd?"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index bca527b70be1fc17694b682cfbf721ba9b4a08fe..68e8088fbc93c329d5769e4f31904bbed5815af8 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -74,6 +74,7 @@ it:
       remove_aspect: "Elimina questo aspetto"
       rename: "rinomina"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Sei sicuro di voler eliminare questo aspetto?"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index f4653b152e82df3463c4de262637af6784c1b0d3..83676a50697f70e341b39c8577fb78007906ea31 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -74,6 +74,7 @@ lt:
       remove_aspect: "Delete this aspect"
       rename: "rename"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 9fd57c22d7395919c30be64bac2c5817f09452ed..2cb4a620ad4ce8dfc4f33ae99244a78cd4eb4e81 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -74,6 +74,7 @@ mk:
       remove_aspect: "Delete this aspect"
       rename: "rename"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index 1b99dc5e417d52dc7e66a9a4fa9ec79ba2b51f06..12bcf4b8b8a74b867179f1bd8f9fdcc2c3907cd4 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -74,6 +74,7 @@ ml:
       remove_aspect: "Delete this aspect"
       rename: "പേര് മാറ്റുക"
       update: "പുതുക്കു"
+      updating: "updating"
     few: "%{count} പരിചയങ്ങള്‍"
     helper: 
       are_you_sure: "നിങ്ങള്‍ ഈ പരിചയം നീക്കം ചെയ്യുവാന്‍ ആഗ്രഹിക്കുന്നു, നിങ്ങള്‍ക്ക് തീര്‍ച്ചയാണോ?"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index e2133dc1b0ea235509ef75af652405eeb22c2f80..52ae2b3dea76795dfb3600b447781c91fab569ee 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -74,6 +74,7 @@ nb:
       remove_aspect: "Slett dette aspektet"
       rename: "endre navn"
       update: "update"
+      updating: "updating"
     few: "%{count} aspekter"
     helper: 
       are_you_sure: "Er du sikker på at du vil slette dette aspektet?"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 72263e83203e5b5939a947e5dc15bd7ddc3ab01a..de5216d48835fa0dc7117671fa64d856c8405dd0 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -74,6 +74,7 @@ nl:
       remove_aspect: "Verwijder dit aspect"
       rename: "hernoem"
       update: "update"
+      updating: "updating"
     few: "%{count} aspecten"
     helper: 
       are_you_sure: "Weet je zeker dat je dit aspect wilt verwijderen?"
@@ -122,7 +123,7 @@ nl:
     few: "%{count} reacties"
     many: "%{count} reacties"
     new_comment: 
-      comment: "Reactie"
+      comment: "reactie"
       commenting: "Reageren..."
     one: "1 reactie"
     other: "%{count} reacties"
@@ -152,7 +153,7 @@ nl:
         zero: "geen nieuwe berichten"
     index: 
       create_a_new_message: "maak een nieuw bericht"
-      inbox: "Inbox"
+      inbox: "Postvak In"
       message_inbox: "Berichten Inbox"
       new_message: "Nieuw Bericht"
       no_conversation_selected: "geen conversatie geselecteerd"
@@ -232,17 +233,17 @@ nl:
   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} personen vinden dit niet leuk"
+        many: "%{count} personen vinden dit niet leuk"
+        one: "1 persoon vindt dit niet leuk"
+        other: "%{count} personen vinden dit niet leuk"
+        zero: "niemand vindt dit niet leuk"
       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} personen vinden dit leuk"
+        many: "%{count} personen vinden dit leuk"
+        one: "1 persoon vindt dit leuk"
+        other: "%{count} personen vinden dit leuk"
+        zero: "niemand vindt dit leuk"
   more: "Meer"
   next: "volgende"
   notifications: 
@@ -307,7 +308,7 @@ nl:
   people: 
     aspect_list: 
       edit_membership: "bewerk aspect lidmaatschap"
-    few: "%{count} mensen"
+    few: "%{count} personen"
     helper: 
       people_on_pod_are_aware_of: "mensen op de pod zich bewust van zijn"
       results_for: "resultaten voor %{params}"
@@ -322,7 +323,7 @@ nl:
     person: 
       add_contact: "voeg contact toe"
       already_connected: "Al verbonden"
-      pending_request: "openstaand verzoek"
+      pending_request: "Openstaand verzoek"
       thats_you: "Dat ben jij!"
     profile_sidebar: 
       bio: "bio"
@@ -334,7 +335,7 @@ nl:
       remove_contact: "verwijder contact"
       remove_from: "Verwijder %{name} uit %{aspect}?"
     show: 
-      add_some: "Voeg wat"
+      add_some: "Voeg toe"
       does_not_exist: "Die persoon bestaat niet!"
       edit: "bewerk"
       incoming_request: "% {name} wil met je delen"
@@ -520,11 +521,11 @@ nl:
     reshare: 
       reshare: "Herdeel"
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "Ik vind dit niet leuk"
+      like: "Ik vind dit leuk"
   status_messages: 
     create: 
-      success: "Successfully mentioned: %{names}"
+      success: "Succesvol genoemd: %{names}"
     destroy: 
       failure: "Verwijderen van post mislukt"
     helper: 
@@ -539,9 +540,9 @@ nl:
     show_comments: "toon alle reacties"
   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: "Nog niemand heeft het over %{tag}."
+      people_tagged_with: "Personen gemerkt met %{tag}"
+      posts_tagged_with: "Berichten gemerkt met #%{tag}"
   the_world: "de wereld"
   username: "Gebruikersnaam"
   users: 
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 96003e201cead2a6caae548d859f8d7c8928cd14..73cb4c25c2798eeed2f8faf7e15507315882068a 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -74,6 +74,7 @@ pa:
       remove_aspect: "Delete this aspect"
       rename: "ਨਾਂ-ਬਦਲੋ"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 1b0d1c49b11b024514f39de28c2d79864f3d3531..6fb7441c8cf996f7b82e9067427630372c5ff865 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -74,6 +74,7 @@ pl:
       remove_aspect: "Usuń ten aspekt"
       rename: "zmień nazwę"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "@{m,f:Jesteś|n:Czy na}{ pew}{m:ien|f:na|n:no}{m,f:, że } chcesz usunąć ten aspekt?"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index bf46937bee3d4dfe48d92d7325b64bd0916e93ce..b53dd7cb91f53af443f309508aadce54166cfaa9 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -74,6 +74,7 @@ pt-BR:
       remove_aspect: "Excluir este aspecto"
       rename: "Renomear"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Tem certeza que quer excluir este aspecto?"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 12ce4432f88ab0648d5152e942a6255bc30c4029..8ecebcf5b657ed25c1f1722f449d36309ebacae9 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -74,6 +74,7 @@ pt-PT:
       remove_aspect: "Remover este aspecto"
       rename: "renomear"
       update: "update"
+      updating: "updating"
     few: "%{count} aspectos"
     helper: 
       are_you_sure: "Tem a certeza que deseja eliminar este aspecto?"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index c9c6b713b4b66445eafd4126e26dc1938864a893..0e661259b198ea08be2928c944e673adbf85fbd6 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -74,6 +74,7 @@ ro:
       remove_aspect: "Delete this aspect"
       rename: "rename"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Eşti sigur că doreşti să ştergi acest aspect?"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index e843c7fcfb4fd25f290340ec032f81a94fca7f84..eb34436aafc4b83b39b4bdc3b63a46979ecf6ef8 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -74,6 +74,7 @@ ru:
       remove_aspect: "Удалить этот аспект"
       rename: "переименовать"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Вы уверены в том, что хотите удалить этот аспект?"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 4d265b2c0906aa341775d81007ebd18051267c21..9c023a7ab758ddcd970ed505acdbbfca53da4577 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -74,6 +74,7 @@ sk:
       remove_aspect: "Zmazať tento aspekt"
       rename: "premenovať"
       update: "aktualizovať"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Ste si istý, že chcete zmazať tento aspekt?"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index acdde73bb60a80d9ef71edf76463b24136634926..402ed234d0d8fccb2ddadda796ff18bf0c4586ea 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -74,6 +74,7 @@ sl:
       remove_aspect: "Izbriši ta vidik"
       rename: "preimenuj"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Ste prepričani, da želite izbrisati skupino?"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 487055aea714cf51bd56404cccac470e2109cf1d..1ea1a370fce705db0620c193dbe380ab08b4ecc5 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -74,6 +74,7 @@ sv:
       remove_aspect: "Delete this aspect"
       rename: "rename"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Är du säker på att du vill tabort den här sidan?"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index e36ad9aeda15c84b0de5f2fa10e42a1fe7fa7b48..24ca9b38ea0d46571cf2890abd0469313a492a15 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -74,6 +74,7 @@ tr:
       remove_aspect: "Delete this aspect"
       rename: "rename"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "Are you sure you want to delete this aspect?"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 9a52959b875c6ed2d5ff2b1af2324e981a1b422a..b8855b86b5141188dfc3ebd8c22169571420f43a 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -74,6 +74,7 @@ zh-TW:
       remove_aspect: "刪除這個面向"
       rename: "改名"
       update: "更新"
+      updating: "更新中"
     few: "%{count} 個面向"
     helper: 
       are_you_sure: "你確定要刪除這個面向?"
@@ -108,7 +109,7 @@ zh-TW:
     one: "一個面向"
     other: "%{count} 個面向"
     seed: 
-      family: "家庭"
+      family: "家人"
       work: "工作"
     show: 
       edit_aspect: "編輯面向"
@@ -152,7 +153,7 @@ zh-TW:
         zero: "沒有新訊息"
     index: 
       create_a_new_message: "編寫新訊息"
-      inbox: "Inbox"
+      inbox: "收件匣"
       message_inbox: "訊息信箱"
       new_message: "新訊息"
       no_conversation_selected: "未選取任何對話"
@@ -232,17 +233,17 @@ zh-TW:
   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} 個人不喜歡"
+        many: "有 %{count} 個人不喜歡"
+        one: "有一個人不喜歡"
+        other: "有 %{count} 個人不喜歡"
+        zero: "沒有人不喜歡"
       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} 個人喜歡"
+        many: "有 %{count} 個人喜歡"
+        one: "有一個人喜歡"
+        other: "有 %{count} 個人喜歡"
+        zero: "沒有人喜歡"
   more: "更多"
   next: "後面"
   notifications: 
@@ -323,7 +324,7 @@ zh-TW:
       add_contact: "加入聯繫"
       already_connected: "已建立連結"
       pending_request: "請求等候中"
-      thats_you: "是你耶!"
+      thats_you: "那是你耶!"
     profile_sidebar: 
       bio: "自我介紹"
       born: "生日"
@@ -520,8 +521,8 @@ zh-TW:
     reshare: 
       reshare: "重新分享"
     stream_element: 
-      dislike: "I dislike this"
-      like: "I like this"
+      dislike: "不喜歡"
+      like: "喜歡"
   status_messages: 
     create: 
       success: "成功推薦了: %{names}"
@@ -539,9 +540,9 @@ zh-TW:
     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: "尚還沒有人在討論 %{tag}."
+      people_tagged_with: "標記為 %{tag} 的人"
+      posts_tagged_with: "標記為 #%{tag} 的貼文"
   the_world: "全世界"
   username: "用戶名稱"
   users: 
diff --git a/config/locales/diaspora/zh.yml b/config/locales/diaspora/zh.yml
index 200f4c971f6d29d337f01b54cb9892994defbefa..50f6b02664bdc538ef1875340a685c39ad723004 100644
--- a/config/locales/diaspora/zh.yml
+++ b/config/locales/diaspora/zh.yml
@@ -74,6 +74,7 @@ zh:
       remove_aspect: "删除这个分组"
       rename: "改名"
       update: "update"
+      updating: "updating"
     few: "%{count} aspects"
     helper: 
       are_you_sure: "您确定要删除这个分组吗?"
diff --git a/config/locales/javascript/javascript.en_shaw.yml b/config/locales/javascript/javascript.en_shaw.yml
index 6dc0a9b1ecc93d0e0f8cf87c34a861be002a366b..565cb8630ecdbef70be95bc1e95ab782b92a74ed 100644
--- a/config/locales/javascript/javascript.en_shaw.yml
+++ b/config/locales/javascript/javascript.en_shaw.yml
@@ -7,7 +7,7 @@ en_shaw:
   javascripts: 
     confirm_dialog: "𐑸 𐑿 𐑖𐑻?"
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
+      at_least_one_aspect: "𐑿 𐑥𐑳𐑕𐑑 𐑐𐑳𐑚𐑤𐑦𐑖 𐑑 𐑨𐑑 𐑤𐑰𐑕𐑑 𐑢𐑳𐑯 𐑨𐑕𐑐𐑧𐑒𐑑"
     search_for: "𐑕𐑻𐑗 𐑓𐑹 {{name}}"
     shared: 
       contact_list: 
diff --git a/config/locales/javascript/javascript.nl.yml b/config/locales/javascript/javascript.nl.yml
index 6e396f48251bef1e515160968df1585742ee60a6..c47466fe2836ba6a052932234565ddbfade2d199 100644
--- a/config/locales/javascript/javascript.nl.yml
+++ b/config/locales/javascript/javascript.nl.yml
@@ -7,7 +7,7 @@ nl:
   javascripts: 
     confirm_dialog: "Weet je het zeker?"
     publisher: 
-      at_least_one_aspect: "You must publish to at least one aspect"
+      at_least_one_aspect: "Je moet op zijn minst één aspect publiceren"
     search_for: "Zoek naar {{name}}"
     shared: 
       contact_list: