From c483246ac7f6a887a3d445c0a63e5632ce4b34e0 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Tue, 22 Mar 2011 22:48:08 +0100
Subject: [PATCH] updated locales

---
 config/locales/devise/devise.zh-TW.yml        |   8 +-
 config/locales/diaspora/ar.yml                |  11 +-
 config/locales/diaspora/cs.yml                |  11 +-
 config/locales/diaspora/cy.yml                |  11 +-
 config/locales/diaspora/da.yml                |  11 +-
 config/locales/diaspora/de.yml                |  11 +-
 config/locales/diaspora/el.yml                |  47 ++++---
 config/locales/diaspora/en_shaw.yml           |  11 +-
 config/locales/diaspora/eo.yml                |  11 +-
 config/locales/diaspora/es-CL.yml             |  11 +-
 config/locales/diaspora/es.yml                |  11 +-
 config/locales/diaspora/eu.yml                |  19 ++-
 config/locales/diaspora/fi.yml                |  11 +-
 config/locales/diaspora/fr.yml                |  11 +-
 config/locales/diaspora/ga.yml                |  11 +-
 config/locales/diaspora/gl.yml                |  11 +-
 config/locales/diaspora/he.yml                |  11 +-
 config/locales/diaspora/hu.yml                |  11 +-
 config/locales/diaspora/id.yml                |  11 +-
 config/locales/diaspora/is.yml                |  11 +-
 config/locales/diaspora/it.yml                |  11 +-
 config/locales/diaspora/lt.yml                |  11 +-
 config/locales/diaspora/mk.yml                |  11 +-
 config/locales/diaspora/ml.yml                |  11 +-
 config/locales/diaspora/nb.yml                |  11 +-
 config/locales/diaspora/nl.yml                |  11 +-
 config/locales/diaspora/pa.yml                |  11 +-
 config/locales/diaspora/pl.yml                |  11 +-
 config/locales/diaspora/pt-BR.yml             |  11 +-
 config/locales/diaspora/pt-PT.yml             |  11 +-
 config/locales/diaspora/ro.yml                |  11 +-
 config/locales/diaspora/ru.yml                |  11 +-
 config/locales/diaspora/sk.yml                |  11 +-
 config/locales/diaspora/sl.yml                |  11 +-
 config/locales/diaspora/sv.yml                |  11 +-
 config/locales/diaspora/tr.yml                |  11 +-
 config/locales/diaspora/zh-TW.yml             | 119 +++++++++---------
 config/locales/diaspora/zh.yml                |  11 +-
 .../locales/javascript/javascript.zh-TW.yml   |  10 +-
 config/locales/rails-i18n/nb.yml              | 108 +++++++++++-----
 40 files changed, 344 insertions(+), 341 deletions(-)

diff --git a/config/locales/devise/devise.zh-TW.yml b/config/locales/devise/devise.zh-TW.yml
index 7a6feee50d..8152bace8a 100644
--- a/config/locales/devise/devise.zh-TW.yml
+++ b/config/locales/devise/devise.zh-TW.yml
@@ -15,7 +15,7 @@ zh-TW:
       invalid: "電子信箱或密碼有誤."
       invalid_token: "認證信物無效."
       locked: "你的帳號已鎖定."
-      timeout: "工作階段已逾時, 請重新登入已繼續."
+      timeout: "工作階段已逾時, 若要繼續請重新登入."
       unauthenticated: "繼續之前你必須先登入或登記."
       unconfirmed: "你必須先確認帳號才能繼續."
     invitations: 
@@ -31,16 +31,16 @@ zh-TW:
       invitation: 
         accept: "接受邀請"
         ignore: "如果你不想接受邀請, 請忽略這封信件."
-        no_account_till: "在你使用以上連結登記後, 你的帳號才會建立."
+        no_account_till: "在使用以上連結並登記後, 你的帳號才會建立."
         subject: "有人邀請你加入 Diaspora!"
       inviters: 
-        accept_at: ", at %{url}, you can accept it through the link below."
+        accept_at: ", 在 %{url}, 你可以透過以下連結來接受."
         has_invited_you: "%{name} 邀請你加入 Diaspora"
         have_invited_you: "%{names} 邀請你加入 Diaspora"
       reset_password_instructions: 
         change: "更改密碼"
         ignore: "如果你沒請求過, 請忽略這封信件."
-        someone_requested: "有人請求要更改你的密碼, 請使用以下連結."
+        someone_requested: "有人要求更改你的密碼, 若確定要這麼做, 請使用以下連結."
         subject: "密碼重設步驟"
         wont_change: "在使用以上連結設定新的密碼後, 你的密碼才會改變."
       unlock_instructions: 
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 668bca86fb..643528c657 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -98,12 +98,6 @@ ar:
     new_aspect: 
       create: "جديد"
       name: "Nombre"
-    no_contacts_message: 
-      add_contact: "Add a contact"
-      add_contact_to: "Add someone to %{aspect_name}"
-      invite: "Invite someone to join Diaspora!"
-      nobody: "We know you know people — bring them to Diaspora!"
-      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
     no_posts_message: 
       start_talking: "Nadie ha dicho nada todavía. ¡Empezá la conversación!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ ar:
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
     love: "love,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ ar:
   password: "Password"
   password_confirmation: "Password confirmation"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
     few: "%{count} people"
@@ -514,6 +511,7 @@ ar:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "مشاركة"
       share_with: "Share with %{aspect}"
@@ -534,6 +532,7 @@ ar:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "إزالة"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "hide comments"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 4bb2fe8a37..60243aa632 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -98,12 +98,6 @@ cs:
     new_aspect: 
       create: "Vytvořit"
       name: "Název"
-    no_contacts_message: 
-      add_contact: "Přidat kontakt"
-      add_contact_to: "Přidat někoho do %{aspect_name}"
-      invite: "Pozvěte někoho na Diasporu!"
-      nobody: "Přiveďte do Diaspory lidi, na kterých vám záleží!"
-      nobody_in_aspect: "Váš aspekt '%{aspect_name}' je prázdný."
     no_posts_message: 
       start_talking: "Zatím žádný příspěvek. Začněte konverzaci!"
     one: "1 aspekt"
@@ -279,6 +273,7 @@ cs:
     diaspora: "diaspora email robot"
     hello: "Vítej %{name}!"
     love: "s láskou,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "zmínil jste v příspěvku:"
       sign_in: "Přihlaste se pro zobrazení."
@@ -306,6 +301,8 @@ cs:
   password: "Heslo"
   password_confirmation: "Potvrzení hesla"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "upravit člena aspektu"
     few: "%{count} lidi"
@@ -514,6 +511,7 @@ cs:
       mention_helper_text: "pokud chcete někoho zmínit, stiskněte tlačítko '@' a začněte psát jeho jméno"
       post_a_message_to: "Poslat zprávu do %{aspect}"
       posting: "Odesílání..."
+      public: "Veřejné"
       publishing_to: "publikování na:"
       share: "Sdělit"
       share_with: "sdílet s"
@@ -534,6 +532,7 @@ cs:
       mentioning: "Zmínka: %{person}"
     show: 
       destroy: "Smazat"
+      not_found: "Omlouváme se, ale nemůžeme najít tento příspěvek."
       permalink: "trvalý odkaz"
   stream_helper: 
     hide_comments: "skrýt komentáře"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 4c2cd440ef..57d674e441 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -98,12 +98,6 @@ cy:
     new_aspect: 
       create: "Create"
       name: "Name"
-    no_contacts_message: 
-      add_contact: "Add a contact"
-      add_contact_to: "Add someone to %{aspect_name}"
-      invite: "Invite someone to join Diaspora!"
-      nobody: "We know you know people — bring them to Diaspora!"
-      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
     no_posts_message: 
       start_talking: "Nobody has said anything yet.  Get the conversation started!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ cy:
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
     love: "love,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ cy:
   password: "Password"
   password_confirmation: "Password confirmation"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
     few: "%{count} people"
@@ -514,6 +511,7 @@ cy:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Share"
       share_with: "Share with %{aspect}"
@@ -534,6 +532,7 @@ cy:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Destroy"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "hide comments"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 2047886f6f..52c8c58c3d 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -98,12 +98,6 @@ da:
     new_aspect: 
       create: "Opret"
       name: "Navn"
-    no_contacts_message: 
-      add_contact: "Tilføj en kontaktperson"
-      add_contact_to: "Tilføj en kontaktperson til %{aspect_name}"
-      invite: "Invitér en person til Diaspora!"
-      nobody: "Bring de mennesker der betyder noget i dit liv til Diaspora!"
-      nobody_in_aspect: "Dit aspekt '%{aspect_name}' er tomt."
     no_posts_message: 
       start_talking: "Ingen har sagt noget endnu. Start samtalen!"
     one: "1 aspekt"
@@ -279,6 +273,7 @@ da:
     diaspora: "Diaspora e-mail robotten"
     hello: "Hej %{name}!"
     love: "Hilsen,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "omtalte dig i en post:"
       sign_in: "Log in for at se det."
@@ -306,6 +301,8 @@ da:
   password: "Adgangskode"
   password_confirmation: "Adgangskode bekræftelse"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "redigér aspektsmedlemsskab"
     few: "%{count} personer"
@@ -514,6 +511,7 @@ da:
       mention_helper_text: "for at nævne nogen i en post, tryk '@' og begynd at skrive deres navn"
       post_a_message_to: "Send en besked til %{aspect}"
       posting: "Sender..."
+      public: "Public"
       publishing_to: "del med: "
       share: "Del"
       share_with: "Del med"
@@ -534,6 +532,7 @@ da:
       mentioning: "Nævnt: %{person}"
     show: 
       destroy: "Slet"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permanentlink"
   stream_helper: 
     hide_comments: "Skjul kommentarer"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 961df63585..08e8a81f64 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -98,12 +98,6 @@ de:
     new_aspect: 
       create: "Erstellen"
       name: "Name"
