diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index a8ef1c8b6097be625bac820294da54573ba9c4f1..c428c07352b0de23c87bb620f224cf0b222f0091 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -14,7 +14,7 @@ class CommentsController < ApplicationController
     text = params[:text]
 
     if target
-      @comment = current_user.build_comment(text, :on => target)
+      @comment = current_user.build_comment(:text => text, :on => target)
 
       if @comment.save
         Rails.logger.info("event=create type=comment user=#{current_user.diaspora_handle} status=success comment=#{@comment.id} chars=#{params[:text].length}")
diff --git a/app/controllers/likes_controller.rb b/app/controllers/likes_controller.rb
index fd8e77063ccd51e00a1702686d68e0652c1e3f6f..357c3b90eaa17d0addc4b061945558bd4918063c 100644
--- a/app/controllers/likes_controller.rb
+++ b/app/controllers/likes_controller.rb
@@ -12,7 +12,7 @@ class LikesController < ApplicationController
     target = current_user.find_visible_post_by_id params[:post_id]
     positive = (params[:positive] == 'true') ? true : false
     if target
-      @like = current_user.build_like(positive, :on => target)
+      @like = current_user.build_like(:positive => positive, :on => target)
 
       if @like.save
         Rails.logger.info("event=create type=like user=#{current_user.diaspora_handle} status=success like=#{@like.id} positive=#{positive}")
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index 45779f3c33e1b99549bf74c6cee31b6ca906fb60..9f0863713bc68007e1749759a509f96d915c6609 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -26,13 +26,15 @@ class PeopleController < ApplicationController
       end
 
       format.all do
-        @people = Person.search(params[:q], current_user).paginate :page => params[:page], :per_page => limit
-        @hashes = hashes_for_people(@people, @aspects)
-
         #only do it if it is an email address
         if params[:q].try(:match, Devise.email_regexp)
           webfinger(params[:q])
+          people = Person.where(:diaspora_handle => params[:q])
+        else
+          people = Person.search(params[:q], current_user)
         end
+        @people = people.paginate :page => params[:page], :per_page => limit
+        @hashes = hashes_for_people(@people, @aspects)
       end
     end
   end
diff --git a/app/helpers/markdownify_helper.rb b/app/helpers/markdownify_helper.rb
index 4e024437531015fcb5a104c2adb85405a1ce63ba..587a50ad1bd04d8ba4a9b13e1cf32987c1e3ba22 100644
--- a/app/helpers/markdownify_helper.rb
+++ b/app/helpers/markdownify_helper.rb
@@ -70,7 +70,7 @@ module MarkdownifyHelper
       captures = [$1,$2,$3]
       if !captures[0].nil?
         m
-      elsif m.match(/(youtube|vimeo)/)
+      elsif m.match(/(youtu.?be|vimeo)/)
         m.gsub(/(\*|_)/) { |m| "\\#{$1}" } #remove markers on markdown chars to not markdown inside links
       else
         res = %{<a target="_blank" href="#{captures[1]}://#{captures[2]}">#{captures[2]}</a>}
diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index c42a0defd5a5aa31dd4a2eb967f02cba4b90bd91..175ed92b00fd28092a65b57ac02ca123234fc595 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -43,8 +43,8 @@ module SocketsHelper
           :person => object,
           :all_aspects => user.aspects,
           :contact => user.contact_for(object),
-          :request => user.request_from(object),
           :current_user => user}
+        @all_aspects = user.aspects
         v = render_to_string(:partial => 'people/person', :locals => person_hash)
 
       elsif object.is_a? Comment
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 08ec011e765e1e3fbc8e602d44a7ccdbc79b1c45..e3084553fca0b93dfbc7df9a8cbcec33a01d18c7 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -25,7 +25,6 @@ class Comment < ActiveRecord::Base
 
   serialize :youtube_titles, Hash
   before_save do
-    get_youtube_title text
     self.text.strip! unless self.text.nil?
   end
   def diaspora_handle
diff --git a/app/models/message.rb b/app/models/message.rb
index abebfc04d461f01906bcf5c1cfe3122040c9e462..1f79ad6a468cfd918eb47ede28b1b0021107f98f 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -63,7 +63,7 @@ class Message < ActiveRecord::Base
       vis.save
       self
     else
-      raise NotVisibileException("Attempting to access a ConversationVisibility that does not exist!")
+      raise NotVisibleException("Attempting to access a ConversationVisibility that does not exist!")
     end
   end
 
diff --git a/app/models/request.rb b/app/models/request.rb
index 775d79361d5229d24f2ffbc339a5521ffc414a29..af97fc7eaff71c7a9598868820369e9a85ad5a1e 100644
--- a/app/models/request.rb
+++ b/app/models/request.rb
@@ -71,7 +71,7 @@ class Request
   private
 
   def not_already_connected
-    if sender && recipient && Contact.where(:user_id => self.recipient.owner_id, :person_id => self.sender.id).count > 0
+    if sender && recipient && Contact.where(:user_id => self.recipient.owner_id, :person_id => self.sender.id).exists?
       errors[:base] << 'You have already connected to this person'
     end
   end
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index 462b6acbe49a12073a78a9975794b3ad2f2ef959..3fb1f9b7faa2baf9b29f79e0a6f2792b49630618 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -23,9 +23,6 @@ class StatusMessage < Post
   attr_accessible :text
 
   serialize :youtube_titles, Hash
-  before_save do
-    get_youtube_title text
-  end
 
   before_create :build_tags
 
diff --git a/app/models/user.rb b/app/models/user.rb
index e7b352c75cdd7fa297895a04995de78b020218c8..82534c1e42f1fbae71479bb2d0030048e38c7c71 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -153,38 +153,30 @@ class User < ActiveRecord::Base
     Salmon::SalmonSlap.create(self, post.to_diaspora_xml)
   end
 
-  ######## Commenting  ########
-  def build_comment(text, options = {})
-    comment = Comment.new(:author_id => self.person.id,
-                          :text => text,
-                          :post => options[:on])
-    comment.set_guid
-    #sign comment as commenter
-    comment.author_signature = comment.sign_with_key(self.encryption_key)
-
-    if !comment.post_id.blank? && person.owns?(comment.parent)
-      #sign comment as post owner
-      comment.parent_author_signature = comment.sign_with_key(self.encryption_key)
+  def build_relayable(model, options = {})
+    options[:post] = options.delete(:on)
+    m = model.new(options.merge(:author_id => self.person.id))
+    m.set_guid
+
+    #sign relayable as model creator
+    m.author_signature = m.sign_with_key(self.encryption_key)
+
+    if !m.post_id.blank? && person.owns?(m.parent)
+      #sign relayable as parent object owner
+      m.parent_author_signature = m.sign_with_key(self.encryption_key)
     end
 
-    comment
+    m
   end
 
-  ######## Liking  ########
-  def build_like(positive, options = {})
-    like = Like.new(:author_id => self.person.id,
-                    :positive => positive,
-                    :post => options[:on])
-    like.set_guid
-    #sign like as liker
-    like.author_signature = like.sign_with_key(self.encryption_key)
-
-    if !like.post_id.blank? && person.owns?(like.parent)
-      #sign like as post owner
-      like.parent_author_signature = like.sign_with_key(self.encryption_key)
-    end
+  ######## Commenting  ########
+  def build_comment(options = {})
+    build_relayable(Comment, options)
+  end
 
-    like
+  ######## Liking  ########
+  def build_like(options = {})
+    build_relayable(Like, options)
   end
 
   def liked?(post)
@@ -194,7 +186,7 @@ class User < ActiveRecord::Base
       return false
     end
   end
-  
+
   def like_for(post)
     [post.likes, post.dislikes].each do |likes|
       likes.each do |like|
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index 8edff42d07a5221e2ce5b64b7ab3c898bfeb9609..3ae8858e9c45fb595578f42e5a18afa0747a42f3 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -24,7 +24,7 @@
     .title
       = image_tag('/images/icons/bookmark.png')
       %h5
-        Diaspora Bookmarklet
+        = t('bookmarklet.heading')
     .content
       != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.explanation_link_text'), bookmarklet))
 
@@ -32,10 +32,10 @@
     .title
       = image_tag('/images/icons/cubbies.png')
       %h5
-        Connect to Cubbi.es
+        = t('.cubbies.heading')
     .content
-      Cubbi.es is the first Diaspora application under development.
-      = link_to "Learn more", token_path
+      = t('.cubbies.explanation')
+      = link_to t('.cubbies.learn_more'), token_path
 
   - if @invites > 0
     .section
diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml
index ca7394783cd26d9d3b7d9405db7857e422f3b416..5f73d7cb8c362522de3c32ee65b7609fce3354c2 100644
--- a/app/views/aspects/manage.html.haml
+++ b/app/views/aspects/manage.html.haml
@@ -17,8 +17,8 @@
 
 #manage_aspect_zones
   .span-24.last
-    - for aspect in @aspects
-      .aspect.span-9{:data=>{:guid => aspect.id}}
+    - @aspects.each_with_index do |aspect, i|
+      .aspect.span-12{:data => {:guid => aspect.id}, :class => (i+1) % 2 == 0 ? "last" : nil}
         .aspect_name
           %span.edit_name_field
             %h3{:contenteditable=>true, :ondragenter=>"return false;", :ondragleave=>"return false;", :ondragover=>"return false;", :ondrop=>"return false;"}
diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index 1dd3aaa2882df33424e3b0b22c6082b8efb8215e..5e777f4da6f5cbdeb346dda44932c5a5bc8c6387 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/app/views/comments/_new_comment.html.haml
@@ -3,7 +3,7 @@
 -#   the COPYRIGHT file.
 
 = form_tag( comments_path, :id => "new_comment_on_#{post_id}", :class => 'new_comment', :remote => true) do
-  = person_image_tag(current_user, nil)
+  = person_image_tag(current_user)
   %p
     = label_tag "comment_text_on_#{post_id}", t('.comment')
     = text_area_tag :text, nil, :rows => 2, :class => "comment_box",:id => "comment_text_on_#{post_id}"
diff --git a/app/views/conversations/_show.haml b/app/views/conversations/_show.haml
index ff1797a323af0551484594dc1b53b1b461c4fff4..5c45327e85fc8a7ad9d6a3ead7a0698bfeac4dd7 100644
--- a/app/views/conversations/_show.haml
+++ b/app/views/conversations/_show.haml
@@ -27,7 +27,7 @@
     = render :partial => 'messages/message', :collection => conversation.messages
 
     .stream_element.new_message
-      = owner_image_tag
+      = owner_image_tag(:thumb_small)
 
       .content
         = form_for [conversation, Message.new] do |message|
diff --git a/app/views/people/_person.html.haml b/app/views/people/_person.html.haml
index 362c019350e2c39706b953652cfc2e4027feafee..b01b479dff1986ab31ace48bc3829d5ecee99b65 100644
--- a/app/views/people/_person.html.haml
+++ b/app/views/people/_person.html.haml
@@ -6,7 +6,7 @@
   .right
     = render :partial => 'people/relationship_action',
              :locals => { :person => person, :contact => contact,
-                          :request => request, :current_user => current_user }
+                          :current_user => current_user }
 
   = person_image_link(person)
 
diff --git a/config/locales/devise/devise.ar.yml b/config/locales/devise/devise.ar.yml
index da6c3bf25f6dde3aa53e967297aac56cf35e771c..53da33b2a61f6345507b369d2ff784ccfb64174c 100644
--- a/config/locales/devise/devise.ar.yml
+++ b/config/locales/devise/devise.ar.yml
@@ -29,10 +29,10 @@ ar:
         you_can_confirm: "يمكنك تأكيد حسابك عبر الرابط التالي"
       hello: "مرحبا %{email}!"
       invitation_instructions: 
-        accept: "Accept invitation"
-        ignore: "If you don't want to accept the invitation, please ignore this email."
-        no_account_till: "Your account won't be created until you access the link above and sign up."
-        subject: "You've been invited to join Diaspora!"
+        accept: "إقبل الدعوة"
+        ignore: "رجاء تجاهل هذا البريد الإلكتروني في حال لم ترغب بقبول الدعوة"
+        no_account_till: "لن يتم إنشاء حسابك حتى تلج الرابط أعلاه وتسجل"
+        subject: "تم دعوتك للإنضمام لدياسبرا"
       inviters: 
         accept_at: ", at %{url}, يمكنك قبولها عبر الرابط التالي."
         has_invited_you: "%{name} يدعوك للإنضمام إلى دياسبرا"
diff --git a/config/locales/devise/devise.bg.yml b/config/locales/devise/devise.bg.yml
index 648db692a2356dd638cc223bba22947fbfb59f53..e236d6fa381e857d09ac6755d5776594352824cc 100644
--- a/config/locales/devise/devise.bg.yml
+++ b/config/locales/devise/devise.bg.yml
@@ -84,7 +84,7 @@ bg:
         sign_up: "Регистриране"
         sign_up_closed: "За сега регистрациите не са възможни."
       mail_signup_form: 
-        sign_up_for_an_invite: "Запишете се за покана!"
+        sign_up_for_an_invite: "Резервирайте си покана!"
     unlocks: 
       new: 
         resend_unlock: "Повторно изпращане на инструкциите за отключване"
diff --git a/config/locales/devise/devise.en_shaw.yml b/config/locales/devise/devise.en_shaw.yml
index f1108fe63e5017d3f5136c591906f1871bdc0fd7..9db2ed2c6a8817354b3ec3cf0e8e25bed5e62112 100644
--- a/config/locales/devise/devise.en_shaw.yml
+++ b/config/locales/devise/devise.en_shaw.yml
@@ -29,10 +29,10 @@ en_shaw:
         you_can_confirm: "𐑿 𐑒𐑨𐑯 𐑒𐑩𐑯𐑓𐑻𐑥 𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑔𐑮𐑵 𐑞 𐑤𐑦𐑙𐑒 𐑚𐑦𐑤𐑴:"
       hello: "𐑣𐑧𐑤𐑴 %{email}!"
       invitation_instructions: 
-        accept: "Accept invitation"
-        ignore: "If you don't want to accept the invitation, please ignore this email."
-        no_account_till: "Your account won't be created until you access the link above and sign up."
-        subject: "You've been invited to join Diaspora!"
+        accept: "𐑩𐑒𐑕𐑧𐑐𐑑 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯"
+        ignore: "𐑦𐑓 𐑿 𐑛𐑴𐑯𐑑 𐑢𐑳𐑯𐑑 𐑑 𐑩𐑒𐑕𐑧𐑐𐑑 𐑞 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯, 𐑐𐑤𐑰𐑟 𐑦𐑜𐑯𐑹 𐑞𐑦𐑕 𐑦-𐑥𐑱𐑤."
+        no_account_till: "𐑿𐑼 𐑩𐑒𐑬𐑯𐑑 𐑢𐑴𐑯𐑑 𐑚𐑰 𐑒𐑮𐑦𐑱𐑑𐑩𐑛 𐑩𐑯𐑑𐑦𐑤 𐑿 𐑨𐑒𐑕𐑧𐑕 𐑞 𐑤𐑦𐑙𐑒 𐑩𐑚𐑳𐑝 𐑯 𐑕𐑲𐑯 𐑳𐑐."
+        subject: "𐑿𐑝 𐑚𐑧𐑯 𐑦𐑯𐑝𐑲𐑑𐑩𐑛 𐑑 𐑡𐑶𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩!"
       inviters: 
         accept_at: ", 𐑨𐑑 %{url}, 𐑿 𐑒𐑨𐑯 𐑩𐑒𐑕𐑧𐑐𐑑 𐑦𐑑 𐑔𐑮𐑵 𐑔 𐑤𐑦𐑙𐑒 𐑚𐑦𐑤𐑴."
         has_invited_you: "%{name} 𐑣𐑨𐑟 𐑦𐑥𐑝𐑲𐑑𐑩𐑛 𐑿 𐑑 𐑡𐑶𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index 1b684200febca9eb7fd1b95d21deaf0bc9256cdc..f45ef618686acd076dcf3732655ac9bb1807e29b 100644
--- a/config/locales/diaspora/ar.yml
+++ b/config/locales/diaspora/ar.yml
@@ -43,13 +43,13 @@ ar:
   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: "لم يتم إيجاد العضو المحدد في هذه الفئة"
@@ -89,9 +89,13 @@ ar:
       aspect_not_empty: "الفئة ليست فارغة"
       remove: "حذف"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "هذا وسيط دياسبرا. مثل البريد الالكتروني, يمكنك منحه للأصدقاء حتى تستطيع التواصل معهم"
       no_contacts: "لا أعضاء"
-      people_sharing_with_you: "People sharing with you"
+      people_sharing_with_you: "أعضاء يتشاركون معك"
       post_a_message: "انشر رسالة >>"
     manage: 
       add_a_new_aspect: "أضف فئة جديدة"
@@ -106,8 +110,8 @@ ar:
       failure: "لم يعمل %{inspect}"
       success: "تم تحريك عضو إلى الفئة الجديدة"
     new: 
-      create: "Create"
-      name: "Name"
+      create: "أنشئ"
+      name: "إسم"
     no_posts_message: 
       start_talking: "لم تنشر أي رسالة بعد، إبدأ المحادثة"
     one: "فئة"
@@ -125,6 +129,7 @@ ar:
   bookmarklet: 
     explanation: "%{link} من أي مكان بحفظ هذا الرابط في المفضلة"
     explanation_link_text: "انشر على دياسبرا"
+    heading: "Diaspora Bookmarklet"
     post_something: "انشر شيئا على دياسبرا"
     post_success: "تم النشر, إغلاق"
   cancel: "إلغاء"
@@ -145,7 +150,7 @@ ar:
     one: "1 عضو"
     other: "%{count} أعضاء"
     sharing: 
-      people_sharing: "People sharing with you:"
+      people_sharing: "أعضاء يتشاركون معك:"
     zero: "لا يوجد أعضاء"
   conversations: 
     create: 
@@ -207,7 +212,7 @@ ar:
       already_contacts: "لقد قمت بإنشاء اتصال مع هذا العضو مسبقا"
       already_sent: "لقد قمت بدعوة هذا الشخص مسبقا"
       no_more: "لم يتبقى لك أية دعوات"
-      own_address: "You can't send an invitation to your own address."
+      own_address: "لا تستطيع إرسال دعوة لعنوانك الخاص"
       rejected: "واجه هذا البريد الإلكتروني مشاكلا:  "
       sent: "تم إرسال دعوتك"
     edit: 
@@ -227,7 +232,7 @@ ar:
     application: 
       have_a_problem: "واجهت مشكلة؟ اعثر على حل هنا"
       powered_by: "بدعم DIASPORA*"
-      public_feed: "فيد دياسبرا العام لـ for %{name}"
+      public_feed: "فيد دياسبرا العام لـ %{name}"
       toggle: "التحول إلى الموقع الخاص بالهواتف المحمولة"
       whats_new: "ما الجديد؟"
       your_aspects: "فئاتك"
@@ -258,23 +263,23 @@ ar:
   no_results: "لا نتائج موجودة"
   notifications: 
     also_commented: 
