diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 3beee0f97..625719724 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -367,13 +367,13 @@ en:
 
   likes:
     likes:
-      people_like_this:
-        zero: "no likes"
-        one: "%{count} like"
-        two: "%{count} likes"
-        few: "%{count} likes"
-        many: "%{count} likes"
-        other: "%{count} likes"
+      people_pin_this:
+        zero: "no pins"
+        one: "%{count} pin"
+        two: "%{count} pins"
+        few: "%{count} pins"
+        many: "%{count} pins"
+        other: "%{count} pins"
       people_like_this_comment:
         zero: "no likes"
         one: "%{count} like"
@@ -425,13 +425,13 @@ en:
       few: "%{actors} have mentioned you in a %{post_link}."
       many: "%{actors} have mentioned you in a %{post_link}."
       other: "%{actors} have mentioned you in a %{post_link}."
-    liked:
-      zero: "%{actors} have liked your %{post_link}."
-      one: "%{actors} has liked your %{post_link}."
-      two: "%{actors} have liked your %{post_link}."
-      few: "%{actors} have liked your %{post_link}."
-      many: "%{actors} have liked your %{post_link}."
-      other: "%{actors} have liked your %{post_link}."
+    pinned:
+      zero: "%{actors} have pinned your %{post_link}."
+      one: "%{actors} has pinned your %{post_link}."
+      two: "%{actors} have pinned your %{post_link}."
+      few: "%{actors} have pinned your %{post_link}."
+      many: "%{actors} have pinned your %{post_link}."
+      other: "%{actors} have pinned your %{post_link}."
     reshared:
       zero: "%{actors} have reshared your %{post_link}."
       one: "%{actors} has reshared your %{post_link}."
@@ -447,13 +447,13 @@ en:
       few: "%{actors} commented on a deleted post."
       many: "%{actors} commented on a deleted post."
       other: "%{actors} commented on a deleted post."
-    liked_post_deleted:
-      zero: "%{actors} liked your deleted post."
-      one: "%{actors} liked your deleted post."
-      two: "%{actors} liked your deleted post."
-      few: "%{actors} liked your deleted post."
-      many: "%{actors} liked your deleted post."
-      other: "%{actors} liked your deleted post."
+    pinned_post_deleted:
+      zero: "%{actors} pinned your deleted post."
+      one: "%{actors} pinned your deleted post."
+      two: "%{actors} pinned your deleted post."
+      few: "%{actors} pinned your deleted post."
+      many: "%{actors} pinned your deleted post."
+      other: "%{actors} pinned your deleted post."
     reshared_post_deleted:
       zero: "%{actors} reshared your deleted post."
       one: "%{actors} reshared your deleted post."
@@ -509,8 +509,8 @@ en:
         mentioned: "mentioned you in a post:"
     private_message:
         reply_to_or_view: "Reply to or view this conversation >"
-    liked:
-        liked: "%{name} liked your post"
+    pinned:
+        pinned: "%{name} pinned your post"
         view_post: "View post >"
     reshared:
         reshared: "%{name} reshared your post"
@@ -816,8 +816,8 @@ en:
       ignore_user: "Ignore %{name}"
       ignore_user_description: "Ignore and remove user from all aspects?"
       hide_and_mute: "Hide and mute post"
-      like: "Like"
-      unlike: "Unlike"
+      pin: "Pin"
+      unpin: "Unpin"
       dislike: "Dislike"
       shared_with: "Shared with: %{aspect_names}"
       nsfw: "This post has been flagged as NSFW by its author. %{link}"
@@ -904,8 +904,8 @@ en:
       contacts_title: "People whose posts you commented on"
 
     like_stream:
-      title: "Like Stream"
-      contacts_title: "People whose posts you like"
+      title: "Pin Stream"
+      contacts_title: "People whose posts you pinned"
 
     followed_tag:
       title: "#Followed Tags"
@@ -957,7 +957,7 @@ en:
       mentioned: "...you are mentioned in a post?"
       started_sharing: "...someone starts sharing with you?"
       private_message: "...you receive a private message?"
-      liked: "...someone likes your post?"
+      pinned: "...someone pins your post?"
       reshared: "...someone reshares your post?"
       change: "Change"
       email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Until you follow this link and activate the new address, we will continue to use your original address %{email}."
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index d30c4b0d0..776fad527 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -49,7 +49,7 @@ en:
           many: "In <%= count %> aspects"
           other: "In <%= count %> aspects"
       show_more: "show more"
-      failed_to_like: "Failed to like!"
+      failed_to_like: "Failed to pin!"
       failed_to_post_message: "Failed to post message!"
       comments:
         show: "show all comments"
@@ -74,8 +74,8 @@ en:
         hide: "Hide"
         public: "Public"
         limited: "Limited"
-        like: "Like"
-        unlike: "Unlike"
+        like: "Pin"
+        unlike: "Unpin"
         reshare: "Reshare"
         comment: "Comment"
         original_post_deleted: "Original post deleted by author."
@@ -83,12 +83,12 @@ en:
         show: "Show"
 
         likes:
-          zero: "<%= count %> Likes"
-          one: "<%= count %> Like"
-          two: "<%= count %> Likes"
-          few: "<%= count %> Likes"
-          many: "<%= count %> Likes"
-          other: "<%= count %> Likes"
+          zero: "<%= count %> Pins"
+          one: "<%= count %> Pin"
+          two: "<%= count %> Pins"
+          few: "<%= count %> Pins"
+          many: "<%= count %> Pins"
+          other: "<%= count %> Pins"
 
         reshares:
           zero: "<%= count %> Reshares"