-    no_contacts_message: 
-      add_contact: "Kontakt hinzufügen"
-      add_contact_to: "Jemanden zum Aspekt %{aspect_name} hinzufügen"
-      invite: "Lade jemanden zu Diaspora* ein!"
-      nobody: "Bring die dir wichtigen Leute zu Diaspora*!"
-      nobody_in_aspect: "‚%{aspect_name}‘ ist leer."
     no_posts_message: 
       start_talking: "Niemand hat bisher etwas gesagt. Fange eine Unterhaltung an!"
     one: "Ein Aspekt"
@@ -279,6 +273,7 @@ de:
     diaspora: "der Diaspora E-Mail-Roboter"
     hello: "Hallo %{name}!"
     love: "Gruß,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "hat dich in einem Beitrag erwähnt:"
       sign_in: "Melde dich an um sie zu sehen."
@@ -306,6 +301,8 @@ de:
   password: "Passwort"
   password_confirmation: "Passwort-Bestätigung"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "bearbeite die Aspekt-Zugehörigkeit"
     few: "%{count} Personen"
@@ -514,6 +511,7 @@ de:
       mention_helper_text: "um jemanden zu erwähnen, drücke '@' und beginne den Namen zu schreiben"
       post_a_message_to: "Sende eine Nachricht an %{aspect}"
       posting: "Senden …"
+      public: "Public"
       publishing_to: "Veröffentlichen an: "
       share: "Teilen"
       share_with: "Teile mit"
@@ -534,6 +532,7 @@ de:
       mentioning: "Erwähnt: %{person}"
     show: 
       destroy: "Entfernen"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "Permalink"
   stream_helper: 
     hide_comments: "Kommentare verbergen"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index f9d06b5cef..8f3dac2db6 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -74,7 +74,7 @@ el:
       remove_aspect: "Διαγραφή αυτής της πτυχής"
       rename: "μετονομασία"
       update: "ενημέρωση"
-      updating: "updating"
+      updating: "ενημέρωση"
     few: "%{count} πτυχές"
     helper: 
       are_you_sure: "Είστε σίγουρος/η πως θέλετε να διαγράψετε αυτή την πτυχή;"
@@ -98,12 +98,6 @@ el:
     new_aspect: 
       create: "Δημιουργία"
       name: "Όνομα"
-    no_contacts_message: 
-      add_contact: "Προσθήκη επαφής"
-      add_contact_to: "Προσθέστε κάποιον στην πτυχή %{aspect_name}"
-      invite: "Προσκαλέστε κάποιον να ενταχθεί στο Diaspora!"
-      nobody: "Φέρτε τους σημαντικούς ανθρώπους της ζωής σας στο Diaspora!"
-      nobody_in_aspect: "Η πτυχή σας '%{aspect_name}' είναι κενή."
     no_posts_message: 
       start_talking: "Κανένας δεν έχει δημοσιεύσει κάτι ακόμα. Ξεκινήστε εσείς τη συζήτηση!"
     one: "1 πτυχή"
@@ -233,17 +227,17 @@ el:
   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: 
@@ -279,6 +273,7 @@ el:
     diaspora: "το ρομποτάκι για τα email του δικτύου Diaspora.."
     hello: "Γειά σου %{name}!"
     love: "Με αγάπη,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "αναφέρεται σε σας σε μια δημοσίευση:"
       sign_in: "Συνδεθείτε για να το δείτε."
@@ -306,6 +301,8 @@ el:
   password: "Κωδικός"
   password_confirmation: "Επαλήθευση κωδικού"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "επεξεργασία ιδιοτήτων πτυχής"
     few: "%{count} άτομα"
@@ -323,8 +320,8 @@ el:
     person: 
       add_contact: "προσθήκη επαφής"
       already_connected: "Είναι ήδη συνδεδεμένο"
-      pending_request: "αίτημα σε αναμονή"
-      thats_you: "εσύ είσαι αυτός!"
+      pending_request: "Αίτημα σε αναμονή"
+      thats_you: "Εσύ είσαι αυτός!"
     profile_sidebar: 
       bio: "βιογραφικό"
       born: "γεννήθηκε"
@@ -339,7 +336,7 @@ el:
       does_not_exist: "Ο/Η χρήστης δεν υπάρχει!"
       edit: "επεξεργασία"
       incoming_request: "Ο/Η %{name} θέλει να μοιραστεί μαζί σας"
-      mention: "Mention"
+      mention: "Αναφορά"
       message: "Μήνυμα"
       no_posts: "κανένα μήνυμα προς εμφάνιση!"
       not_connected: "Δεν είστε συνδεδεμένος με αυτόν τον χρήστη "
@@ -514,6 +511,7 @@ el:
       mention_helper_text: "για ν' αναφέρεις κάποιον, πάτα '@' και άρχισε να πληκτρολογείς το όνομα του"
       post_a_message_to: "Αναρτήστε ένα μήνυμα στην πτυχή %{aspect}"
       posting: "Ανάρτηση..."
+      public: "Public"
       publishing_to: "δημοσίευση στο: "
       share: "Μοιράσου"
       share_with: "Μοιράσου με"
@@ -521,19 +519,20 @@ el:
     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: "Διαγραφή"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "απόκρυψη σχολίων"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 6f0557c6e4..5fea4ca464 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -98,12 +98,6 @@ en_shaw:
     new_aspect: 
       create: "𐑒𐑮𐑦𐑱𐑑"
       name: "𐑯𐑱𐑥"
-    no_contacts_message: 
-      add_contact: "𐑨𐑛 𐑩 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
-      add_contact_to: "𐑨𐑛 𐑕𐑳𐑥𐑢𐑩𐑯 𐑑 %{aspect_name}"
-      invite: "𐑦𐑯𐑝𐑲𐑑 𐑕𐑳𐑥𐑢𐑩𐑯 𐑑 𐑡𐑶𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩!"
-      nobody: "𐑚𐑮𐑦𐑙 𐑞 𐑐𐑰𐑐𐑩𐑤 𐑞𐑨𐑑 𐑥𐑨𐑑𐑼 𐑦𐑯 𐑿𐑼 𐑤𐑲𐑓 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩!"
-      nobody_in_aspect: "𐑿𐑼 𐑨𐑕𐑐𐑧𐑒𐑑 '%{aspect_name}' 𐑦𐑟 𐑧𐑥𐑐𐑑𐑦."
     no_posts_message: 
       start_talking: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑣𐑨𐑟 𐑕𐑧𐑛 𐑨𐑯𐑦𐑔𐑦𐑙 𐑘𐑧𐑑.  𐑜𐑧𐑑 𐑞 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑕𐑑𐑸𐑑𐑩𐑛!"
     one: "1 𐑨𐑕𐑐𐑧𐑒𐑑"
@@ -279,6 +273,7 @@ en_shaw:
     diaspora: "𐑞 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑦-𐑥𐑱𐑤 𐑮𐑴𐑚𐑪𐑑"
     hello: "𐑣𐑧𐑤𐑴 %{name}!"
     love: "𐑤𐑳𐑝,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑:"
       sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑑 𐑝𐑿 𐑦𐑑."
@@ -306,6 +301,8 @@ en_shaw:
   password: "Password"
   password_confirmation: "𐑐𐑨𐑕𐑢𐑼𐑛 𐑒𐑪𐑯𐑓𐑼𐑥𐑱𐑖𐑩𐑯"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "𐑧𐑛𐑦𐑑 𐑨𐑕𐑐𐑧𐑒𐑑 𐑥𐑧𐑥𐑚𐑼𐑖𐑦𐑐"
     few: "%{count} 𐑐𐑰𐑐𐑩𐑤"
@@ -514,6 +511,7 @@ en_shaw:
       mention_helper_text: "𐑑 𐑥𐑧𐑯𐑖𐑩𐑯 𐑕𐑳𐑥𐑢𐑩𐑯, 𐑐𐑮𐑧𐑕 '@' 𐑯 𐑕𐑑𐑸𐑑 𐑑𐑲𐑐𐑦𐑙 𐑞𐑺 𐑯𐑱𐑥"
       post_a_message_to: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 %{aspect}"
       posting: "𐑐𐑴𐑕𐑑𐑦𐑙..."
+      public: "Public"
       publishing_to: "𐑐𐑳𐑚𐑤𐑦𐑖𐑦𐑙 𐑑: "
       share: "𐑖𐑺"
       share_with: "𐑖𐑺 𐑢𐑦𐑞 %{aspect}"
@@ -534,6 +532,7 @@ en_shaw:
       mentioning: "𐑥𐑧𐑯𐑖𐑩𐑯𐑦𐑙: %{person}"
     show: 
       destroy: "𐑛𐑦𐑤𐑰𐑑"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "𐑐𐑻𐑥𐑩𐑤𐑦𐑙𐑒"
   stream_helper: 
     hide_comments: "𐑣𐑲𐑛 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 9fcfa20b31..2b799f52b6 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -98,12 +98,6 @@ eo:
     new_aspect: 
       create: "Krei"
       name: "Nomo"
-    no_contacts_message: 
-      add_contact: "Aldoni kontakton"
-      add_contact_to: "Add someone to %{aspect_name}"
-      invite: "Invitu iun al Diaspora!"
-      nobody: "Bring the people that matter in your life to Diaspora!"
-      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
     no_posts_message: 
       start_talking: "Nobody has said anything yet.  Get the conversation started!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ eo:
     diaspora: "the diaspora email robot"
     hello: "Saluton %{name}!"
     love: "love,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ eo:
   password: "Pasvorto"
   password_confirmation: "Password confirmation"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
     few: "%{count} people"
@@ -514,6 +511,7 @@ eo:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Share"
       share_with: "Share with %{aspect}"
@@ -534,6 +532,7 @@ eo:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Destroy"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "hide comments"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index e44745e8ca..e49b45ea84 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -98,12 +98,6 @@ es-CL:
     new_aspect: 
       create: "Crear"
       name: "Nombre"