-      few: "%{actors} also commented on %{post_author}'s %{post_link}."
-      many: "%{actors} also commented on %{post_author}'s %{post_link}."
-      one: "%{actors} also commented on %{post_author}'s %{post_link}."
-      other: "%{actors} also commented on %{post_author}'s %{post_link}."
-      zero: "%{actors} also commented on %{post_author}'s %{post_link}."
+      few: "%{actors} علق أيضا على %{post_link} %{post_author}."
+      many: "%{actors} علق أيضا على %{post_link} %{post_author}."
+      one: "%{actors} علق أيضا على %{post_link} %{post_author}."
+      other: "%{actors} علق أيضا على %{post_link} %{post_author}."
+      zero: "%{actors} علق أيضا على %{post_link} %{post_author}."
     also_commented_deleted: 
-      few: "%{actors} commented on a deleted post."
-      many: "%{actors} commented on a deleted post."
-      one: "%{actors} commented on a deleted post."
-      other: "%{actors} commented on a deleted post."
-      zero: "%{actors} commented on a deleted post."
+      few: "%{actors} علقوا على المنشور المحذوف."
+      many: "%{actors} علقوا على المنشور المحذوف."
+      one: "%{actors} علق على المنشور المحذوف."
+      other: "%{actors} علقوا على المنشور المحذوف."
+      zero: "%{actors} علق على المنشور المحذوف."
     comment_on_post: 
-      few: "%{actors} commented on your %{post_link}."
-      many: "%{actors} commented on your %{post_link}."
-      one: "%{actors} commented on your %{post_link}."
-      other: "%{actors} commented on your %{post_link}."
-      zero: "%{actors} commented on your %{post_link}."
+      few: "%{actors} علقوا على %{post_link}."
+      many: "%{actors} علقوا على %{post_link}."
+      one: "%{actors} علق على %{post_link}."
+      other: "%{actors} علقوا على %{post_link}."
+      zero: "%{actors} علق على %{post_link}."
     helper: 
       new_notifications: 
         few: "%{count} تنبيهات جديدة"
@@ -285,50 +290,50 @@ ar:
     index: 
       and: "Ùˆ"
       and_others: 
-        few: "and %{count} others"
-        many: "and %{count} others"
-        one: "and one more"
-        other: "and %{count} others"
-        zero: "and nobody else"
+        few: "و %{count} آخرون"
+        many: "و %{count} آخرون"
+        one: "و آخر"
+        other: "و %{count} آخرون"
+        zero: "و لا أحد"
       mark_all_as_read: "وضع الجميع كمقروء"
       notifications: "تنبيهات"
     liked: 
-      few: "%{actors} has just liked your %{post_link}."
-      many: "%{actors} has just liked your %{post_link}."
-      one: "%{actors} has just liked your %{post_link}."
-      other: "%{actors} has just liked your %{post_link}."
-      zero: "%{actors} has just liked your %{post_link}."
+      few: "%{actors} أعجبوا لتوهم بـ %{post_link}."
+      many: "%{actors} أعجبوا لتوهم بـ %{post_link}."
+      one: "%{actors} أعجب لتوه بـ %{post_link}."
+      other: "%{actors} أعجبوا لتوهم بـ %{post_link}."
+      zero: "%{actors} أعجب لتوه بـ %{post_link}."
     liked_post_deleted: 
-      few: "%{actors} liked your deleted post."
-      many: "%{actors} liked your deleted post."
-      one: "%{actors} liked your deleted post."
-      other: "%{actors} liked your deleted post."
-      zero: "%{actors} liked your deleted post."
+      few: "%{actors} أعجبوا بالمنشور المحذوف."
+      many: "%{actors} أعجبوا بالمنشور المحذوف."
+      one: "%{actors} أعجب بالمنشور المحذوف."
+      other: "%{actors} أعجبوا بالمنشور المحذوف."
+      zero: "%{actors} أعجب بالمنشور المحذوف."
     mentioned: 
-      few: "%{actors} has mentioned you in a %{post_link}."
-      many: "%{actors} has mentioned you in a %{post_link}."
-      one: "%{actors} has mentioned you in a %{post_link}."
-      other: "%{actors} has mentioned you in a %{post_link}."
-      zero: "%{actors} has mentioned you in a %{post_link}."
+      few: "%{actors} أشاروا إليك في %{post_link}."
+      many: "%{actors} أشاروا إليك في %{post_link}."
+      one: "%{actors} أشار إليك في %{post_link}."
+      other: "%{actors} أشاروا إليك في %{post_link}."
+      zero: "%{actors} أشار إليك في %{post_link}."
     mentioned_deleted: 
-      few: "%{actors} mentioned you in a deleted post."
-      many: "%{actors} mentioned you in a deleted post."
-      one: "%{actors} mentioned you in a deleted post."
-      other: "%{actors} mentioned you in a deleted post."
-      zero: "%{actors} mentioned you in a deleted post."
+      few: "%{actors} أشاروا إليك في منشور محذوف."
+      many: "%{actors} أشاروا إليك في منشور محذوف."
+      one: "%{actors} أشار إليك في منشور محذوف."
+      other: "%{actors} أشاروا إليك في منشور محذوف."
+      zero: "%{actors} أشار إليك في منشور محذوف."
     post: "منشور"
     private_message: 
-      few: "%{actors} sent you a message."
-      many: "%{actors} sent you a message."
-      one: "%{actors} sent you a message."
-      other: "%{actors} sent you a message."
-      zero: "%{actors} sent you a message."
+      few: "%{actors} راسلوك."
+      many: "%{actors} راسلوك."
+      one: "%{actors} راسلك."
+      other: "%{actors} راسلوك."
+      zero: "%{actors} راسلك."
     started_sharing: 
-      few: "%{actors} started sharing with you."
-      many: "%{actors} started sharing with you."
-      one: "%{actors} started sharing with you."
-      other: "%{actors} started sharing with you."
-      zero: "%{actors} started sharing with you."
+      few: "%{actors} بدؤوا المشاركة معك."
+      many: "%{actors} بدؤوا المشاركة معك."
+      one: "%{actors} بدأ المشاركة معك."
+      other: "%{actors} بدؤوا المشاركة معك."
+      zero: "%{actors} بدأ المشاركة معك."
   notifier: 
     also_commented: 
       commented: "علق أيضا على مشاركة %{post_author}:"
@@ -359,9 +364,9 @@ ar:
       admin: "إدارة دياسبرا"
       subject: "رسالة من إدارة دياسبرا:"
     started_sharing: 
-      sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
-      subject: "%{name} has started sharing with you on Diaspora*"
+      sharing: "بدأ المشاركة معك!"
+      sign_in: "لُج هنا"
+      subject: "%{name} بدأ المشاركة معك بدياسبرا"
     thanks: "شكرا,"
   ok: "حسنا"
   or: "أو"
@@ -482,7 +487,7 @@ ar:
   registrations: 
     closed: "التسجيلات مغلقة على هذه المنصة"
     create: 
-      success: "!Diaspora سجل في"
+      success: "سجل في دياسبرا"
     edit: 
       cancel_my_account: "إلغاء حسابي"
       edit: "تعديل %{name}"
@@ -552,9 +557,9 @@ ar:
     add_contact: 
       create_request: "ابحث باستخدام وسيط دياسبرا"
       diaspora_handle: "وسيط دياسبرا"
-      enter_a_diaspora_username: "أدخل معرف دياسبرا:"
+      enter_a_diaspora_username: "أدخل وسيط دياسبرا:"
       know_email: "تعرف بريد الإلكتروني؟ يجدر بك دعوتهم"
-      your_diaspora_username_is: "معرف دياسبورا خاصتك هو: %{diaspora_handle}"
+      your_diaspora_username_is: "وسيط دياسبورا خاصتك هو: %{diaspora_handle}"
     contact_list: 
       all_contacts: "جميع الأعضاء"
     footer: 
@@ -592,10 +597,10 @@ ar:
     reshare: 
       reshare: "إعادة مشاركة"
     stream_element: 
-      dislike: "لم يعجبني هذا"
-      like: "أعجبني هذا"
+      dislike: "لم يعجبني"
+      like: "أعجبني"
       unlike: "إلغاء إعجابي"
-      via: "via %{link}"
+      via: "بواسطة %{link}"
   status_messages: 
     create: 
       success: "ذكرت بنجاح: %{names}"
@@ -610,11 +615,11 @@ ar:
       not_found: "للأسف، لم نجد هذا المنشور"
       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: "رجاء لا تتجاوز في منشوراتك حد %{count} حرفا"
+      many: "رجاء لا تتجاوز في منشوراتك حد %{count} حرفا"
+      one: "رجاء لا تتجاوز في منشوراتك حد %{count} حرفا"
+      other: "رجاء لا تتجاوز في منشوراتك حد %{count} حرفا"
+      zero: "رجاء لا تتجاوز في منشوراتك حد %{count} حرفا"
   stream_helper: 
     hide_comments: "إخفاء التعليقات"
     show_comments: "إظهار التعليقات"
@@ -626,20 +631,20 @@ ar:
   the_world: "العالم"
   tokens: 
     show: 
-      connect_to_cubbies: "Connect to Cubbi.es"
-      connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
-      daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
-      love_to_try: "We'd love for you to try it out."
-      making_the_connection: "Making the Connection"
-      screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
-      sign_up_today: "Sign up today!"
-      typical_userpage: "A typical cubbi.es userpage"
-      via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
-      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
+      connect_to_cubbies: "اتصل بـ Cubbi.es"
+      connecting_is_simple: "صِل حساب دياسبرا خاصتك عن طريق ملأ حقلين بـصفحة حساب Cubbi.es خاصتك."
+      daniels_account: "حساب دياسبرا الخاص بدانييل"
+      generate_a_token: "أنشئ إقليدا"
+      love_to_try: "نحبذ أن تجربه."
+      making_the_connection: "جارِ الإتصال"
+      screenshot_explanation: "%{link1}.  هذا الـ cubby خاص بـ %{link2}."
+      sign_up_today: "سجل الآن!"
+      typical_userpage: "حساب cubbi.es نموذجي"
+      via: "(بواسطة %{link})"
+      were_working_hard: "نحن نعمل بكد لخلق اتصال سلس وسهل بين منصات دياسبرا مع برمجيات أخرى.  على سبيل المثال, وصل حساب دياسبرا بـ Cubbi.es يعني نسخ ولصق حقلين فقط"
+      what_is_cubbies: "Cubbi.es هو أول برنامج خاص بدياسبرا في العالم.  وأيضا أفضل وسيلة لتجميع الصور على الويب."
+      your_diaspora_handle: "وسيط دياسبرا خاصتك:"
+      your_diaspora_token: "إقليد دياسبرا خاصتك:"
   undo: "تراجع؟"
   username: "معرف"
   users: 
@@ -661,7 +666,7 @@ ar:
       new_password: "كلمة مرور جديدة"
       private_message: "...وصلتك راسلة خاصة"
       receive_email_notifications: "استقبال تنبيهات عبر البريد الإلكتروني؟"
-      started_sharing: "...someone starts sharing with you?"
+      started_sharing: "...بدأ أحدهم المشاركة معك؟"
       your_email: "بريدك الإلكتروني"
       your_handle: "وسيط دياسبرا خاصتك"
     getting_started: 
diff --git a/config/locales/diaspora/bg.yml b/config/locales/diaspora/bg.yml
index 625733dc78a21a20bab5b145eeefe5bcc00e3b30..6e5e183566b5643aa07a5c5f2490af51c30a39df 100644
--- a/config/locales/diaspora/bg.yml
+++ b/config/locales/diaspora/bg.yml
@@ -89,6 +89,10 @@ bg:
       aspect_not_empty: "Аспектът не е празен"
       remove: "премахване"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es е първото приложение за Diaspora и все още се разработва."
+        heading: "Свързване с Cubbi.es"
+        learn_more: "Научете повече"
       handle_explanation: "Това е вашият адрес в Diaspora. Наподобява адрес на ел. поща - давате го на хора, за да се свържат с вас."
       no_contacts: "Няма контакти"
       people_sharing_with_you: "Хора споделящи с вас"
@@ -125,6 +129,7 @@ bg:
   bookmarklet: 
     explanation: "Публикувайте в Diaspora от където и да е, запаметявайки %{link} като отметка."
     explanation_link_text: "тази връзка"
+    heading: "Diaspora Bookmarklet"
     post_something: "Публикуване в Diaspora"
     post_success: "Публикувано!"
   cancel: "Отказ"
@@ -190,11 +195,11 @@ bg:
     show: 
       already_account: "вече имате акаунт?"
       choice: "Избор"
-      choice_explanation: "Diaspora предоставя възможност за сортиране на контактите в групи наречени аспекти. Те са уникална функция, която позволява споделянето на снимки, истории и шеги само с хората, за които са предвидени."
+      choice_explanation: "Diaspora предоставя възможност за сортиране на контактите в групи, наречени аспекти. Уникални за Diaspora, те позволяват споделянето на снимки, истории и шеги само с хората, за които са предвидени.\n"
       learn_about_host: "Научете как да стартирате Diaspora на собствен сървър."
       login_here: "впишете се от тук"
       ownership: "Собственост"
-      ownership_explanation: "Вие притежавате снимките си и не е необходимо да се отказвате от това си право само за да ги споделите. Вие запазвате собствеността си върху всичко споделено в Diaspora - това ви осигурява контрол над разпространението."
+      ownership_explanation: "Вие притежавате снимките си и не е необходимо да се отказвате от това си право само за да ги споделите. Запазвате собсвеност върху всичко, което споделяте в Diaspora и контролирате разпространението."
       share_what_you_want: "Споделяйте каквото желаете, с когото пожелаете."
       simplicity: "Леснота"
       simplicity_explanation: "Споделянето чрез Diaspora е просто и лесно. Характерно за Diaspora е, че запазва личния ви живот поверителен без нужда от настройване на различни страници с безброй опции."
@@ -213,7 +218,7 @@ bg:
     edit: 
       sign_up: "регистриране"
     new: 
-      already_invited: "Вече е поканен"
+      already_invited: "Вече поканени"
       aspect: "Аспект"
       comma_seperated_plz: "Можете да въведете повече от една ел. поща като ги разделяте със запетаи."
       if_they_accept_info: "ако приемат поканата ще бъдат добавени към аспекта в който сте ги поканили."
@@ -331,9 +336,9 @@ bg:
       zero: "%{actors} започна да споделя с вас."
   notifier: 
     also_commented: 
-      commented: "has also commented on %{post_author}'s post:"
+      commented: "също коментира публикацията на %{post_author}:"
       sign_in: "Впишете се, за да я прегледате."
-      subject: "%{name} has also commented on %{post_author}'s post."
+      subject: "%{name} коментира публикация на %{post_author}."
     comment_on_post: 
       commented: "добави коментар на ваша публикация:"
       sign_in: "Впишете се, за да го прегледате."
@@ -441,7 +446,7 @@ bg:
       view_all: "всички снимки на %{name}"
     show: 
       collection_permalink: "постоянен адрес на колекцията"
-      delete_photo: "Изтриване на изображение"
+      delete_photo: "Изтриване на изображението"
       edit: "редактиране"
       edit_delete_photo: "Редактиране на описанието / изтриване"
       make_profile_photo: "ползване като профилна снимка"
@@ -610,11 +615,11 @@ bg:
       not_found: "За съжаление публикацията не може да бъде намерена."
       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: ", моля съкратете съобщението си до %{count} знака"
+      many: ", моля съкратете съобщението си до %{count} знака"
+      one: ", моля съкратете съобщението си до %{count} знака"
+      other: ", моля съкратете съобщението си до %{count} знака"
+      zero: ", моля съкратете съобщението си до %{count} знака"
   stream_helper: 
     hide_comments: "скриване на коментарите"
     show_comments: "всички коментари"
diff --git a/config/locales/diaspora/br.yml b/config/locales/diaspora/br.yml
index 2ebba0312f2921791a69f9e1a2c11e12eb1d154c..665efcac9ae1cc56be2d6f7651a8d89591808469 100644
--- a/config/locales/diaspora/br.yml
+++ b/config/locales/diaspora/br.yml
@@ -89,6 +89,10 @@ br:
       aspect_not_empty: "Aspect not empty"
       remove: "skarzhañ"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Ar postel-mañ zo ho skor diaspora. E-giz ur chomlec'h-postel e c'hellit skignat anezhañ a-benn bezañ kavet gant an dud."
       no_contacts: "Darempred ebet"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ br:
   bookmarklet: 
     explanation: "%{link} adalek pep lec'h dre lakaat al liamm-se e-barzh ho sinedoù."
     explanation_link_text: "Embann e-barzh Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Embann un dra bennak e-barzh Diaspora"
     post_success: "Embannet! O serriñ!"
   cancel: "Nullañ"
diff --git a/config/locales/diaspora/ca.yml b/config/locales/diaspora/ca.yml
index 34356cb69dfdb0fed592968af07cc2571080c3a8..352dd5f3132685a5610cb35e102d2d281c3ec59b 100644
--- a/config/locales/diaspora/ca.yml
+++ b/config/locales/diaspora/ca.yml
@@ -364,9 +364,9 @@ ca:
       and_others:
         zero: "i ningú més"
         one: "i una persona més"
-        few: "i %{number} més"
-        many: "i %{number} més"
-        other: "i %{number} més"
+        few: "i %{count} més"
+        many: "i %{count} més"
+        other: "i %{count} més"
       and: "i"
     helper:
       new_notifications:
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index cc00f82629f0e6b070a8cc88c2f2644cfb19cb6a..9863746e1f0068d623aa6b285e7ccc83fa74c5da 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -89,6 +89,10 @@ cs:
       aspect_not_empty: "Aspekt není prázdný"
       remove: "odebrat"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Toto je váš Diaspora identifikátor. Podobně jako e-mailovou adresu ho můžete dál lidem a budete na něm dostupní."
       no_contacts: "Žádné kontakty"
       people_sharing_with_you: "Lidé, kteří s vámi sdílí"
@@ -125,6 +129,7 @@ cs:
   bookmarklet: 
     explanation: "Přidat na Diaspora odkudkoliv do záložek %{link}."
     explanation_link_text: "tento odkaz"
+    heading: "Diaspora Bookmarklet"
     post_something: "Poslat něco na Diasporu"
     post_success: "Odesláno! Zavírám!"
   cancel: "Zrušit"
@@ -258,23 +263,23 @@ cs:
   no_results: "Nebyly nalezeny žádné výsledky"
   notifications: 
     also_commented: 
-      few: "%{actors} also commented on %{post_author}'s %{post_link}."
-      many: "%{actors} also commented on %{post_author}'s %{post_link}."
-      one: "%{actors} also commented on %{post_author}'s %{post_link}."
-      other: "%{actors} also commented on %{post_author}'s %{post_link}."
-      zero: "%{actors} also commented on %{post_author}'s %{post_link}."
+      few: "%{actors} také komentovali %{post_link} od %{post_author}."
+      many: "%{actors} také komentovali %{post_link} od %{post_author}."
+      one: "%{actors} také komentoval %{post_link} od %{post_author}."
+      other: "%{actors} také komentovali %{post_link} od %{post_author}."
+      zero: "%{actors} také komentovali %{post_link} od %{post_author}."
     also_commented_deleted: 
-      few: "%{actors} komentovali ve smazaném příspěvku."
-      many: "%{actors} commented on a deleted post."
-      one: "%{actors} komentoval ve smazaném příspěvku."
-      other: "%{actors} komentovali ve smazaném příspěvku."
-      zero: "%{actors} komentovalo ve smazaném příspěvku."
+      few: "%{actors} komentovali váš smazaný příspěvek."
+      many: "%{actors} komentovali váš smazaný příspěvek."
+      one: "%{actors} komentoval váš smazaný příspěvek."
+      other: "%{actors} komentovali váš smazaný příspěvek."
+      zero: "%{actors} komentovali váš smazaný příspěvek."
     comment_on_post: 
