New migration to add better auditing to user_roles and better column names there...

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8220a91e925f4edca6368b25e69c13bd1b243b02..bfa728c1e26ed70bfe4adedcaf40b296989dd4d6 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1001,8 +1001,12 @@ en:
       not_a_friend: "{{name}} is not one of your friends."
   user_role:
     grant:
       not_a_friend: "{{name}} is not one of your friends."
   user_role:
     grant:

+      are_you_sure: "Are you sure you want to grant the role `{{role}}' to the user `{{name}}'?"
+      confirm: "Confirm"

       fail: "Couldn't grant role `{{role}}' to user `{{name}}'. Please check that the user and role are both valid."
     revoke:
       fail: "Couldn't grant role `{{role}}' to user `{{name}}'. Please check that the user and role are both valid."
     revoke:

+      are_you_sure: "Are you sure you want to revoke the role `{{role}}' from the user `{{name}}'?"
+      confirm: "Confirm"

       fail: "Couldn't revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid."
   user_block:
     new:
       fail: "Couldn't revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid."
   user_block:
     new:


@@ -1049,14 +1053,15 @@ en:
       revoke: "Revoke!"
       confirm: "Are you sure?"
       display_name: "Blocked User"
       revoke: "Revoke!"
       confirm: "Are you sure?"
       display_name: "Blocked User"

-      moderator_name: "Moderator"
+      creator_name: "Creator"

       reason: "Reason for block"
       status: "Status"
       revoker_name: "Revoked by"
       not_revoked: "(not revoked)"
       reason: "Reason for block"
       status: "Status"
       revoker_name: "Revoked by"
       not_revoked: "(not revoked)"

-      time_future: "Ends in {{time}}"
-      until_login: "Until the user logs in"
-      not_active: "(not active)"
+    helper:
+      time_future: "Ends in {{time}}."
+      until_login: "Active until the user logs in."
+      time_past: "Ended {{time}} ago."

     blocks_on:
       heading: "List blocks on {{name}}"
     blocks_by:
     blocks_on:
       heading: "List blocks on {{name}}"
     blocks_by:


@@ -1065,6 +1070,7 @@ en:
       heading: "Block on {{block_on}} by {{block_by}}"
       time_future: "Ends in {{time}}"
       time_past: "Ended {{time}} ago"
       heading: "Block on {{block_on}} by {{block_by}}"
       time_future: "Ends in {{time}}"
       time_past: "Ended {{time}} ago"

+      status: "Status"

       show: "Show"
       edit: "Edit"
       revoke: "Revoke!"
       show: "Show"
       edit: "Edit"
       revoke: "Revoke!"