-    no_contacts_message: 
-      add_contact: "Agregar un contacto"
-      add_contact_to: "Agregar a alguien a %{aspect_name}"
-      invite: "¡Invita a alguien a unirse a Diaspora!"
-      nobody: "¡Invita a toda esa gente importante en tu vida a Diaspora!"
-      nobody_in_aspect: "Tu aspecto '%{aspect_name}' está vacío."
     no_posts_message: 
       start_talking: "Nadie ha dicho nada aún.  ¡Que comiense la conversación!"
     one: "1 aspecto"
@@ -279,6 +273,7 @@ es-CL:
     diaspora: "correo robot de diaspora"
     hello: "¡Hola %{name}!"
     love: "cariño,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "Te mencionó en un post:"
       sign_in: "Conéctate para verlo."
@@ -306,6 +301,8 @@ es-CL:
   password: "Contraseña"
   password_confirmation: "Confirmar contraseña"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "Editar el Aspecto donde está el contacto"
     few: "%{count} personas"
@@ -514,6 +511,7 @@ es-CL:
       mention_helper_text: "para mencionar a alguien, usa '@' antes de su nombre"
       post_a_message_to: "Postear un mensaje a %{aspect}"
       posting: "Posteando..."
+      public: "Public"
       publishing_to: "publicar en: "
       share: "Compartir"
       share_with: "Compartir con "
@@ -534,6 +532,7 @@ es-CL:
       mentioning: "Mencionar a: %{person}"
     show: 
       destroy: "Eliminar"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "ocultar comentarios"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 0a19f328b9..ec8289cb7b 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -98,12 +98,6 @@ es:
     new_aspect: 
       create: "Crear"
       name: "Nombre"
-    no_contacts_message: 
-      add_contact: "Añadir un contacto"
-      add_contact_to: "Añadir a alguien a %{aspect_name}"
-      invite: "¡Invita a otros a unirse a Diaspora*!"
-      nobody: "Segúramente conozcas más gente, ¡tráelos a Diaspora*!"
-      nobody_in_aspect: "El Aspecto '%{aspect_name}' está vacío."
     no_posts_message: 
       start_talking: "Nadie dijo nada todavía. ¡Inicia la conversación!"
     one: "1 aspecto"
@@ -279,6 +273,7 @@ es:
     diaspora: "Email robot de Diaspora*"
     hello: "¡Hola %{name}!"
     love: "¡Qué pasa!"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "te nombró en una publicación:"
       sign_in: "Conéctate para verlo."
@@ -306,6 +301,8 @@ es:
   password: "Contraseña"
   password_confirmation: "Confirmación de contraseña"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "editar el Aspecto donde está el contacto"
     few: "%{count} personas"
@@ -514,6 +511,7 @@ es:
       mention_helper_text: "para nombrar a alguien, usa \"@\" justo antes"
       post_a_message_to: "Enviar un mensaje a %{aspect}"
       posting: "Publicando..."
+      public: "Public"
       publishing_to: "publicar en: "
       share: "Compartir"
       share_with: "compartir con"
@@ -534,6 +532,7 @@ es:
       mentioning: "Mencionar a: %{person}"
     show: 
       destroy: "Eliminar"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "Enlace permanente"
   stream_helper: 
     hide_comments: "Ocultar comentarios"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index c9b4d05ccd..17b86aa906 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -74,7 +74,7 @@ eu:
       remove_aspect: "Alderdi hau ezabatu"
       rename: "berrizendatu"
       update: "eguneratu"
-      updating: "updating"
+      updating: "eguneratzen"
     few: "%{count} alderdi"
     helper: 
       are_you_sure: "Ziur al zaude alderdi hau ezabatu nahi duzunaz?"
@@ -98,12 +98,6 @@ eu:
     new_aspect: 
       create: "Sortu"
       name: "Izena"
-    no_contacts_message: 
-      add_contact: "Adiskidea gehitu"
-      add_contact_to: "Norbait gehitu %{aspect_name}(r)a"
-      invite: "Gonbidatu norbait Diasporara!"
-      nobody: "Ekar ezazu zure bizitzako jende garrantzitsua Diasporara!"
-      nobody_in_aspect: "Zure alderdi '%{aspect_name}' hutsik dago."
     no_posts_message: 
       start_talking: "Oraindik inork ez du ezer esan. Izan zaitez lehenengoa!"
     one: "alderdi 1"
@@ -123,7 +117,7 @@ eu:
     few: "%{count} iruzkin"
     many: "%{count} iruzkin"
     new_comment: 
-      comment: "Iruzkindu"
+      comment: "iruzkindu"
       commenting: "Iruzkintzen..."
     one: "iruzkin 1"
     other: "%{count} iruzkin"
@@ -279,6 +273,7 @@ eu:
     diaspora: "diasporaren e-posta robota"
     hello: "Kaixo, %{name}!"
     love: "ikusi arte,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "zu aipatu zaituzte mezu batean:"
       sign_in: "Sartu ikusteko."
@@ -306,6 +301,8 @@ eu:
   password: "Pasahitza"
   password_confirmation: "Pasahitz baieztapena"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "aldatu alderdiaren bazkidetza"
     few: "%{count} pertsona"
@@ -323,8 +320,8 @@ eu:
     person: 
       add_contact: "adiskidea gehitu"
       already_connected: "Dagoeneko harremanetan"
-      pending_request: "onarpenaren zain"
-      thats_you: "zu zeu zara!"
+      pending_request: "Onarpenaren zain"
+      thats_you: "Zu zeu zara!"
     profile_sidebar: 
       bio: "niri buruz"
       born: "jaioteguna"
@@ -514,6 +511,7 @@ eu:
       mention_helper_text: "norbait aipatzeko, sakatu '@' eta hasi adiskidearen izena idazten"
       post_a_message_to: "%{aspect}(e)n mezu bat partekatu"
       posting: "Partekatzen..."
+      public: "Publikoa"
       publishing_to: "hemen partekatzen:"
       share: "Partekatu"
       share_with: "honekin partekatu:"
@@ -534,6 +532,7 @@ eu:
       mentioning: "Aipatzen: %{person}"
     show: 
       destroy: "Suntsitu"
+      not_found: "Barkatu, baina ezin izan dugu mezu hori aurkitu."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "iruzkinak ezkutatu"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index 6bce37bb2a..93c93adcb9 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -98,12 +98,6 @@ fi:
     new_aspect: 
       create: "Luo"
       name: "Nimi"
-    no_contacts_message: 
-      add_contact: "Lisää kontakti"
-      add_contact_to: "Lisää henkilö näkymään %{aspect_name}"
-      invite: "Kutsu ystäväsi Diasporan käyttäjäksi!"
-      nobody: "Tuo elämäsi tärkeät ihmiset Diasporaan!"
-      nobody_in_aspect: "Näkymäsi, '%{aspect_name}', on tyhjä."
     no_posts_message: 
       start_talking: "Kukaan ei ole sanonut vielä mitään. Aloita keskustelu!"
     one: "1 näkymä"
@@ -279,6 +273,7 @@ fi:
     diaspora: "Diasporan sähköpostirobotti"
     hello: "Hei %{name}!"
     love: "Terveisin,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mainitsi sinut viestissään:"
       sign_in: "Kirjaudu sisään nähdäksesi."
@@ -306,6 +301,8 @@ fi:
   password: "Salasana"
   password_confirmation: "Salasanan varmistus"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "muokkaa näkymän jäsenyyttä."
     few: "%{count} people"
@@ -514,6 +511,7 @@ fi:
       mention_helper_text: "mainitaksesi jonkun, valitse '@' ja kirjoita nimen alku"
       post_a_message_to: "Lähetä viesti näkymään %{aspect}"
       posting: "Lähetetään..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Jaa"
       share_with: "Jaa"
@@ -534,6 +532,7 @@ fi:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Poista"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "pysyvä linkki"
   stream_helper: 
     hide_comments: "piilota kommentit"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 6383373f6f..897151ab3d 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -98,12 +98,6 @@ fr:
     new_aspect: 
       create: "Créer"
       name: "Nom"
-    no_contacts_message: 
-      add_contact: "Ajouter un contact"
-      add_contact_to: "Ajouter quelqu'un à %{aspect_name}"
-      invite: "Inviter quelqu'un à rejoindre Diaspora !"
-      nobody: "Invitez les personnes qui comptent dans votre vie sur Diaspora !"
-      nobody_in_aspect: "Votre aspect « %{aspect_name} » est vide."
     no_posts_message: 
       start_talking: "Personne n’a encore rien dit.  Engagez dès à présent la conversation !"
     one: "1 aspect"
@@ -279,6 +273,7 @@ fr:
     diaspora: "le robot de messagerie électronique de Diaspora"
     hello: "Bonjour %{name} !"
     love: "affectueusement,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "vous a mentionné(e) dans un message :"
       sign_in: "Connectez-vous pour le/la voir."
@@ -306,6 +301,8 @@ fr:
   password: "Mot de passe"
   password_confirmation: "Confirmation du mot de passe"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "modifier l'appartenance à vos aspects"
     few: "%{count} personnes"
@@ -514,6 +511,7 @@ fr:
       mention_helper_text: "pour mentionner quelqu'un, insérez un « @ » et commencez à écrire son nom"
       post_a_message_to: "Publier un message dans %{aspect}"
       posting: "Publication…"
+      public: "Public"
       publishing_to: "publication vers : "
       share: "Partager"
       share_with: "Partager avec"
@@ -534,6 +532,7 @@ fr:
       mentioning: "Mentionne : %{person}"
     show: 
       destroy: "Supprimer"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalien"
   stream_helper: 
     hide_comments: "masquer les commentaires"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index c3305e8f9c..9b8b2d39fb 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -98,12 +98,6 @@ ga:
     new_aspect: 
       create: "Cruthaigh"
       name: "Ainm"