-      few: "%{actors} commented on your %{post_link}."
-      many: "%{actors} commented on your %{post_link}."
-      one: "%{actors} commented on your %{post_link}."
-      other: "%{actors} commented on your %{post_link}."
-      zero: "%{actors} commented on your %{post_link}."
+      few: "%{actors} komentovali váš %{post_link}."
+      many: "%{actors} komentovali váš %{post_link}."
+      one: "%{actors} komentoval váš %{post_link}."
+      other: "%{actors} komentovali váš %{post_link}."
+      zero: "%{actors} komentovali váš %{post_link}."
     helper: 
       new_notifications: 
         few: "%{count} nové oznámení"
@@ -285,25 +290,25 @@ cs:
     index: 
       and: "a"
       and_others: 
-        few: "and %{count} others"
-        many: "and %{count} others"
-        one: "and one more"
-        other: "and %{count} others"
-        zero: "and nobody else"
+        few: "a %{count} další"
+        many: "a %{count} dalších"
+        one: "a ještě jeden"
+        other: "a %{count} dalších"
+        zero: "a už nikdo"
       mark_all_as_read: "Označit vše jako přečtené"
       notifications: "Oznámení"
     liked: 
-      few: "%{actors} has just liked your %{post_link}."
-      many: "%{actors} has just liked your %{post_link}."
-      one: "%{actors} has just liked your %{post_link}."
-      other: "%{actors} has just liked your %{post_link}."
-      zero: "%{actors} has just liked your %{post_link}."
+      few: "%{actors} si právě oblíbili váš %{post_link}."
+      many: "%{actors} si právě oblíbili váš %{post_link}."
+      one: "%{actors} si právě oblíbil váš %{post_link}."
+      other: "%{actors} si právě oblíbili váš %{post_link}."
+      zero: "%{actors} si právě oblíbili váš %{post_link}."
     liked_post_deleted: 
-      few: "%{actors} liked your deleted post."
-      many: "%{actors} liked your deleted post."
-      one: "%{actors} liked your deleted post."
-      other: "%{actors} liked your deleted post."
-      zero: "%{actors} liked your deleted post."
+      few: "%{actors} měli oblíben váš smazaný příspěvek."
+      many: "%{actors} měli oblíben váš smazaný příspěvek."
+      one: "%{actors} měl oblíben váš smazaný příspěvek."
+      other: "%{actors} měli oblíben váš smazaný příspěvek."
+      zero: "%{actors} měli oblíben váš smazaný příspěvek."
     mentioned: 
       few: "%{actors} vás zmínilo na %{post_link}."
       many: "%{actors} vás zmínili na %{post_link}."
@@ -324,11 +329,11 @@ cs:
       other: "%{actors} vám poslali zprávu."
       zero: "%{actors} vám poslal zprávu."
     started_sharing: 
-      few: "%{actors} started sharing with you."
-      many: "%{actors} started sharing with you."
-      one: "%{actors} started sharing with you."
-      other: "%{actors} started sharing with you."
-      zero: "%{actors} started sharing with you."
+      few: "%{actors} s vámi začali sdílet."
+      many: "%{actors} s vámi začali sdílet."
+      one: "%{actors} s vámi začal sdílet."
+      other: "%{actors} s vámi začali sdílet."
+      zero: "%{actors} s vámi začali sdílet."
   notifier: 
     also_commented: 
       commented: "také komentoval příspěvek od %{post_author}:"
@@ -630,14 +635,14 @@ cs:
       connecting_is_simple: "Připojení účtu na Diaspoře je tak jednoduché, jak vyplňovat dvě pole na vaší stránce účtu Cubbi.es."
       daniels_account: "Daniel's Diaspora account"
       generate_a_token: "Vytvořit token"
-      love_to_try: "We'd love for you to try it out."
+      love_to_try: "Rádi bychom, aby jste to vyzkoušeli."
       making_the_connection: "Vytváří se spojení"
-      screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
+      screenshot_explanation: "%{link1}. Tato konkrétní cubby je připojena na %{link2}."
       sign_up_today: "Registrujte se ještě dnes!"
       typical_userpage: "Typická uživatelská stránka na cubbi.es"
       via: "(přes %{link})"
       were_working_hard: "Usilovně pracujeme na dosažení snadného spojení mezi pody Diaspory a aplikacemi. Do té doby, spojení vašeho účtu na Diaspoře s Cubbi.es znamená kopírování a vkládání dvou polí."
-      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
+      what_is_cubbies: "Cubbi.es je celosvětově první aplikace Diaspory. Je to také nejlepší způsob, jak shromáždit fotografie online."
       your_diaspora_handle: "Vaše indentifikace na Diaspoře:"
       your_diaspora_token: "Váš token na Diaspoře:"
   undo: "Vrátit?"
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index 06912fecacb16f053afd6de4ca70dc08b46238b9..2164a82120c9a69901364edcd42b191ca83f6fe5 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -89,6 +89,10 @@ cy:
       aspect_not_empty: "Aspect not empty"
       remove: "remove"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ cy:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Cancel"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index 14a10dca2b716a704ab4c17c20d63be6a56b1453..12111f368e06a060b2ab0221e5185d7791ac3d8c 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -89,6 +89,10 @@ da:
       aspect_not_empty: "Aspektet er ikke tomt"
       remove: "slet"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Dette er dit diaspora handle. Som med en e-mail-adresse, kan du give denne til folk, så de kan kontakte dig."
       no_contacts: "Ingen kontakter"
       people_sharing_with_you: "Personer der deler med dig"
@@ -125,6 +129,7 @@ da:
   bookmarklet: 
     explanation: "%{link} alle steder fra ved at bogmærke dette link."
     explanation_link_text: "Post på Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post noget til Diaspora"
     post_success: "Posted! Lukker!"
   cancel: "Annullér"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index da2456b9e6c02855af7cdbe86b16993e58bef934..4564b825410d87f164f3939554f5d890bf141bc9 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -89,6 +89,10 @@ de:
       aspect_not_empty: "Aspekt ist nicht leer"
       remove: "entfernen"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es ist die erste Diaspora Anwendung."
+        heading: "Mit Cubbi.es verbinden"
+        learn_more: "Mehr erfahren"
       handle_explanation: "Das ist deine Diaspora*-Adresse. Du kannst sie wie eine E-Mail-Adresse weitergeben, damit andere Nutzer mit dir Kontakt aufnehmen können."
       no_contacts: "Keine Kontakte"
       people_sharing_with_you: "Leute die mit dir teilen"
@@ -125,6 +129,7 @@ de:
   bookmarklet: 
     explanation: "Erstelle einen Beitrag in Diaspora von überall in dem du %{link} als Lesezeichen speicherst."
     explanation_link_text: "diesen Link"
+    heading: "Diaspora Bookmarklet"
     post_something: "Erstelle einen Beitrag in Diaspora"
     post_success: "Erstellt! Schließen…"
   cancel: "Abbrechen"
@@ -617,7 +622,7 @@ de:
       zero: "Bitte kürze deinen Beitrag auf weniger als %{count} Zeichen."
   stream_helper: 
     hide_comments: "Kommentare verbergen"
-    show_comments: "alle Kommentare zeigen"
+    show_comments: "Alle Kommentare zeigen"
   tags: 
     show: 
       nobody_talking: "Niemand hat bereits etwas über %{tag} gesagt."
diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml
index bcd6fed9016d7d5856fb1e02493aefdc95eeefc4..8a6962263f0758e81366c625e2fa6075f9f28e50 100644
--- a/config/locales/diaspora/el.yml
+++ b/config/locales/diaspora/el.yml
@@ -89,6 +89,10 @@ el:
       aspect_not_empty: "Η πτυχή δεν είναι άδεια"
       remove: "αφαίρεση"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Αυτό είναι το αναγνωριστικό σας στο Diaspora. Όπως και με μια διεύθυνση ηλεκτρονικού ταχυδρομείου, μπορείτε να το δώσετε σε άλλους για να μπορέσουν να σας βρουν."
       no_contacts: "Καμία επαφή"
       people_sharing_with_you: "Άτομα που μοιράζονται μαζί σας"
@@ -125,6 +129,7 @@ el:
   bookmarklet: 
     explanation: "Δημοσιεύστε στο Diaspora από οπουδήποτε προσθέτοντας αυτόν τον σύνδεσμο %{link}."
     explanation_link_text: "αυτός ο σύνδεσμος"
+    heading: "Diaspora Bookmarklet"
     post_something: "Δημοσιεύστε κάτι στο Diaspora"
     post_success: "Δημοσιεύτηκε! Κλείνει!"
   cancel: "Ακύρωση"
@@ -316,7 +321,7 @@ el:
       one: "%{actors} mentioned you in a deleted post."
       other: "%{actors} mentioned you in a deleted post."
       zero: "%{actors} mentioned you in a deleted post."
-    post: "δημοσίευση."
+    post: "δημοσίευση"
     private_message: 
       few: "%{actors} sent you a message."
       many: "%{actors} sent you a message."
@@ -627,18 +632,18 @@ el:
   tokens: 
     show: 
       connect_to_cubbies: "Σύνδεση με Cubbi.es"
-      connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
-      daniels_account: "Daniel's Diaspora account"
+      connecting_is_simple: "Η σύνδεση του Diaspora λογαριασμού σας γίνεται απλά με τη συμπλήρωση των δύο πεδίων στην σελίδα σύνδεσης του Cubbi.es."
+      daniels_account: "Ο Diaspora λογαριασμός του Daniel"
       generate_a_token: "Generate a token"
-      love_to_try: "We'd love for you to try it out."
-      making_the_connection: "Making the Connection"
+      love_to_try: "Θα χαιρόμασταν αν το δοκιμάζατε."
+      making_the_connection: "Γίνεται η σύνδεση"
       screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
-      sign_up_today: "Sign up today!"
+      sign_up_today: "Συνδεθείτε σήμερα!"
       typical_userpage: "Μία τυπική cubbi.es σελίδα χρήστη"
       via: "(μέσω %{link})"
       were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
       what_is_cubbies: "Το Cubbi.es είναι παγκοσμίως η πρώτη εφαρμογή για το Diaspora. Είναι επίσης ο καλύτερος τρόπος συλλογής φωτογραφιών στο διαδίκτυο."
-      your_diaspora_handle: "Your Diaspora Handle:"
+      your_diaspora_handle: "Το Diaspora αναγνωριστικό σας:"
       your_diaspora_token: "Your Diaspora Token:"
   undo: "Αναίρεση;"
   username: "Όνομα Χρήστη"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index a6655b9452b397e06f5574fb4b013dda17c2917a..782aa46d179339d19a6ef058fa42473c8a7fd81c 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -142,6 +142,10 @@ en:
       no_contacts: "No contacts"
       post_a_message: "post a message >>"
       people_sharing_with_you: "People sharing with you"
+      cubbies:
+        heading: "Connect to Cubbi.es"
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        learn_more: "Learn more"
 
   aspect_memberships:
     destroy:
@@ -158,6 +162,7 @@ en:
         other: "In %{count} aspects"
 
   bookmarklet:
+    heading: "Diaspora Bookmarklet"
     post_success: "Posted! Closing!"
     post_something: "Post something to Diaspora"
     explanation: "Post to Diaspora from anywhere by bookmarking %{link}."
diff --git a/config/locales/diaspora/en_shaw.yml b/config/locales/diaspora/en_shaw.yml
index f5acd746397123e59f663dd558a193f4c429d2a1..bcfc737bb4963686b598f1039187cc1c570c6c3a 100644
--- a/config/locales/diaspora/en_shaw.yml
+++ b/config/locales/diaspora/en_shaw.yml
@@ -36,20 +36,20 @@ en_shaw:
   all_aspects: "𐑷𐑤 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
   application: 
     helper: 
-      diaspora_alpha: "DIASPORA* ALPHA"
+      diaspora_alpha: "·𐑛𐑦𐑨𐑕𐑐𐑹𐑩* 𐑨𐑤𐑓𐑩"
       unknown_person: "𐑩𐑯𐑯𐑴𐑯 𐑐𐑻𐑕𐑩𐑯"
       video_title: 
         unknown: "𐑩𐑯𐑯𐑴𐑯 𐑝𐑦𐑛𐑦𐑴 𐑑𐑲𐑑𐑩𐑤"
   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: "𐑒𐑫𐑛 𐑯𐑪𐑑 𐑓𐑲𐑯𐑛 𐑞 𐑕𐑦𐑤𐑧𐑒𐑑𐑩𐑛 𐑐𐑻𐑕𐑩𐑯 𐑦𐑯 𐑞𐑨𐑑 𐑨𐑕𐑐𐑧𐑒𐑑"
@@ -89,9 +89,13 @@ en_shaw:
       aspect_not_empty: "𐑨𐑕𐑐𐑧𐑒𐑑 𐑯𐑪𐑑 𐑧𐑥𐑐𐑑𐑦"
       remove: "𐑮𐑦𐑥𐑵𐑝"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "𐑞𐑦𐑕 𐑦𐑟 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤. 𐑤𐑲𐑒 𐑩𐑯 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕, 𐑿 𐑒 𐑜𐑦𐑝 𐑞𐑦𐑕 𐑑 𐑐𐑰𐑐𐑩𐑤 𐑑 𐑮𐑰𐑗 𐑿."
       no_contacts: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
-      people_sharing_with_you: "People sharing with you"
+      people_sharing_with_you: "𐑐𐑰𐑐𐑩𐑤 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿"
       post_a_message: "𐑐𐑴𐑕𐑑 𐑩 𐑥𐑧𐑕𐑩𐑡 >>"
     manage: 
       add_a_new_aspect: "𐑨𐑛 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑"
@@ -106,8 +110,8 @@ en_shaw:
       failure: "𐑛𐑦𐑛𐑯𐑑 𐑢𐑻𐑒 %{inspect}"
       success: "𐑐𐑻𐑕𐑩𐑯 𐑥𐑵𐑝𐑛 𐑑 𐑯𐑿 𐑨𐑕𐑐𐑧𐑒𐑑"
     new: 
-      create: "Create"
-      name: "Name"
+      create: "𐑒𐑮𐑦𐑱𐑑"
+      name: "𐑯𐑱𐑥"
     no_posts_message: 
       start_talking: "𐑯𐑴𐑚𐑩𐑛𐑦 𐑣𐑨𐑟 𐑕𐑧𐑛 𐑨𐑯𐑦𐑔𐑦𐑙 𐑘𐑧𐑑.  𐑜𐑧𐑑 𐑞 𐑒𐑪𐑯𐑝𐑼𐑕𐑱𐑖𐑩𐑯 𐑕𐑑𐑸𐑑𐑩𐑛!"
     one: "1 𐑨𐑕𐑐𐑧𐑒𐑑"
@@ -125,6 +129,7 @@ en_shaw:
   bookmarklet: 
     explanation: "%{link} 𐑓𐑮𐑪𐑥 𐑨𐑯𐑦𐑢𐑺 𐑚𐑲 𐑚𐑫𐑒𐑥𐑸𐑒𐑦𐑙 𐑞𐑦𐑕 𐑤𐑦𐑙𐑒."
     explanation_link_text: "𐑐𐑴𐑕𐑑 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
+    heading: "Diaspora Bookmarklet"
     post_something: "𐑐𐑴𐑕𐑑 𐑕𐑳𐑥𐑔𐑦𐑙 𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩"
     post_success: "𐑐𐑴𐑕𐑑𐑩𐑛! 𐑒𐑤𐑴𐑟𐑦𐑙!"
   cancel: "𐑒𐑨𐑯𐑕𐑩𐑤"
@@ -145,7 +150,7 @@ en_shaw:
     one: "1 𐑒𐑪𐑯𐑑𐑨𐑒𐑑"
     other: "%{count} 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
     sharing: 
-      people_sharing: "People sharing with you:"
+      people_sharing: "𐑐𐑰𐑐𐑩𐑤 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿:"
     zero: "𐑯𐑴 𐑒𐑪𐑯𐑑𐑨𐑒𐑑𐑕"
   conversations: 
     create: 
@@ -207,7 +212,7 @@ en_shaw:
       already_contacts: "𐑿 𐑣𐑨𐑝 𐑷𐑤𐑮𐑧𐑛𐑦 𐑒𐑩𐑯𐑧𐑒𐑑𐑩𐑛 𐑢𐑦𐑞 𐑞𐑦𐑕 𐑐𐑻𐑕𐑩𐑯"
       already_sent: "𐑿 𐑷𐑤𐑮𐑧𐑛𐑦 𐑦𐑯𐑝𐑲𐑑𐑩𐑛 𐑞𐑦𐑕 𐑐𐑻𐑕𐑩𐑯."
       no_more: "𐑿 𐑣𐑨𐑝 𐑯𐑴 𐑥𐑹 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯𐑟."
-      own_address: "You can't send an invitation to your own address."
+      own_address: "𐑿 𐑒𐑨𐑯𐑑 𐑕𐑧𐑯𐑛 𐑩𐑯 𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯 𐑑 𐑿𐑼 𐑴𐑯 𐑩𐑛𐑮𐑧𐑕."
       rejected: "𐑞 𐑓𐑪𐑤𐑴𐑦𐑙 𐑦-𐑥𐑱𐑤 𐑩𐑛𐑮𐑧𐑕 𐑣𐑨𐑛 𐑐𐑮𐑪𐑚𐑤𐑩𐑥𐑟: "
       sent: "𐑦𐑯𐑝𐑦𐑑𐑱𐑖𐑩𐑯𐑟 𐑣𐑨𐑝 𐑚𐑧𐑯 𐑕𐑧𐑯𐑑 𐑑: "
     edit: 
@@ -232,7 +237,7 @@ en_shaw:
       whats_new: "𐑢𐑪𐑑𐑕 𐑯𐑿?"
       your_aspects: "𐑿𐑼 𐑨𐑕𐑒𐑐𐑧𐑒𐑑𐑕"
     header: 
-      admin: "admin"
+      admin: "𐑩𐑛𐑥𐑦𐑯"
       blog: "𐑚𐑤𐑪𐑜"
       code: "𐑒𐑴𐑛"
       login: "𐑤𐑪𐑜 𐑦𐑯"
@@ -258,23 +263,23 @@ en_shaw:
   no_results: "𐑯𐑴 𐑮𐑦𐑟𐑫𐑤𐑑𐑕 𐑓𐑬𐑯𐑛"
   notifications: 
     also_commented: 
-      few: "%{actors} also commented on %{post_author}'s %{post_link}."
-      many: "%{actors} also commented on %{post_author}'s %{post_link}."
-      one: "%{actors} also commented on %{post_author}'s %{post_link}."
-      other: "%{actors} also commented on %{post_author}'s %{post_link}."
-      zero: "%{actors} also commented on %{post_author}'s %{post_link}."
+      few: "%{actors} 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 %{post_link}."
+      many: "%{actors} 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 %{post_link}."
+      one: "%{actors} 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 %{post_link}."
+      other: "%{actors} 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 %{post_link}."
+      zero: "%{actors} 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 %{post_link}."
     also_commented_deleted: 
