diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index 8edff42d0..3ae8858e9 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/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index a6655b945..782aa46d1 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}."