When a user hasn't made any blocks or been blocked don't display a

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 95b53821f03f7e663dd89fe13de5563ab67f0232..684b0f5d57f77dbbc817bc9a4b3bb139c0d2a2cb 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -608,9 +608,9 @@ en:
       deleted: "Message deleted"
   site:
     index:
       deleted: "Message deleted"
   site:
     index:

-      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
-      js_2: "OpenStreetMap uses javascript for its slippy map."
-      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
+      js_1: "You are either using a browser that doesn't support JavaScript, or you have disabled JavaScript."
+      js_2: "OpenStreetMap uses JavaScript for its slippy map."
+      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable JavaScript.'

       permalink: Permalink
       shortlink: Shortlink
       license:
       permalink: Permalink
       shortlink: Shortlink
       license:


@@ -948,8 +948,14 @@ en:
       change your settings: change your settings
       my_oauth_details: "View my OAuth details"
       role:
       change your settings: change your settings
       my_oauth_details: "View my OAuth details"
       role:

-        administrator: "Administrator"
-        moderator: "Moderator"
+        administrator: "This user is an administrator"
+        moderator: "This user is a moderator"
+        grant:
+          administrator: "Grant administrator access"
+          moderator: "Grant moderator access"
+        revoke:
+          administrator: "Revoke administrator access"
+          moderator: "Revoke moderator access"

       block_history: "view blocks received"
       moderator_history: "view blocks given"
       create_block: "block this user"
       block_history: "view blocks received"
       moderator_history: "view blocks given"
       create_block: "block this user"


@@ -1009,10 +1015,14 @@ en:
       already_has_role: "The user already has role {{role}}."
       doesnt_have_role: "The user does not have role {{role}}."
     grant:
       already_has_role: "The user already has role {{role}}."
       doesnt_have_role: "The user does not have role {{role}}."
     grant:

+      title: Confirm role granting
+      heading: Confirm role granting

       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:
       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:

+      title: Confirm role revoking
+      heading: Confirm role revoking

       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."
       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."


@@ -1078,9 +1088,13 @@ en:
       until_login: "Active until the user logs in."
       time_past: "Ended {{time}} ago."
     blocks_on:
       until_login: "Active until the user logs in."
       time_past: "Ended {{time}} ago."
     blocks_on:

-      heading: "List blocks on {{name}}"
+      title: "Blocks on {{name}}"
+      heading: "List of blocks on {{name}}"
+      empty: "{{name}} has not made any blocks yet."

     blocks_by:
     blocks_by:

-      heading: "List blocks by {{name}}"
+      title: "Blocks by {{name}}"
+      heading: "List of blocks by {{name}}"
+      empty: "{{name}} has not been blocked yet."

     show:
       heading: "Block on {{block_on}} by {{block_by}}"
       time_future: "Ends in {{time}}"
     show:
       heading: "Block on {{block_on}} by {{block_by}}"
       time_future: "Ends in {{time}}"