-      few: "%{actors} commented on a deleted post."
-      many: "%{actors} commented on a deleted post."
-      one: "%{actors} commented on a deleted post."
-      other: "%{actors} commented on a deleted post."
-      zero: "%{actors} commented on a deleted post."
+      few: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      many: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      one: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      other: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      zero: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
     comment_on_post: 
-      few: "%{actors} commented on your %{post_link}."
-      many: "%{actors} commented on your %{post_link}."
-      one: "%{actors} commented on your %{post_link}."
-      other: "%{actors} commented on your %{post_link}."
-      zero: "%{actors} commented on your %{post_link}."
+      few: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 %{post_link}."
+      many: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 %{post_link}."
+      one: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 %{post_link}."
+      other: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 %{post_link}."
+      zero: "%{actors} 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 𐑿𐑼 %{post_link}."
     helper: 
       new_notifications: 
         few: "%{count} 𐑯𐑿 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
@@ -285,50 +290,50 @@ en_shaw:
     index: 
       and: "𐑯"
       and_others: 
-        few: "and %{count} others"
-        many: "and %{count} others"
-        one: "and one more"
-        other: "and %{count} others"
-        zero: "and nobody else"
+        few: "𐑯 %{count} 𐑳𐑞𐑼𐑟"
+        many: "𐑯 %{count} 𐑳𐑞𐑼𐑟"
+        one: "𐑯 𐑢𐑳𐑯 𐑥𐑹"
+        other: "𐑯 %{count} 𐑳𐑞𐑼𐑟"
+        zero: "𐑯 𐑯𐑴𐑚𐑩𐑛𐑦 𐑧𐑤𐑕"
       mark_all_as_read: "𐑥𐑸𐑒 𐑷𐑤 𐑨𐑟 𐑮𐑧𐑛"
       notifications: "𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟"
     liked: 
-      few: "%{actors} has just liked your %{post_link}."
-      many: "%{actors} has just liked your %{post_link}."
-      one: "%{actors} has just liked your %{post_link}."
-      other: "%{actors} has just liked your %{post_link}."
-      zero: "%{actors} has just liked your %{post_link}."
+      few: "%{actors} 𐑣𐑨𐑟 𐑡𐑩𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 %{post_link}."
+      many: "%{actors} 𐑣𐑨𐑟 𐑡𐑩𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 %{post_link}."
+      one: "%{actors} 𐑣𐑨𐑟 𐑡𐑩𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 %{post_link}."
+      other: "%{actors} 𐑣𐑨𐑟 𐑡𐑩𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 %{post_link}."
+      zero: "%{actors} 𐑣𐑨𐑟 𐑡𐑩𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 %{post_link}."
     liked_post_deleted: 
-      few: "%{actors} liked your deleted post."
-      many: "%{actors} liked your deleted post."
-      one: "%{actors} liked your deleted post."
-      other: "%{actors} liked your deleted post."
-      zero: "%{actors} liked your deleted post."
+      few: "%{actors} 𐑤𐑦𐑙𐑒𐑑 𐑑 𐑿𐑼 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      many: "%{actors} 𐑤𐑦𐑙𐑒𐑑 𐑿𐑼 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      one: "%{actors} 𐑤𐑦𐑙𐑒𐑑 𐑿𐑼 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      other: "%{actors} 𐑤𐑦𐑙𐑒𐑑 𐑑 𐑿𐑼 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      zero: "%{actors} 𐑤𐑦𐑙𐑒𐑑 𐑑 𐑿𐑼 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
     mentioned: 
-      few: "%{actors} has mentioned you in a %{post_link}."
-      many: "%{actors} has mentioned you in a %{post_link}."
-      one: "%{actors} has mentioned you in a %{post_link}."
-      other: "%{actors} has mentioned you in a %{post_link}."
-      zero: "%{actors} has mentioned you in a %{post_link}."
+      few: "%{actors} 𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 %{post_link}."
+      many: "%{actors} 𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 %{post_link}."
+      one: "%{actors} 𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 %{post_link}."
+      other: "%{actors} 𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 %{post_link}."
+      zero: "%{actors} 𐑣𐑨𐑟 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 %{post_link}."
     mentioned_deleted: 
-      few: "%{actors} mentioned you in a deleted post."
-      many: "%{actors} mentioned you in a deleted post."
-      one: "%{actors} mentioned you in a deleted post."
-      other: "%{actors} mentioned you in a deleted post."
-      zero: "%{actors} mentioned you in a deleted post."
+      few: "%{actors} 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      many: "%{actors} 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      one: "%{actors} 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      other: "%{actors} 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
+      zero: "%{actors} 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑿 𐑦𐑯 𐑩 𐑛𐑦𐑤𐑰𐑑𐑩𐑛 𐑐𐑴𐑕𐑑."
     post: "𐑐𐑴𐑕𐑑"
     private_message: 
-      few: "%{actors} sent you a message."
-      many: "%{actors} sent you a message."
-      one: "%{actors} sent you a message."
-      other: "%{actors} sent you a message."
-      zero: "%{actors} sent you a message."
+      few: "%{actors} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑩𐑡."
+      many: "%{actors} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑩𐑡."
+      one: "%{actors} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑩𐑡."
+      other: "%{actors} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑩𐑡."
+      zero: "%{actors} 𐑕𐑧𐑯𐑑 𐑿 𐑩 𐑥𐑧𐑕𐑩𐑡."
     started_sharing: 
-      few: "%{actors} started sharing with you."
-      many: "%{actors} started sharing with you."
-      one: "%{actors} started sharing with you."
-      other: "%{actors} started sharing with you."
-      zero: "%{actors} started sharing with you."
+      few: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿."
+      many: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿."
+      one: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿."
+      other: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿."
+      zero: "%{actors} 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿."
   notifier: 
     also_commented: 
       commented: "𐑣𐑨𐑟 𐑷𐑤𐑕𐑴 𐑒𐑪𐑥𐑩𐑯𐑑𐑩𐑛 𐑪𐑯 %{post_author}𐑟 𐑐𐑴𐑕𐑑:"
@@ -341,9 +346,9 @@ en_shaw:
     diaspora: "𐑞 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑦-𐑥𐑱𐑤 𐑮𐑴𐑚𐑪𐑑"
     hello: "𐑣𐑧𐑤𐑴 %{name}!"
     liked: 
-      liked: "%{name} has just liked your post: "
+      liked: "%{name} 𐑣𐑨𐑟 𐑡𐑳𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 𐑐𐑴𐑕𐑑: "
       sign_in: "Sign to view it"
-      subject: "%{name} has just liked your post"
+      subject: "%{name} 𐑣𐑨𐑟 𐑡𐑳𐑕𐑑 𐑤𐑲𐑒𐑑 𐑿𐑼 𐑐𐑴𐑕𐑑"
     love: "𐑤𐑳𐑝,"
     manage_your_email_settings: "𐑥𐑨𐑯𐑩𐑡 𐑿𐑼 𐑦-𐑥𐑱𐑤 𐑕𐑧𐑑𐑦𐑙𐑟"
     mentioned: 
@@ -359,9 +364,9 @@ en_shaw:
       admin: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑨𐑛𐑥𐑦𐑯𐑦𐑕𐑑𐑮𐑱𐑑𐑼"
       subject: "𐑩 𐑥𐑧𐑕𐑩𐑡 𐑑 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑:"
     started_sharing: 
-      sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
-      subject: "%{name} has started sharing with you on Diaspora*"
+      sharing: "𐑣𐑨𐑟 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿!"
+      sign_in: "𐑕𐑲𐑯 𐑦𐑯 𐑣𐑽"
+      subject: "%{name} 𐑣𐑨𐑟 𐑕𐑑𐑸𐑑𐑩𐑛 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑪𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩*"
     thanks: "𐑔𐑱𐑙𐑒𐑕,"
   ok: "𐑴𐑒𐑱"
   or: "𐑹"
@@ -594,8 +599,8 @@ en_shaw:
     stream_element: 
       dislike: "𐑲 𐑛𐑦𐑕𐑤𐑲𐑒 𐑞𐑦𐑕"
       like: "𐑲 𐑤𐑲𐑒 𐑞𐑦𐑕"
-      unlike: "Unlike"
-      via: "via %{link}"
+      unlike: "𐑩𐑯𐑤𐑲𐑒"
+      via: "𐑝𐑾 %{link}"
   status_messages: 
     create: 
       success: "𐑕𐑩𐑒𐑕𐑧𐑕𐑓𐑫𐑤𐑦 𐑥𐑧𐑯𐑖𐑩𐑯𐑛: %{names}"
@@ -610,11 +615,11 @@ en_shaw:
       not_found: "𐑕𐑪𐑮𐑦, 𐑢𐑰 𐑒𐑫𐑛𐑩𐑯𐑑 𐑓𐑲𐑯𐑛 𐑞𐑨𐑑 𐑐𐑴𐑕𐑑."
       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: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
+      many: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
+      one: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼"
+      other: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
+      zero: "𐑐𐑤𐑰𐑟 𐑥𐑱𐑒 𐑿𐑼 𐑕𐑑𐑨𐑑𐑩𐑕 𐑥𐑧𐑕𐑩𐑡𐑩𐑟 𐑤𐑧𐑕 𐑞𐑨𐑯 %{count} 𐑒𐑺𐑩𐑒𐑑𐑼𐑟"
   stream_helper: 
     hide_comments: "𐑣𐑲𐑛 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
     show_comments: "𐑖𐑴 𐑷𐑤 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
@@ -626,20 +631,20 @@ en_shaw:
   the_world: "𐑞 𐑢𐑻𐑤𐑛"
   tokens: 
     show: 
-      connect_to_cubbies: "Connect to Cubbi.es"
+      connect_to_cubbies: "𐑒𐑩𐑯𐑧𐑒𐑑 𐑑 Cubbi.es"
       connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
-      daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
+      daniels_account: "·𐑛𐑨𐑯𐑘𐑩𐑤𐑟 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑"
+      generate_a_token: "𐑡𐑧𐑯𐑼𐑱𐑑 𐑩 𐑑𐑴𐑒𐑩𐑯"
       love_to_try: "We'd love for you to try it out."
-      making_the_connection: "Making the Connection"
-      screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
-      sign_up_today: "Sign up today!"
-      typical_userpage: "A typical cubbi.es userpage"
-      via: "(via %{link})"
-      were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
-      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
+      making_the_connection: "𐑥𐑱𐑒𐑦𐑙 𐑞 𐑒𐑩𐑯𐑧𐑒𐑖𐑩𐑯"
+      screenshot_explanation: "%{link1}.  𐑞𐑦𐑕 𐑐𐑼𐑑𐑦𐑒𐑿𐑤𐑼 𐑒𐑩𐑚𐑦 𐑦𐑟 𐑤𐑦𐑙𐑒𐑑 𐑑 %{link2}."
+      sign_up_today: "𐑕𐑲𐑯 𐑳𐑐 𐑑𐑩𐑛𐑱!"
+      typical_userpage: "𐑩 𐑑𐑦𐑐𐑦𐑒𐑩𐑤 cubbi.es 𐑿𐑟𐑼𐑐𐑱𐑡"
+      via: "(𐑝𐑾 %{link})"
+      were_working_hard: "𐑢𐑺 𐑢𐑻𐑒𐑦𐑙 𐑣𐑸𐑛 𐑪𐑯 𐑛𐑦𐑤𐑦𐑝𐑼𐑦𐑙 𐑰𐑟𐑦 𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑝𐑦𐑑𐑦 𐑚𐑦𐑑𐑢𐑰𐑯 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑐𐑪𐑛𐑟 𐑯 𐑨𐑐𐑤𐑦𐑒𐑱𐑖𐑩𐑯𐑟.  𐑦𐑯 𐑞 𐑥𐑰𐑯𐑑𐑲𐑥, 𐑒𐑩𐑯𐑧𐑒𐑑𐑦𐑙 𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑩𐑒𐑬𐑯𐑑 𐑢𐑦𐑞 Cubbi.es 𐑥𐑰𐑯𐑟 𐑒𐑪𐑐𐑦𐑦𐑙 𐑯 𐑐𐑱𐑕𐑑𐑦𐑙 𐑑𐑵 𐑓𐑰𐑤𐑛𐑟."
+      what_is_cubbies: "Cubbi.es 𐑦𐑟 𐑞 𐑢𐑻𐑤𐑛𐑟 𐑓𐑻𐑕𐑑 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑨𐑐𐑤𐑦𐑒𐑱𐑖𐑩𐑯.  𐑦𐑑𐑕 𐑷𐑤𐑕𐑴 𐑞 𐑚𐑧𐑕𐑑 𐑢𐑱 𐑑 𐑒𐑩𐑤𐑧𐑒𐑑 𐑓𐑴𐑑𐑴𐑟 𐑪𐑯𐑤𐑲𐑯."
+      your_diaspora_handle: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤:"
+      your_diaspora_token: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑑𐑴𐑒𐑩𐑯:"
   undo: "𐑩𐑯𐑛𐑵?"
   username: "𐑿𐑟𐑼𐑯𐑱𐑥"
   users: 
@@ -656,12 +661,12 @@ en_shaw:
       download_xml: "𐑛𐑬𐑯𐑤𐑴𐑛 𐑥𐑲 𐑧.𐑥.𐑤."
       edit_account: "𐑧𐑛𐑦𐑑 𐑩𐑒𐑬𐑯𐑑"
       export_data: "𐑧𐑒𐑕𐑐𐑹𐑑 𐑛𐑱𐑑𐑩"
-      liked: "...someone likes your post?"
+      liked: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑤𐑲𐑒𐑕 𐑿𐑼 𐑐𐑴𐑕𐑑?"
       mentioned: "...𐑿 𐑸 𐑥𐑧𐑯𐑖𐑩𐑯𐑛 𐑦𐑯 𐑩 𐑐𐑴𐑕𐑑?"
       new_password: "𐑯𐑿 𐑐𐑨𐑕𐑢𐑼𐑛"
       private_message: "...𐑿 𐑮𐑦𐑕𐑰𐑝 𐑩 𐑐𐑮𐑲𐑝𐑩𐑑 𐑥𐑧𐑕𐑩𐑡?"
       receive_email_notifications: "𐑮𐑦𐑕𐑰𐑝 𐑦-𐑥𐑱𐑤 𐑯𐑴𐑑𐑦𐑓𐑦𐑒𐑱𐑖𐑩𐑯𐑟 𐑢𐑧𐑯..."
-      started_sharing: "...someone starts sharing with you?"
+      started_sharing: "...𐑕𐑳𐑥𐑢𐑩𐑯 𐑕𐑑𐑸𐑑𐑕 𐑖𐑺𐑦𐑙 𐑢𐑦𐑞 𐑿?"
       your_email: "𐑿𐑼 𐑦-𐑥𐑱𐑤"
       your_handle: "𐑿𐑼 ·𐑛𐑦𐑨𐑕𐑐𐑹𐑩 𐑣𐑨𐑯𐑛𐑩𐑤"
     getting_started: 
diff --git a/config/locales/diaspora/eo.yml b/config/locales/diaspora/eo.yml
index d9d905d3952c9a7b2da056a7630c8d4d4915079b..f9109ad8b3d7347b7c405410b156c7cab9a32a7c 100644
--- a/config/locales/diaspora/eo.yml
+++ b/config/locales/diaspora/eo.yml
@@ -89,6 +89,10 @@ eo:
       aspect_not_empty: "Aspekto ne malplenas"
       remove: "forigi"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ eo:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Cancel"
diff --git a/config/locales/diaspora/es-CL.yml b/config/locales/diaspora/es-CL.yml
index aeabcba06b0e5fbbe05643891686b71166c37564..ced00ee14ee0f13920576d5dc95d44461333c0e7 100644
--- a/config/locales/diaspora/es-CL.yml
+++ b/config/locales/diaspora/es-CL.yml
@@ -89,6 +89,10 @@ es-CL:
       aspect_not_empty: "El aspecto no está vacío"
       remove: "eliminar"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es es la primera aplicación de Diaspora en desarrollo."
+        heading: "Conectate a Cubbi.es"
+        learn_more: "Aprende mas"
       handle_explanation: "Esta es tu dirección Diaspora. Como una dirección de correo, puedes dársela a la gente para que te encuentren."
       no_contacts: "No hay contactos"
       people_sharing_with_you: "Personas compartiendo contigo"
@@ -125,6 +129,7 @@ es-CL:
   bookmarklet: 
     explanation: "%{link} donde sea agregando a marcadores este link."
     explanation_link_text: "Postea en Diaspora"
+    heading: "Diaspora en tus marcadores"
     post_something: "Postea algo en Diaspora"
     post_success: "Posteado! Cerrando!"
   cancel: "Cancelar"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index fa3efd084c717af5a65183c64fb840acbddf3c7d..fd5c94d4928146427a722cb8481a5384fc67c05d 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -89,6 +89,10 @@ es:
       aspect_not_empty: "El aspecto no está vacío"
       remove: "eliminar"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es es la primera aplicación de Diaspora en desarrollo."
+        heading: "Conectate a Cubbi.es"
+        learn_more: "Aprende mas"
       handle_explanation: "Ésta es tu dirección Diaspora*. Como una dirección de correo, puedes dársela a la gente para que te encuentren."
       no_contacts: "No hay contactos"
       people_sharing_with_you: "Comparten contigo"
@@ -125,6 +129,7 @@ es:
   bookmarklet: 
     explanation: "%{link} desde donde quieras agregando a tus marcadores este enlace."
     explanation_link_text: "Publica en Diaspora"
+    heading: "Diaspora en tus marcadores"
     post_something: "Publica algo en Diaspora"
     post_success: "Publicado! Cerrando!"
   cancel: "Cancelar"
diff --git a/config/locales/diaspora/eu.yml b/config/locales/diaspora/eu.yml
index 7713b2d4ec8e7286523aeac63710b27b8b9b0109..8f37e015fab41fb319062746ef87cff67d1569ed 100644
--- a/config/locales/diaspora/eu.yml
+++ b/config/locales/diaspora/eu.yml
@@ -89,7 +89,11 @@ eu:
       aspect_not_empty: "Alderdi ez hutsa"
       remove: "ezabatu"
     index: 
-      handle_explanation: "Hau da zure Diaspora erabiltzailea. Zure adiskideei emaiezu zu aurkitzearren."
+      cubbies: 
+        explanation: "Cubbi.es garapenean dagoen lehenengo Diaspora aplikazioa da."
+        heading: "Cubbi.esera lotu"
+        learn_more: "Gehiago ikasi"
+      handle_explanation: "Hau da zure Diaspora helbidea. Zure adiskideei emaiezu zu aurkitzearren."
       no_contacts: "Adiskiderik ez"
       people_sharing_with_you: "Zurekin harremanetan dagoen jendea"
       post_a_message: "mezu bat bidali >>"
@@ -125,6 +129,7 @@ eu:
   bookmarklet: 
     explanation: "Diasporan partekatu %{link} erabiliz."
     explanation_link_text: "esteka hau"
+    heading: "Diaspora Bookmarkleta"
     post_something: "Partekatu zerbait Diasporan"
     post_success: "Bidalia! Irteten!"
   cancel: "Ezeztatu"
@@ -285,10 +290,10 @@ eu:
     index: 
       and: "eta"
       and_others: 
