Adding title for role icons when viewing user isn't an admin, re-adding translations...

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 363f620f4c6f4a63f93135b0e7e5846ef5d1d32b..f0b9cb235b296a4825ecf3c6362c7bbbb1d1115c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -608,9 +608,9 @@ en:
       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:
@@ -800,6 +800,9 @@ en:
       scheduled_for_deletion: "Track scheduled for deletion"
     make_public:
       made_public: "Track made public"
+  application:
+    setup_user_auth:
+      blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
   oauth:
     oauthorize:
       request_access: "The application {{app_name}} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
@@ -947,6 +950,12 @@ en:
       role:
         administrator: "Administrator"
         moderator: "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"
@@ -1000,11 +1009,20 @@ en:
       success: "{{name}} was removed from your friends."
       not_a_friend: "{{name}} is not one of your friends."
   user_role:
+    filter:
+      not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
+      not_a_role: "The string `{{role}}' isn't a valid role."
+      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:
+      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."
@@ -1012,6 +1030,9 @@ en:
     model:
       non_moderator_update: "Must be a moderator to create or update a block."
       non_moderator_revoke: "Must be a moderator to revoke a block."
+    not_found:
+      sorry: "Sorry, the user block with ID {{id}} could not be found."
+      back: "Back to index"
     new:
       reason: "The reason why {{name}} is being blocked. Please be as calm and as reasonable as possible, giving as much detail as you can about the situation, remembering that the message will be publicly visible. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
       period: "How long, starting now, the user will be blocked from the API for."