Merge pull request #5060 from tomhughes/rake-expiry

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a1cf2cecf178ff5a55fe0272d97a7bab959e488c..a544fe30762e40989c999db20a20e43174594de5 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1469,11 +1469,17 @@ en:
       search_guidance: "Search Issues:"
       user_not_found: User does not exist
       issues_not_found: No such issues found
       search_guidance: "Search Issues:"
       user_not_found: User does not exist
       issues_not_found: No such issues found

+      link_to_reports: View Reports
+      states:
+        ignored: Ignored
+        open: Open
+        resolved: Resolved
+    page:
+      reported_user: Reported User

       status: Status
       reports: Reports
       last_updated: Last Updated
       last_updated_time_ago_user_html: "%{time_ago} by %{user}"
       status: Status
       reports: Reports
       last_updated: Last Updated
       last_updated_time_ago_user_html: "%{time_ago} by %{user}"

-      link_to_reports: View Reports

       reports_count:
         one: "%{count} Report"
         other: "%{count} Reports"
       reports_count:
         one: "%{count} Report"
         other: "%{count} Reports"


@@ -1482,6 +1488,8 @@ en:
         ignored: Ignored
         open: Open
         resolved: Resolved
         ignored: Ignored
         open: Open
         resolved: Resolved

+      older_issues: Older Issues
+      newer_issues: Newer Issues

     show:
       title: "%{status} Issue #%{issue_id}"
       reports:
     show:
       title: "%{status} Issue #%{issue_id}"
       reports:


@@ -2943,6 +2951,7 @@ en:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
       period: "How long, starting now, the user will be blocked from the API for."

+      revoke: "Revoke block"

     filter:
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
     filter:
       block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:


@@ -2957,14 +2966,6 @@ en:
       title: "User blocks"
       heading: "List of user blocks"
       empty: "No blocks have been made yet."
       title: "User blocks"
       heading: "List of user blocks"
       empty: "No blocks have been made yet."

-    revoke:
-      title: "Revoking block on %{block_on}"
-      heading_html: "Revoking block on %{block_on} by %{block_by}"
-      time_future_html: "This block will end in %{time}."
-      past_html: "This block ended %{time} and cannot be revoked now."
-      confirm: "Are you sure you wish to revoke this block?"
-      revoke: "Revoke!"
-      flash: "This block has been revoked."

     revoke_all:
       title: "Revoking all blocks on %{block_on}"
       heading_html: "Revoking all blocks on %{block_on}"
     revoke_all:
       title: "Revoking all blocks on %{block_on}"
       heading_html: "Revoking all blocks on %{block_on}"


@@ -3012,7 +3013,6 @@ en:
       status: "Status:"
       show: "Show"
       edit: "Edit"
       status: "Status:"
       show: "Show"
       edit: "Edit"

-      revoke: "Revoke!"

       confirm: "Are you sure?"
       reason: "Reason for block:"
       revoker: "Revoker:"
       confirm: "Are you sure?"
       reason: "Reason for block:"
       revoker: "Revoker:"


@@ -3021,7 +3021,6 @@ en:
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"
       not_revoked: "(not revoked)"
       show: "Show"
       edit: "Edit"

-      revoke: "Revoke!"

     blocks:
       display_name: "Blocked User"
       creator_name: "Creator"
     blocks:
       display_name: "Blocked User"
       creator_name: "Creator"