-        few: "eta beste %{count}"
-        many: "eta beste %{count}"
-        one: "eta beste bat"
-        other: "eta beste %{count}"
+        few: "eta beste %{count}(e)k"
+        many: "eta beste %{count}(e)k"
+        one: "eta beste batek"
+        other: "eta beste %{count}(e)k"
         zero: "eta inork gehiago ez"
       mark_all_as_read: "Guztiak irakurrita"
       notifications: "Jakinarazpenak"
@@ -554,7 +559,7 @@ eu:
       diaspora_handle: "diaspora@helbidea.org"
       enter_a_diaspora_username: "Diaspora erabiltzaile izena idatzi:"
       know_email: "Badakizu beraien e-posta? Gonbida itzazu!"
-      your_diaspora_username_is: "Zure Diaspora erabiltzailea honakoa da: %{diaspora_handle}"
+      your_diaspora_username_is: "Zure Diaspora helbidea honakoa da: %{diaspora_handle}"
     contact_list: 
       all_contacts: "Adiskide Guztiak"
     footer: 
@@ -634,11 +639,11 @@ eu:
       making_the_connection: "Lotura Ezartzen"
       screenshot_explanation: "%{link1}. Cubby hau %{link2}(r)ekin lotuta dago."
       sign_up_today: "Izena eman oraintxe!"
-      typical_userpage: "Cubbi.es erabiltzaile orri tipiko bat"
+      typical_userpage: "Cubbi.es erabiltzaile orrialde tipiko bat"
       via: "(%{link}(r)en bidez)"
       were_working_hard: "Gogor ari gara lanean Diaspora zerbitzarien eta aplikazioen arteko harremanak eskaintzeko. Momentuan, Diaspora eta Cubbi.es kontuak lotzeak bi eremu kopiatzean eta itsastean datza."
       what_is_cubbies: "Cubbi.es munduko lehen Diaspora aplikazioa da. Argazkiak metatzeko biderik onena ere da."
-      your_diaspora_handle: "Zure Diaspora Kodea:"
+      your_diaspora_handle: "Zure Diaspora Helbidea:"
       your_diaspora_token: "Zure Diaspora Kodea:"
   undo: "Desegin?"
   username: "Erabiltzailea"
@@ -651,7 +656,7 @@ eu:
       change_password: "Pasahitza aldatu"
       close_account: "Kontua Ezabatu"
       comment_on_post: "...norbaitek zure mezu bat iruzkintzen duenean?"
-      current_password: "Oraingo pasahitza"
+      current_password: "Pasahitz zaharra"
       download_photos: "nire argazkiak jaitsi"
       download_xml: "nire xml jaitsi"
       edit_account: "Kontua aldatu"
@@ -663,7 +668,7 @@ eu:
       receive_email_notifications: "E-posta jakinarazpenak jaso nahi dituzu..."
       started_sharing: "...norbaitek zurekin harreman berria hasten duenean?"
       your_email: "Zure e-posta"
-      your_handle: "Zure Diaspora erabiltzailea"
+      your_handle: "Zure Diaspora helbidea"
     getting_started: 
       connect_on_diaspora: "Konektatu Diasporan"
       connect_services: "Beste zerbitzu batzuekin lotu"
diff --git a/config/locales/diaspora/fi.yml b/config/locales/diaspora/fi.yml
index ee8eed053fd7cf2ec87032273a920e778ac78c3d..e8e0adcee46561cea524cf0427dbb252d6f18e4c 100644
--- a/config/locales/diaspora/fi.yml
+++ b/config/locales/diaspora/fi.yml
@@ -89,6 +89,10 @@ fi:
       aspect_not_empty: "Näkymä ei ole tyhjä"
       remove: "poista"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Tämä on Diaspora-osoitteesi. Voit käyttää sitä kuten sähköpostiosoitettasi. Sen avulla sinut tavoitetaan Diasporasta."
       no_contacts: "Ei kontakteja"
       people_sharing_with_you: "Ihmiset jotka jakavat kanssasi"
@@ -125,6 +129,7 @@ fi:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Peruuta"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index f6a0e787dfc589164007d87f39388cc869cffa39..bdc8415cbb382277ebaa919a793a8b42ea2a1eb4 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -89,6 +89,10 @@ fr:
       aspect_not_empty: "L’aspect n’est pas vide"
       remove: "supprimer"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es est la première application Diaspora en cours de développement."
+        heading: "Connectez-vous à Cubbi.es"
+        learn_more: "En savoir plus"
       handle_explanation: "Ceci est votre handle diaspora. Comme une adresse de courrier électronique, vous pouvez le communiquer à d'autres personnes pour leur permettre de vous joindre."
       no_contacts: "Aucun contact"
       people_sharing_with_you: "Personnes partageant avec vous"
@@ -125,6 +129,7 @@ fr:
   bookmarklet: 
     explanation: "Publier sur Diaspora depuis n'importe où en ajoutant %{link} à vos marque-pages."
     explanation_link_text: "ce lien"
+    heading: "Marque-page Diaspora"
     post_something: "Publier quelque chose sur Diaspora"
     post_success: "Publié ! Fermeture !"
   cancel: "Annuler"
diff --git a/config/locales/diaspora/ga.yml b/config/locales/diaspora/ga.yml
index d2318e70c6e64ab60d7ee58dd5c6c57b7e3216fb..601b377c6bb24e8ec23a469773da30e9d4fa4cb0 100644
--- a/config/locales/diaspora/ga.yml
+++ b/config/locales/diaspora/ga.yml
@@ -89,6 +89,10 @@ ga:
       aspect_not_empty: "Níl an gné folamh"
       remove: "bhain"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ ga:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Cealaigh"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 813fe2fb2dc1954aadcbfcfacb6651ecc8b7e994..346e2e6dc12019c0d1ed6abab980bec78ee03574 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -89,6 +89,10 @@ he:
       aspect_not_empty: "ההיבט אינו ריק"
       remove: "הסרה"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "זהו שם המשתמש שלך בדיאספורה. כמו כתובת דואר אלקטרוני, ניתן לחלוק אותו עם אנשים כדי שיגיעו אליך."
       no_contacts: "אין אנשי קשר"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ he:
   bookmarklet: 
     explanation: "%{link} מכל מקום על ידי הוספת קישור זה לסימניות."
     explanation_link_text: "פרסום לדיאספורה"
+    heading: "Diaspora Bookmarklet"
     post_something: "פרסום משהו לתוך דיאספורה"
     post_success: "פורסם! נסגר!"
   cancel: "ביטול"
diff --git a/config/locales/diaspora/hu.yml b/config/locales/diaspora/hu.yml
index 22704ee2b88028fa741ba477ff6d31063326fdf9..9ba6b6c644c6de29d14265517dbdd9b32dbaf317 100644
--- a/config/locales/diaspora/hu.yml
+++ b/config/locales/diaspora/hu.yml
@@ -89,6 +89,10 @@ hu:
       aspect_not_empty: "A csoport nem üres"
       remove: "eltávolítás"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Ez a Te Diaspora felhasználóneved. Megadhatod elérhetőségként, mint egy email címet."
       no_contacts: "Nincs ismerős"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ hu:
   bookmarklet: 
     explanation: "Hivatkozz rá: %{link} bárhonnan, azzal, hogy hozzáadod a könyvjelzőkhöz!"
     explanation_link_text: "Posztolás a Diasporára"
+    heading: "Diaspora Bookmarklet"
     post_something: "Írj valamit a Diasporára"
     post_success: "Elküldve! Bezárás!"
   cancel: "Mégsem"
diff --git a/config/locales/diaspora/id.yml b/config/locales/diaspora/id.yml
index 4a7166b96d34bd29bea3879464f78281dedcf18f..3be75816af8ac401f77fe08e81b4cb8edda4dd4f 100644
--- a/config/locales/diaspora/id.yml
+++ b/config/locales/diaspora/id.yml
@@ -89,6 +89,10 @@ id:
       aspect_not_empty: "Aspek tidak kosong"
       remove: "hapus"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ id:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Cancel"
diff --git a/config/locales/diaspora/is.yml b/config/locales/diaspora/is.yml
index 8e55f90977005d655464bdf9421d92f78a771c3c..af3e5ee81dd1c52490de0dc6666ddb6fcc2794d8 100644
--- a/config/locales/diaspora/is.yml
+++ b/config/locales/diaspora/is.yml
@@ -89,6 +89,10 @@ is:
       aspect_not_empty: "Ásýnd er ekki tóm"
       remove: "fjarlægja"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Þetta er netfangið þitt hjá Díaspora. Eins og með venjulegt netfang, geturðu gefið fólki það svo þau geti haft samband við þig. "
       no_contacts: "Engir tengiliðir"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ is:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Hætta við"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 3bdb28f122fd4eda68899e20e2e86de5b82d4b70..7883779c6c815b21cc604eabf1feaa3a3f75737b 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -89,6 +89,10 @@ it:
       aspect_not_empty: "Aspetto non vuoto"
       remove: "rimuovi"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Questo è il tuo contatto Diaspora. Lo puoi dare alle persone per farti trovare, come un indirizzo email."
       no_contacts: "Nessun contatto"
       people_sharing_with_you: "Persone in condivisione con te"
@@ -125,6 +129,7 @@ it:
   bookmarklet: 
     explanation: "Condividi su Diaspora da ovunque aggiungendo come segnalibro %{link}."
     explanation_link_text: "questo link"
+    heading: "Diaspora Bookmarklet"
     post_something: "Pubblica qualcosa su Diaspora"
     post_success: "Inviato! Sta per chiudersi!"
   cancel: "Annulla"
diff --git a/config/locales/diaspora/ja.yml b/config/locales/diaspora/ja.yml
index 71b255dc72505a608ab7175f7d9c616c834572d1..ef509d89951ed8f4ee118c12a6109e8dcf5b6c17 100644
--- a/config/locales/diaspora/ja.yml
+++ b/config/locales/diaspora/ja.yml
@@ -89,6 +89,10 @@ ja:
       aspect_not_empty: "アスペクトは空ではありません。"
       remove: "削除"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "これがあなたのハンドル名です。メールアドレスと同じようにほかの人に教えて、ダイアスポラで連絡を取り合うことができます。"
       no_contacts: "連絡先無し"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ ja:
   bookmarklet: 
     explanation: "このリンクをお気に入りに登録すると、どこからでも%{link}できます。"
     explanation_link_text: "ダイアスポラに投稿"
+    heading: "Diaspora Bookmarklet"
     post_something: "ダイアスポラに投稿"
     post_success: "投稿完了！ウィンドウを閉じます。"
   cancel: "取り消す"
diff --git a/config/locales/diaspora/ko.yml b/config/locales/diaspora/ko.yml
index 041cf3dde96c9a2488cc68e5c2680f201c8e998e..a929bbf3d917b52e3c8fe9ca0c7280e4cf4e0bad 100644
--- a/config/locales/diaspora/ko.yml
+++ b/config/locales/diaspora/ko.yml
@@ -89,6 +89,10 @@ ko:
       aspect_not_empty: "애스펙이 비어있지 않습니다"
       remove: "지우기"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es는 개발중인 최초의 디아스포라 어플입니다."
+        heading: "Cubbi.es에 연결하기"
+        learn_more: "자세히 알아보기"
       handle_explanation: "이 디아스포라 핸들은 이메일 주소처럼 남에게 건넬 수 있습니다."
       no_contacts: "컨택 없음"
       people_sharing_with_you: "나와 공유하는 사람들"
@@ -125,6 +129,7 @@ ko:
   bookmarklet: 
     explanation: "%{link} 링크를 북마크로 추가하세요."
     explanation_link_text: "디아스포라에 올리기"
+    heading: "디아스포라 북마크"
     post_something: "디아스포라에 올리기"
     post_success: "올렸습니다! 닫힙니다!"
   cancel: "취소"
@@ -258,11 +263,11 @@ ko:
   no_results: "결과 없음"
   notifications: 
     also_commented: 
-      few: "%{actors}님 등도 %{post_author}님의 %{post_link} 공유물에 댓글을 달았습니다."
-      many: "%{actors}님 등도 %{post_author}님의 %{post_link} 공유물에 댓글을 달았습니다."
-      one: "%{actors}님도 %{post_author}님의 %{post_link} 공유물에 댓글을 달았습니다."
-      other: "%{actors}님 등도 %{post_author}님의 %{post_link} 공유물에 댓글을 달았습니다."
-      zero: "%{actors}님도 %{post_author}님의 %{post_link} 공유물에 댓글을 달았습니다."
+      few: "%{actors}님 등도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
+      many: "%{actors}님 등도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
+      one: "%{actors}님도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
+      other: "%{actors}님 등도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
+      zero: "%{actors}님도 %{post_author}님의 %{post_link}에 댓글을 달았습니다."
     also_commented_deleted: 
       few: "%{actors}님이 지운 공유물에 댓글을 달았습니다."
       many: "%{actors}님이 내가 지운 공유물을 좋아합니다."
@@ -270,11 +275,11 @@ ko:
       other: "%{actors}님이 지운 공유물에 댓글을 달았습니다."
       zero: "%{actors}님이 지운 공유물에 댓글을 달았습니다."
     comment_on_post: 
-      few: "%{actors}님 등이 내 %{post_link} 공유물에 댓글을 달았습니다."
-      many: "%{actors}님 등이 내 %{post_link} 공유물에 댓글을 달았습니다."
-      one: "%{actors}님 등이 내 %{post_link} 공유물에 댓글을 달았습니다."
-      other: "%{actors}님 등이 내 %{post_link} 공유물에 댓글을 달았습니다."
-      zero: "%{actors}님이 내 %{post_link} 공유물에 댓글을 달았습니다."
+      few: "%{actors}님 등이 내 %{post_link}에 댓글을 달았습니다."
+      many: "%{actors}님 등이 내 %{post_link}에 댓글을 달았습니다."
+      one: "%{actors}님 등이 내 %{post_link}에 댓글을 달았습니다."
+      other: "%{actors}님 등이 내 %{post_link}에 댓글을 달았습니다."
+      zero: "%{actors}님이 내 %{post_link}에 댓글을 달았습니다."
     helper: 
       new_notifications: 
         few: "새 알림 %{count}개"
@@ -293,11 +298,11 @@ ko:
       mark_all_as_read: "모두 읽음으로 표시"
       notifications: "알림"
     liked: 
-      few: "%{actors}님 등이 내 %{post_link} 공유물을 좋아합니다."
-      many: "%{actors}님 등이 내 %{post_link} 공유물을 좋아합니다."
-      one: "%{actors}님이 내 %{post_link} 공유물을 좋아합니다."
-      other: "%{actors}님 등이 내 %{post_link} 공유물을 좋아합니다."
-      zero: "%{actors}님이 내 %{post_link} 공유물을 좋아합니다."
+      few: "%{actors}님 등이 내 %{post_link}을 좋아합니다."
+      many: "%{actors}님 등이 내 %{post_link}을 좋아합니다."
+      one: "%{actors}님이 내 %{post_link}을 좋아합니다."
+      other: "%{actors}님 등이 내 %{post_link}을 좋아합니다."
+      zero: "%{actors}님 등이 내 %{post_link}을 좋아합니다."
     liked_post_deleted: 
       few: "%{actors}님 등이 내가 지운 공유물을 좋아합니다."
       many: "%{actors}님 등이 내가 지운 공유물을 좋아합니다."
@@ -305,11 +310,11 @@ ko:
       other: "%{actors}님 등이 내가 지운 공유물을 좋아합니다."
       zero: "%{actors}님이 내가 지운 공유물을 좋아합니다."
     mentioned: 
-      few: "%{actors}님이 %{post_link} 공유물에서 나를 멘션했습니다!"
-      many: "%{actors}님이 %{post_link} 공유물에서 나를 멘션했습니다."
-      one: "%{actors}님이 %{post_link} 공유물에서 나를 멘션했습니다!"
-      other: "%{actors}님이 %{post_link} 공유물에서 나를 멘션했습니다!"
-      zero: "%{actors}님이 %{post_link} 공유물에서 나를 멘션했습니다!"
+      few: "%{actors}님이 %{post_link}에서 나를 멘션했습니다!"
+      many: "%{actors}님이 %{post_link}에서 나를 멘션했습니다."
+      one: "%{actors}님이 %{post_link}에서 나를 멘션했습니다!"
+      other: "%{actors}님이 %{post_link}에서 나를 멘션했습니다!"
+      zero: "%{actors}님이 %{post_link}에서 나를 멘션했습니다!"
     mentioned_deleted: 
       few: "%{actors}님 등이 지워진 공유물에서 나를 멘션했습니다."
       many: "%{actors}님 등이 지워진 공유물에서 나를 멘션했습니다."
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index a2af2ccab716f9521b297426547bdeb5040fa822..aa9f1cf2fa4e2b354f77b8d65ebe7d591732b62e 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -89,6 +89,10 @@ lt:
       aspect_not_empty: "Aspektas netuščias"
       remove: "Å¡alinti"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Tai tavo vartotojo vardas Diasporoje. Kaip ir el. pašto adresas, jis leidžia sistemoje rasti pažįstamus."
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ lt:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Atšaukti"
diff --git a/config/locales/diaspora/mk.yml b/config/locales/diaspora/mk.yml
index 74d6552fa6afab01003cc7c3824aeb96b86140f9..a8f1478cec05b113252d6a6fc91a0776f0d0fef8 100644
--- a/config/locales/diaspora/mk.yml
+++ b/config/locales/diaspora/mk.yml
@@ -89,6 +89,10 @@ mk:
       aspect_not_empty: "Аспектот не е празен"
       remove: "одстрани"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Ова е вашето diaspora корисничко име. Исто како е-маил адреса, можете да го давате на луѓе за да се сврзат со вас."
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ mk:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Откажи"
diff --git a/config/locales/diaspora/ml.yml b/config/locales/diaspora/ml.yml
index d34e82ccefb9673616ba38847ed575a8e5d50f8f..fb7c304db229be5544d9e9d6dfa8949697f29ec3 100644
--- a/config/locales/diaspora/ml.yml
+++ b/config/locales/diaspora/ml.yml
@@ -263,7 +263,12 @@ ml:
         zero: "പുതിയ അറിയിപ്പൊന്നുമില്ല"
     index: 
       and: "കൂടാതെ"
-      and_others: "ഉം %{number} മറ്റുള്ളവരും"
+      and_others:
+        zero: "ഉം %{count} മറ്റുള്ളവരും"
+        one: "ഉം %{count} മറ്റുള്ളവരും"
+        few: "ഉം %{count} മറ്റുള്ളവരും"
+        many: "ഉം %{count} മറ്റുള്ളവരും"
+        others: "ഉം %{count} മറ്റുള്ളവരും"
       mark_all_as_read: "എല്ലാം വായിച്ചതായി അടയാളപ്പെടുത്തുക"
       notifications: "അറിയിപ്പുകള്‍"
     mentioned: "താങ്കളെ സൂചിപ്പിച്ചിരിക്കുന്നു"
diff --git a/config/locales/diaspora/nb.yml b/config/locales/diaspora/nb.yml
index 7f666b18cd1b890ed3685f73dd301ff1037f8c15..fae775ed5e53188e5b370b757ecc9925ed527f08 100644
--- a/config/locales/diaspora/nb.yml
+++ b/config/locales/diaspora/nb.yml
@@ -89,6 +89,10 @@ nb:
       aspect_not_empty: "Aspektet er ikke tomt"
       remove: "fjern"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
       no_contacts: "Ingen kontakter"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ nb:
   bookmarklet: 
     explanation: "%{link} fra hvor som helst ved å bokmerke denne linken."
     explanation_link_text: "Post på Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post noe på Diaspora"
     post_success: "Postet! Lukker!"
   cancel: "Avbryt"
