Merge pull request #5390 from AntonKhorev/trace-resourceful-routes

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c423de766639981d375023147fe282ac9e8115c8..c3a0c5aed0802f2afe1c8acaf4eafee1f5c7e8e4 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2898,6 +2898,15 @@ en:
         years:
           one: "%{count} year"
           other: "%{count} years"
         years:
           one: "%{count} year"
           other: "%{count} years"

+      short:
+        ended: "ended"
+        revoked_html: "revoked by %{name}"
+        active: "active"
+        active_unread: "active unread"
+        expired_unread: "expired unread"
+        read_html: "read at %{time}"
+        time_in_future_title: "%{time_absolute}; in %{time_relative}"
+        time_in_past_title: "%{time_absolute}; %{time_relative}"

     blocks_on:
       title: "Blocks on %{name}"
       heading_html: "List of Blocks on %{name}"
     blocks_on:
       title: "Blocks on %{name}"
       heading_html: "List of Blocks on %{name}"


@@ -2916,15 +2925,15 @@ en:
       reason: "Reason for block:"
       revoker: "Revoker:"
     block:
       reason: "Reason for block:"
       revoker: "Revoker:"
     block:

-      not_revoked: "(not revoked)"

       show: "Show"
       edit: "Edit"
     page:
       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"
       show: "Show"
       edit: "Edit"
     page:
       display_name: "Blocked User"
       creator_name: "Creator"
       reason: "Reason for block"

+      start: "Start"
+      end: "End"

       status: "Status"
       status: "Status"

-      revoker_name: "Revoked by"

     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"
     navigation:
       all_blocks: "All Blocks"
       blocks_on_me: "Blocks on Me"