-    no_contacts_message: 
-      add_contact: "Cuir teagmháil leis"
-      add_contact_to: "Cuir teaghmháil le %{aspect_name}"
-      invite: "Seol cuireadh chuig duine chun comhcheangail le Diaspora!"
-      nobody: "Tóg na daoine i gceist i do saol chuig Diaspora!"
-      nobody_in_aspect: "Tá do gné '%{aspect_name}' folamh."
     no_posts_message: 
       start_talking: "Níor deireadh aon rud fós. Cuir tús leis an comhrá!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ ga:
     diaspora: "an róbat ríomhpost diaspora"
     hello: "Haileo %{name}!"
     love: "le meas,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ ga:
   password: "Pasfhocal"
   password_confirmation: "Deimhniú pasfhocal"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "athraigh ballraíocht gné"
     few: "%{count} people"
@@ -514,6 +511,7 @@ ga:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Chuir teachtaireach chuig %{aspect}"
       posting: "Póstáil..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Roinn"
       share_with: "Roinn le %{aspect}"
@@ -534,6 +532,7 @@ ga:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Scrios"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "nasc-buan"
   stream_helper: 
     hide_comments: "folaigh nótaí tráchta"
diff --git a/config/locales/diaspora/gl.yml b/config/locales/diaspora/gl.yml
index 8349ae4b75..138dda9fa3 100644
--- a/config/locales/diaspora/gl.yml
+++ b/config/locales/diaspora/gl.yml
@@ -98,12 +98,6 @@ gl:
     new_aspect: 
       create: "Crear"
       name: "Nome"
-    no_contacts_message: 
-      add_contact: "Engadir un contacto"
-      add_contact_to: "Engadir alguén a %{aspect_name}"
-      invite: "Convida a alguén a unirse a Diaspora!"
-      nobody: "Trae ás persoas que che importan a Diaspora!"
-      nobody_in_aspect: "O seu aspecto '%{aspect_name}' está baleiro."
     no_posts_message: 
       start_talking: "Ninguén dixo nada. Comeza unha conversa!"
     one: "1 aspecto"
@@ -279,6 +273,7 @@ gl:
     diaspora: "robot do correo electrónico de Diaspora"
     hello: "Ola %{name}!"
     love: "bicos,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "citoute nunha publicación:"
       sign_in: "Entra para velo."
@@ -306,6 +301,8 @@ gl:
   password: "Contrasinal"
   password_confirmation: "Confirmación do contrasinal"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "Editar membresía de aspecto"
     few: "%{count} persoas"
@@ -514,6 +511,7 @@ gl:
       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..."
+      public: "Public"
       publishing_to: "publicar en: "
       share: "Compartir"
       share_with: "Compartir con %{aspect}"
@@ -534,6 +532,7 @@ gl:
       mentioning: "Mencionando: %{person}"
     show: 
       destroy: "Borrar"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "esconder comentarios"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 7026f65c15..7b31c093bd 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -98,12 +98,6 @@ he:
     new_aspect: 
       create: "יציאה"
       name: "שם"
-    no_contacts_message: 
-      add_contact: "הוספת איש קשר"
-      add_contact_to: "הוספת מישהו אל %{aspect_name}"
-      invite: "להזמין מישהו להצטרף לדיאספורה!"
-      nobody: "מומלץ להזמין את האנשים החשובים לך באמת לדיאספורה!"
-      nobody_in_aspect: "ההיבט שלך '%{aspect_name}' ריק."
     no_posts_message: 
       start_talking: "אף אחד לא דיבר עדיין. בואו נתחיל להתקשקש פה!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ he:
     diaspora: "רובוט הדוא״ל של דיאספורה"
     hello: "שלום %{name}!"
     love: "באהבה,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "הזכיר/ה אותך ברשומה:"
       sign_in: "יש להיכנס כדי לצפות בזה."
@@ -306,6 +301,8 @@ he:
   password: "ססמה"
   password_confirmation: "אישור הססמה"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "עריכת חברות בהיבט"
     few: "%{count} people"
@@ -514,6 +511,7 @@ he:
       mention_helper_text: "כדי להזכיר שם של מישהו, יש ללחוץ על '@' ולהתחיל לכתוב את שמו"
       post_a_message_to: "פרסום הודעה אל %{aspect}"
       posting: "פרסום..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "שיתוף"
       share_with: "שיתוף עם"
@@ -534,6 +532,7 @@ he:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "מחיקה"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "קישור קבוע"
   stream_helper: 
     hide_comments: "הסתרת הערות"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 36768ef0ce..b282745488 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -98,12 +98,6 @@ hu:
     new_aspect: 
       create: "Létrehoz"
       name: "Név"
-    no_contacts_message: 
-      add_contact: "Ismerős felvétele"
-      add_contact_to: "Adj hozzá valakit ehhez: %{aspect_name}"
-      invite: "Hívj meg valakit a Diaspora-ra!"
-      nobody: "Hozd a Diaspora-ra azokat, akik számítanak az életedben!"
-      nobody_in_aspect: "A '%{aspect_name}' csoportod üres."
     no_posts_message: 
       start_talking: "Mindenki hallgat. Kezd el te a beszélgetést."
     one: "1 csoport"
@@ -279,6 +273,7 @@ hu:
     diaspora: "A diaspora email robot"
     hello: "Szia %{name}!"
     love: "Szeretettel,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "megemlített téged egy bejegyzésében:"
       sign_in: "Jelentkezz be, hogy megnézhesd."
@@ -306,6 +301,8 @@ hu:
   password: "Jelszó"
   password_confirmation: "Jelszó megerősítése"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "csoport tagság szerkesztése"
     few: "%{count} személy"
@@ -514,6 +511,7 @@ hu:
       mention_helper_text: "valaki megemlítéséhez írj '@' jelet, és kezd el írni a nevet"
       post_a_message_to: "Bejegyzés küldése ennek a csoportnak: %{aspect}"
       posting: "Küldés..."
+      public: "Public"
       publishing_to: "Publikálás:"
       share: "Megosztás"
       share_with: "Megosztás vele: %{aspect}"
@@ -534,6 +532,7 @@ hu:
       mentioning: "Megemlít: %{person}"
     show: 
       destroy: "Töröl"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "hozzászólások elrejtése"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 643853c41b..d886a09648 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -98,12 +98,6 @@ id:
     new_aspect: 
       create: "Ciptakan"
       name: "Name"
-    no_contacts_message: 
-      add_contact: "Add a contact"
-      add_contact_to: "Add someone to %{aspect_name}"
-      invite: "Invite someone to join Diaspora!"
-      nobody: "We know you know people — bring them to Diaspora!"
-      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
     no_posts_message: 
       start_talking: "Nobody has said anything yet.  Get the conversation started!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ id:
     diaspora: "the diaspora email robot"
     hello: "Hello %{name}!"
     love: "love,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ id:
   password: "Password"
   password_confirmation: "Password confirmation"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
     few: "%{count} people"
@@ -514,6 +511,7 @@ id:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Bagikan"
       share_with: "Share with %{aspect}"
@@ -534,6 +532,7 @@ id:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Hapus"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "hide comments"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 6413765716..e2054436a2 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -98,12 +98,6 @@ is:
     new_aspect: 
       create: "Búa til"
       name: "Nafn"
-    no_contacts_message: 
-      add_contact: "Bæta tengilið við"
-      add_contact_to: "Bæta einhverjum við %{aspect_name}"
-      invite: "Bjóddu einhverjum að tengjast Diaspora!"
-      nobody: "Fáðu fólkið sem skiptir máli í lífi þínu með í Díaspora!"
-      nobody_in_aspect: "Ásýndin þín '%{aspect_name}' er auð."
     no_posts_message: 
       start_talking: "Enginn hefur sagt neitt enn.  Byrjaðu umræðurnar!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ is:
     diaspora: "the diaspora email robot"
     hello: "Halló %{name}!"
     love: "ást,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "gat þín í pósti:"
       sign_in: "Skráðu þig inn til að sjá það."
@@ -306,6 +301,8 @@ is:
   password: "Lykilorð"
   password_confirmation: "Staðfesting lykilorðs"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "breyta aðild að ásýnd"
     few: "%{count} people"
@@ -514,6 +511,7 @@ is:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Skrifa skilaboð til %{aspect}"
       posting: "Senda..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Deila"
       share_with: "deila með"
@@ -534,6 +532,7 @@ is:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Eyða"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "varanleg slóð"
   stream_helper: 
     hide_comments: "fela athugasemdir"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 68e8088fbc..e3e9d522bf 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -98,12 +98,6 @@ it:
     new_aspect: 
       create: "Crea"
       name: "Nome"
-    no_contacts_message: 
-      add_contact: "Aggiungi un contatto"
-      add_contact_to: "Aggiungi qualcuno a %{aspect_name}"
-      invite: "Invita qualcuna a unirsi a Diaspora!"
-      nobody: "Sappiamo che conosci tante persone - invitale su Diaspora!"
-      nobody_in_aspect: "Il tuo aspetto '%{aspect_name}' è vuoto."
     no_posts_message: 
       start_talking: "Nessuno ha ancora detto niente. Inizia la conversazione!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ it:
     diaspora: "l'email robot di diaspora"
     hello: "Ciao %{name}!"
     love: "amore,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "ti ha menzionato in un post:"
       sign_in: "Loggati per vederlo."
@@ -306,6 +301,8 @@ it:
   password: "Password"
   password_confirmation: "Conferma password"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "modifica appartenenza all'aspetto"
     few: "%{count} people"
@@ -514,6 +511,7 @@ it:
       mention_helper_text: "per menzionare qualcuno, inserisci '@' e digita il suo nome"
       post_a_message_to: "Invia un messaggio a %{aspect}"
       posting: "Invio in corso..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Condividi"
       share_with: "Condividi con"
@@ -534,6 +532,7 @@ it:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Elimina"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "nascondi i commenti"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index 83676a5069..d5171e4c0d 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -98,12 +98,6 @@ lt:
     new_aspect: 
       create: "Sukurti"
       name: "Pavadinimas"