diff --git a/config/locales/diaspora/nl.yml b/config/locales/diaspora/nl.yml
index 574cb14723ac2e3f97897c39187a34cd0274aee6..b3ae3ffa83b26e22ad86bd9d3ee83e4fa63187b5 100644
--- a/config/locales/diaspora/nl.yml
+++ b/config/locales/diaspora/nl.yml
@@ -89,6 +89,10 @@ nl:
       aspect_not_empty: "Aspect niet leeg"
       remove: "verwijderen"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Dit is jouw Diaspora handle. Deze kun je aan mensen geven zodat ze je kunnen bereiken, net als een e-mailadres."
       no_contacts: "Geen contacten"
       people_sharing_with_you: "Mensen die met jou delen"
@@ -125,6 +129,7 @@ nl:
   bookmarklet: 
     explanation: "%{link} vanaf elke locatie door deze link te bookmarken."
     explanation_link_text: "Post naar Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post iets naar Diaspora"
     post_success: "Gepost!"
   cancel: "Annuleren"
diff --git a/config/locales/diaspora/pa.yml b/config/locales/diaspora/pa.yml
index 19204d78ba8d83cf632744541ed19e03ac8297a9..356f6eea268a0baa36d1ef1ba8c37e12230e5b41 100644
--- a/config/locales/diaspora/pa.yml
+++ b/config/locales/diaspora/pa.yml
@@ -89,6 +89,10 @@ pa:
       aspect_not_empty: "Aspect not empty"
       remove: "ਹਟਾਓ"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "This is your diaspora handle. Like an email address, you can give this to people to reach you."
       no_contacts: "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ pa:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "ਰੱਦ ਕਰੋ"
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index bc76658c0bd4206e9329d02a32082f83e8bb9cc3..1cecb31ee157ffc026b206c4447a4e8044dad2c7 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -89,6 +89,10 @@ pl:
       aspect_not_empty: "Aspekt nie jest pusty"
       remove: "usuń"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "To jest Twój identyfikator w Diasporze. Podobnie jak adresu e-mailowy, możesz podawać go innym, aby mogli się z Tobą skontaktować."
       no_contacts: "Brak kontaktów"
       people_sharing_with_you: "Osoby dzielÄ…ce siÄ™ z tobÄ…"
@@ -125,6 +129,7 @@ pl:
   bookmarklet: 
     explanation: "%{link} z każdego miejsca dodając ten link do zakładek."
     explanation_link_text: "Publikuj w serwisie Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Napisz coÅ› na Diasporze"
     post_success: "Post opublikowany! Zamykam okno!"
   cancel: "Anuluj"
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index f5f2548522915ff36efececd18d283cc3566c733..780df4f8876e8892da664312852e60ffdb05db51 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -89,6 +89,10 @@ pt-BR:
       aspect_not_empty: "Aspecto não está vazio"
       remove: "remover"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Este é o seu endereço na Diaspora*. Como um endereço de e-mail, pode ser usado por outras pessoas para contactar você."
       no_contacts: "Nenhum contato"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ pt-BR:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Cancelar"
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index 4e7f9c221a716c7f37ddd698b177dc74af73e11b..af225c75416598ec401d8ea8b3e9644982879b36 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -89,6 +89,10 @@ pt-PT:
       aspect_not_empty: "Aspecto não vazio"
       remove: "remover"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Este é o seu endereço do Diaspora. Tal como um endereço de email, pode dá-lo a quem deseja que o contacte."
       no_contacts: "Não há contactos"
       people_sharing_with_you: "Pessoas a partilhar consigo"
@@ -125,6 +129,7 @@ pt-PT:
   bookmarklet: 
     explanation: "Publique no Diaspora de qualquer lado ao adicionar %{link} como marcador."
     explanation_link_text: "esta hiperligação"
+    heading: "Diaspora Bookmarklet"
     post_something: "Publique qualquer coisa no Diaspora"
     post_success: "Publicado! A fechar!"
   cancel: "Cancelar"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index 6c3f36eb2ce756e7f3407225cfe63bfa265d71ae..8fda96d5bbf8e5e5e1629748925564289f8b297e 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -89,6 +89,10 @@ ro:
       aspect_not_empty: "Aspectul nu este gol"
       remove: "ÅŸterge"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ ro:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Anulează"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index 4928fbde0773c4bd69d709131bd32bdbbc576377..7011678cde5dc3a250c26ba24173bbe43b13ecce 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -43,13 +43,13 @@ ru:
   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: "Не удалось найти этого человека в этом аспекте"
@@ -89,6 +89,10 @@ ru:
       aspect_not_empty: "Аспект не пуст"
       remove: "удалить"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es это первая программа по развитию диаспоры."
+        heading: "Подключение к Cubbi.es"
+        learn_more: "Узнать больше"
       handle_explanation: "Это идентификатор вашей Диаспоры. Так же как адрес электронной почты, который вы можете дать людям, для связи с вами."
       no_contacts: "Контакты отсутствуют"
       people_sharing_with_you: "Люди делятса с вами"
@@ -123,8 +127,9 @@ ru:
     zero: "нет аспектов"
   back: "Назад"
   bookmarklet: 
-    explanation: "%{link} из любого места на закладок ссылку."
-    explanation_link_text: "Написать диаспоре"
+    explanation: "Сообщение для диаспоры из любого места %{link}."
+    explanation_link_text: "эта ссылка"
+    heading: "Diaspora Bookmarklet"
     post_something: "Сообщите что-нибудь диаспоре"
     post_success: "Опубликовано! Закрытие!"
   cancel: "Отмена"
@@ -145,7 +150,7 @@ ru:
     one: "1 контакт"
     other: "%{count} контакт[-а, -ов]"
     sharing: 
-      people_sharing: "People sharing with you:"
+      people_sharing: "делятся с вами:"
     zero: "ни одного контакта"
   conversations: 
     create: 
@@ -207,7 +212,7 @@ ru:
       already_contacts: "Вы уже связаны с этим человеком"
       already_sent: "Вы уже пригласили этого человека."
       no_more: "У вас закончились приглашения."
-      own_address: "You can't send an invitation to your own address."
+      own_address: "Вы не можете отправить приглашение на ваш собственный адрес."
       rejected: "Следующие адреса электронной почты имеют проблемы:"
       sent: "Ваши приглашения отправлены:"
     edit: 
@@ -232,7 +237,7 @@ ru:
       whats_new: "Что нового?"
       your_aspects: "Ваши аспекты"
     header: 
-      admin: "admin"
+      admin: "админ"
       blog: "блог"
       code: "код"
       login: "логин"
@@ -258,23 +263,23 @@ ru:
   no_results: "Результатов не найдено"
   notifications: 
     also_commented: 
-      few: "%{actors} also commented on %{post_author}'s %{post_link}."
-      many: "%{actors} also commented on %{post_author}'s %{post_link}."
-      one: "%{actors} also commented on %{post_author}'s %{post_link}."
-      other: "%{actors} also commented on %{post_author}'s %{post_link}."
-      zero: "%{actors} also commented on %{post_author}'s %{post_link}."
+      few: "%{actors} прокомментировали %{post_author}'s %{post_link}."
+      many: "%{actors} прокомментировали %{post_author}'s %{post_link}."
+      one: "%{actors} прокомментировали %{post_author}'s %{post_link}."
+      other: "%{actors} также прокомментировал %{post_author}'s %{post_link}."
+      zero: "%{actors} также прокомментировал %{post_author}'s %{post_link}."
     also_commented_deleted: 
-      few: "%{actors} commented on a deleted post."
-      many: "%{actors} commented on a deleted post."
-      one: "%{actors} commented on a deleted post."
-      other: "%{actors} commented on a deleted post."
-      zero: "%{actors} commented on a deleted post."
+      few: "%{actors} комментировали ваше удаленое сообщение."
+      many: "%{actors} комментировали ваше удаленое сообщение."
+      one: "%{actors} комментировали ваше удаленое сообщение."
+      other: "%{actors} комментировали ваше удаленое сообщение."
+      zero: "%{actors} комментировали ваше удаленое сообщение."
     comment_on_post: 
-      few: "%{actors} commented on your %{post_link}."
-      many: "%{actors} commented on your %{post_link}."
-      one: "%{actors} commented on your %{post_link}."
-      other: "%{actors} commented on your %{post_link}."
-      zero: "%{actors} commented on your %{post_link}."
+      few: "%{actors} комментариев на вас %{post_link}."
+      many: "%{actors} комментариев на вас %{post_link}."
+      one: "%{actors} комментариев на вас %{post_link}."
+      other: "%{actors} комментариев на вас %{post_link}."
+      zero: "%{actors} комментариев на вас %{post_link}."
     helper: 
       new_notifications: 
         few: "%{count} новое[-ых] извещение[-ий]"
@@ -285,50 +290,50 @@ ru:
     index: 
       and: "и"
       and_others: 
-        few: "and %{count} others"
-        many: "and %{count} others"
-        one: "and one more"
-        other: "and %{count} others"
-        zero: "and nobody else"
+        few: "и %{count} другим"
+        many: "и %{count} другим"
+        one: "и еще один"
+        other: "и %{count} другим"
+        zero: "и больше кикому"
       mark_all_as_read: "Отметить все как прочитанные"
       notifications: "Уведомления"
     liked: 
-      few: "%{actors} has just liked your %{post_link}."
-      many: "%{actors} has just liked your %{post_link}."
-      one: "%{actors} has just liked your %{post_link}."
-      other: "%{actors} has just liked your %{post_link}."
-      zero: "%{actors} has just liked your %{post_link}."
+      few: "%{actors} понравилось ваш %{post_link}."
+      many: "%{actors} понравилось ваш %{post_link}."
+      one: "%{actors} понравилось ваш %{post_link}."
+      other: "%{actors} понравилось ваш %{post_link}."
+      zero: "%{actors} понравилось ваш %{post_link}."
     liked_post_deleted: 
-      few: "%{actors} liked your deleted post."
-      many: "%{actors} liked your deleted post."
-      one: "%{actors} liked your deleted post."
-      other: "%{actors} liked your deleted post."
-      zero: "%{actors} liked your deleted post."
+      few: "%{actors} нравилось ваше удаленое сообщение."
+      many: "%{actors} нравилось ваше удаленое сообщение."
+      one: "%{actors} нравилось ваше удаленое сообщение."
+      other: "%{actors} нравилось ваше удаленое сообщение.ost."
+      zero: "%{actors} нравилось ваше удаленое сообщение."
     mentioned: 
-      few: "%{actors} has mentioned you in a %{post_link}."
-      many: "%{actors} has mentioned you in a %{post_link}."
-      one: "%{actors} has mentioned you in a %{post_link}."
-      other: "%{actors} has mentioned you in a %{post_link}."
-      zero: "%{actors} has mentioned you in a %{post_link}."
+      few: "%{actors} упомянули вас в %{post_link}."
+      many: "%{actors} упомянули вас в %{post_link}."
+      one: "%{actors} упомянули вас в %{post_link}."
+      other: "%{actors} упомянули вас в %{post_link}."
+      zero: "%{actors} упомянули вас в %{post_link}."
     mentioned_deleted: 
-      few: "%{actors} mentioned you in a deleted post."
-      many: "%{actors} mentioned you in a deleted post."
-      one: "%{actors} mentioned you in a deleted post."
-      other: "%{actors} mentioned you in a deleted post."
-      zero: "%{actors} mentioned you in a deleted post."
-    post: "сообщение."
+      few: "%{actors} упомянули вас в удаленом сообщение."
+      many: "%{actors} упомянули вас в удаленом сообщение."
+      one: "%{actors} упомянули вас в удаленом сообщение."
+      other: "%{actors} упомянули вас в удаленом сообщение."
+      zero: "%{actors} упомянули вас в удаленом сообщение."
+    post: "сообщение"
     private_message: 
-      few: "%{actors} sent you a message."
-      many: "%{actors} sent you a message."
-      one: "%{actors} sent you a message."
-      other: "%{actors} sent you a message."
-      zero: "%{actors} sent you a message."
+      few: "%{actors} послали вам сообщение."
+      many: "%{actors} послали вам сообщение."
+      one: "%{actors} послали вам сообщение."
+      other: "%{actors} послали Вам сообщение."
+      zero: "%{actors} послали Вам сообщение."
     started_sharing: 
-      few: "%{actors} started sharing with you."
-      many: "%{actors} started sharing with you."
-      one: "%{actors} started sharing with you."
-      other: "%{actors} started sharing with you."
-      zero: "%{actors} started sharing with you."
+      few: "%{actors} начали делиться с вами."
+      many: "%{actors} начали делиться с вами."
+      one: "%{actors} начали делиться с вами."
+      other: "%{actors} начали делиться с вами."
+      zero: "%{actors} начали делиться с вами."
   notifier: 
     also_commented: 
       commented: "также прокомментировал %{post_author} сообщение:\n"
@@ -359,9 +364,9 @@ ru:
       admin: "Ваш администратор Диаспоры"
       subject: "Сообщение о вашем аккаунте Диаспоры:"
     started_sharing: 
-      sharing: "has started sharing with you!"
-      sign_in: "Sign in here"
-      subject: "%{name} has started sharing with you on Diaspora*"
+      sharing: "начал делиться с вами!"
+      sign_in: "Войти сюда"
+      subject: "%{name} начал делиться с вами в диаспоре*"
     thanks: "Спасибо,"
   ok: "Ок"
   or: "или"
@@ -564,7 +569,7 @@ ru:
       by_email: "по электронной почте"
       dont_have_now: "У вас больше нет приглашений, но новые будут уже скоро!"
       from_facebook: "из Facebook"
-      invitations_left: "(осталось %{count})"
+      invitations_left: "%{count} слева"
       invite_someone: "Пригласить кого-нибудь"
       invite_your_friends: "Пригласить своих друзей"
       invites: "Приглашения"
@@ -595,7 +600,7 @@ ru:
       dislike: "Не нравится"
       like: "Нравится"
       unlike: "В отличие от"
-      via: "via %{link}"
+      via: "через %{link}"
   status_messages: 
     create: 
       success: "Успешно упомянут: %{names}"
@@ -610,11 +615,11 @@ ru:
       not_found: "К сожалению мы не смогли найти это сообщение."
       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: "сократите пожалуйста ваше сообщение до %{count} символов"
+      many: "сократите пожалуйста ваше сообщение до %{count} символов"
+      one: "сократите пожалуйста ваше сообщение до %{count} символов"
+      other: "сократите пожалуйста ваше сообщение до %{count} символов"
+      zero: "сократите пожалуйста ваше сообщение до %{count} символов"
   stream_helper: 
     hide_comments: "скрыть комментарии"
     show_comments: "комментарии"
@@ -626,20 +631,20 @@ ru:
   the_world: "мир"
   tokens: 
     show: 
-      connect_to_cubbies: "Connect to Cubbi.es"
-      connecting_is_simple: "Connecting your Diaspora account is as simple as filling out two fields on your Cubbi.es account page."
-      daniels_account: "Daniel's Diaspora account"
-      generate_a_token: "Generate a token"
-      love_to_try: "We'd love for you to try it out."
-      making_the_connection: "Making the Connection"
-      screenshot_explanation: "%{link1}.  This particular cubby is linked to %{link2}."
-      sign_up_today: "Sign up today!"
-      typical_userpage: "A typical cubbi.es userpage"
+      connect_to_cubbies: "Подключение к Cubbi.es"
+      connecting_is_simple: "Подключение диаспоры так же просто, как заполнить два поля на вашей странице Cubbi.es."
+      daniels_account: "Диаспора-аккаунт Даниила"
+      generate_a_token: "Создание маркера"
+      love_to_try: "Мы будем рады, если вы попробуете это."
+      making_the_connection: "Создание подключения"
+      screenshot_explanation: "%{link1}.  Это особенно связано с %{link2}."
+      sign_up_today: "Зарегистрируйтесь прямо сейчас!"
+      typical_userpage: "Типичная cubbi.es страница"
       via: "(via %{link})"
       were_working_hard: "We're working hard on delivering easy connectivity between Diaspora pods and applications.  In the meantime, connecting you Diaspora account with Cubbi.es means copying and pasting two fields."
-      what_is_cubbies: "Cubbi.es is the world's first Diaspora application.  It's also the best way to collect photos online."
-      your_diaspora_handle: "Your Diaspora Handle:"
-      your_diaspora_token: "Your Diaspora Token:"
+      what_is_cubbies: "Cubbi.es первая программа диаспоры. Это также лучший способ коллекции фотографий в Интернете."
+      your_diaspora_handle: "Ваша диаспора Ручка:"
+      your_diaspora_token: "Ваш диаспора Token:"
   undo: "Отменить?"
   username: "Имя пользователя"
   users: 
diff --git a/config/locales/diaspora/sk.yml b/config/locales/diaspora/sk.yml
index 12e1b6210cce17d1c1dfeeb392ac4321e79229e7..2ca9db0e8246f1a5a4230f6b97b789a95b84e232 100644
--- a/config/locales/diaspora/sk.yml
+++ b/config/locales/diaspora/sk.yml
@@ -89,6 +89,10 @@ sk:
       aspect_not_empty: "Aspekt nie je prázdny"
       remove: "odstrániť"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Toto je Vaša adresa a slúži ako vizitka. Pomocou nej Vás môžu ostatní vyhľadať."
       no_contacts: "Žiadne kontakty"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ sk:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Zrušiť"
diff --git a/config/locales/diaspora/sl.yml b/config/locales/diaspora/sl.yml
index 27360f5046ca0d78ae79a22bd94cd4924e27c4bb..c3ee6bd4b5383daab243ca86249b0104af5de1fc 100644
--- a/config/locales/diaspora/sl.yml
+++ b/config/locales/diaspora/sl.yml
@@ -89,6 +89,10 @@ sl:
       aspect_not_empty: "Skupina vsebuje stike"
       remove: "odstrani"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "To je vaš diaspora naslov. Tako kot vaš e-naslov, ga lahko uporabite kot naslov s pomočjo katerega drugi stopijo v stik z vami."
       no_contacts: "Ni kontaktov"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ sl:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Prekliči"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 961689c82b174d6e7229003043e1800d7276a3a3..35350a0cda0afeb8e4bd86afea7267cb6dae86b6 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -89,6 +89,10 @@ sv:
       aspect_not_empty: "Aspekten är inte tom"
       remove: "ta bort"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "Det här är ditt Diaspora-användarnamn. Det är den här du ska ge till dina vänner om du vill att de ska lägga till dig på Diaspora."
       no_contacts: "Inga kontakter"
       people_sharing_with_you: "Personer som delar med dig"
@@ -125,6 +129,7 @@ sv:
   bookmarklet: 
     explanation: "%{link} från var som helst genom att lägga till den här länken som bokmärke."
     explanation_link_text: "Posta på Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Posta något till Diaspora"
     post_success: "Postat! Stänger!"
   cancel: "Avbryt"
diff --git a/config/locales/diaspora/tr.yml b/config/locales/diaspora/tr.yml
index ac4fb5b40a12c868c1f5c3b24eef2e08a82a12d9..bed8eb9b148ccf2668b4e2a9f9cd9722e5aaa8a0 100644
--- a/config/locales/diaspora/tr.yml
+++ b/config/locales/diaspora/tr.yml
@@ -89,6 +89,10 @@ tr:
       aspect_not_empty: "Yan boÅŸ deÄŸil"
       remove: "çıkar"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
       no_contacts: "No contacts"
       people_sharing_with_you: "People sharing with you"
