Merge remote-tracking branch 'upstream/pull/4681'

[rails.git] / config / locales / en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index de2a4f89cd6a4c0e7a2e71009bf102cee2fc149a..f9117ca1cc89add7669440805fbb59138644c7b0 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2988,7 +2988,10 @@ en:
     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"
+      blocks_on_user: "Blocks on %{user}"
       blocks_by_me: "Blocks by Me"
+      blocks_by_user: "Blocks by %{user}"
+      block: "Block #%{id}"
   user_mutes:
     index:
       title: "Muted Users"