-    no_contacts_message: 
-      add_contact: "PridÄ—ti kontaktÄ…"
-      add_contact_to: "Pridėti kontaktą į aspektą \"%{aspect_name}\""
-      invite: "Pakviesk į Diasporą!"
-      nobody: "Žinome, kad pažįsti daug žmonių - pakviesk juos į Diasporą!"
-      nobody_in_aspect: "Aspektas \"%{aspect_name}\" tuščias."
     no_posts_message: 
       start_talking: "Dar niekas nepasisakė. Pradėk pokalbį pats!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ lt:
     diaspora: "Diasporos pašto robotas"
     hello: "Labas, %{name}!"
     love: "su meile,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ lt:
   password: "Slaptažodis"
   password_confirmation: "Slaptažodžio patvirtinimas"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
     few: "%{count} people"
@@ -514,6 +511,7 @@ lt:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Parašyti žinutę į aspektą \"%{aspect}\""
       posting: "Rašoma..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Skelbti"
       share_with: "Skelbti aspekte \"%{aspect}\""
@@ -534,6 +532,7 @@ lt:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Sunaikinti"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "nascondi i commenti"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 2cb4a620ad..a72b43ff28 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -98,12 +98,6 @@ mk:
     new_aspect: 
       create: "Креирај"
       name: "Име"
-    no_contacts_message: 
-      add_contact: "Додај контакт"
-      add_contact_to: "Додај некој во %{aspect_name}"
-      invite: "Покани некој да се зачлени во Diaspora!"
-      nobody: "Донеси ги луѓето кои ти значат во Diaspora!"
-      nobody_in_aspect: "Вашиот аспект '%{aspect_name}' е празен."
     no_posts_message: 
       start_talking: "Никој досега нема кажано ништо. Започни го разговорот!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ mk:
     diaspora: "diaspora е-маил робот"
     hello: "Здраво %{name}!"
     love: "со љубов,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ mk:
   password: "Лозинка"
   password_confirmation: "Потврда на лозинка"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
     few: "%{count} people"
@@ -514,6 +511,7 @@ mk:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Додај порака во %{aspect}"
       posting: "Објавување..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Сподели"
       share_with: "Сподели со %{aspect}"
@@ -534,6 +532,7 @@ mk:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Уништи"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "hide comments"
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index 12bcf4b8b8..9a66c8b921 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -98,12 +98,6 @@ ml:
     new_aspect: 
       create: "ഉണ്ടാക്കു"
       name: "പേര്"
-    no_contacts_message: 
-      add_contact: "ഒരു സമ്പര്‍ക്കം ചേര്‍ക്കുക"
-      add_contact_to: "%{aspect_name} ലേയ്ക്ക് ആരെയെങ്കിലും ചേര്‍ക്കുക"
-      invite: "ആരെയെങ്കിലും ഡയസ്പോറയില്‍ ചേരാന്‍ ക്ഷണിക്കുക!"
-      nobody: "Bring the people that matter in your life to Diaspora!"
-      nobody_in_aspect: "താങ്കളുടെ '%{aspect_name}' പരിചയം ശൂന്യമാണ്."
     no_posts_message: 
       start_talking: "ആരും ഒന്നും പറയുന്നില്ല. സംഭാഷണം തുടങ്ങിവെയ്ക്കു!"
     one: "ഒരു പരിചയം"
@@ -279,6 +273,7 @@ ml:
     diaspora: "ഡയസ്പോറ ഇമെയില്‍ ചാത്തന്‍"
     hello: "നമസ്‌കാരം %{name}!"
     love: "സ്നേഹപൂര്‍വ്വം,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "കാണാനായി അകത്ത് കയറുക."
@@ -306,6 +301,8 @@ ml:
   password: "അടയാളവാക്ക്"
   password_confirmation: "അടയാളവാക്ക് തിര്‍ച്ചപ്പെടുത്തുക"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "പരിചയത്തിലെ അംഗത്വം തിരുത്തു"
     few: "%{count} ആളുകള്‍"
@@ -514,6 +511,7 @@ ml:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "%{aspect}ല്‍ ഒരു സന്ദേശം പ്രസിദ്ധീകരിക്കുക"
       posting: "കുറിക്കുന്നു..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "പങ്കുവെയ്ക്കുക"
       share_with: "പങ്കുവെയ്ക്കുക"
@@ -534,6 +532,7 @@ ml:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "നീക്കം ചെയ്യുക"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "സ്ഥിരം കണ്ണി"
   stream_helper: 
     hide_comments: "അഭിപ്രായങ്ങള്‍ മറയ്ക്കുക"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 52ae2b3dea..c2135466dc 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -98,12 +98,6 @@ nb:
     new_aspect: 
       create: "Opprett"
       name: "Navn"
-    no_contacts_message: 
-      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: "Aspektet ditt '%{aspect_name}' er tomt."
     no_posts_message: 
       start_talking: "Ingen har sagt noe enda. FÃ¥ samtalen i gang!"
     one: "1 aspekt"
@@ -279,6 +273,7 @@ nb:
     diaspora: "the diaspora email robot"
     hello: "Hei %{name}!"
     love: "love,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "nevnte deg i et innlegg:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ nb:
   password: "Passord"
   password_confirmation: "Passord bekreftelse"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
     few: "%{count} people"
@@ -514,6 +511,7 @@ nb:
       mention_helper_text: "for å nevne noen, skriv '@' og begynn å skriv navnet deres"
       post_a_message_to: "Post et innlegg til %{aspect}"
       posting: "Poster..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Del"
       share_with: "Share with %{aspect}"
@@ -534,6 +532,7 @@ nb:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Utslett"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "hide comments"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index de5216d488..ea8cbd9e90 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -98,12 +98,6 @@ nl:
     new_aspect: 
       create: "Aanmaken"
       name: "Naam"
-    no_contacts_message: 
-      add_contact: "Voeg een contact toe"
-      add_contact_to: "Voeg iemand toe aan %{aspect_name}"
-      invite: "Nodig iemand uit om lid te worden op Diaspora!"
-      nobody: "Breng de mensen die je lief zijn naar Diaspora!"
-      nobody_in_aspect: "Je aspect '%{aspect_name}' is leeg."
     no_posts_message: 
       start_talking: "Nog niemand heeft iets gezegd. Breng het gesprek op gang!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ nl:
     diaspora: "de diaspora email robot"
     hello: "Hoi %{name}!"
     love: "liefs,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "heeft jou genoemd in een post:"
       sign_in: "Log in om het te bekijken."
@@ -306,6 +301,8 @@ nl:
   password: "Wachtwoord"
   password_confirmation: "Wachtwoordbevestiging"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "bewerk aspect lidmaatschap"
     few: "%{count} personen"
@@ -514,6 +511,7 @@ nl:
       mention_helper_text: "om iemand te noemen, typ '@' gevolgd door zijn of haar naam"
       post_a_message_to: "Plaats een bericht aan %{aspect}"
       posting: "Plaatsen..."
+      public: "Public"
       publishing_to: "delen met: "
       share: "Delen"
       share_with: "deel met"
@@ -534,6 +532,7 @@ nl:
       mentioning: "Noem: %{person}"
     show: 
       destroy: "Verwijderen"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "verberg reacties"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 73cb4c25c2..d759d2b1cf 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -98,12 +98,6 @@ pa:
     new_aspect: 
       create: "Create"
       name: "Name"
-    no_contacts_message: 
-      add_contact: "Add a contact"
-      add_contact_to: "Add someone to %{aspect_name}"
-      invite: "Invite someone to join Diaspora!"
-      nobody: "Bring the people that matter in your life to Diaspora!"
-      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
     no_posts_message: 
       start_talking: "Nobody has said anything yet.  Get the conversation started!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ pa:
     diaspora: "the diaspora email robot"
     hello: "ਹੈਲੋ %{name}!"
     love: "love,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ pa:
   password: "ਪਾਸਵਰਡ"
   password_confirmation: "ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
     few: "%{count} people"
@@ -514,6 +511,7 @@ pa:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "ਪੋਸਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Share"
       share_with: "share with"
@@ -534,6 +532,7 @@ pa:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Delete"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "ਟਿੱਪਣੀਆਂ ਓਹਲੇ ਕਰੋ"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 6fb7441c8c..b378b9f2b8 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -98,12 +98,6 @@ pl:
     new_aspect: 
       create: "Utwórz"
       name: "Nazwa"
-    no_contacts_message: 
-      add_contact: "Dodaj kontakt"
-      add_contact_to: "Dodaj kogoÅ› do aspektu %{aspect_name}"
-      invite: "ZaproÅ› znajomych do Diaspory!"
-      nobody: "Zaproś do Diaspory ludzi ważnych dla Ciebie!"
-      nobody_in_aspect: "Twój aspekt '%{aspect_name}' jest pusty."
     no_posts_message: 
       start_talking: "Nikt jeszcze nic nie powiedział. Rozkręć rozmowę!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ pl:
     diaspora: "robot e-mailowy diaspory"
     hello: "Cześć %{name}!"
     love: "uściski,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ pl:
   password: "Hasło"
   password_confirmation: "Potwierdzenie hasła"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
     few: "%{count} people"
@@ -514,6 +511,7 @@ pl:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Wyślij wiadomość do %{aspect}"
       posting: "Wysyłanie…"
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Podziel siÄ™"
       share_with: "Podziel siÄ™ z aspektem %{aspect}"
@@ -534,6 +532,7 @@ pl:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Usuń"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "ukryj komentarze"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index b53dd7cb91..00229c52f6 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -98,12 +98,6 @@ pt-BR:
     new_aspect: 
       create: "Criar"
       name: "Nome do aspecto"
-    no_contacts_message: 
-      add_contact: "Adicione um contato"
-      add_contact_to: "Adicione alguém à %{aspect_name}"
-      invite: "Convide alguém para se juntar à Diaspora*!"
-      nobody: "Convide quem você gosta para a Diaspora*!"
-      nobody_in_aspect: "Seu aspecto '%{aspect_name}' está vazio."
     no_posts_message: 
       start_talking: "Ninguém postou ainda. Comece você! Diga algo!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ pt-BR:
     diaspora: "o robô de email da Diaspora*"
     hello: "Olá, %{name}!"
     love: "Com carinho,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ pt-BR:
   password: "Senha"
   password_confirmation: "Confirmação de senha"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "editar participação no aspecto"
     few: "%{count} people"
@@ -514,6 +511,7 @@ pt-BR:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Enviar uma mensagem para %{aspect}"
       posting: "Postando..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Compartilhar"
       share_with: "Compartilhar com %{aspect}"
@@ -534,6 +532,7 @@ pt-BR:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Excluir"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "Link permanente"
   stream_helper: 
     hide_comments: "Esconder comentários"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 8ecebcf5b6..a4ab850740 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -98,12 +98,6 @@ pt-PT:
     new_aspect: 
       create: "Criar"
       name: "Nome"
-    no_contacts_message: 
-      add_contact: "Adicionar um contacto"
-      add_contact_to: "Adicionar alguém a %{aspect_name}"
-      invite: "Convida alguém para se juntar ao Diaspora!"
-      nobody: "Traz as pessoas que são importantes para ti para o Diaspora!"
-      nobody_in_aspect: "O teu grupo '%{aspect_name}' está vazio."
     no_posts_message: 
       start_talking: "Ainda ninguém disse nada. Dá início à conversa!"
     one: "1 aspecto"
@@ -279,6 +273,7 @@ pt-PT:
     diaspora: "o robot de email do diaspora"
     hello: "Olá %{name}!"
     love: "com carinho,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ pt-PT:
   password: "Palavra-chave"
   password_confirmation: "Confirmação de palavra-chave"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "editar participação no aspecto"
     few: "%{count} people"
@@ -514,6 +511,7 @@ pt-PT:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Publicar uma mensagem em %{aspect}"
       posting: "A publicar..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Partilhar"
       share_with: "Partilhar com %{aspect}"
@@ -534,6 +532,7 @@ pt-PT:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Destruir"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "ocultar comentários"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 0e661259b1..add9a83f80 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -98,12 +98,6 @@ ro:
     new_aspect: 
       create: "Crează"
       name: "Nume"
-    no_contacts_message: 
-      add_contact: "Adaugă un contact"
-      add_contact_to: "Add someone to %{aspect_name}"
-      invite: "Invită pe cineva pe Diaspora!"
-      nobody: "We know you know people — bring them to Diaspora!"
-      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
     no_posts_message: 
       start_talking: "Nimeni nu a spus nimic deocamdată. Începe tu o conversaţie!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ ro:
     diaspora: "robotul e-mail Diaspora"
     hello: "Bună %{name}!"
     love: "cu dragoste,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ ro:
   password: "Parola"
   password_confirmation: "Confirmă parola"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
     few: "%{count} people"
@@ -514,6 +511,7 @@ ro:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Post a message to %{aspect}"
       posting: "Posting..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Distribuie"
       share_with: "Share with %{aspect}"
@@ -534,6 +532,7 @@ ro:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Åžterge"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "ascunde comentariile"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index eb34436aaf..39fc4f38b0 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -98,12 +98,6 @@ ru:
     new_aspect: 
       create: "Создать"
       name: "Имя"
-    no_contacts_message: 
-      add_contact: "Добавить контакт"
-      add_contact_to: "Добавить кого-нибудь в %{aspect_name}"
-      invite: "Пригласить кого-нибудь присоединится к Диаспоре!"
-      nobody: "Сообщите людям, что происходит в вашей жизни через Диаспору!"
-      nobody_in_aspect: "Ваш аспект '%{aspect_name}' пуст."
     no_posts_message: 
       start_talking: "Здесь ещё никто ничего не сказал.  Начать разговор!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ ru:
     diaspora: "почтовый робот Диаспоры"
     hello: "Привет %{name}!"
     love: "С любовью,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ ru:
   password: "Пароль"
   password_confirmation: "Подтверждение пароля"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "редактировать участников аспекта"
     few: "%{count} people"
@@ -514,6 +511,7 @@ ru:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Опубликовать сообщение для %{aspect}"
       posting: "Отправка ..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Поделиться"
       share_with: "поделиться с"
@@ -534,6 +532,7 @@ ru:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Уничтожить"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "постоянная ссылка"
   stream_helper: 
     hide_comments: "скрыть комментарии"
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 9c023a7ab7..8c37c330f0 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -98,12 +98,6 @@ sk:
     new_aspect: 
       create: "Vytvoriť"
       name: "Meno"
-    no_contacts_message: 
-      add_contact: "Pridať kontakt"
-      add_contact_to: "Pridať niekoho k aspektu %{aspect_name}"
-      invite: "Prizvať niekoho k Diaspore!"
-      nobody: "Pozvite do Diaspory ľudí, na ktorých Vám záleží!"
-      nobody_in_aspect: "Váš aspekt '%{aspect_name}' je prázdny."
     no_posts_message: 
       start_talking: "Nikto nič nevraví. Začnite Vy!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ sk:
     diaspora: "e-mail robot Diaspory"
     hello: "Ahoj %{name}!"
     love: "miluje,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "ťa spomenul v príspevku:"
       sign_in: "K prezeraniu sa prihlás."
@@ -306,6 +301,8 @@ sk:
   password: "Heslo"
   password_confirmation: "Potvrdenie hesla"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "upraviť členstvo v Aspekte."
     few: "%{count} people"
@@ -514,6 +511,7 @@ sk:
       mention_helper_text: "spomenúť niekoho, stlač '@' a začni písať jeho meno"
       post_a_message_to: "Poslať správu na aspekt %{aspect}"
       posting: "Posielam..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Zdieľať"
       share_with: "Zdieľať s aspektom %{aspect}"
@@ -534,6 +532,7 @@ sk:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Zmazať"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "skyť komentáre"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 402ed234d0..e1b1745ee1 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -98,12 +98,6 @@ sl:
     new_aspect: 
       create: "Ustvari"
       name: "Ime"
-    no_contacts_message: 
-      add_contact: "Dodaj stik"
-      add_contact_to: "Dodaj osebo v skupino %{aspect_name}"
-      invite: "Povabi osebo naj se pridruži v Diasporo!"
-      nobody: "Povabite v Diasporo vse, ki vam v življenju nekaj pomenijo!"
-      nobody_in_aspect: "Vaša skupina '%{aspect_name}' je prazna."
     no_posts_message: 
       start_talking: "Trenutno še brez objav. Začnite s prvo objavo!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ sl:
     diaspora: "diaspora email robot"
     hello: "Pozdravljeni %{name}!"
     love: "vas pozdravlja,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ sl:
   password: "Geslo"
   password_confirmation: "Potrditev gesla"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "uredi člane skupin"
     few: "%{count} people"
@@ -514,6 +511,7 @@ sl:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Objavi sporočilo v %{aspect}"
       posting: "Objavljam..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Deli"
       share_with: "deli s/z"
@@ -534,6 +532,7 @@ sl:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Izbriši"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "trajna povezava"
   stream_helper: 
     hide_comments: "skrij komentarje"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 1ea1a370fc..5d95fee2fd 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -98,12 +98,6 @@ sv:
     new_aspect: 
       create: "Skapa"
       name: "Namn"
-    no_contacts_message: 
-      add_contact: "Lägg till en kontakt"
-      add_contact_to: "Lägg till en kontakt i %{aspect_name}"
-      invite: "Bjud in en kontakt till Diaspora!"
-      nobody: "Bjud in dina vänner till Diaspora!"
-      nobody_in_aspect: "Sidan '%{aspect_name}' är tom."
     no_posts_message: 
       start_talking: "Ingen har sagt något än. Bli först!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ sv:
     diaspora: "Diasporas mailrobot"
     hello: "Hej %{name}!"
     love: "hälsningar,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ sv:
   password: "Lösenord"
   password_confirmation: "Bekräfta lösenord"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "flytta mellan sidor"
     few: "%{count} people"
@@ -514,6 +511,7 @@ sv:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "Skicka ett meddelande till %{aspect}"
       posting: "Skickar..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "Dela"
       share_with: "dela med"
@@ -534,6 +532,7 @@ sv:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Ta bort"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalänk"
   stream_helper: 
     hide_comments: "dölj kommentarer"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 24ca9b38ea..85c4d7b687 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -98,12 +98,6 @@ tr:
     new_aspect: 
       create: "Yarat"
       name: "Ä°sim"
-    no_contacts_message: 
-      add_contact: "Kontak ekleyin"
-      add_contact_to: "Add someone to %{aspect_name}"
-      invite: "Diaspora'ya tanıdıklarınızı davet edin!"
-      nobody: "Tanıdıklarınız olduğunu biliyoruz - onları Diasporaya getirin!"
-      nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
     no_posts_message: 
       start_talking: "Kimse henüz birşey söylemedi. Sohbeti başlatın!"
     one: "1 aspect"
@@ -279,6 +273,7 @@ tr:
     diaspora: "Diaspora e-posta robotu"
     hello: "Merhaba %{name}!"
     love: "love,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ tr:
   password: "Parola"
   password_confirmation: "Åžifre doÄŸrulama"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
     few: "%{count} people"
@@ -514,6 +511,7 @@ tr:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "mesaj gönder %{aspect}"
       posting: "Posting..."
+      public: "Public"
       publishing_to: "publishing to: "
       share: "PaylaÅŸ"
       share_with: "Share with %{aspect}"
@@ -534,6 +532,7 @@ tr:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "Yok et"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "permalink"
   stream_helper: 
     hide_comments: "yorumları gizle"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index b8855b86b5..e8f4780f68 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -32,7 +32,7 @@ zh-TW:
               invalid: "不合格."
             username: 
               taken: "已被使用."