@@ -125,6 +129,7 @@ tr:
   bookmarklet: 
     explanation: "%{link} from anywhere by bookmarking this link."
     explanation_link_text: "Post to Diaspora"
+    heading: "Diaspora Bookmarklet"
     post_something: "Post something to Diaspora"
     post_success: "Posted! Closing!"
   cancel: "Ä°ptal Et"
diff --git a/config/locales/diaspora/zh-CN.yml b/config/locales/diaspora/zh-CN.yml
index 2fc285ef8846ba21e07c107c8207d247efd01904..65c7bc88210f45a1ff6ad343c470918396b575fa 100644
--- a/config/locales/diaspora/zh-CN.yml
+++ b/config/locales/diaspora/zh-CN.yml
@@ -89,6 +89,10 @@ zh-CN:
       aspect_not_empty: "此视图不是空的"
       remove: "删除"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es is the first Diaspora application under development."
+        heading: "Connect to Cubbi.es"
+        learn_more: "Learn more"
       handle_explanation: "这是您的 diaspora 帐号， 就像是邮箱一样，你可以把它提供给想好友您的人。"
       no_contacts: "没有任何好友"
       people_sharing_with_you: "与您分享的人"
@@ -125,6 +129,7 @@ zh-CN:
   bookmarklet: 
     explanation: "%{link} 收藏这个链接，即可随时发布新内容"
     explanation_link_text: "这个链接"
+    heading: "Diaspora Bookmarklet"
     post_something: "发布些新内容到Diaspora"
     post_success: "发布完成！关闭中！"
   cancel: "取消"
diff --git a/config/locales/diaspora/zh-TW.yml b/config/locales/diaspora/zh-TW.yml
index 1f5f31c8d065f12a6bb45f404ff07d3d8736c52f..1db5492cb771c2b837eb805af33f311b7c0f5444 100644
--- a/config/locales/diaspora/zh-TW.yml
+++ b/config/locales/diaspora/zh-TW.yml
@@ -89,6 +89,10 @@ zh-TW:
       aspect_not_empty: "面向不是空的"
       remove: "刪除"
     index: 
+      cubbies: 
+        explanation: "Cubbi.es 是 Diaspora 的第一個應用程式, 目前正在開發中."
+        heading: "與 Cubbi.es 連結"
+        learn_more: "進一步了解"
       handle_explanation: "這是你的 diaspora 識別碼. 就像是電子信箱一樣, 你可以把它給想聯絡你的人."
       no_contacts: "沒有任何聯繫"
       people_sharing_with_you: "跟你分享的人"
@@ -125,6 +129,7 @@ zh-TW:
   bookmarklet: 
     explanation: "%{link}加入書籤後可對任何網站使用."
     explanation_link_text: "這個連結"
+    heading: "Diaspora 書籤小程式"
     post_something: "貼些東西到 Diaspora"
     post_success: "貼好了! 關掉中!"
   cancel: "取消"
diff --git a/config/locales/javascript/javascript.ar.yml b/config/locales/javascript/javascript.ar.yml
index d9621b4c3c80352aee6fe89f489f9b63f5c1ed4e..473d4a607501ea72bd1392b3ee35a32424b2b5bc 100644
--- a/config/locales/javascript/javascript.ar.yml
+++ b/config/locales/javascript/javascript.ar.yml
@@ -6,25 +6,25 @@
 ar: 
   javascripts: 
     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: "أضف إلى فئة"
     comments: 
-      hide: "hide comments"
-      show: "show all comments"
+      hide: "إخفاء التعليقات"
+      show: "عرض جميع التعليقات"
     confirm_dialog: "هل أنت متأكد؟"
-    failed_to_like: "Failed to like!"
-    failed_to_post_message: "Failed to post message!"
+    failed_to_like: "فشل في [أعجبني]"
+    failed_to_post_message: "فشل في نشر رسالة!"
     infinite_scroll: 
       no_more: "لا توجد أية رسائل أخرى"
     publisher: 
       at_least_one_aspect: "عليك تحديد فئة واحدة على الأقل"
     search_for: "إبحث عن {{name}}"
-    show_more: "show more"
+    show_more: "المزيد"
     timeago: 
       day: "منذ يوم"
       days: "منذ %d أيام"
diff --git a/config/locales/javascript/javascript.de.yml b/config/locales/javascript/javascript.de.yml
index 72a9eaa2df3219a4c28ad3d3db805ead8b8cd0af..2a68410d088adaaf06d3bd0f93c63bc6ef6c210c 100644
--- a/config/locales/javascript/javascript.de.yml
+++ b/config/locales/javascript/javascript.de.yml
@@ -10,7 +10,7 @@ de:
       toggle: 
         few: "In {{count}} Aspekten"
         many: "In {{count}} Aspekten"
-        one: "In {{count}} Aspekten"
+        one: "In einem Aspekt"
         other: "In {{count}} Aspekten"
         zero: "Zu Aspekt hinzufügen"
     comments: 
diff --git a/config/locales/javascript/javascript.ru.yml b/config/locales/javascript/javascript.ru.yml
index d37f774dfe2c348004050b2d17718d4602a2e77c..c33a6bd5b382635c7e0fa190406975fb846d3724 100644
--- a/config/locales/javascript/javascript.ru.yml
+++ b/config/locales/javascript/javascript.ru.yml
@@ -6,25 +6,25 @@
 ru: 
   javascripts: 
     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: "Добавить к аспектам"
     comments: 
-      hide: "hide comments"
-      show: "show all comments"
+      hide: "скрыть комментарии"
+      show: "Показать все комментарии"
     confirm_dialog: "Вы уверенны? "
-    failed_to_like: "Failed to like!"
-    failed_to_post_message: "Failed to post message!"
+    failed_to_like: "Не удалось!"
+    failed_to_post_message: "Не удалось отправить сообщение!"
     infinite_scroll: 
       no_more: "Сообщений больше нет."
     publisher: 
       at_least_one_aspect: "Вам надо минимум один аспект создать"
     search_for: "Искать {{name}}"
-    show_more: "show more"
+    show_more: "показать больше"
     timeago: 
       day: "день"
       days: "%d дней[-я]"
diff --git a/lib/youtube_titles.rb b/lib/youtube_titles.rb
index 8530e8ad3e27d9b1694a9ec5ec33aad76585ef73..cf90f28b3ca66f616d704f7c8e291f43e0c703c4 100644
--- a/lib/youtube_titles.rb
+++ b/lib/youtube_titles.rb
@@ -1,4 +1,12 @@
 module YoutubeTitles
+  def self.included(model)
+    model.class_eval do
+      before_save do
+        get_youtube_title text
+      end
+    end if model.respond_to?(:before_save)
+  end
+
   def youtube_title_for video_id
     http = Net::HTTP.new('gdata.youtube.com', 80)
     path = "/feeds/api/videos/#{video_id}?v=2"
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
index 1ccc5e3a9370d2ef197f30347298528d2999acec..3027448479dbbf0fe1b0a3ba868e8f6ed43ed285 100644
Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ
diff --git a/public/favicon.png b/public/favicon.png
index 72d6b3e020c91f8d9fb081805bde1b22a3e7d6ed..869fabfaf94d251bbcc014733f8cdff81072fb32 100644
Binary files a/public/favicon.png and b/public/favicon.png differ
diff --git a/public/images/404.png b/public/images/404.png
index f7a87253295485fdf416c3200c71f106c2f598ae..2172c13b13d5a9348910e79ebf73b88123d8fda9 100644
Binary files a/public/images/404.png and b/public/images/404.png differ
diff --git a/public/images/add_contact_button.png b/public/images/add_contact_button.png
index 6248f1b88bc0084916b0ec473d2e0cc7dcce2ca6..75004609243b1c3f026c004c6123ca0184f7c5ce 100644
Binary files a/public/images/add_contact_button.png and b/public/images/add_contact_button.png differ
diff --git a/public/images/asterisk.png b/public/images/asterisk.png
index 0aac946d0c5b150e9bd7b5c2bf4f199967cff5b5..9e181f5f38c777ee567bb28df8ba0423a0dde44c 100644
Binary files a/public/images/asterisk.png and b/public/images/asterisk.png differ
diff --git a/public/images/ball.png b/public/images/ball.png
index ea811fb11a9e01fd6118058681c1f40a35daef2a..dbb1c15401484d279e7ebe52765a2428a75f4fc0 100644
Binary files a/public/images/ball.png and b/public/images/ball.png differ
diff --git a/public/images/ball_small.png b/public/images/ball_small.png
index a3309689cc03da343e693f38b2c432d33fc3b162..4d30835c80d3938b0dd3d87172f0f4ecb583ce9d 100644
Binary files a/public/images/ball_small.png and b/public/images/ball_small.png differ
diff --git a/public/images/cubbies_screenshot.png b/public/images/cubbies_screenshot.png
index 1f4d98005f19d843ba6902368ca3cb10e7b8d5ec..7dad8817eb9185d2334b9b822cd2f0f16f636143 100644
Binary files a/public/images/cubbies_screenshot.png and b/public/images/cubbies_screenshot.png differ
diff --git a/public/images/cubbies_settings.png b/public/images/cubbies_settings.png
index 01f7505fedf4a39cd1f4a044ae261ea19d3c2c83..ca9bef480f918fb22afd81ebcb3387215329c9b6 100644
Binary files a/public/images/cubbies_settings.png and b/public/images/cubbies_settings.png differ
diff --git a/public/images/icons/cog.png b/public/images/icons/cog.png
index e35106fec568ad8d14fa33b5abaf61ea3165ff43..06e6939605d8c7ae1f21e204783e6bc03d1be8cb 100644
Binary files a/public/images/icons/cog.png and b/public/images/icons/cog.png differ
diff --git a/public/images/icons/doc_edit.png b/public/images/icons/doc_edit.png
index 406e5af18dded4ecda44a1cad0a3ce965c99aceb..17071ef8786ebb9c0bf8544dc25be2fcaa535e60 100644
Binary files a/public/images/icons/doc_edit.png and b/public/images/icons/doc_edit.png differ
diff --git a/public/images/icons/globe.png b/public/images/icons/globe.png
index 240045014ebd3fb871886a7ced8a7d6013718887..6e8cdb50df0208c191c84c39cde19528c8fd488c 100644
Binary files a/public/images/icons/globe.png and b/public/images/icons/globe.png differ
diff --git a/public/images/icons/happy_smiley.png b/public/images/icons/happy_smiley.png
index f9b44488d3b8e9f3cf70981f6d00f69386c03796..675e39ce6f38acbd7cedea38c2f1d3bfb907d450 100644
Binary files a/public/images/icons/happy_smiley.png and b/public/images/icons/happy_smiley.png differ
diff --git a/public/images/icons/monotone_add_plus.png b/public/images/icons/monotone_add_plus.png
index f03378c1eecd97ecee3c05b7caac10f5e601b7dd..ba6920a77b15d385cdfc390eff270fa2dc450c43 100644
Binary files a/public/images/icons/monotone_add_plus.png and b/public/images/icons/monotone_add_plus.png differ
diff --git a/public/images/icons/monotone_chat_talk.png b/public/images/icons/monotone_chat_talk.png
index 3fd86d27dc707892542c96603adab116a9b179b2..ccfae8620396a51464b236b370014e742fda57b5 100644
Binary files a/public/images/icons/monotone_chat_talk.png and b/public/images/icons/monotone_chat_talk.png differ
diff --git a/public/images/icons/monotone_email_letter_round.png b/public/images/icons/monotone_email_letter_round.png
index 30af3047ba4877d0a5a7d6a36ac624339d208568..a450fe25fabb69566a607552436223755be266b0 100644
Binary files a/public/images/icons/monotone_email_letter_round.png and b/public/images/icons/monotone_email_letter_round.png differ
diff --git a/public/images/icons/monotone_flag.png b/public/images/icons/monotone_flag.png
index baea94936d2e36f689fdf10a49500c3b2cf26efc..fbfeb559dad5423bcc813be68579237e6d2567a7 100644
Binary files a/public/images/icons/monotone_flag.png and b/public/images/icons/monotone_flag.png differ
diff --git a/public/images/icons/monotone_pen_write.png b/public/images/icons/monotone_pen_write.png
index c7f7756fe2b51a2afbdaf29d47f8d9c1275a7972..34a2fdffc679506d78782c0f706e02c94a08bf4e 100644
Binary files a/public/images/icons/monotone_pen_write.png and b/public/images/icons/monotone_pen_write.png differ
diff --git a/public/images/icons/monotone_plus_add_round.png b/public/images/icons/monotone_plus_add_round.png
index 21872fb9a2618feeeb07214d87c63a395550ef85..6b37aa3c2ac6cbe9b94f0afebd2a7ce9ee546c6e 100644
Binary files a/public/images/icons/monotone_plus_add_round.png and b/public/images/icons/monotone_plus_add_round.png differ
diff --git a/public/images/icons/monotone_question.png b/public/images/icons/monotone_question.png
index 0620937a6e3069191c4a4f3362e48ea96744cb83..c7ffbe94146b77b10835d5071ad82a46697925f5 100644
Binary files a/public/images/icons/monotone_question.png and b/public/images/icons/monotone_question.png differ
diff --git a/public/images/icons/padlock-closed.png b/public/images/icons/padlock-closed.png
index af69232630ca096dbfc3f60b78b996283a4c5b97..25f3c8861c3a7b443ab7528e58515804179fac9a 100644
Binary files a/public/images/icons/padlock-closed.png and b/public/images/icons/padlock-closed.png differ
diff --git a/public/images/icons/padlock-open.png b/public/images/icons/padlock-open.png
index 895a25a76fe036bf9e4a5b8f15f93dab8adcf7ca..c4cd4bffa886e62d21407ba29e4f461f0c4b5f9e 100644
Binary files a/public/images/icons/padlock-open.png and b/public/images/icons/padlock-open.png differ
diff --git a/public/images/icons/pen_write.png b/public/images/icons/pen_write.png
index c7f7756fe2b51a2afbdaf29d47f8d9c1275a7972..34a2fdffc679506d78782c0f706e02c94a08bf4e 100644
Binary files a/public/images/icons/pen_write.png and b/public/images/icons/pen_write.png differ
diff --git a/public/images/icons/sad_smiley.png b/public/images/icons/sad_smiley.png
index 3e2de91c5b5a7694f27d276ba5073ba43f4773f5..c825f7ab6d0e354375ff8fe04b3fc38dfba2e3f1 100644
Binary files a/public/images/icons/sad_smiley.png and b/public/images/icons/sad_smiley.png differ
diff --git a/public/images/icons/smiley_laughing.png b/public/images/icons/smiley_laughing.png
index 37787d20670ca388f3564cf973eef62eb8aeeb6d..e2e6dc0b84f57fb1a6830e6ae088751f775c4700 100644
Binary files a/public/images/icons/smiley_laughing.png and b/public/images/icons/smiley_laughing.png differ
diff --git a/public/images/logo_caps.png b/public/images/logo_caps.png
index 139adaec0162ed5139b72fcff5037a71e6aba898..64075dd2bc39b84d296c00e933a991ae186c9c64 100644
Binary files a/public/images/logo_caps.png and b/public/images/logo_caps.png differ
diff --git a/public/images/logo_large.png b/public/images/logo_large.png
index 54a843a0ff6e28548a17ded335ef3d92cdc70363..7339202e57483635758ddb1dc3868cd2c76287b9 100644
Binary files a/public/images/logo_large.png and b/public/images/logo_large.png differ
diff --git a/public/images/logo_small.png b/public/images/logo_small.png
index 606e1edeba040fc0dcaf1953141bb283a81aadb3..0b22962be06ae905faabde36ffde7843b3fb7510 100644
Binary files a/public/images/logo_small.png and b/public/images/logo_small.png differ
diff --git a/public/images/mocks/bp.jpeg b/public/images/mocks/bp.jpeg
index 33f75aa044a365d52811406f0a43d8d5068cec30..62221c6dfba2f1b9dc9aa42561ef4e06e8cee313 100644
Binary files a/public/images/mocks/bp.jpeg and b/public/images/mocks/bp.jpeg differ
diff --git a/public/images/mocks/user_pic.jpeg b/public/images/mocks/user_pic.jpeg
index 4732d561ed7face2bb5b4b8c3d1699e559c45104..dbb41e89ca3839fa39c3200453d5b2b537c804d5 100644
Binary files a/public/images/mocks/user_pic.jpeg and b/public/images/mocks/user_pic.jpeg differ
diff --git a/public/images/modern_browsers.png b/public/images/modern_browsers.png
index 7d7c6aefe68571b24e951b123bd0f6b3a6f7bf14..6d9ec65e51c6fc3a005befabcad31158bc735dfe 100644
Binary files a/public/images/modern_browsers.png and b/public/images/modern_browsers.png differ
diff --git a/public/images/powered_by_diaspora.png b/public/images/powered_by_diaspora.png
index 971d0d6a118cbe312f235b180d4a97b8abb90ab2..1266901ef8f73e282494905d1dd98b37f952e123 100644
Binary files a/public/images/powered_by_diaspora.png and b/public/images/powered_by_diaspora.png differ
diff --git a/public/images/press_logos/Mashable_logo.png b/public/images/press_logos/Mashable_logo.png
index f6b684ff5470bff113c892e2b04316df482d6434..242c571972faa99b4928bbe59d90ff8946dd8955 100644
Binary files a/public/images/press_logos/Mashable_logo.png and b/public/images/press_logos/Mashable_logo.png differ
diff --git a/public/images/press_logos/The_New_York_Times_logo.png b/public/images/press_logos/The_New_York_Times_logo.png
index a2d06f8e9fef0d42b5287f8ed039f9f3c9d96ffc..09571e02950ee2c1f5bfe1c02ef8a66f2e3bd034 100644
Binary files a/public/images/press_logos/The_New_York_Times_logo.png and b/public/images/press_logos/The_New_York_Times_logo.png differ
diff --git a/public/images/press_logos/mashable_logo.png b/public/images/press_logos/mashable_logo.png
index f6b684ff5470bff113c892e2b04316df482d6434..242c571972faa99b4928bbe59d90ff8946dd8955 100644
Binary files a/public/images/press_logos/mashable_logo.png and b/public/images/press_logos/mashable_logo.png differ
diff --git a/public/images/press_logos/nymag_logo.png b/public/images/press_logos/nymag_logo.png
index ab43b6ebfcc93ad30b78139acdd7e30414b6e8ab..a1811d61ce42b92a7bdf2168152b52f5e8ddd4bf 100644
Binary files a/public/images/press_logos/nymag_logo.png and b/public/images/press_logos/nymag_logo.png differ
diff --git a/public/images/press_logos/techcrunch_logo.png b/public/images/press_logos/techcrunch_logo.png
index 5a9d2a0ec19e08641457110cafb4606fec816026..dead15d5bda0178f5054cc414661e44bb062bb47 100644
Binary files a/public/images/press_logos/techcrunch_logo.png and b/public/images/press_logos/techcrunch_logo.png differ
diff --git a/public/images/press_logos/the_new_york_times_logo.png b/public/images/press_logos/the_new_york_times_logo.png
index a2d06f8e9fef0d42b5287f8ed039f9f3c9d96ffc..09571e02950ee2c1f5bfe1c02ef8a66f2e3bd034 100644
Binary files a/public/images/press_logos/the_new_york_times_logo.png and b/public/images/press_logos/the_new_york_times_logo.png differ
diff --git a/public/images/reply.png b/public/images/reply.png
index 2356dc7791f28e2dae9bb96e62f9d60c7ca3906f..38668dbb12bc0d44755ca5d5cea6ade71b365681 100644
Binary files a/public/images/reply.png and b/public/images/reply.png differ
diff --git a/public/images/services/twitter_sign_in.png b/public/images/services/twitter_sign_in.png
index 297bb03404f2d7462ee9355aae38f5f5f3e47fbd..89712f2b70482355dfda588a0af008ee06a0b117 100644
Binary files a/public/images/services/twitter_sign_in.png and b/public/images/services/twitter_sign_in.png differ
diff --git a/public/images/user/buchanan.jpg b/public/images/user/buchanan.jpg
index ff1ebd5d41e98595ee69ed5b8f6d358b793df9cf..5a1787e36fe160b9cdc45abed91babad254004c1 100644
Binary files a/public/images/user/buchanan.jpg and b/public/images/user/buchanan.jpg differ
diff --git a/public/images/user/buren.jpg b/public/images/user/buren.jpg
index 377246b662d00a8f66976eb471b6098bc421158f..ba2d126d1622d71df009b889aea1afea7cc00608 100644
Binary files a/public/images/user/buren.jpg and b/public/images/user/buren.jpg differ
diff --git a/public/images/user/default.png b/public/images/user/default.png
index cd0b9059f97721141d8e402b35810bc84992e30a..53d10ffc0371cdf94146121da55755662219df9f 100644
Binary files a/public/images/user/default.png and b/public/images/user/default.png differ
diff --git a/public/images/user/fillmore.jpg b/public/images/user/fillmore.jpg
index c6850dfd31b887989206ca6dae640f6c87b3bd54..da53e741e1686cedf419d41a5ec8b383edb733d0 100644
Binary files a/public/images/user/fillmore.jpg and b/public/images/user/fillmore.jpg differ
diff --git a/public/images/user/harrison.jpg b/public/images/user/harrison.jpg
index c0a32898371375877cd856c33f3e2af5a0451715..6cc19ff4f256ea3c8d94589fa309182765d7a2f2 100644
Binary files a/public/images/user/harrison.jpg and b/public/images/user/harrison.jpg differ
diff --git a/public/images/user/jackson.jpg b/public/images/user/jackson.jpg
index 0e7386cf500adc6c9f779030c9b9457d76fb79cd..9aa0660ffa09f386b06833cedf1568eefe8fd293 100644
Binary files a/public/images/user/jackson.jpg and b/public/images/user/jackson.jpg differ
diff --git a/public/images/user/jefferson.jpg b/public/images/user/jefferson.jpg
index c36dfbc6a16f1b2c8a3b7d2caac5c978f2e9fe56..07351c679dd1ec7d4952e68a9152491246da58df 100644
Binary files a/public/images/user/jefferson.jpg and b/public/images/user/jefferson.jpg differ
diff --git a/public/images/user/monroe.jpg b/public/images/user/monroe.jpg
index 6169b4db812d79f3eb9b8894b7edd0778a45c0bf..84f3f1a6ec17e2735b0017ba7b5de6164f210358 100644
Binary files a/public/images/user/monroe.jpg and b/public/images/user/monroe.jpg differ
diff --git a/public/images/user/pierce.jpg b/public/images/user/pierce.jpg
index f86fdb0484a61ccaa2b5194b47f5452c00a9e4ea..5450a4f2c5a7e5d255864a12ab51239ba6e3b8bf 100644
Binary files a/public/images/user/pierce.jpg and b/public/images/user/pierce.jpg differ
diff --git a/public/images/user/polk.jpg b/public/images/user/polk.jpg
index ca04d3c4d1d671273d7df34e8364e1806cb32b0c..971d2cfb0e22b2bcfd08c9919b717a4e8e7480e7 100644
Binary files a/public/images/user/polk.jpg and b/public/images/user/polk.jpg differ
diff --git a/public/images/user/quincyadams.jpg b/public/images/user/quincyadams.jpg
index 9aac84b25e8ab5315929a8f94d2086824aa35a5d..2a9cd67f41fe3fc3da3c467c5fcb4a4c79e3ae0e 100644
Binary files a/public/images/user/quincyadams.jpg and b/public/images/user/quincyadams.jpg differ
diff --git a/public/images/white.png b/public/images/white.png
index 2a7260ea414c0b34f59c0527dada16b38cf7590d..fdbb27091bfa6f6ceff6584c9d173b8ff58e7a63 100644
Binary files a/public/images/white.png and b/public/images/white.png differ
diff --git a/public/images/white@2x.png b/public/images/white@2x.png
index 4d868523efb39781c19ca7cda0a158faf3dd2c70..abd33d8cea5c9bd74141085ee35d7d35647d7b4f 100644
Binary files a/public/images/white@2x.png and b/public/images/white@2x.png differ
diff --git a/public/images/white_on_grey.png b/public/images/white_on_grey.png
index 6213e06712dd37b1c841e55ef4dc7bd85d1e778f..0f6294fef2b2398caf3a653446135f225bd64475 100644
Binary files a/public/images/white_on_grey.png and b/public/images/white_on_grey.png differ
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/external.png b/public/stylesheets/blueprint/plugins/link-icons/icons/external.png
index cf1cfb42687a8ddd637139eb8ff83e8d03e91a0f..2cd011b22bd80bdfaa460bf838243c6f78ce84c4 100644
Binary files a/public/stylesheets/blueprint/plugins/link-icons/icons/external.png and b/public/stylesheets/blueprint/plugins/link-icons/icons/external.png differ
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/visited.png b/public/stylesheets/blueprint/plugins/link-icons/icons/visited.png
index ebf206def2729dae1fa9e8c5c9e5a95b7176c45b..b8a1eceb9658ac430115dfee76a2f5441adc1cd9 100644
Binary files a/public/stylesheets/blueprint/plugins/link-icons/icons/visited.png and b/public/stylesheets/blueprint/plugins/link-icons/icons/visited.png differ
diff --git a/public/stylesheets/blueprint/src/grid.png b/public/stylesheets/blueprint/src/grid.png
index d42a6c32c173bf067ee9fe1aa062afd915fb366c..61a06891871b4c618f62f3d840974851e9597e7b 100644
Binary files a/public/stylesheets/blueprint/src/grid.png and b/public/stylesheets/blueprint/src/grid.png differ
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 1d55ff81dbc903b828172e718bffe578132bcd59..c8e0cdc33f11297a5d9fa513d543a4ecd509d67d 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -1334,9 +1334,11 @@ ul#aspect_nav
   :background-color rgb(252,252,252)
 
 .aspect
