Rework the default denied access handler to give different responses to tokens, logge...

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 66eba938d52ea13d53a7eed046603e45995ac9e5..6942c1720e58b996f330da83785719a5e951ddd4 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -228,7 +228,7 @@ en:
       user: "User"
       comment: "Comment"
       area: "Area"
       user: "User"
       comment: "Comment"
       area: "Area"

-    list:
+    index:

       title: "Changesets"
       title_user: "Changesets by %{user}"
       title_friend: "Changesets by my friends"
       title: "Changesets"
       title_user: "Changesets by %{user}"
       title_friend: "Changesets by my friends"


@@ -253,7 +253,7 @@ en:
     new:
       title: New Diary Entry
       publish_button: "Publish"
     new:
       title: New Diary Entry
       publish_button: "Publish"

-    list:
+    index:

       title: "Users' diaries"
       title_friends: "Friends' diaries"
       title_nearby: "Nearby Users' diaries"
       title: "Users' diaries"
       title_friends: "Friends' diaries"
       title_nearby: "Nearby Users' diaries"


@@ -276,7 +276,7 @@ en:
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location
       use_map_link: "use map"
       save_button: "Save"
       marker_text: Diary entry location

-    view:
+    show:

       title: "%{user}'s diary | %{title}"
       user_title: "%{user}'s diary"
       leave_a_comment: "Leave a comment"
       title: "%{user}'s diary | %{title}"
       user_title: "%{user}'s diary"
       leave_a_comment: "Leave a comment"


@@ -1055,9 +1055,8 @@ en:
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"

-    partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}."
+    hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}."

     partners_ucl: "UCL"
     partners_ucl: "UCL"

-    partners_ic: "Imperial College London"

     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."
     partners_bytemark: "Bytemark Hosting"
     partners_partners: "partners"
     osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out."


@@ -1194,6 +1193,7 @@ en:
       body: "Body"
       send_button: "Send"
       back_to_inbox: "Back to inbox"
       body: "Body"
       send_button: "Send"
       back_to_inbox: "Back to inbox"

+    create:

       message_sent: "Message sent"
       limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
     no_such_message:
       message_sent: "Message sent"
       limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more."
     no_such_message:


@@ -1700,6 +1700,7 @@ en:
     create:
       upload_trace: "Upload GPS Trace"
       trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
     create:
       upload_trace: "Upload GPS Trace"
       trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."

+      upload_failed: "Sorry, the GPX upload failed. An administrator has been alerted to the error. Please try again"

       traces_waiting:
         one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
         other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
       traces_waiting:
         one: "You have %{count} trace waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
         other: "You have %{count} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."


@@ -1721,9 +1722,11 @@ en:
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
       visibility: "Visibility:"
       visibility_help: "what does this mean?"
       visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"

+    update:
+      updated: Trace updated

     trace_optionals:
       tags: "Tags"
     trace_optionals:
       tags: "Tags"

-    view:
+    show:

       title: "Viewing trace %{name}"
       heading: "Viewing trace %{name}"
       pending: "PENDING"
       title: "Viewing trace %{name}"
       heading: "Viewing trace %{name}"
       pending: "PENDING"


@@ -1738,8 +1741,8 @@ en:
       description: "Description:"
       tags: "Tags:"
       none: "None"
       description: "Description:"
       tags: "Tags:"
       none: "None"

-      edit_track: "Edit this trace"
-      delete_track: "Delete this trace"
+      edit_trace: "Edit this trace"
+      delete_trace: "Delete this trace"

       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"
       trace_not_found: "Trace not found!"
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"


@@ -1763,7 +1766,7 @@ en:
       by: "by"
       in: "in"
       map: "map"
       by: "by"
       in: "in"
       map: "map"

-    list:
+    index:

       public_traces: "Public GPS traces"
       my_traces: "My GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
       public_traces: "Public GPS traces"
       my_traces: "My GPS traces"
       public_traces_from: "Public GPS traces from %{user}"


@@ -1790,6 +1793,7 @@ en:
         other: "GPX file with %{count} points from %{user}"
       description_without_count: "GPX file from %{user}"
   application:
         other: "GPX file with %{count} points from %{user}"
       description_without_count: "GPX file from %{user}"
   application:

+    permission_denied: You do not have permission to access that action

     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
     require_admin:
     require_cookies:
       cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing."
     require_admin:


@@ -1886,7 +1890,7 @@ en:
       flash: "Updated the client information successfully"
     destroy:
       flash: "Destroyed the client application registration"
       flash: "Updated the client information successfully"
     destroy:
       flash: "Destroyed the client application registration"

-  user:
+  users:

     login:
       title: "Login"
       heading: "Login"
     login:
       title: "Login"
       heading: "Login"


@@ -2002,7 +2006,7 @@ en:
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
       deleted: "deleted"
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
       deleted: "deleted"

-    view:
+    show:

       my diary: My Diary
       new diary entry: new diary entry
       my edits: My Edits
       my diary: My Diary
       new diary entry: new diary entry
       my edits: My Edits


@@ -2164,7 +2168,7 @@ en:
       not_a_friend: "%{name} is not one of your friends."
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."
       not_a_friend: "%{name} is not one of your friends."
     filter:
       not_an_administrator: "You need to be an administrator to perform that action."

-    list:
+    index:

       title: Users
       heading: Users
       showing:
       title: Users
       heading: Users
       showing: