Added better messages and error handling in a couple of places. Added integration...

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 5459cd1dae07e511dfb17f1dbaa3532df0960d7c..241e0327f12c84c1f5bdddd32e4a53ec627bd9c3 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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."
@@ -1009,8 +1012,14 @@ en:
       confirm: "Confirm"
       fail: "Couldn't revoke role `{{role}}' from user `{{name}}'. Please check that the user and role are both valid."
   user_block:
+    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. Bear in mind that not all users understand the community jargon, so please try to use laymans terms."
+      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."
       submit: "Create block"
       tried_contacting: "I have contacted the user and asked them to stop."
@@ -1025,15 +1034,16 @@ en:
       back: "Back"
       title: "Editing block on {{name}}"
       needs_view: "Does the user need to log in before this block will be cleared?"
+    filter:
+      not_a_moderator: "You need to be a moderator to perform that action."
+      block_expired: "The block has already expired and cannot be edited."
+      block_period: "The blocking period must be one of the values selectable in the drop-down list."
     create:
-      not_a_moderator: "User block could not be created: you are not a moderator."
       try_contacting: "Please try contacting the user before blocking them and giving them a reasonable time to respond."
       try_waiting: "Please try giving the user a reasonable time to respond before blocking them."
-      bad_parameters: "Could not create a new block due to bad parameters. Maybe the blocking period is not valid?"
       flash: "Created a block on user {{name}}."
     update:
       only_creator_can_edit: "Only the moderator who created this block can edit it."
-      block_expired: "The block has already expired and cannot be edited."
       success: "Block updated."
     index:
       heading: "Listing User Blocks"
@@ -1053,14 +1063,15 @@ en:
       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)"
-      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:
@@ -1069,6 +1080,7 @@ en:
       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!"