-  :margin
-    :right 20px
-
+  :margin-right 20px // overwriting default of 10px from grid
+  &.last
+    :margin-right 0
+  &.span-12
+    :width 465px // overwriting default of 470px from grid
 
 .requests
   ul.dropzone
diff --git a/public/stylesheets/vendor/images/ajax-loader.png b/public/stylesheets/vendor/images/ajax-loader.png
index 811a2cdd1b492c47faf85c1206ad6606521eb6e4..ff3a6ab7e03c5d45aaf907e661b9d5b569e88023 100644
Binary files a/public/stylesheets/vendor/images/ajax-loader.png and b/public/stylesheets/vendor/images/ajax-loader.png differ
diff --git a/public/stylesheets/vendor/images/icon-search-black.png b/public/stylesheets/vendor/images/icon-search-black.png
index 5721120f8df590d9b745fe96342590600580954b..4723c9b851f8f51b4ebe745eb0a2f2937f90d2c6 100644
Binary files a/public/stylesheets/vendor/images/icon-search-black.png and b/public/stylesheets/vendor/images/icon-search-black.png differ
diff --git a/public/stylesheets/vendor/images/icons-18-black.png b/public/stylesheets/vendor/images/icons-18-black.png
index 71268bdf70f4a925e511d68be966e536449455a1..ab07b90601fd31801d1fbe8bfaae624ba1c393e3 100644
Binary files a/public/stylesheets/vendor/images/icons-18-black.png and b/public/stylesheets/vendor/images/icons-18-black.png differ
diff --git a/public/stylesheets/vendor/images/icons-18-white.png b/public/stylesheets/vendor/images/icons-18-white.png
index dadc6af58703dc34132c8756ab74b125278ca1ea..c1962570da482e9b3d23aca6b027e30bdcba602f 100644
Binary files a/public/stylesheets/vendor/images/icons-18-white.png and b/public/stylesheets/vendor/images/icons-18-white.png differ
diff --git a/public/stylesheets/vendor/images/icons-36-black.png b/public/stylesheets/vendor/images/icons-36-black.png
index 8c35ae3fb03fcd68f24f106a50eb1d0c512dc798..1e71ed2f5a4d43c13bad560ba301a3ae2efc701e 100644
Binary files a/public/stylesheets/vendor/images/icons-36-black.png and b/public/stylesheets/vendor/images/icons-36-black.png differ
diff --git a/public/stylesheets/vendor/images/icons-36-white.png b/public/stylesheets/vendor/images/icons-36-white.png
index 7e559b8163f4673c1cd943ccfdba4a6a87af822a..bbea8da53a44bed15d59777b04cd2cff4a49a786 100644
Binary files a/public/stylesheets/vendor/images/icons-36-white.png and b/public/stylesheets/vendor/images/icons-36-white.png differ
diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index a3f0fa9d670722ae03d43342188c0618af477482..dd958f81066849e2b31933966ea9ea2acdee3f8c 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -104,7 +104,7 @@ describe AspectsController do
           post.save!
           @posts << post
         end
-        alice.build_comment('lalala', :on => @posts.first ).save
+        alice.build_comment(:text => 'lalala', :on => @posts.first ).save
       end
 
       describe "post visibilities" do
diff --git a/spec/controllers/likes_controller_spec.rb b/spec/controllers/likes_controller_spec.rb
index ee99e5339bc11918ee0d619944146aa4ddb72ff4..1ded8837d1a196f2d082dbbc697c9d3742a1a380 100644
--- a/spec/controllers/likes_controller_spec.rb
+++ b/spec/controllers/likes_controller_spec.rb
@@ -11,7 +11,7 @@ describe LikesController do
 
     @aspect1 = @user1.aspects.first
     @aspect2 = @user2.aspects.first
-  
+
     @controller.stub(:current_user).and_return(alice)
     sign_in :user, @user1
   end
@@ -76,7 +76,7 @@ describe LikesController do
     context 'your like' do
       before do
         @message = bob.post(:status_message, :text => "hey", :to => @aspect1.id)
-        @like = alice.build_like(true, :on => @message)
+        @like = alice.build_like(:positive => true, :on => @message)
         @like.save
       end
 
@@ -87,11 +87,11 @@ describe LikesController do
       end
 
       it 'does not let a user destroy other likes' do
-        like2 = eve.build_like(true, :on => @message)
+        like2 = eve.build_like(:positive => true, :on => @message)
         like2.save
 
-        expect { 
-          delete :destroy, :format => "js", :post_id => like2.post_id, :id => like2.id 
+        expect {
+          delete :destroy, :format => "js", :post_id => like2.post_id, :id => like2.id
         }.should_not change(Like, :count)
       end
     end
diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb
index 31c53c3c528a7b7ad6275cbb12ae3d75908ede65..c5883b3b0e7cb7109d37191c1502ed0fb48595ac 100644
--- a/spec/controllers/people_controller_spec.rb
+++ b/spec/controllers/people_controller_spec.rb
@@ -42,6 +42,22 @@ describe PeopleController do
       assigns[:people].should =~ [@eugene, eugene2]
     end
 
+    it "excludes people that are not searchable" do
+      eugene2 = Factory.create(:person,
+                               :profile => Factory.build(:profile, :first_name => "Eugene",
+                                                         :last_name => "w", :searchable => false))
+      get :index, :q => "Eug"
+      assigns[:people].should_not =~ [eugene2]
+    end
+
+    it "allows unsearchable people to be found by handle" do
+      eugene2 = Factory.create(:person, :diaspora_handle => "eugene@example.org",
+                               :profile => Factory.build(:profile, :first_name => "Eugene",
+                                                         :last_name => "w", :searchable => false))
+      get :index, :q => "eugene@example.org"
+      assigns[:people].should =~ [eugene2]
+    end
+    
     it "does not redirect to person page if there is exactly one match" do
       get :index, :q => "Korth"
       response.should_not redirect_to @korth
@@ -268,4 +284,4 @@ describe PeopleController do
       get :retrieve_remote, :diaspora_handle => @user.diaspora_handle
     end
   end
-end
\ No newline at end of file
+end
diff --git a/spec/fixtures/button.png b/spec/fixtures/button.png
index 6248f1b88bc0084916b0ec473d2e0cc7dcce2ca6..75004609243b1c3f026c004c6123ca0184f7c5ce 100644
Binary files a/spec/fixtures/button.png and b/spec/fixtures/button.png differ
diff --git a/spec/helpers/markdownify_helper_spec.rb b/spec/helpers/markdownify_helper_spec.rb
index 6e9746d685b378c3e5a0658584b1f6b614d43481..a30ee28e0deaafcd22e2ab4bb887665bfc06e9ae 100644
--- a/spec/helpers/markdownify_helper_spec.rb
+++ b/spec/helpers/markdownify_helper_spec.rb
@@ -35,6 +35,15 @@ describe MarkdownifyHelper do
         markdownify(proto+"://"+url).should == "<a target=\"_blank\" href=\""+proto+"://"+url+"\">"+url+"</a>"
       end
 
+      it "doesn't double parse video links" do
+        message = "http://www.vimeo.com/17449557
+                   http://www.youtube.com/watch?v=0x__dDWdf23&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1
+                   http://youtu.be/x_CzD0GBD-4"
+        res = markdownify(message)
+        res.should =~ /href.+href.+href/
+        res.should_not =~ /href.+href.+href.+href/
+      end
+
       describe "video links" do
         it "recognizes vimeo links" do
           video_id = "17449557"
@@ -62,6 +71,15 @@ describe MarkdownifyHelper do
           res.should =~ /data-video-id="#{video_id}"/
         end
 
+        it "recognizes youtu.be links" do
+          video_id = "x_CzD0GBD-4"
+          url =  "http://youtu.be/#{video_id}"
+          res = markdownify(url)
+          res.should =~ /Youtube:/
+          res.should =~ /data-host="youtube.com"/
+          res.should =~ /data-video-id="#{video_id}"/
+        end
+
         it "recognizes youtube links with hyphens" do
           video_id = "ABYnqp-bxvg"
           url = "http://www.youtube.com/watch?v=" + video_id + "&a=GxdCwVVULXdvEBKmx_f5ywvZ0zZHHHDU&list=ML&playnext=1"
diff --git a/spec/lib/postzord/dispatch_spec.rb b/spec/lib/postzord/dispatch_spec.rb
index d1e4fae54de1653904f2776fd06b7022faecc941..f46a0ca60361844d081235368aa64e7a332f6908 100644
--- a/spec/lib/postzord/dispatch_spec.rb
+++ b/spec/lib/postzord/dispatch_spec.rb
@@ -84,7 +84,7 @@ describe Postzord::Dispatch do
         end
         context "local leia" do
           before do
-            @comment = @local_leia.build_comment "yo", :on => @post
+            @comment = @local_leia.build_comment :text => "yo", :on => @post
             @comment.save
           end
           context "local leia's mailman" do
@@ -156,7 +156,7 @@ describe Postzord::Dispatch do
         end
         context "local luke" do
           before do
-            @comment = @local_luke.build_comment "yo", :on => @post
+            @comment = @local_luke.build_comment :text => "yo", :on => @post
             @comment.save
             @mailman = Postzord::Dispatch.new(@local_luke, @comment)
           end
@@ -182,7 +182,7 @@ describe Postzord::Dispatch do
       context "remote raphael's post is commented on by local luke" do
         before do
           @post = Factory(:status_message, :author => @remote_raphael)
-          @comment = @local_luke.build_comment "yo", :on => @post
+          @comment = @local_luke.build_comment :text => "yo", :on => @post
           @comment.save
           @mailman = Postzord::Dispatch.new(@local_luke, @comment)
         end
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index f844c2ab77e8bbf60cb8a3b9cce39c72859eec45..8f0a10c12e3b97ab0e4122d1bd8f3380ee0f860d 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -104,7 +104,7 @@ describe Comment do
       mock_http.should_receive(:get).with(/\/feeds\/api\/videos/, nil).twice.and_return(
         [nil, 'Foobar <title>'+expected_title+'</title> hallo welt <asd><dasdd><a>dsd</a>'])
 
-      comment = alice.build_comment url, :on => @message
+      comment = alice.build_comment :text => url, :on => @message
       comment.save!
 
       Comment.find(comment.id).youtube_titles.should == { first_video_id => CGI::escape(expected_title), second_video_id => CGI::escape(expected_title) }
@@ -118,7 +118,7 @@ describe Comment do
       @local_parent = @local_luke.post :status_message, :text => "hi", :to => @local_luke.aspects.first
 
       @object_by_parent_author = @local_luke.comment("yo", :on => @local_parent)
-      @object_by_recipient = @local_leia.build_comment("yo", :on => @local_parent)
+      @object_by_recipient = @local_leia.build_comment(:text => "yo", :on => @local_parent)
       @dup_object_by_parent_author = @object_by_parent_author.dup
 
       @object_on_remote_parent = @local_luke.comment("Yeah, it was great", :on => @remote_parent)
diff --git a/spec/models/like_spec.rb b/spec/models/like_spec.rb
index 2bb4728f1b96eb99761705565f11da3900a777a0..f3b9859b8b124de0d3730c9b1cf860a0cc0c2510 100644
--- a/spec/models/like_spec.rb
+++ b/spec/models/like_spec.rb
@@ -91,7 +91,7 @@ describe Like do
       @local_parent = @local_luke.post :status_message, :text => "foobar", :to => @local_luke.aspects.first
 
       @object_by_parent_author = @local_luke.like(1, :on => @local_parent)
-      @object_by_recipient = @local_leia.build_like(1, :on => @local_parent)
+      @object_by_recipient = @local_leia.build_like(:positive => 1, :on => @local_parent)
       @dup_object_by_parent_author = @object_by_parent_author.dup
 
       @object_on_remote_parent = @local_luke.like(0, :on => @remote_parent)
diff --git a/spec/support/user_methods.rb b/spec/support/user_methods.rb
index 6e43704b3b0ae64676fe8d20d1f50431aab5096a..e65e7f92380215c8ed7d3fefcac3a991f75971a0 100644
--- a/spec/support/user_methods.rb
+++ b/spec/support/user_methods.rb
@@ -27,7 +27,7 @@ class User
 
   def comment(text, options = {})
     fantasy_resque do
-      c = build_comment(text, options)
+      c = build_comment(options.merge(:text => text))
       if c.save!
         Postzord::Dispatch.new(self, c).post
       end
@@ -37,7 +37,7 @@ class User
 
   def like(positive, options ={})
     fantasy_resque do
-      l = build_like(positive, options)
+      l = build_like(options.merge(:positive => positive))
       if l.save!
         Postzord::Dispatch.new(self, l).post
       end