-  ago: "%{time} 前"
+  ago: "%{time}前"
   application: 
     helper: 
       aspect_badge: 
@@ -75,7 +75,7 @@ zh-TW:
       rename: "改名"
       update: "æ›´æ–°"
       updating: "更新中"
-    few: "%{count} 個面向"
+    few: "%{count}個面向"
     helper: 
       are_you_sure: "你確定要刪除這個面向?"
       aspect_not_empty: "面向不是空的"
@@ -90,24 +90,18 @@ zh-TW:
       manage_aspects: "面向管理"
       no_requests: "沒有新要求"
       requests: "請求"
-    many: "%{count} 個面向"
+    many: "%{count}個面向"
     move_contact: 
       error: "聯繫移動錯誤: %{inspect}"
-      failure: "didn't work %{inspect}"
+      failure: "因%{inspect}沒有作用"
       success: "聯絡人已移至新的面向"
     new_aspect: 
       create: "創造"
       name: "名稱"
-    no_contacts_message: 
-      add_contact: "加入聯繫"
-      add_contact_to: "將某人加入至 %{aspect_name}"
-      invite: "邀請某人加入 Diaspora!"
-      nobody: "帶生活中重要的人來 Diaspora!"
-      nobody_in_aspect: "你的面向 '%{aspect_name}' 是空的."
     no_posts_message: 
       start_talking: "還沒人說話. 你來起個頭吧!"
-    one: "一個面向"
-    other: "%{count} 個面向"
+    one: "1個面向"
+    other: "%{count}個面向"
     seed: 
       family: "家人"
       work: "工作"
@@ -120,13 +114,13 @@ zh-TW:
   back: "後退"
   cancel: "取消"
   comments: 
-    few: "%{count} 則回應"
-    many: "%{count} 則回應"
+    few: "%{count}則回應"
+    many: "%{count}則回應"
     new_comment: 
       comment: "發表意見"
       commenting: "意見發表中..."
-    one: "一則回應"
-    other: "%{count} 則回應"
+    one: "1則回應"
+    other: "%{count}則回應"
     zero: "沒有回應"
   contacts: 
     create: 
@@ -134,10 +128,10 @@ zh-TW:
     destroy: 
       failure: "跟 %{name} 切斷聯繫失敗"
       success: "成功切斷與 %{name} 的聯繫"
-    few: "%{count} 個聯繫"
-    many: "%{count} 個聯繫"
-    one: "一個聯繫"
-    other: "%{count} 個聯繫"
+    few: "%{count}個聯繫"
+    many: "%{count}個聯繫"
+    one: "1個聯繫"
+    other: "%{count}個聯繫"
     share_with_pane: 
       accepts: "當 %{name} 接受後, 你們就開始可以看到彼此在 Diaspora 上發表的東西"
       add_new_aspect: "加入至新的面向"
@@ -146,16 +140,16 @@ zh-TW:
   conversations: 
     helper: 
       new_messages: 
-        few: "%{count} 則新訊息"
-        many: "%{count} 則新訊息"
-        one: "一則新訊息"
-        other: "%{count} 則新訊息"
+        few: "%{count}則新訊息"
+        many: "%{count}則新訊息"
+        one: "1則新訊息"
+        other: "%{count}則新訊息"
         zero: "沒有新訊息"
     index: 
       create_a_new_message: "編寫新訊息"
       inbox: "收件匣"
       message_inbox: "訊息信箱"
-      new_message: "新訊息"
+      new_message: "發新訊息"
       no_conversation_selected: "未選取任何對話"
       no_messages: "沒有訊息"
     new: 
@@ -175,7 +169,7 @@ zh-TW:
   email: "電子郵件"
   error_messages: 
     helper: 
-      correct_the_following_errors_and_try_again: "修正以下後再試一次."
+      correct_the_following_errors_and_try_again: "修正以下錯誤後再試一次."
       invalid_fields: "欄位無效"
   fill_me_out: "填寫我"
   home: 
@@ -189,7 +183,7 @@ zh-TW:
       ownership_explanation: "你擁有你的圖片, 且不該因為分享出去就失去它. 在 Diaspora, 所有你分享出去的東西, 你都仍有所有權, 你可以控制它們如何散布."
       share_what_you_want: "分享你想分享的東西, 給你想分享的人."
       simplicity: "ç°¡å–®"
-      simplicity_explanation: "Diaspora 讓分享變得單純且簡單, 而隱私也是一樣. 以隱私為出發點, Diaspora 讓你不用必須千辛萬苦的調整設定, 才能保護你的個人檔案安全."
+      simplicity_explanation: "Diaspora 讓分享變得單純且簡單, 而隱私也是一樣. 以隱私為出發點, Diaspora 讓你不必千辛萬苦的調整設定, 才能保護你的個人檔案安全."
       tagline_first_half: "分享你想分享的東西,"
       tagline_second_half: "給你想分享的人."
   invitations: 
@@ -233,34 +227,34 @@ zh-TW:
   likes: 
     likes: 
       people_dislike_this: 
-        few: "有 %{count} 個人不喜歡"
-        many: "有 %{count} 個人不喜歡"
-        one: "有一個人不喜歡"
-        other: "有 %{count} 個人不喜歡"
+        few: "有%{count}個人不喜歡"
+        many: "有%{count}個人不喜歡"
+        one: "有1個人不喜歡"
+        other: "有%{count}個人不喜歡"
         zero: "沒有人不喜歡"
       people_like_this: 
-        few: "有 %{count} 個人喜歡"
-        many: "有 %{count} 個人喜歡"
-        one: "有一個人喜歡"
-        other: "有 %{count} 個人喜歡"
+        few: "有%{count}個人喜歡"
+        many: "有%{count}個人喜歡"
+        one: "有1個人喜歡"
+        other: "有%{count}個人喜歡"
         zero: "沒有人喜歡"
   more: "更多"
   next: "後面"
   notifications: 
     also_commented: "也在別處發表了意見, 在 %{post_author} 的"
-    also_commented_deleted: "對一則已刪除的貼文發表意見"
+    also_commented_deleted: "對已刪除的貼文發表意見"
     comment_on_post: "發表了意見, 在你的"
     deleted: "已刪除"
     helper: 
       new_notifications: 
-        few: "%{count} 個新消息"
-        many: "%{count} 個新消息"
-        one: "一個新消息"
-        other: "%{count} 個新消息"
+        few: "%{count}個新消息"
+        many: "%{count}個新消息"
+        one: "1個新消息"
+        other: "%{count}個新消息"
         zero: "沒有新消息"
     index: 
       and: "和"
-      and_others: "和其他 %{number} 個人"
+      and_others: "和其他%{number}個人"
       mark_all_as_read: "全部標示為已讀"
       notifications: "消息"
     mentioned: "提到了你, 在他們的"
@@ -279,6 +273,7 @@ zh-TW:
     diaspora: "diaspora 電郵機器人"
     hello: "%{name}你好!"
     love: "衷心祝福,"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "在貼文中提到你:"
       sign_in: "登入來看看."
@@ -306,9 +301,11 @@ zh-TW:
   password: "密碼"
   password_confirmation: "密碼確認"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "編輯所屬面向"
-    few: "%{count} 個聯絡人"
+    few: "%{count}個聯絡人"
     helper: 
       people_on_pod_are_aware_of: "Pod 上已知的人"
       results_for: "%{params} 的搜尋結果"
@@ -317,9 +314,9 @@ zh-TW:
       no_one_found: "...找不到任何東西."
       no_results: "嘿! 搜尋要有目標."
       results_for: "搜尋結果:"
-    many: "%{count} 個聯絡人"
-    one: "一個聯絡人"
-    other: "%{count} 個聯絡人"
+    many: "%{count}個聯絡人"
+    one: "1個聯絡人"
+    other: "%{count}個聯絡人"
     person: 
       add_contact: "加入聯繫"
       already_connected: "已建立連結"
@@ -368,8 +365,8 @@ zh-TW:
       post_it: "發表!"
     new_photo: 
       empty: "檔案 {file} 是空的, 請重新挑選檔案, 且不要再選它."
-      invalid_ext: "檔案 {file} 的副檔名不合格. 只接受 {extensions}."
-      size_error: "檔案 {file} 太大了, 上限是 {sizeLimit}."
+      invalid_ext: "檔案 {file} 的副檔名不合格. 只接受{extensions}."
+      size_error: "檔案 {file} 太大了, 上限是{sizeLimit}."
     new_profile_photo: 
       or_select_one: "或從既有相片中挑選一張"
       upload: "上傳新的個人照!"
@@ -406,13 +403,13 @@ zh-TW:
       your_photo: "你的相片"
       your_private_profile: "你的私人檔案"
       your_public_profile: "你的公開檔案"
-      your_tags: "你: 可以有 5 個\"#標籤\""
+      your_tags: "你: 可以有5個\"#標籤\""
       your_tags_placeholder: "像是: #diaspora #燙髮 #貓咪 #音樂"
     update: 
       failed: "個人檔案更新失敗"
       updated: "個人檔案已更新"
   registrations: 
-    closed: "此 Diaspora pod 不開放登記."
+    closed: "本 Diaspora pod 不開放登記."
     create: 
       success: "你已經加入 Diaspora 了!"
     edit: 
@@ -439,10 +436,10 @@ zh-TW:
       success: "你們現在是朋友了."
     helper: 
       new_requests: 
-        few: "%{count} 個新請求!"
-        many: "%{count} 個新請求!"
+        few: "%{count}個新請求!"
+        many: "%{count}個新請求!"
         one: "新的請求!"
-        other: "%{count} 個新請求!"
+        other: "%{count}個新請求!"
         zero: "沒有新請求"
     manage_aspect_contacts: 
       existing: "聯繫編輯"
@@ -459,10 +456,10 @@ zh-TW:
       error: "與該服務連結時有錯誤"
     finder: 
       friends: 
