diff --git a/.gitignore b/.gitignore
index 5fa4f1592..8b60753a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ db/*.sqlite3
 .redcar
 
 # Temporary files of every sort
+.sass-cache/*
 .DS_Store
 .idea
 .rvmrc
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index dbe6098ac..9d969fcdf 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -22,7 +22,15 @@ module NotificationsHelper
       else
         t('notifications.also_commented_deleted')
       end
-    else #Notifications:StartedSharing, Notifications::Liked, etc.
+    elsif note.instance_of?(Notifications::Liked)
+      post = note.target
+      post = post.post if post.is_a? Like
+      if post
+        "#{translation(target_type, post.author.name)} #{link_to t('notifications.post'), object_path(post), 'data-ref' => post.id, :class => 'hard_object_link'}".html_safe
+      else
+        t('notifications.liked_post_deleted')
+      end
+    else #Notifications:StartedSharing, etc.
       translation(target_type)
     end
   end
@@ -41,11 +49,20 @@ module NotificationsHelper
   def notification_people_link(note)
     actors = note.actors
     number_of_actors = actors.count
-    actor_links = actors.collect{ |person| link_to("#{h(person.name.titlecase)}", person_path(person))}
+    sentence_translations = {:two_words_connector => " #{t('notifications.index.and')} ", :last_word_connector => ", #{t('notifications.index.and')} " }
+    actor_links = actors.collect{ |person| link_to("#{h(person.name.titlecase.strip)}", person_path(person))}
+    
     if number_of_actors < 4
-      message =  actor_links.join(', ')
+      message = actor_links.to_sentence(sentence_translations)
     else
-      message  = actor_links[0..2].join(', ') << "<a class='more' href='#'> #{t('.and_others', :number =>(number_of_actors - 3))}</a><span class='hidden'>, " << actor_links[3..(number_of_actors-2)].join(', ')<< " #{t('.and')} "<< actor_links.last << '</span>'
+      first, second, third, *others = actor_links
+      others_sentence = others.to_sentence(sentence_translations)
+      if others.count == 1
+        others_sentence = " #{t('notifications.index.and')} " + others_sentence
+      end
+      message = "#{first}, #{second}, #{third},"
+      message += "<a class='more' href='#'> #{t('notifications.index.and_others', :number =>(number_of_actors - 3))}</a>"
+      message += "<span class='hidden'> #{others_sentence} </span>"
     end
     message.html_safe
   end
diff --git a/app/views/sessions/new.mobile.haml b/app/views/sessions/new.mobile.haml
index d41ebe310..4869f5072 100644
--- a/app/views/sessions/new.mobile.haml
+++ b/app/views/sessions/new.mobile.haml
@@ -2,21 +2,20 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
-  #user
-    %p.username
+#login_form
+  = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+    %div{:data => {:role => 'fieldcontain'}}
       = f.label :username , t('username')
       = f.text_field :username
-    %p.user_network
-      ="@#{AppConfig[:pod_uri].host}"
-
-    %p
+      %p.user_network
+        ="@#{AppConfig[:pod_uri].host}"
+    
       = f.label :password , t('password')
       = f.password_field :password
-  = f.submit t('devise.sessions.new.sign_in')
-  - if devise_mapping.rememberable?
-    = f.check_box :remember_me
-    = f.label :remember_me, t('devise.sessions.new.remember_me')
+    = f.submit t('devise.sessions.new.sign_in')
+    - if devise_mapping.rememberable?
+      = f.check_box :remember_me
+      = f.label :remember_me, t('devise.sessions.new.remember_me')
 
-%p
-  = render :partial => "devise/shared/links"
+  %p
+    = render :partial => "devise/shared/links"
diff --git a/app/views/shared/_stream_element.mobile.haml b/app/views/shared/_stream_element.mobile.haml
index 9229cd2f1..beef700e7 100644
--- a/app/views/shared/_stream_element.mobile.haml
+++ b/app/views/shared/_stream_element.mobile.haml
@@ -23,6 +23,7 @@
 
       - if post.activity_streams?
         = link_to "#{t('comments', :count => post.comments.length)} →", activity_streams_photo_path(post), :class => 'comment_link right'
+        %br
       - else
         = link_to "#{t('comments', :count => post.comments.length)} →", status_message_path(post), :class => 'comment_link right'
 
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index caea5953b..d6ccca8c7 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -12,7 +12,7 @@ de:
       send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto bestätigst."
     failure: 
       inactive: "Dein Konto wurde noch nicht aktiviert."
-      invalid: "Ungültige E-Mail-Adresse oder Kennwort."
+      invalid: "Ungültiger Benutzername oder ungültiges Kennwort."
       invalid_token: "Ungültiger Authentifizierungstoken."
       locked: "Dein Konto ist gesperrt."
       timeout: "Deine Sitzung ist abgelaufen! Um fortzufahren, melde dich bitte erneut an."
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 354a12f2f..16ac57e94 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -207,6 +207,7 @@ ar:
       already_contacts: "لقد قمت بإنشاء اتصال مع هذا العضو مسبقا"
       already_sent: "لقد قمت بدعوة هذا الشخص مسبقا"
       no_more: "لم يتبقى لك أية دعوات"
+      own_address: "You can't send an invitation to your own address."
       rejected: "واجه هذا البريد الإلكتروني مشاكلا:  "
       sent: "تم إرسال دعوتك"
     edit: 
@@ -273,6 +274,7 @@ ar:
       mark_all_as_read: "وضع الجميع كمقروء"
       notifications: "تنبيهات"
     liked: "أعجبه منشورك:"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "قام بذكرك في"
     new_request: "عرض المشاركة معك"
     post: "منشور"
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index f1cb270dc..aacc317c6 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -207,6 +207,7 @@ bg:
       already_contacts: "Вече сте свързани с тава лице"
       already_sent: "Вече сте свързани с тава лице."
       no_more: "Не разполагате с повече покани."
+      own_address: "You can't send an invitation to your own address."
       rejected: "The following email addresses had problems: "
       sent: "Покани са изпратени до: "
     edit: 
@@ -273,6 +274,7 @@ bg:
       mark_all_as_read: "Маркиране на всички като прочетени"
       notifications: "Известия"
     liked: "току-що хареса ваша публикация."
+    liked_post_deleted: "liked your deleted post."
     mentioned: "ви спомена в"
     new_request: "ви предложи да споделяте."
     post: "публикация."
@@ -513,7 +515,7 @@ bg:
       by_email: "по ел. поща"
       dont_have_now: "За момента не разполагате с покани, но скоро ще имате!"
       from_facebook: "от Facebook"
-      invitations_left: "(остават още %{count} покани)"
+      invitations_left: "(имате %{count} покани)"
       invite_someone: "Поканете някого"
       invite_your_friends: "Поканете приятелите си"
       invites: "Покани"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 46c4f33f2..91989218e 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -207,6 +207,7 @@ br:
       already_contacts: "You are already connected with this person"
       already_sent: "You already invited this person."
       no_more: "You have no more invitations."
+      own_address: "You can't send an invitation to your own address."
       rejected: "The following email addresses had problems: "
       sent: "Invitations have been sent to: "
     edit: 
@@ -273,6 +274,7 @@ br:
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "en deus meneget ac'hanoc'h e-barzh ur skrid"
     new_request: "offered to share with you."
     post: "post"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 9f9dfc0f9..8359a3547 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -43,13 +43,13 @@ cs:
   are_you_sure: "Jste si jist?"
   aspect_memberships: 
     aspect_dropdown: 
-      add_to_aspect: "přidat k aspektu"
+      add_to_aspect: "Přidat do aspektu"
       toggle: 
-        few: "v %{count} aspektech"
-        many: "v %{count} aspektech"
-        one: "v %{count} aspektech"
-        other: "v %{count} aspektech"
-        zero: "přidat k aspektu"
+        few: "V %{count} aspektech"
+        many: "Ve %{count} aspektech"
+        one: "V %{count} aspektu"
+        other: "V %{count} aspektech"
+        zero: "Přidat do aspektu"
     destroy: 
       failure: "Nepodařilo se odstranit osobu z aspektu"
       no_membership: "Nelze najít vybrané osoby v tomto aspektu"
@@ -207,6 +207,7 @@ cs:
       already_contacts: "Jste již propojen s touto osobou"
       already_sent: "Již jste pozval tuto osobu."
       no_more: "Nemáte žádné další pozvánky."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Následující emailové adresy mají problémy: "
       sent: "Pozvánky byly poslány pro:"
     edit: 
@@ -273,6 +274,7 @@ cs:
       mark_all_as_read: "Označit vše jako přečtené"
       notifications: "Oznámení"
     liked: "si právě oblíbil váš příspěvek"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "vás zmínil v příspěvku"
     new_request: "nabídnul vám sdílení."
     post: "zpráva"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index a43a9cf9f..9eeb12d14 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -207,6 +207,7 @@ cy:
       already_contacts: "You are already connected with this person"
       already_sent: "You already invited this person."
       no_more: "You have no more invitations."
+      own_address: "You can't send an invitation to your own address."
       rejected: "The following email addresses had problems: "
       sent: "Your invitation has been sent."
     edit: 
@@ -273,6 +274,7 @@ cy:
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 5588745de..c4137dd06 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -207,6 +207,7 @@ da:
       already_contacts: "Du er allerede forbundet med denne person"
       already_sent: "Du har allerede inviteret denne person."
       no_more: "Du har ikke flere invitationer."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Der var problemer med de følgende e-mail adresser: "
       sent: "Din invitation er blevet sendt til:"
     edit: 
@@ -273,6 +274,7 @@ da:
       mark_all_as_read: "Marker alle som læst"
       notifications: "Notifikationer"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "har omtalt dig i deres"
     new_request: "tilbød at dele med dig."
     post: "indlæg"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 843db66c2..d9e11aa23 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -207,6 +207,7 @@ de:
       already_contacts: "Du bist bereits mit dieser Person verbunden"
       already_sent: "Du hast diese Person bereits eingeladen."
       no_more: "Du hast keine Einladungen mehr."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Mit dieser E-Mail-Adresse gab es Probleme:"
       sent: "Einladungen wurden verschickt an:"
     edit: 
@@ -273,6 +274,7 @@ de:
       mark_all_as_read: "Markiere alle als gelesen"
       notifications: "Benachrichtigungen"
     liked: "gefällt dein Beitrag"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "hat dich erwähnt in einem"
     new_request: "hat angeboten mit dir zu teilen."
     post: "Beitrag"
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index 8e09b0617..c6e4e5a61 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -43,13 +43,13 @@ el:
   are_you_sure: "Είστε σίγουρος/η;"
   aspect_memberships: 
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "Προσθήκη σε πτυχή"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "Σε %{count} πτυχές"
+        many: "Σε %{count} πτυχές"
+        one: "Σε %{count} πτυχές"
+        other: "Σε %{count} πτυχές"
+        zero: "Προσθήκη σε πτυχή"
     destroy: 
       failure: "Αποτυχία στην αφαίρεση προσώπου από την πτυχή"
       no_membership: "Δεν βρέθηκε το επιλεγμένο άτομο σε αυτή την πτυχή"
@@ -123,8 +123,8 @@ el:
     zero: "καμία πτυχή"
   back: "Πίσω"
   bookmarklet: 
-    explanation: "%{link} από οπουδήποτε προσθέτοντας αυτόν τον σύνδεσμο."
-    explanation_link_text: "Δημοσιεύστε στο Diaspora"
+    explanation: "Δημοσιεύστε στο Diaspora από οπουδήποτε προσθέτοντας αυτόν τον σύνδεσμο %{link}."
+    explanation_link_text: "αυτός ο σύνδεσμος"
     post_something: "Δημοσιεύστε κάτι στο Diaspora"
     post_success: "Δημοσιεύτηκε! Κλείνει!"
   cancel: "Ακύρωση"
@@ -207,6 +207,7 @@ el:
       already_contacts: "Είστε ήδη συνδεδεμένος με αυτό το άτομο"
       already_sent: "Έχετε ήδη προσκαλέσει αυτό το άτομο."
       no_more: "Δεν έχετε άλλες προσκλήσεις."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Οι παρακάτω διευθύνσεις ηλεκτρονικού ταχυδρομείου είχαν προβλήματα:"
       sent: "Η πρόσκλησή σας έχει σταλεί στο:"
     edit: 
@@ -231,7 +232,7 @@ el:
       whats_new: "Τι νέα?"
       your_aspects: "οι πτυχές σας"
     header: 
-      admin: "admin"
+      admin: "διαχειριστής"
       blog: "blog"
       code: "κώδικας"
       login: "Είσοδος"
@@ -273,6 +274,7 @@ el:
       mark_all_as_read: "Σήμανση όλων ως διαβασμένα"
       notifications: "Ειδοποιήσεις"
     liked: "μόλις του/της άρεσε η δημοσίευση σας"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "σας ανέφερε σε"
     new_request: "προσφέρθηκε να μοιραστεί μαζί σας."
     post: "δημοσίευση."
@@ -510,12 +512,12 @@ el:
       logged_in_as: "συνδεδεμένος/η ως %{name}"
       your_aspects: "οι πτυχές σας"
     invitations: 
-      by_email: "με ηλεκτρονικό ταχυδρομείο"
+      by_email: "Μέσω ηλεκτρονικού ταχυδρομείου"
       dont_have_now: "Δεν έχετε κάποιο δικαίωμα τώρα, αλλά περισσότερες προσκλήσεις έρχονται σύντομα!"
       from_facebook: "Από το Facebook"
-      invitations_left: "(απομένουν %{count})"
+      invitations_left: "απομένουν %{count}"
       invite_someone: "Προσκαλέστε κάποιον/α"
-      invite_your_friends: "Προσκαλέστε τους φίλους σας"
+      invite_your_friends: "Προσκαλέστε φίλους"
       invites: "Προσκλήσεις"
       invites_closed: "Οι προσκλήσεις είναι κλειστές αυτή την περίοδο στο Diaspora pod"
     notification: 
@@ -544,7 +546,7 @@ el:
       dislike: "Δεν μ' αρέσει"
       like: "Μου αρέσει"
       unlike: "Δεν μου αρέσει"
-      via: "via %{link}"
+      via: "μέσω %{link}"
   status_messages: 
     create: 
       success: "Αναφέρθηκαν επιτυχώς: %{names}"
@@ -559,11 +561,11 @@ el:
       not_found: "Συγνώμη, δεν μπορέσαμε να βρούμε αυτή τη δημοσίευση."
       permalink: "permalink"
     too_long: 
-      few: "please make your status messages less than %{count} characters"
+      few: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες"
       many: "παρακαλώ ελαττώστε την κατάσταση σας σε λιγότερο από %{count} χαρακτήρες"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+      one: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερο από %{count} χαρακτήρα"
+      other: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες"
+      zero: "παρακαλώ μετατρέψτε τα μηνύματα κατάστασης σας σε λιγότερους από %{count} χαρακτήρες"
   stream_helper: 
     hide_comments: "απόκρυψη σχολίων"
     show_comments: "προβολή όλων των σχολίων"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index dc3b552d7..d13edc067 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -295,10 +295,11 @@ en:
     comment_on_post: "commented on your"
     also_commented: "also commented on %{post_author}'s"
     mentioned: "has mentioned you in a "
-    liked: "has just liked your post"
+    liked: "has just liked your"
     post: "post."
     deleted: "deleted"
     also_commented_deleted: "commented on a deleted post."
+    liked_post_deleted: "liked your deleted post."
     index:
       notifications: "Notifications"
       mark_all_as_read: "Mark All as Read"
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index 52b89fad2..ea975aecd 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -207,6 +207,7 @@ en_shaw:
       already_contacts: "𐑿 𐑣𐑨𐑝 𐑷𐑤𐑮𐑧𐑛𐑦 𐑒𐑩𐑯𐑧𐑒𐑑𐑩𐑛 𐑢𐑦𐑞 𐑞𐑦𐑕 𐑐𐑻𐑕𐑩𐑯"
       already_sent: "𐑿 𐑷𐑤𐑮𐑧𐑛𐑦 𐑦𐑯𐑝𐑲𐑑𐑩𐑛 𐑞𐑦𐑕 𐑐𐑻𐑕𐑩𐑯."
       no_more: "𐑿 𐑣𐑨𐑝 𐑯𐑴 𐑥𐑹 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯𐑟."
+      own_address: "You can't send an invitation to your own address."
       rejected: "𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕 𐑣𐑨𐑛 𐑐𐑮𐑪𐑚𐑤𐑩𐑥𐑟: "
       sent: "𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯𐑟 𐑣𐑨𐑝 𐑚𐑧𐑯 𐑕𐑧𐑯𐑑 𐑑: "
     edit: 
@@ -273,6 +274,7 @@ en_shaw:
       mark_all_as_read: "𐑥𐑸𐑒 𐑷𐑤 𐑨𐑟 𐑮𐑧𐑛"
       notifications: "𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩"
     new_request: "𐑪𐑓𐑼𐑛 𐑑 𐑖𐑺 𐑢𐑦𐑞 𐑿."
     post: "𐑐𐑴𐑕𐑑"
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index 1294650ec..b407b6e5a 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -207,6 +207,7 @@ eo:
       already_contacts: "You are already connected with this person"
       already_sent: "You already invited this person."
       no_more: "You have no more invitations."
+      own_address: "You can't send an invitation to your own address."
       rejected: "The following email addresses had problems: "
       sent: "Invitations have been sent to: "
     edit: 
@@ -273,6 +274,7 @@ eo:
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index 2d559669b..31d733761 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -43,13 +43,13 @@ es-CL:
   are_you_sure: "¿Estás seguro?"
   aspect_memberships: 
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "Agregar al aspecto"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "En %{count} aspectos"
+        many: "En %{count} aspectos"
+        one: "En %{count} aspecto"
+        other: "En %{count} aspectos"
+        zero: "Agregar al aspecto"
     destroy: 
       failure: "No se pudo eliminar a la persona del Aspecto"
       no_membership: "No se pudo encontrar la persona seleccionada en ese Aspecto"
@@ -207,6 +207,7 @@ es-CL:
       already_contacts: "Ya estás conectado con esta persona"
       already_sent: "Ya has invitado a esta persona."
       no_more: "No tienes más invitaciones."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Las siguientes direcciones de correo han tenido problemas:"
       sent: "Las invitaciones han sido enviadas a:"
     edit: 
@@ -231,7 +232,7 @@ es-CL:
       whats_new: "¿Qué hay de nuevo?"
       your_aspects: "Tus Aspectos"
     header: 
-      admin: "admin"
+      admin: "administrar"
       blog: "blog"
       code: "codigo"
       login: "entrar"
@@ -273,6 +274,7 @@ es-CL:
       mark_all_as_read: "Marcar todo como leido"
       notifications: "Notificaciones"
     liked: "le gustó tu post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "te mencionó en un"
     new_request: "quiere compartir contigo."
     post: "post."
@@ -345,7 +347,7 @@ es-CL:
       gender: "sexo"
       in_aspects: "en aspectos"
       location: "Ubicación"
-      remove_contact: "remove contact"
+      remove_contact: "eliminar contacto"
       remove_from: "¿Eliminar a %{name} de %{aspect}?"
     show: 
       add_some: "agrega algunas"
@@ -513,7 +515,7 @@ es-CL:
       by_email: "Por email"
       dont_have_now: "No tienes ninguna ahora, ¡pero pronto vendrán mas invitaciones!"
       from_facebook: "Desde Facebook"
-      invitations_left: "(quedan %{count})"
+      invitations_left: "quedan %{count}"
       invite_someone: "Invita a alguien"
       invite_your_friends: "Invita a tus amigos"
       invites: "Invitaciones"
@@ -559,11 +561,11 @@ es-CL:
       not_found: "Perdón, no pudimos encontrar ese post."
       permalink: "permalink"
     too_long: 
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+      few: "Tu mensaje de estado debe tener menos de %{count} caracteres"
+      many: "Tu mensaje de estado debe tener menos de %{count} caracteres"
+      one: "Tu mensaje de estado debe tener menos de %{count} caracter"
+      other: "Tu mensaje de estado debe tener menos de %{count} caracteres"
+      zero: "Tu mensaje de estado debe tener menos de %{count} caracteres"
   stream_helper: 
     hide_comments: "ocultar comentarios"
     show_comments: "mostrar todos los comentarios"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index f31edebd9..ece211cfc 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -43,13 +43,13 @@ es:
   are_you_sure: "¿Estás seguro?"
   aspect_memberships: 
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "Añadir al aspecto"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "En %{count} aspectos"
+        many: "En %{count} aspectos"
+        one: "En %{count} aspecto"
+        other: "En %{count} aspectos"
+        zero: "Añadir al aspecto"
     destroy: 
       failure: "No se pudo eliminar a la persona del aspecto"
       no_membership: "No se pudo encontrar a la persona seleccionada en ese aspecto"
@@ -207,6 +207,7 @@ es:
       already_contacts: "Ya estás conectado con esa persona"
       already_sent: "Ya has invitado a esa persona."
       no_more: "No tienes más invitaciones."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Las siguientes direcciones de correo han tendido problemas:"
       sent: "Invitaciones enviadas a:"
     edit: 
@@ -231,7 +232,7 @@ es:
       whats_new: "Novedades en Diaspora*"
       your_aspects: "tus aspectos"
     header: 
-      admin: "admin"
+      admin: "administrar"
       blog: "Blog"
       code: "Código"
       login: "Conectarse"
@@ -273,6 +274,7 @@ es:
       mark_all_as_read: "Marcar todo como leído"
       notifications: "Notificaciones"
     liked: "le gustó tu publicación"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "te mencionó en una"
     new_request: "quisiera compartir contigo."
     post: "publicación."
@@ -345,7 +347,7 @@ es:
       gender: "Género / Sexo"
       in_aspects: "en aspectos"
       location: "Ubicación "
-      remove_contact: "remove contact"
+      remove_contact: "eliminar contacto"
       remove_from: "¿Eliminar a %{name} de %{aspect}?"
     show: 
       add_some: "agrega algunos"
@@ -513,7 +515,7 @@ es:
       by_email: "vía Email"
       dont_have_now: "No tienes invitaciones ahora mismo pero, ¡pronto llegarán más!"
       from_facebook: "Desde Facebook"
-      invitations_left: "(%{count} restantes)"
+      invitations_left: "%{count} restantes"
       invite_someone: "Invita a alguien"
       invite_your_friends: "Invita a tus amigos"
       invites: "Invitaciones"
@@ -559,11 +561,11 @@ es:
       not_found: "Lo sentimos, no pudimos encontrar esa publicación."
       permalink: "Enlace permanente"
     too_long: 
-      few: "please make your status messages less than %{count} characters"
-      many: "please make your status messages less than %{count} characters"
-      one: "please make your status messages less than %{count} character"
-      other: "please make your status messages less than %{count} characters"
-      zero: "please make your status messages less than %{count} characters"
+      few: "Tu mensaje de estado debe tener menos de %{count} caracteres"
+      many: "Tu mensaje de estado debe tener menos de %{count} caracteres"
+      one: "Tu mensaje de estado debe tener menos de %{count} caracter"
+      other: "Tu mensaje de estado debe tener menos de %{count} caracteres"
+      zero: "Tu mensaje de estado debe tener menos de %{count} caracteres"
   stream_helper: 
     hide_comments: "Ocultar comentarios"
     show_comments: "Mostrar comentarios"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index f820909d3..d0f6643c8 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -207,6 +207,7 @@ eu:
       already_contacts: "Pertsona honekin harremanetan zaude jadanik"
       already_sent: "Pertsona hau gonbidatu duzu jada."
       no_more: "Ez daukazu gonbidapen gehiago."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Hurrengo e-posta hauek arazoak sortu dituzte:"
       sent: "Gonbidapenen jasotzaileak hauek izan dira:"
     edit: 
@@ -273,6 +274,7 @@ eu:
       mark_all_as_read: "Guztiak irakurrita"
       notifications: "Jakinarazpenak"
     liked: "(e)k zure mezua gustoko du"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "(e)k zu aipatu zaitu hemen:"
     new_request: "(e)k zurekin partekatu nahi du."
     post: "mezua."
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index e27502315..abab5c2df 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -207,6 +207,7 @@ fi:
       already_contacts: "Olet jo yhteydessä tähän henkilöön"
       already_sent: "Olet jo kutsunut tämän henkilön."
       no_more: "Sinulla ei ole enempää kutsuja."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Seuraavissa sähköpostiosoitteissa oli ongelmia: "
       sent: "Kutsut on lähetetty seuraaviin osoitteisiin:"
     edit: 
@@ -273,6 +274,7 @@ fi:
       mark_all_as_read: "Merkitse kaikki luetuiksi"
       notifications: "Ilmoitukset"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "on maininnut sinut "
     new_request: "haluaa jakaa kanssasi."
     post: "viesti."
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index fd8621c51..e88b5e752 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -43,13 +43,13 @@ fr:
   are_you_sure: "Êtes-vous certains?"
   aspect_memberships: 
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "Ajouter à l'aspect"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "Dans %{count} aspects"
+        many: "Dans %{count} aspects"
+        one: "Dans %{count} aspect"
+        other: "Dans %{count} aspects"
+        zero: "Ajouter à l'aspect"
     destroy: 
       failure: "Impossible de retirer la personne de l'aspect"
       no_membership: "Impossible de trouver la personne sélectionnée dans cet aspect"
@@ -123,8 +123,8 @@ fr:
     zero: "aucun aspect"
   back: "Retour"
   bookmarklet: 
-    explanation: "%{link} depuis n'importe où en ajoutant ce bookmarklet à vos marque-pages ou favoris."
-    explanation_link_text: "Publier sur Diaspora"
+    explanation: "Publier sur Diaspora depuis n'importe où en ajoutant %{link} à vos marque-pages."
+    explanation_link_text: "ce lien"
     post_something: "Publier quelque chose sur Diaspora"
     post_success: "Publié ! Fermeture !"
   cancel: "Annuler"
@@ -207,6 +207,7 @@ fr:
       already_contacts: "Vous avez déjà établi une connexion avec cette personne"
       already_sent: "Vous avez déjà invité cette personne."
       no_more: "Vous n’avez plus d’invitation."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Les adresses de courrier électronique suivantes ont rencontré des problèmes :"
       sent: "Les invitations ont été envoyées à :"
     edit: 
@@ -273,6 +274,7 @@ fr:
       mark_all_as_read: "Tout marquer comme lu"
       notifications: "Notifications"
     liked: "vient juste d'aimer votre message"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "vous a mentionné(e) dans un"
     new_request: "a proposé de partager avec vous."
     post: "message."
@@ -510,10 +512,10 @@ fr:
       logged_in_as: "Connecté en tant que %{name}"
       your_aspects: "vos aspects"
     invitations: 
-      by_email: "par courriel"
+      by_email: "Par courriel"
       dont_have_now: "Vous n'en avez aucune pour l'instant, mais d'autres invitations arriveront bientôt !"
       from_facebook: "depuis Facebook"
-      invitations_left: "(il vous en reste %{count})"
+      invitations_left: "il vous en reste %{count}"
       invite_someone: "Inviter quelqu'un"
       invite_your_friends: "Invitez vos amis"
       invites: "Invitations"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index 9b67b83f1..b6cd3cf62 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -207,6 +207,7 @@ ga:
       already_contacts: "Tá tú cheanna féin ceangailte leis an duine seo"
       already_sent: "Cheana féin sheol tú cuireadh chuig an duine seo."
       no_more: "Níl aon cuiridh eile agat."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Bhí fadbhanna ag na seolaí ríomhphost seo: "
       sent: "Tá cuiridh seola chuigh: "
     edit: 
@@ -273,6 +274,7 @@ ga:
       mark_all_as_read: "Mark All as Read"
       notifications: "Fograí"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "has mentioned you in their"
     new_request: "ofráiladh chun roint leant"
     post: "póst"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 0d17c05af..5dbc9b42e 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -207,6 +207,7 @@ he:
       already_contacts: "כבר יש לך קשר עם אדם זה"
       already_sent: "כבר הזמנת אדם זה."
       no_more: "אין לך עוד הזמנות."
+      own_address: "You can't send an invitation to your own address."
       rejected: "בכתובת הדוא״ל הבאה התגלו שגיאות:"
       sent: "נשלחו הזמנות אל:"
     edit: 
@@ -273,6 +274,7 @@ he:
       mark_all_as_read: "סימון הכול כלאחר קריאה"
       notifications: "התרעות"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "הזכיר/ה אותך ב"
     new_request: "הציע/ה לשתף אתך."
     post: "רשומה."
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 7405fdb94..c88669a2c 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -207,6 +207,7 @@ hu:
       already_contacts: "Már ismerősöd ez a személy"
       already_sent: "Már meghívtad ezt a személyt."
       no_more: "Nincs több felkérésed."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Az alábbi e-mail címmel voltak problémák:"
       sent: "Meghívók elküldve ide:"
     edit: 
@@ -273,6 +274,7 @@ hu:
       mark_all_as_read: "Mind megjelölése olvasottként"
       notifications: "Értesítések"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "megemlített téged egy"
     new_request: "megosztást ajánlott neked."
     post: "bejegyzésben."
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index a78a7c903..bb879d0ba 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -207,6 +207,7 @@ id:
       already_contacts: "You are already connected with this person"
       already_sent: "You already invited this person."
       no_more: "You have no more invitations."
+      own_address: "You can't send an invitation to your own address."
       rejected: "The following email addresses had problems: "
       sent: "Your invitation has been sent."
     edit: 
@@ -273,6 +274,7 @@ id:
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index b5caa166d..a6f0a9efb 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -207,6 +207,7 @@ is:
       already_contacts: "Þú tengist þessari manneskju nú þegar"
       already_sent: "Þessari manneskju hefur þegar verið boðið."
       no_more: "Ekki eru til fleiri boðsmiðar."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Eftirfarandi netföng ollu vandræðum: "
       sent: "Boðsmiðar hafa verið sendir til:"
     edit: 
@@ -273,6 +274,7 @@ is:
       mark_all_as_read: "Merkja allt sem lesið"
       notifications: "Tilkynningar"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "hefur getið þín í þeirra"
     new_request: "bauð þér samnýtingu."
     post: "setja inn"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 298bd435c..d993358cf 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -207,6 +207,7 @@ it:
       already_contacts: "Sei già connessa con questa persona"
       already_sent: "Hai già invitato questa persona."
       no_more: "Non hai più inviti a disposizione"
+      own_address: "You can't send an invitation to your own address."
       rejected: "Questi indirizzi email hanno dei problemi:"
       sent: "Il tuoi inviti sono stati inviati a:"
     edit: 
@@ -273,6 +274,7 @@ it:
       mark_all_as_read: "Segna Tutti come Letti"
       notifications: "Notifiche"
     liked: "ha appena apprezzato il tuo post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "ti ha menzionato in un "
     new_request: "vuole condividere con te."
     post: "post."
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 8a2fa31df..b5f4ff937 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -207,6 +207,7 @@ ja:
       already_contacts: "既に連絡先として登録しています。"
       already_sent: "既に招待しました。"
       no_more: "招待権がもう残っていません。"
+      own_address: "You can't send an invitation to your own address."
       rejected: "次のメールアドレスに問題が発生しました："
       sent: "次の人々に招待を送信しました："
     edit: 
@@ -273,6 +274,7 @@ ja:
       mark_all_as_read: "全件を既読にする"
       notifications: "通知"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "さんはあなたをメンションしました。"
     new_request: "さんは共有の許可を求めました。"
     post: "（投稿で）"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 9e799a300..09639d6ac 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -43,13 +43,13 @@ ko:
   are_you_sure: "확실합니까?"
   aspect_memberships: 
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "애스펙에 넣기"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "애스펙 %{count}개 안에 있어요"
+        many: "애스펙 %{count}개 안에 있어요"
+        one: "애스펙 한 개 안에 있어요"
+        other: "애스펙 %{count}개 안에 있어요"
+        zero: "애스펙에 넣기"
     destroy: 
       failure: "애스펙에서 지우지 못했습니다"
       no_membership: "애스펙에서 찾을 수 없는 사람입니다"
@@ -207,6 +207,7 @@ ko:
       already_contacts: "이미 컨택인 사람입니다."
       already_sent: "이미 초대한 사람입니다."
       no_more: "가진 초대장 이 없습니다."
+      own_address: "You can't send an invitation to your own address."
       rejected: "아래의 이메일 주소는 문제가 있습니다: "
       sent: "초대장이 보내진 이메일 주소: "
     edit: 
@@ -273,6 +274,7 @@ ko:
       mark_all_as_read: "모두 읽음으로 표시"
       notifications: "알림"
     liked: "님이 내 공유물을 좋아합니다"
+    liked_post_deleted: "liked your deleted post."
     mentioned: " 님이 나를 멘션했습니다:"
     new_request: " 님이 나와 공유를 시작했습니다."
     post: "공유물"
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index c6dab9899..de93b4334 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -207,6 +207,7 @@ lt:
       already_contacts: "You are already connected with this person"
       already_sent: "You already invited this person."
       no_more: "Daugiau pakvietimų neturi."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Šie el. pašto adresai neveikė: "
       sent: "Pakvietimas išsiųstas."
     edit: 
@@ -273,6 +274,7 @@ lt:
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 398bcf70f..8dcd92896 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -207,6 +207,7 @@ mk:
       already_contacts: "You are already connected with this person"
       already_sent: "You already invited this person."
       no_more: "Немате повеќе покани."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Следните е-маил адреси имаа проблем:"
       sent: "Поканите беа испратени кон:"
     edit: 
@@ -273,6 +274,7 @@ mk:
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 25cd2082e..036930a98 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -207,6 +207,7 @@ nb:
       already_contacts: "Du er allerede tilknyttet denne personen"
       already_sent: "Du har allerede invitert denne personen."
       no_more: "Du har ikke flere invitasjoner."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Følgende e-postadresser hadde problemer:"
       sent: "Invitasjoner har blitt sendt til:"
     edit: 
@@ -273,6 +274,7 @@ nb:
       mark_all_as_read: "Merk alle som leste"
       notifications: "Varsler"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "har nevnt deg i sin"
     new_request: "spør om å få dele med deg."
     post: "innlegg"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index f2bd43b2e..8d46c971e 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -207,6 +207,7 @@ nl:
       already_contacts: "Je bent al verbonden met deze persoon"
       already_sent: "Je hebt deze persoon al uitgenodigd."
       no_more: "Je hebt geen uitnodigingen meer."
+      own_address: "You can't send an invitation to your own address."
       rejected: "De volgende e-mailadressen gaven problemen: "
       sent: "Uitnodigingen zijn verzonden aan:"
     edit: 
@@ -273,6 +274,7 @@ nl:
       mark_all_as_read: "Markeer alles gelezen"
       notifications: "Notificaties"
     liked: "vind je post leuk"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "heeft je genoemd in een"
     new_request: "bood aan om met jou te delen."
     post: "post."
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 03e016b95..6dc2b35de 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -207,6 +207,7 @@ pa:
       already_contacts: "You are already connected with this person"
       already_sent: "You already invited this person."
       no_more: "You have no more invitations."
+      own_address: "You can't send an invitation to your own address."
       rejected: "The following email addresses had problems: "
       sent: "Invitations have been sent to: "
     edit: 
@@ -273,6 +274,7 @@ pa:
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "ਪੋਸਟ"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 4e33c2765..5a0d211bd 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -207,6 +207,7 @@ pl:
       already_contacts: "{m,f:Jesteś już|n:Połączono już}{ }{m,f:połączon}{m:y|f:a} z tą osobą."
       already_sent: "Już zapros@{m:iłeś|f:iłaś|n:zono} tę osobę."
       no_more: "Nie masz więcej zaproszeń."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Poniższy adres e-mail okazał się problematyczny:"
       sent: "Zaproszenia zostały wysłane do:"
     edit: 
@@ -273,6 +274,7 @@ pl:
       mark_all_as_read: "Oznacz wszystkie jako przeczytane"
       notifications: "Powiadomienia"
     liked: "polubił twój wpis"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "wspomniał o tobie we wpisie"
     new_request: "chce zostać twoim znajomym."
     post: "wpis."
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index f0890048d..fecc61085 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -207,6 +207,7 @@ pt-BR:
       already_contacts: "Você já está conectado com essa pessoa."
       already_sent: "Você já convidou essa pessoa."
       no_more: "Você não possui mais convites."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Emails com problemas: "
       sent: "Convites foram enviados para:"
     edit: 
@@ -273,6 +274,7 @@ pt-BR:
       mark_all_as_read: "Marcar Tudo como Lido"
       notifications: "Notificações"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "has mentioned you in their"
     new_request: "deseja partilhar com você."
     post: "post"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 0befc584f..c3d71e1fc 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -43,13 +43,13 @@ pt-PT:
   are_you_sure: "Tem a certeza?"
   aspect_memberships: 
     aspect_dropdown: 
-      add_to_aspect: "Add to aspect"
+      add_to_aspect: "Adicionar ao aspecto"
       toggle: 
-        few: "In %{count} aspects"
-        many: "In %{count} aspects"
-        one: "In %{count} aspect"
-        other: "In %{count} aspects"
-        zero: "Add to aspect"
+        few: "Em %{count} aspectos"
+        many: "Em %{count} aspectos"
+        one: "Em %{count} aspecto"
+        other: "Em %{count} aspectos"
+        zero: "Adicionar ao aspecto"
     destroy: 
       failure: "Erro ao remover a pessoa do aspecto"
       no_membership: "A pessoa seleccionada não foi encontrada neste aspecto"
@@ -123,8 +123,8 @@ pt-PT:
     zero: "não há aspectos"
   back: "Voltar"
   bookmarklet: 
-    explanation: "%{link} de qualquer lado ao adicionar esta hiperligação como marcador."
-    explanation_link_text: "Publicar no Diaspora"
+    explanation: "Publique no Diaspora de qualquer lado ao adicionar %{link} como marcador."
+    explanation_link_text: "esta hiperligação"
     post_something: "Publique qualquer coisa no Diaspora"
     post_success: "Publicado! A fechar!"
   cancel: "Cancelar"
@@ -207,6 +207,7 @@ pt-PT:
       already_contacts: "Já está ligado a esta pessoa"
       already_sent: "Já convidou esta pessoa."
       no_more: "Não tem mais convites."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Os seguintes endereços de email tiveram problemas: "
       sent: "Os convites foram enviados a:"
     edit: 
@@ -273,6 +274,7 @@ pt-PT:
       mark_all_as_read: "Marcar Tudo como Lido"
       notifications: "Notificações"
     liked: "gostou da sua publicação"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "mencionou-o numa"
     new_request: "deseja partilhar consigo."
     post: "publicação."
@@ -510,10 +512,10 @@ pt-PT:
       logged_in_as: "iniciou sessão como %{name}"
       your_aspects: "os seus aspectos"
     invitations: 
-      by_email: "por email"
+      by_email: "Por Email"
       dont_have_now: "Não tem nenhum agora, mas terá mais convites brevemente!"
       from_facebook: "do Facebook"
-      invitations_left: "(faltam %{count})"
+      invitations_left: "ainda tem %{count}"
       invite_someone: "Convidar alguém"
       invite_your_friends: "Convide os seus amigos"
       invites: "Convites"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 1d6a1ccb3..a17d5d14b 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -207,6 +207,7 @@ ro:
       already_contacts: "Eşti deja conectat cu această persoană"
       already_sent: "Ai invitat deja această persoană."
       no_more: "Nu mai dispui de invitaţii."
+      own_address: "You can't send an invitation to your own address."
       rejected: "The following email addresses had problems: "
       sent: "Invitaţia dvs. a fost trimisă."
     edit: 
@@ -273,6 +274,7 @@ ro:
       mark_all_as_read: "Marchează-le pe toate ca citite"
       notifications: "Notificări"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 9b91a4844..d9659a3fa 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -207,6 +207,7 @@ ru:
       already_contacts: "Вы уже связаны с этим человеком"
       already_sent: "Вы уже пригласили этого человека."
       no_more: "У вас закончились приглашения."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Следующие адреса электронной почты имеют проблемы:"
       sent: "Ваши приглашения отправлены:"
     edit: 
@@ -273,6 +274,7 @@ ru:
       mark_all_as_read: "Отметить все как прочитанные"
       notifications: "Уведомления"
     liked: "понравилось Ваше сообщение"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "упомянул вас в"
     new_request: "предлагает поделиться с вами."
     post: "сообщение."
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index cb55fde97..016b385ab 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -207,6 +207,7 @@ sk:
       already_contacts: "S touto osobou ste už spojený."
       already_sent: "Túto osobu ste už pozvali."
       no_more: "Nemáte žiadné nové pozvania."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Problém s nasledujúcimi adresami: "
       sent: "Vaše pozvanie bolo odoslané."
     edit: 
@@ -273,6 +274,7 @@ sk:
       mark_all_as_read: "Všetko označiť ako prečítané"
       notifications: "Notifikácie"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "ťa spomenuli v ich"
     new_request: "offered to share with you."
     post: "príspevok"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index ce2a77d95..64978b07d 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -207,6 +207,7 @@ sl:
       already_contacts: "S to osebo ste že povezani"
       already_sent: "To osebo ste že povabili."
       no_more: "Nimate več povabil."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Naslednji e-naslovi imajo težave z dostavo povabila: "
       sent: "Povabila so bila poslana naslednjim: "
     edit: 
@@ -273,6 +274,7 @@ sl:
       mark_all_as_read: "Označi vse kot prebrano"
       notifications: "Sporočila"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "bili ste omenjeni v objavi"
     new_request: "nekdo želi deliti z vami."
     post: "prispevek"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 9252fb768..42594bc05 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -207,6 +207,7 @@ sv:
       already_contacts: "Du är redan ansluten med denna personen"
       already_sent: "Du har redan bjudit in denna personen."
       no_more: "Du har inga fler inbjudningar."
+      own_address: "You can't send an invitation to your own address."
       rejected: "Det var problem med följande e-postadresser: "
       sent: "Inbjudningar har skickats till:"
     edit: 
@@ -273,6 +274,7 @@ sv:
       mark_all_as_read: "Markera alla som läst"
       notifications: "Notifieringar"
     liked: "har precis gillat ditt inlägg"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "har nämnt dig i sitt"
     new_request: "erbjöd sig att dela med dig."
     post: "inlägg."
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index 73cdeb3ee..18acd0526 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -207,6 +207,7 @@ tr:
       already_contacts: "You are already connected with this person"
       already_sent: "You already invited this person."
       no_more: "Başka davetiyeniz bulunmamaktadır."
+      own_address: "You can't send an invitation to your own address."
       rejected: "The following email addresses had problems: "
       sent: "Your invitation has been sent."
     edit: 
@@ -273,6 +274,7 @@ tr:
       mark_all_as_read: "Mark All as Read"
       notifications: "Notifications"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "has mentioned you in their"
     new_request: "offered to share with you."
     post: "post"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 5d51831f8..95902e1f2 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -207,6 +207,7 @@ zh-CN:
       already_contacts: "你已经将他加为好友了"
       already_sent: "你邀请过这个人了。"
       no_more: "你没有邀请函了。"
+      own_address: "You can't send an invitation to your own address."
       rejected: "下列电子信箱有问题: "
       sent: "邀请函已经寄给: "
     edit: 
@@ -273,6 +274,7 @@ zh-CN:
       mark_all_as_read: "全部标示为已读"
       notifications: "消息"
     liked: "has just liked your post"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "在他发布的内容中提到了你"
     new_request: "想要与您分享。"
     post: "日志。"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 1bbde05f1..76617dd6b 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -207,6 +207,7 @@ zh-TW:
       already_contacts: "你已經和這個人相連了"
       already_sent: "你邀請過這個人了."
       no_more: "你沒有邀請函了."
+      own_address: "You can't send an invitation to your own address."
       rejected: "下列電子信箱有問題: "
       sent: "邀請函已經寄給: "
     edit: 
@@ -273,6 +274,7 @@ zh-TW:
       mark_all_as_read: "全部標示為已讀"
       notifications: "消息"
     liked: "剛剛對你的貼文說讚"
+    liked_post_deleted: "liked your deleted post."
     mentioned: "在貼文中提到了你"
     new_request: "想要跟你分享."
     post: "貼文."
diff --git a/config/locales/javascript/javascript.el.yml b/config/locales/javascript/javascript.el.yml
index 88620446d..79d2c9b7c 100644
--- a/config/locales/javascript/javascript.el.yml
+++ b/config/locales/javascript/javascript.el.yml
@@ -17,7 +17,7 @@ el:
       hide: "Απόκρυψη σχολίων"
       show: "προβολή σχολίων"
     confirm_dialog: "Είστε σίγουρος/η;"
-    failed_to_like: "Failed to like!"
+    failed_to_like: "Αποτυχία!"
     failed_to_post_message: "Αποτυχία δημοσίευσης μηνύματος!"
     infinite_scroll: 
       no_more: "Δεν υπάρχουν άλλες δημοσιεύσεις."
diff --git a/public/stylesheets/sass/mobile.sass b/public/stylesheets/sass/mobile.sass
index fef7ddfc5..0776ad95c 100755
--- a/public/stylesheets/sass/mobile.sass
+++ b/public/stylesheets/sass/mobile.sass
@@ -26,7 +26,9 @@ a.ui-link-inherit
 
   .info_pane
     :text-align left
-
+#login_form
+  :padding 15px
+  :padding-top 0px
 
 #diaspora_description
   :background
diff --git a/spec/helpers/notifications_helper_spec.rb b/spec/helpers/notifications_helper_spec.rb
index 70bfc2e58..e60055808 100644
--- a/spec/helpers/notifications_helper_spec.rb
+++ b/spec/helpers/notifications_helper_spec.rb
@@ -2,20 +2,92 @@ require 'spec_helper'
 
 
 describe NotificationsHelper do
+  include ApplicationHelper
+  before do
+    @user = Factory(:user)
+    @person = Factory(:person)
+    @post = Factory(:status_message, :author => @user.person)
+    @person2 = Factory(:person)
+    @notification = Notification.notify(@user, Factory(:like, :author => @person, :post => @post), @person)
+    @notification =  Notification.notify(@user, Factory(:like, :author => @person2, :post => @post), @person2)
+    
+  end
   describe '#notification_people_link' do
+    context 'formatting' do
+      include ActionView::Helpers::SanitizeHelper
+      let(:output){ strip_tags(notification_people_link(@note)) }
+
+      before do
+        @max = Factory(:person)
+        @max.profile.first_name = 'max'
+        @max.profile.last_name = 'salzberg'
+        @sarah = Factory(:person)
+        @sarah.profile.first_name = 'sarah'
+        @sarah.profile.last_name = 'mei'
+
+
+        @daniel = Factory(:person)
+        @daniel.profile.first_name = 'daniel'
+        @daniel.profile.last_name = 'grippi'
+
+        @ilya = Factory(:person)
+        @ilya.profile.first_name = 'ilya'
+        @ilya.profile.last_name = 'zhit'
+        @note = mock()
+      end
+
+      it 'with two, does not comma seperate two actors' do
+        @note.stub!(:actors).and_return([@max, @sarah])
+        output.scan(/,/).should be_empty
+        output.scan(/and/).count.should be 1
+      end
+
+      it 'with three, comma seperates the first two, and and the last actor' do
+        @note.stub!(:actors).and_return([@max, @sarah, @daniel])
+        output.scan(/,/).count.should be 2
+        output.scan(/and/).count.should be 1
+      end
+
+      it 'with more than three, lists the first three, then the others tag' do
+        @note.stub!(:actors).and_return([@max, @sarah, @daniel, @ilya])
+        puts output
+        output.scan(/,/).count.should be 3
+        output.scan(/and/).count.should be 2
+      end
+    end
     describe 'for a like' do
       it 'displays #{list of actors}' do
-        @user = Factory(:user)
-        @person = Factory(:person)
-        p = Factory(:status_message, :author => @user.person)
-        person2 = Factory(:person)
-        notification = Notification.notify(@user, Factory(:like, :author => @person, :post => p), @person)
-        notification2 =  Notification.notify(@user, Factory(:like, :author => person2, :post => p), person2)
-        
-        output = notification_people_link(notification2)
-        output.should include person2.name
+        output = notification_people_link(@notification)
+        output.should include @person2.name
         output.should include @person.name
       end
     end
   end
+
+
+  describe '#object_link' do
+    describe 'for a like' do
+      it 'should include a link to the post' do
+        output = object_link(@notification)
+        output.should include status_message_path(@post)
+      end
+
+      it 'includes the boilerplate translation' do
+        output = object_link(@notification)
+        output.should include t("#{@notification.popup_translation_key}")
+      end
+
+      context 'when post is deleted' do
+        it 'works' do
+          @post.destroy
+          expect{ object_link(@notification)}.should_not raise_error
+        end
+
+        it 'displays that the post was deleted' do
+          @post.destroy
+          object_link(@notification).should == t('notifications.liked_post_deleted')
+        end
+      end
+    end
+  end
 end