Merge remote-tracking branch 'upstream/pull/1838'

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b31ce4d5d6918fe1f05823039139095fa972e009..53238a75aa3fffa1fbe5b9134567a3f52bbd30da 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1690,7 +1690,7 @@ en:
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth:
       blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more."
       need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them."
   oauth:

-    oauthorize:
+    authorize:

       title: "Authorize access to your account"
       request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
       allow_to: "Allow the client application to:"
       title: "Authorize access to your account"
       request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like."
       allow_to: "Allow the client application to:"


@@ -1702,11 +1702,11 @@ en:
       allow_write_gpx:   "upload GPS traces."
       allow_write_notes: "modify notes."
       grant_access: "Grant Access"
       allow_write_gpx:   "upload GPS traces."
       allow_write_notes: "modify notes."
       grant_access: "Grant Access"

-    oauthorize_success:
+    authorize_success:

       title: "Authorization request allowed"
       allowed: "You have granted application %{app_name} access to your account."
       verification: "The verification code is %{code}."
       title: "Authorization request allowed"
       allowed: "You have granted application %{app_name} access to your account."
       verification: "The verification code is %{code}."

-    oauthorize_failure:
+    authorize_failure:

       title: "Authorization request failed"
       denied: "You have denied application %{app_name} access to your account."
       invalid: "The authorization token is not valid."
       title: "Authorization request failed"
       denied: "You have denied application %{app_name} access to your account."
       invalid: "The authorization token is not valid."


@@ -2108,7 +2108,7 @@ en:
       are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
       confirm: "Confirm"
       fail: "Could not 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: "Could not revoke role `%{role}' from user `%{name}'. Please check that the user and role are both valid."

-  user_block:
+  user_blocks:

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


@@ -2188,7 +2188,6 @@ en:
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."
       back: "View all blocks"
       revoker: "Revoker:"
       needs_view: "The user needs to log in before this block will be cleared."

-  user_blocks:

     block:
       not_revoked: "(not revoked)"
       show: "Show"
     block:
       not_revoked: "(not revoked)"
       show: "Show"


@@ -2203,8 +2202,8 @@ en:
       showing_page: "Page %{page}"
       next: "Next »"
       previous: "« Previous"
       showing_page: "Page %{page}"
       next: "Next »"
       previous: "« Previous"

-  note:
-    description:
+  notes:
+    comment:

       opened_at_html: "Created %{when} ago"
       opened_at_by_html: "Created %{when} ago by %{user}"
       commented_at_html: "Updated %{when} ago"
       opened_at_html: "Created %{when} ago"
       opened_at_by_html: "Created %{when} ago by %{user}"
       commented_at_html: "Updated %{when} ago"


@@ -2401,7 +2400,7 @@ en:
       show_address: Show address
       query_features: Query features
       centre_map: Centre map here
       show_address: Show address
       query_features: Query features
       centre_map: Centre map here

-  redaction:
+  redactions:

     edit:
       description: "Description"
       heading: "Edit redaction"
     edit:
       description: "Description"
       heading: "Edit redaction"