-        few: "%{count} 個朋友"
-        many: "%{count} 個朋友"
-        one: "一個朋友"
-        other: "%{count} 個朋友"
+        few: "%{count}個朋友"
+        many: "%{count}個朋友"
+        one: "1個朋友"
+        other: "%{count}個朋友"
         zero: "沒有朋友"
       invite_your_friends_from: "邀請你在 %{service} 的朋友"
       not_connected: "未連結"
@@ -491,16 +488,16 @@ zh-TW:
       all_contacts: "全部聯繫"
       cannot_remove: "無法將聯絡人從他/她最後一個面向中移除. (如果你想跟這個人斷絕連結, 你必須刪除他/她的聯繫.)"
     invitations: 
-      by_email: "by Email"
+      by_email: "透過電子郵件"
       dont_have_now: "目前你還不能邀請任何人, 但很快就可以了!"
-      from_facebook: "From Facebook"
-      invitations_left: "(剩餘 %{count} 張)"
+      from_facebook: "從 Facebook"
+      invitations_left: "(剩餘%{count}張)"
       invite_someone: "邀請某人來"
       invite_your_friends: "邀請你的朋友來"
       invites: "邀請"
       invites_closed: "目前本 Diaspora pod 不開放邀請功能"
     notification: 
-      new: "%{from} 有新的 %{type}"
+      new: "%{from} 有新的%{type}"
     public_explain: 
       logged_in: "已登入至 %{service}"
       manage: "管理已連線的服務"
@@ -514,6 +511,7 @@ zh-TW:
       mention_helper_text: "想提到某人的話, 先敲 '@' 再接著打他們的名字"
       post_a_message_to: "在 %{aspect} 發表訊息"
       posting: "發表中..."
+      public: "Public"
       publishing_to: "發表至: "
       share: "分享"
       share_with: "與他/她分享:"
@@ -534,6 +532,7 @@ zh-TW:
       mentioning: "提及發表中: %{person}"
     show: 
       destroy: "刪除"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "靜態連結"
   stream_helper: 
     hide_comments: "隱藏意見"
diff --git a/config/locales/diaspora/zh.yml b/config/locales/diaspora/zh.yml
index 50f6b02664..135edb8d22 100644
--- a/config/locales/diaspora/zh.yml
+++ b/config/locales/diaspora/zh.yml
@@ -98,12 +98,6 @@ zh:
     new_aspect: 
       create: "创建"
       name: "名称"
-    no_contacts_message: 
-      add_contact: "增加一个联系人"
-      add_contact_to: "把某人加入%{aspect_name}这个分组"
-      invite: "邀请人们加入Diaspora!"
-      nobody: "Bring the people that matter in your life to Diaspora!"
-      nobody_in_aspect: "您的'%{aspect_name}'是个空白分组。"
     no_posts_message: 
       start_talking: "还没人冒泡，说点什么吧！"
     one: "1 aspect"
@@ -279,6 +273,7 @@ zh:
     diaspora: "diaspora email机器人"
     hello: "你好%{name}！"
     love: "爱，"
+    manage_your_email_settings: "manage your email settings"
     mentioned: 
       mentioned: "mentioned you in a post:"
       sign_in: "Sign in to view it."
@@ -306,6 +301,8 @@ zh:
   password: "密码"
   password_confirmation: "密码确认"
   people: 
+    add_contact_small: 
+      add_contact_from_tag: "add contact from tag"
     aspect_list: 
       edit_membership: "edit aspect membership"
     few: "%{count} people"
@@ -514,6 +511,7 @@ zh:
       mention_helper_text: "to mention someone, press '@' and start typing their name"
       post_a_message_to: "发送信息给%{aspect}这个分组的所有人"
       posting: "发布中"
+      public: "Public"
       publishing_to: "publishing to: "
       share: "分享"
       share_with: "和%{aspect}这个分组中的人分享"
@@ -534,6 +532,7 @@ zh:
       mentioning: "Mentioning: %{person}"
     show: 
       destroy: "删除"
+      not_found: "Sorry, we couldn't find that post."
       permalink: "永久链接"
   stream_helper: 
     hide_comments: "隐藏评论"
diff --git a/config/locales/javascript/javascript.zh-TW.yml b/config/locales/javascript/javascript.zh-TW.yml
index 35ae676625..8c887dd792 100644
--- a/config/locales/javascript/javascript.zh-TW.yml
+++ b/config/locales/javascript/javascript.zh-TW.yml
@@ -14,20 +14,20 @@ zh-TW:
         cannot_remove: "無法將人從它最後一個面向移除. (如果你想和這個人切斷連結, 你必須刪除和它的聯繫.)"
     timeago: 
       day: "一天"
-      days: "%d 天"
+      days: "%d天"
       hour: "約一小時"
-      hours: "約 %d 小時"
+      hours: "約%d小時"
       minute: "約一分鐘"
-      minutes: "%d 分鐘"
+      minutes: "%d分鐘"
       month: "約一個月"
-      months: "%d 個月"
+      months: "%d個月"
       prefixAgo: "在"
       prefixFromNow: "距今"
       seconds: "少於一分鐘"
       suffixAgo: "前"
       suffixFromNow: "前"
       year: "約一年"
-      years: "%d å¹´"
+      years: "%då¹´"
     videos: 
       unknown: "不明的影片類別"
       watch: "從 {{provider}} 看這部影片"
diff --git a/config/locales/rails-i18n/nb.yml b/config/locales/rails-i18n/nb.yml
index c154c81494..395361aecd 100644
--- a/config/locales/rails-i18n/nb.yml
+++ b/config/locales/rails-i18n/nb.yml
@@ -1,4 +1,8 @@
-# Norwegian, norsk bokmål, by irb.no
+# Norwegian, norsk bokmål
+# by irb.no
+# contributors:
+# - Kim Joar Bekkelund - http://kimjoar.net
+
 nb:
   support:
     array:
@@ -71,24 +75,27 @@ nb:
       minute: "Minutt"
       second: "Sekund"
   number:
-    format:
+    format: &number_format
       precision: 2
-      separator: "."
-      delimiter: ","
+      separator: ","
+      delimiter: " "
+      significant: false
+      strip_insignificant_zeros: true
     currency:
       format:
-        separator: "."
-        delimiter: ","
-        precision: 2
         unit: "kr"
         format: "%n %u"
+        <<: *number_format
     precision:
       format:
         delimiter: ""
     human:
       format:
         precision: 1
-        delimiter: ","
+        separator: ","
+        delimiter: " "
+        significant: false
+        strip_insignificant_zeros: true
       storage_units:
         # Storage units output formatting.
         # %u is the storage unit, %n is the number (default: 2 MB)
@@ -97,44 +104,77 @@ nb:
           byte:
             one:   "Byte"
             other: "Bytes"
-          kb: "KB"
+          kb: "kB"
           mb: "MB"
           gb: "GB"
           tb: "TB"
+      decimal_units:
+        format: "%n %u"
+        units:
+          unit: ""
+          thousand: "tusen"
+          million:
+            one: "million"
+            other: "millioner"
+          billion:
+            one: "milliard"
+            other: "milliarder"
+          trillion:
+            one: "billion"
+            other: "billioner"
+          quadrillion:
+            one: "billiard"
+            other: "billiarder"
+
     percentage:
       format:
-        delimiter: ""        
+        delimiter: ""
+
+  helpers:
+    select:
+      prompt: "Vennligst velg"
+
+    submit:
+      create: "Lag %{model}"
+      update: "Oppdater %{model}"
+      submit: "Lagre %{model}"
 
-  activemodel:
+  errors:
+    format: "%{attribute} %{message}"
+
+    messages: &errors_messages
+      inclusion: "er ikke inkludert i listen"
+      exclusion: "er reservert"
+      invalid: "er ugyldig"
+      confirmation: "passer ikke bekreftelsen"
+      accepted: "må være akseptert"
+      empty: "kan ikke være tom"
+      blank: "kan ikke være blank"
+      too_long: "er for lang (maksimum %{count} tegn)"
+      too_short: "er for kort (minimum %{count} tegn)"
+      wrong_length: "er av feil lengde (maksimum %{count} tegn)"
+      not_a_number: "er ikke et tall"
+      not_an_integer: "er ikke et heltall"
+      greater_than: "må være større enn %{count}"
+      greater_than_or_equal_to: "må være større enn eller lik %{count}"
+      equal_to: "må være lik %{count}"
+      less_than: "må være mindre enn %{count}"
+      less_than_or_equal_to: "må være mindre enn eller lik %{count}"
+      odd: "må være oddetall"
+      even: "må være partall"
+
+  activerecord:
     errors:
       template:
         header:
           one:   "Kunne ikke lagre %{model} på grunn av én feil."
           other: "Kunne ikke lagre %{model} på grunn av %{count} feil."
         body: "Det oppstod problemer i følgende felt:"
-                      
-  activerecord:
-    errors:
+
       messages:
-        inclusion: "er ikke inkludert i listen"
-        exclusion: "er reservert"
-        invalid: "er ugyldig"
-        confirmation: "passer ikke bekreftelsen"
-        accepted: "må være akseptert"
-        empty: "kan ikke være tom"
-        blank: "kan ikke være blank"
-        too_long: "er for lang (maksimum %{count} tegn)"
-        too_short: "er for kort (minimum %{count} tegn)"
-        wrong_length: "er av feil lengde (maksimum %{count} tegn)"
         taken: "er allerede i bruk"
-        not_a_number: "er ikke et tall"
-        greater_than: "må være større enn %{count}"
-        greater_than_or_equal_to: "må være større enn eller lik %{count}"
-        equal_to: "må være lik %{count}"
-        less_than: "må være mindre enn %{count}"
-        less_than_or_equal_to: "må være mindre enn eller lik %{count}"
-        odd: "må være oddetall"
-        even: "må være partall"
         record_invalid: "Det oppstod feil: %{errors}"
-      # models:
-      # attributes:
+        <<: *errors_messages
+
+      full_messages:
+        format: "%{attribute}%{message}"
-- 
GitLab