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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 37d6f99e9be79e54d6b8f068744df37138a1c7f8..72f02fbf14d1efd58ca74872de871f8f91ccb68d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -21,6 +21,9 @@ en:
       client_application:
         create: Register
         update: Update
       client_application:
         create: Register
         update: Update

+      doorkeeper_application:
+        create: Register
+        update: Update

       redaction:
         create: Create redaction
         update: Save redaction
       redaction:
         create: Create redaction
         update: Save redaction


@@ -95,6 +98,11 @@ en:
         latitude: "Latitude"
         longitude: "Longitude"
         language: "Language"
         latitude: "Latitude"
         longitude: "Longitude"
         language: "Language"

+      doorkeeper/application:
+        name: Name
+        redirect_uri: Redirect URIs
+        confidential: Confidential application?
+        scopes: Permissions

       friend:
         user: "User"
         friend: "Friend"
       friend:
         user: "User"
         friend: "Friend"


@@ -116,20 +124,39 @@ en:
         title: "Subject"
         body: "Body"
         recipient: "Recipient"
         title: "Subject"
         body: "Body"
         recipient: "Recipient"

+      redaction:
+        title: Title
+        description: Description

       report:
         category: Select a reason for your report
         details: Please provide some more details about the problem (required).
       user:
       report:
         category: Select a reason for your report
         details: Please provide some more details about the problem (required).
       user:

+        auth_provider: Authentication Provider
+        auth_uid: Authentication UID

         email: "Email"
         email: "Email"

+        email_confirmation: "Email Confirmation"
+        new_email: "New Email Address"

         active: "Active"
         display_name: "Display Name"
         active: "Active"
         display_name: "Display Name"

-        description: "Description"
-        languages: "Languages"
+        description: Profile Description
+        home_lat: Latitude
+        home_lon: Longitude
+        languages: Preferred Languages
+        preferred_editor: Preferred Editor

         pass_crypt: "Password"
         pass_crypt_confirmation: "Confirm Password"
     help:
         pass_crypt: "Password"
         pass_crypt_confirmation: "Confirm Password"
     help:

+      doorkeeper/application:
+        confidential: "Application will be used where the client secret can be kept confidential (native mobile apps and single page apps are not confidential)"
+        redirect_uri: "Use one line per URI"

       trace:
         tagstring: comma delimited
       trace:
         tagstring: comma delimited

+      user_block:
+        reason: The reason why the user 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.
+        needs_view: Does the user need to log in before this block will be cleared?
+      user:
+        email_confirmation: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information.'
+        new_email: "(never displayed publicly)"

   datetime:
     distance_in_words_ago:
       about_x_hours:
   datetime:
     distance_in_words_ago:
       about_x_hours:


@@ -175,18 +202,12 @@ en:
     with_name_html: "%{name} (%{id})"
   editor:
     default: "Default (currently %{name})"
     with_name_html: "%{name} (%{id})"
   editor:
     default: "Default (currently %{name})"

-    potlatch:
-      name: "Potlatch 1"
-      description: "Potlatch 1 (in-browser editor)"

     id:
       name: "iD"
       description: "iD (in-browser editor)"
     id:
       name: "iD"
       description: "iD (in-browser editor)"

-    potlatch2:
-      name: "Potlatch 2"
-      description: "Potlatch 2 (in-browser editor)"

     remote:
       name: "Remote Control"
     remote:
       name: "Remote Control"

-      description: "Remote Control (JOSM or Merkaartor)"
+      description: "Remote Control (JOSM, Potlatch, Merkaartor)"

   auth:
     providers:
       none: None
   auth:
     providers:
       none: None


@@ -399,13 +420,8 @@ en:
     new:
       title: New Diary Entry
     form:
     new:
       title: New Diary Entry
     form:

-      subject: "Subject:"
-      body: "Body:"
-      language: "Language:"
-      location: "Location:"
-      latitude: "Latitude:"
-      longitude: "Longitude:"
-      use_map_link: "use map"
+      location: Location
+      use_map_link: Use Map

     index:
       title: "Users' diaries"
       title_friends: "Friends' diaries"
     index:
       title: "Users' diaries"
       title_friends: "Friends' diaries"


@@ -433,7 +449,8 @@ en:
       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
     diary_entry:
       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
     diary_entry:

-      posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}"
+      posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}."
+      updated_at_html: "Last updated on %{updated}."

       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:


@@ -468,11 +485,17 @@ en:
         description: "Recent diary entries from users of OpenStreetMap"
     comments:
       has_commented_on: "%{display_name} has commented on the following diary entries"
         description: "Recent diary entries from users of OpenStreetMap"
     comments:
       has_commented_on: "%{display_name} has commented on the following diary entries"

+      no_comments: "No diary comments"

       post: Post
       when: When
       comment: Comment
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
       post: Post
       when: When
       comment: Comment
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"

+  doorkeeper:
+    flash:
+      applications:
+        create:
+          notice: Application Registered.

   friendships:
     make_friend:
       heading: "Add %{user} as a friend?"
   friendships:
     make_friend:
       heading: "Add %{user} as a friend?"


@@ -480,6 +503,7 @@ en:
       success: "%{name} is now your friend!"
       failed: "Sorry, failed to add %{name} as a friend."
       already_a_friend: "You are already friends with %{name}."
       success: "%{name} is now your friend!"
       failed: "Sorry, failed to add %{name} as a friend."
       already_a_friend: "You are already friends with %{name}."

+      limit_exceeded: "You have friended a lot of users recently. Please wait a while before trying to friend any more."

     remove_friend:
       heading: "Unfriend %{user}?"
       button: "Unfriend"
     remove_friend:
       heading: "Unfriend %{user}?"
       button: "Unfriend"


@@ -813,6 +837,7 @@ en:
           railway: "Historic Railway"
           roman_road: "Roman Road"
           ruins: "Ruins"
           railway: "Historic Railway"
           roman_road: "Roman Road"
           ruins: "Ruins"

+          rune_stone: "Rune Stone"

           stone: "Stone"
           tomb: "Tomb"
           tower: "Tower"
           stone: "Stone"
           tomb: "Tomb"
           tower: "Tower"


@@ -957,12 +982,14 @@ en:
         mountain_pass:
           "yes" : "Mountain Pass"
         natural:
         mountain_pass:
           "yes" : "Mountain Pass"
         natural:

+          atoll: "Atoll"

           bare_rock: "Bare Rock"
           bay: "Bay"
           beach: "Beach"
           cape: "Cape"
           cave_entrance: "Cave Entrance"
           cliff: "Cliff"
           bare_rock: "Bare Rock"
           bay: "Bay"
           beach: "Beach"
           cape: "Cape"
           cave_entrance: "Cave Entrance"
           cliff: "Cliff"

+          coastline: "Coastline"

           crater: "Crater"
           dune: "Dune"
           fell: "Fell"
           crater: "Crater"
           dune: "Dune"
           fell: "Fell"


@@ -980,6 +1007,7 @@ en:
           moor: "Moor"
           mud: "Mud"
           peak: "Peak"
           moor: "Moor"
           mud: "Mud"
           peak: "Peak"

+          peninsula: "Peninsula"

           point: "Point"
           reef: "Reef"
           ridge: "Ridge"
           point: "Point"
           reef: "Reef"
           ridge: "Ridge"


@@ -1027,6 +1055,7 @@ en:
           "yes": "Office"
         place:
           allotments: "Allotments"
           "yes": "Office"
         place:
           allotments: "Allotments"

+          archipelago: "Archipelago"

           city: "City"
           city_block: "City Block"
           country: "Country"
           city: "City"
           city_block: "City Block"
           country: "Country"


@@ -1244,12 +1273,15 @@ en:
           "yes": "Waterway"
       admin_levels:
         level2: "Country Boundary"
           "yes": "Waterway"
       admin_levels:
         level2: "Country Boundary"

+        level3: "Region Boundary"

         level4: "State Boundary"
         level5: "Region Boundary"
         level6: "County Boundary"
         level4: "State Boundary"
         level5: "Region Boundary"
         level6: "County Boundary"

+        level7: "Municipality Boundary"

         level8: "City Boundary"
         level9: "Village Boundary"
         level10: "Suburb Boundary"
         level8: "City Boundary"
         level9: "Village Boundary"
         level10: "Suburb Boundary"

+        level11: "Neighbourhood Boundary"

       types:
         cities: Cities
         towns: Towns
       types:
         cities: Cities
         towns: Towns


@@ -1285,7 +1317,7 @@ en:
         open: Open
         resolved: Resolved
     update:
         open: Open
         resolved: Resolved
     update:

-      new_report: Your report has been registered sucessfully
+      new_report: Your report has been registered successfully

       successful_update: Your report has been updated successfully
       provide_details: Please provide the required details
     show:
       successful_update: Your report has been updated successfully
       provide_details: Please provide the required details
     show:


@@ -1356,7 +1388,7 @@ en:
           abusive_label: This note is abusive
           other_label: Other
     create:
           abusive_label: This note is abusive
           other_label: Other
     create:

-      successful_report: Your report has been registered sucessfully
+      successful_report: Your report has been registered successfully

       provide_details: Please provide the required details
   layouts:
     project_name:
       provide_details: Please provide the required details
   layouts:
     project_name:


@@ -1414,35 +1446,39 @@ en:
       subject: "[OpenStreetMap] %{user} commented on a diary entry"
       hi: "Hi %{to_user},"
       header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
       subject: "[OpenStreetMap] %{user} commented on a diary entry"
       hi: "Hi %{to_user},"
       header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"

+      header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"

       footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
       footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"

+      footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"

     message_notification:
     message_notification:

-      subject_header: "[OpenStreetMap] %{subject}"
+      subject: "[OpenStreetMap] %{message_title}"

       hi: "Hi %{to_user},"
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       hi: "Hi %{to_user},"
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"

+      header_html: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
+      footer: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"

       footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
     friendship_notification:
       hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} added you as a friend"
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
       see_their_profile: "You can see their profile at %{userurl}."
       footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
     friendship_notification:
       hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} added you as a friend"
       had_added_you: "%{user} has added you as a friend on OpenStreetMap."
       see_their_profile: "You can see their profile at %{userurl}."

+      see_their_profile_html: "You can see their profile at %{userurl}."

       befriend_them: "You can also add them as a friend at %{befriendurl}."
       befriend_them: "You can also add them as a friend at %{befriendurl}."

-    gpx_notification:
-      greeting: "Hi,"
-      your_gpx_file: "It looks like your GPX file"
-      with_description: "with the description"
-      and_the_tags: "and the following tags:"
-      and_no_tags: "and no tags."
-      failure:
-        subject: "[OpenStreetMap] GPX Import failure"
-        failed_to_import: "failed to import. Here is the error:"
-        more_info_1: "More information about GPX import failures and how to avoid"
-        more_info_2: "them can be found at:"
-        import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
-      success:
-        subject: "[OpenStreetMap] GPX Import success"
-        loaded_successfully:
-          one: loaded successfully with %{trace_points} out of a possible 1 point.
-          other: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
+      befriend_them_html: "You can also add them as a friend at %{befriendurl}."
+    gpx_description:
+      description_with_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+      description_with_no_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
+    gpx_failure:
+      hi: "Hi %{to_user},"
+      failed_to_import: "failed to import. Here is the error:"
+      more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}."
+      import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
+      subject: "[OpenStreetMap] GPX Import failure"
+    gpx_success:
+      hi: "Hi %{to_user},"
+      loaded_successfully:
+        one: loaded successfully with %{trace_points} out of a possible 1 point.
+        other: loaded successfully with %{trace_points} out of a possible %{possible_points} points.
+      subject: "[OpenStreetMap] GPX Import success"

     signup_confirm:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"
       greeting: "Hi there!"
     signup_confirm:
       subject: "[OpenStreetMap] Welcome to OpenStreetMap"
       greeting: "Hi there!"


@@ -1451,21 +1487,11 @@ en:
       welcome: "After you confirm your account, we'll provide you with some additional information to get you started."
     email_confirm:
       subject: "[OpenStreetMap] Confirm your email address"
       welcome: "After you confirm your account, we'll provide you with some additional information to get you started."
     email_confirm:
       subject: "[OpenStreetMap] Confirm your email address"

-    email_confirm_plain:
-      greeting: "Hi,"
-      hopefully_you: "Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}."
-      click_the_link: "If this is you, please click the link below to confirm the change."
-    email_confirm_html:

       greeting: "Hi,"
       hopefully_you: "Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}."
       click_the_link: "If this is you, please click the link below to confirm the change."
     lost_password:
       subject: "[OpenStreetMap] Password reset request"
       greeting: "Hi,"
       hopefully_you: "Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}."
       click_the_link: "If this is you, please click the link below to confirm the change."
     lost_password:
       subject: "[OpenStreetMap] Password reset request"

-    lost_password_plain:
-      greeting: "Hi,"
-      hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
-      click_the_link: "If this is you, please click the link below to reset your password."
-    lost_password_html:

       greeting: "Hi,"
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."
       greeting: "Hi,"
       hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account."
       click_the_link: "If this is you, please click the link below to reset your password."


@@ -1476,18 +1502,25 @@ en:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
         subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
         your_note: "%{commenter} has left a comment on one of your map notes near %{place}."
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes"
         subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in"
         your_note: "%{commenter} has left a comment on one of your map notes near %{place}."

+        your_note_html: "%{commenter} has left a comment on one of your map notes near %{place}."

         commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."
         commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."

+        commented_note_html: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}."

       closed:
         subject_own: "[OpenStreetMap] %{commenter} has resolved one of your notes"
         subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in"
         your_note: "%{commenter} has resolved one of your map notes near %{place}."
       closed:
         subject_own: "[OpenStreetMap] %{commenter} has resolved one of your notes"
         subject_other: "[OpenStreetMap] %{commenter} has resolved a note you are interested in"
         your_note: "%{commenter} has resolved one of your map notes near %{place}."

+        your_note_html: "%{commenter} has resolved one of your map notes near %{place}."

         commented_note: "%{commenter} has resolved a map note you have commented on. The note is near %{place}."
         commented_note: "%{commenter} has resolved a map note you have commented on. The note is near %{place}."

+        commented_note_html: "%{commenter} has resolved a map note you have commented on. The note is near %{place}."

       reopened:
         subject_own: "[OpenStreetMap] %{commenter} has reactivated one of your notes"
         subject_other: "[OpenStreetMap] %{commenter} has reactivated a note you are interested in"
         your_note: "%{commenter} has reactivated one of your map notes near %{place}."
       reopened:
         subject_own: "[OpenStreetMap] %{commenter} has reactivated one of your notes"
         subject_other: "[OpenStreetMap] %{commenter} has reactivated a note you are interested in"
         your_note: "%{commenter} has reactivated one of your map notes near %{place}."

+        your_note_html: "%{commenter} has reactivated one of your map notes near %{place}."

         commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."
         commented_note: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."

+        commented_note_html: "%{commenter} has reactivated a map note you have commented on. The note is near %{place}."

       details: "More details about the note can be found at %{url}."
       details: "More details about the note can be found at %{url}."

+      details_html: "More details about the note can be found at %{url}."

     changeset_comment_notification:
       hi: "Hi %{to_user},"
       greeting: "Hi,"
     changeset_comment_notification:
       hi: "Hi %{to_user},"
       greeting: "Hi,"


@@ -1495,16 +1528,46 @@ en:
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
         subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
         your_changeset: "%{commenter} left a comment at %{time} on one of your changesets"
         subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
         subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
         your_changeset: "%{commenter} left a comment at %{time} on one of your changesets"

+        your_changeset_html: "%{commenter} left a comment at %{time} on one of your changesets"

         commented_changeset: "%{commenter} left a comment at %{time} on a changeset you are watching created by %{changeset_author}"
         commented_changeset: "%{commenter} left a comment at %{time} on a changeset you are watching created by %{changeset_author}"

+        commented_changeset_html: "%{commenter} left a comment at %{time} on a changeset you are watching created by %{changeset_author}"

         partial_changeset_with_comment: "with comment '%{changeset_comment}'"
         partial_changeset_with_comment: "with comment '%{changeset_comment}'"

+        partial_changeset_with_comment_html: "with comment '%{changeset_comment}'"

         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."
         partial_changeset_without_comment: "without comment"
       details: "More details about the changeset can be found at %{url}."

+      details_html: "More details about the changeset can be found at %{url}."

       unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
       unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'

+      unsubscribe_html: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".'
+  confirmations:
+    confirm:
+      heading: Check your email!
+      introduction_1: |
+        We sent you a confirmation email.
+      introduction_2: |
+        Confirm your account by clicking on the link in the email and you'll be able to start mapping.
+      press confirm button: "Press the confirm button below to activate your account."
+      button: Confirm
+      success: "Confirmed your account, thanks for signing up!"
+      already active: "This account has already been confirmed."
+      unknown token: "That confirmation code has expired or does not exist."
+      reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
+    confirm_resend:
+      failure: "User %{name} not found."
+    confirm_email:
+      heading: Confirm a change of email address
+      press confirm button: "Press the confirm button below to confirm your new email address."
+      button: Confirm
+      success: "Confirmed your change of email address!"
+      failure: "An email address has already been confirmed with this token."
+      unknown_token: "That confirmation code has expired or does not exist."
+    resend_success_flash:
+      confirmation_sent: We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.
+      whitelist: If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests.

   messages:
     inbox:
       title: "Inbox"
       my_inbox: "My Inbox"
   messages:
     inbox:
       title: "Inbox"
       my_inbox: "My Inbox"

-      outbox: "outbox"
+      my_outbox: "My Outbox"

       messages: "You have %{new_messages} and %{old_messages}"
       new_messages:
         one: "%{count} new message"
       messages: "You have %{new_messages} and %{old_messages}"
       new_messages:
         one: "%{count} new message"


@@ -1537,9 +1600,8 @@ en:
       body: "Sorry there is no message with that id."
     outbox:
       title: "Outbox"
       body: "Sorry there is no message with that id."
     outbox:
       title: "Outbox"

-      my_inbox_html: "My %{inbox_link}"
-      inbox: "inbox"
-      outbox: "outbox"
+      my_inbox: "My Inbox"
+      my_outbox: "My Outbox"

       messages:
         one: "You have %{count} sent message"
         other: "You have %{count} sent messages"
       messages:
         one: "You have %{count} sent message"
         other: "You have %{count} sent messages"


@@ -1568,6 +1630,89 @@ en:
       as_unread: "Message marked as unread"
     destroy:
       destroyed: "Message deleted"
       as_unread: "Message marked as unread"
     destroy:
       destroyed: "Message deleted"

+  passwords:
+    lost_password:
+      title: "Lost password"
+      heading: "Forgotten Password?"
+      email address: "Email Address:"
+      new password button: "Reset password"
+      help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
+      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
+      notice email cannot find: "Could not find that email address, sorry."
+    reset_password:
+      title: "Reset password"
+      heading: "Reset Password for %{user}"
+      reset: "Reset Password"
+      flash changed: "Your password has been changed."
+      flash token bad: "Did not find that token, check the URL maybe?"
+  sessions:
+    new:
+      title: "Login"
+      heading: "Login"
+      email or username: "Email Address or Username:"
+      password: "Password:"
+      openid_html: "%{logo} OpenID:"
+      remember: "Remember me"
+      lost password link: "Lost your password?"
+      login_button: "Login"
+      register now: Register now
+      with username: "Already have an OpenStreetMap account? Please login with your username and password:"
+      with external: "Alternatively, use a third party to login:"
+      new to osm: New to OpenStreetMap?
+      to make changes: To make changes to the OpenStreetMap data, you must have an account.
+      create account minute: Create an account. It only takes a minute.
+      no account: Don't have an account?
+      account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
+      account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact <a href="%{webmaster}">support</a> if you wish to discuss this.
+      auth failure: "Sorry, could not log in with those details."
+      openid_logo_alt: "Log in with an OpenID"
+      auth_providers:
+        openid:
+          title: Login with OpenID
+          alt: Login with an OpenID URL
+        google:
+          title: Login with Google
+          alt: Login with a Google OpenID
+        facebook:
+          title: Login with Facebook
+          alt: Login with a Facebook Account
+        windowslive:
+          title: Login with Windows Live
+          alt: Login with a Windows Live Account
+        github:
+          title: Login with GitHub
+          alt: Login with a GitHub Account
+        wikipedia:
+          title: Login with Wikipedia
+          alt: Login with a Wikipedia Account
+        wordpress:
+          title: Login with Wordpress
+          alt: Login with a Wordpress OpenID
+        aol:
+          title: Login with AOL
+          alt: Login with an AOL OpenID
+    destroy:
+      title: "Logout"
+      heading: "Logout from OpenStreetMap"
+      logout_button: "Logout"
+  shared:
+    markdown_help:
+      title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
+      headings: Headings
+      heading: Heading
+      subheading: Subheading
+      unordered: Unordered list
+      ordered: Ordered list
+      first: First item
+      second: Second item
+      link: Link
+      text: Text
+      image: Image
+      alt: Alt text
+      url: URL
+    richtext_field:
+      edit: Edit
+      preview: Preview

   site:
     about:
       next: Next
   site:
     about:
       next: Next


@@ -1772,10 +1917,6 @@ en:
       anon_edits_html: "(%{link})"
       anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."
       anon_edits_html: "(%{link})"
       anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."

-      flash_player_required_html: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="https://get.adobe.com/flashplayer/">download Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
-      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in live mode, or click save if you have a save button.)"
-      potlatch2_not_configured: "Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for more information"
-      potlatch2_unsaved_changes: "You have unsaved changes. (To save in Potlatch 2, you should click save.)"

       id_not_configured: "iD has not been configured"
       no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     export:
       id_not_configured: "iD has not been configured"
       no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature."
     export:


@@ -1879,6 +2020,10 @@ en:
         url: https://wiki.openstreetmap.org/
         title: OpenStreetMap Wiki
         description: Browse the wiki for in-depth OpenStreetMap documentation.
         url: https://wiki.openstreetmap.org/
         title: OpenStreetMap Wiki
         description: Browse the wiki for in-depth OpenStreetMap documentation.

+    potlatch:
+      removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser.
+      desktop_html: You can still use Potlatch by <a href="https://www.systemed.net/potlatch/">downloading the desktop application for Mac and Windows</a>.
+      id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. <a href="%{settings_url}">Change your user settings here</a>.

     sidebar:
       search_results: Search Results
       close: Close
     sidebar:
       search_results: Search Results
       close: Close


@@ -1962,23 +2107,6 @@ en:
           bicycle_shop: "Bicycle shop"
           bicycle_parking: "Bicycle parking"
           toilets: "Toilets"
           bicycle_shop: "Bicycle shop"
           bicycle_parking: "Bicycle parking"
           toilets: "Toilets"

-    richtext_area:
-      edit: Edit
-      preview: Preview
-    markdown_help:
-      title_html: Parsed with <a href="https://kramdown.gettalong.org/quickref.html">kramdown</a>
-      headings: Headings
-      heading: Heading
-      subheading: Subheading
-      unordered: Unordered list
-      ordered: Ordered list
-      first: First item
-      second: Second item
-      link: Link
-      text: Text
-      image: Image
-      alt: Alt text
-      url: URL

     welcome:
       title: Welcome!
       introduction_html: |
     welcome:
       title: Welcome!
       introduction_html: |


@@ -2094,7 +2222,6 @@ en:
       more: "more"
       trace_details: "View Trace Details"
       view_map: "View Map"
       more: "more"
       trace_details: "View Trace Details"
       view_map: "View Map"

-      edit: "edit"

       edit_map: "Edit Map"
       public: "PUBLIC"
       identifiable: "IDENTIFIABLE"
       edit_map: "Edit Map"
       public: "PUBLIC"
       identifiable: "IDENTIFIABLE"


@@ -2102,7 +2229,6 @@ en:
       trackable: "TRACKABLE"
       by: "by"
       in: "in"
       trackable: "TRACKABLE"
       by: "by"
       in: "in"

-      map: "map"

     index:
       public_traces: "Public GPS traces"
       my_traces: "My GPS traces"
     index:
       public_traces: "Public GPS traces"
       my_traces: "My GPS traces"


@@ -2111,8 +2237,10 @@ en:
       tagged_with: " tagged with %{tags}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
       upload_trace: "Upload a trace"
       tagged_with: " tagged with %{tags}"
       empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
       upload_trace: "Upload a trace"

-      see_all_traces: "See all traces"
-      see_my_traces: "See my traces"
+      all_traces: "All Traces"
+      my_traces: "My Traces"
+      traces_from: "Public Traces from %{user}"
+      remove_tag_filter: "Remove Tag Filter"

     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:
     destroy:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:


@@ -2164,6 +2292,14 @@ en:
       flash: "You've revoked the token for %{application}"
     permissions:
       missing: "You have not permitted the application access to this facility"
       flash: "You've revoked the token for %{application}"
     permissions:
       missing: "You have not permitted the application access to this facility"

+    scopes:
+      read_prefs: Read user preferences
+      write_prefs: Modify user preferences
+      write_diary: Create diary entries, comments and make friends
+      write_api: Modify the map
+      read_gpx: Read private GPS traces
+      write_gpx: Upload GPS traces
+      write_notes: Modify notes

   oauth_clients:
     new:
       title: "Register a new application"
   oauth_clients:
     new:
       title: "Register a new application"


@@ -2203,77 +2339,57 @@ 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"

+  oauth2_applications:
+    index:
+      title: "My client applications"
+      no_applications_html: "Do you have an application you would like to register for use with us using the %{oauth2} standard? You must register your application before it can make OAuth requests to this service."
+      oauth_2: "OAuth 2"
+      new: "Register new application"
+      name: "Name"
+      permissions: "Permissions"
+    application:
+      edit: "Edit"
+      delete: "Delete"
+      confirm_delete: "Delete this application?"
+    new:
+      title: "Register a new application"
+    edit:
+      title: "Edit your application"
+    show:
+      edit: "Edit"
+      delete: "Delete"
+      confirm_delete: "Delete this application?"
+      client_id: "Client ID"
+      client_secret: "Client Secret"
+      client_secret_warning: "Make sure to save this secret - it will not be accessible again"
+      permissions: "Permissions"
+      redirect_uris: "Redirect URIs"
+    not_found:
+      sorry: "Sorry, that application could not be found."
+  oauth2_authorizations:
+    new:
+      title: "Authorization required"
+      introduction: "Authorize %{application} to access your account with the following permissions?"
+      authorize: "Authorize"
+      deny: "Deny"
+    error:
+      title: "An error has occurred"
+    show:
+      title: "Authorization code"
+  oauth2_authorized_applications:
+    index:
+      title: "My authorized applications"
+      application: "Application"
+      permissions: "Permissions"
+      no_applications_html: "You have not yet authorized any %{oauth2} applications."
+    application:
+      revoke: "Revoke Access"
+      confirm_revoke: "Revoke access for this application?"

   users:
   users:

-    login:
-      title: "Login"
-      heading: "Login"
-      email or username: "Email Address or Username:"
-      password: "Password:"
-      openid_html: "%{logo} OpenID:"
-      remember: "Remember me"
-      lost password link: "Lost your password?"
-      login_button: "Login"
-      register now: Register now
-      with username: "Already have an OpenStreetMap account? Please login with your username and password:"
-      with external: "Alternatively, use a third party to login:"
-      new to osm: New to OpenStreetMap?
-      to make changes: To make changes to the OpenStreetMap data, you must have an account.
-      create account minute: Create an account. It only takes a minute.
-      no account: Don't have an account?
-      account not active: "Sorry, your account is not active yet.<br />Please use the link in the account confirmation email to activate your account, or <a href=\"%{reconfirm}\">request a new confirmation email</a>."
-      account is suspended: Sorry, your account has been suspended due to suspicious activity.<br />Please contact the <a href="%{webmaster}">webmaster</a> if you wish to discuss this.
-      auth failure: "Sorry, could not log in with those details."
-      openid_logo_alt: "Log in with an OpenID"
-      auth_providers:
-        openid:
-          title: Login with OpenID
-          alt: Login with an OpenID URL
-        google:
-          title: Login with Google
-          alt: Login with a Google OpenID
-        facebook:
-          title: Login with Facebook
-          alt: Login with a Facebook Account
-        windowslive:
-          title: Login with Windows Live
-          alt: Login with a Windows Live Account
-        github:
-          title: Login with GitHub
-          alt: Login with a GitHub Account
-        wikipedia:
-          title: Login with Wikipedia
-          alt: Login with a Wikipedia Account
-        yahoo:
-          title: Login with Yahoo
-          alt: Login with a Yahoo OpenID
-        wordpress:
-          title: Login with Wordpress
-          alt: Login with a Wordpress OpenID
-        aol:
-          title: Login with AOL
-          alt: Login with an AOL OpenID
-    logout:
-      title: "Logout"
-      heading: "Logout from OpenStreetMap"
-      logout_button: "Logout"
-    lost_password:
-      title: "Lost password"
-      heading: "Forgotten Password?"
-      email address: "Email Address:"
-      new password button: "Reset password"
-      help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
-      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
-      notice email cannot find: "Could not find that email address, sorry."
-    reset_password:
-      title: "Reset password"
-      heading: "Reset Password for %{user}"
-      reset: "Reset Password"
-      flash changed: "Your password has been changed."
-      flash token bad: "Did not find that token, check the URL maybe?"

     new:
       title: "Sign Up"
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
     new:
       title: "Sign Up"
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."

-      contact_webmaster_html: 'Please contact the <a href="%{webmaster}">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
+      contact_support_html: 'Please contact <a href="%{support}">support</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'

       about:
         header: Free and editable
         html: |
       about:
         header: Free and editable
         html: |


@@ -2282,18 +2398,13 @@ en:
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
           <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"

-      not_displayed_publicly_html: 'Your address is not displayed publicly, see our <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy policy including section on email addresses">privacy policy</a> for more information'

       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       external auth: "Third Party Authentication:"
       display name: "Display Name:"
       display name description: "Your publicly displayed username. You can change this later in the preferences."
       external auth: "Third Party Authentication:"

-      password: "Password:"
-      confirm password: "Confirm Password:"

       use external auth: "Alternatively, use a third party to login"
       auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       use external auth: "Alternatively, use a third party to login"
       auth no password: "With third party authentication a password is not required, but some extra tools or server may still need one."
       continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"

-      terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
-      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: "Terms"
       heading: "Terms"
     terms:
       title: "Terms"
       heading: "Terms"


@@ -2316,6 +2427,10 @@ en:
         france: "France"
         italy: "Italy"
         rest_of_world: "Rest of the world"
         france: "France"
         italy: "Italy"
         rest_of_world: "Rest of the world"

+    terms_declined_flash:
+      terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}.
+      terms_declined_link: this wiki page
+      terms_declined_url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     no_such_user:
       title: "No such user"
       heading: "The user %{user} does not exist"
     no_such_user:
       title: "No such user"
       heading: "The user %{user} does not exist"


@@ -2331,7 +2446,6 @@ en:
       my profile: My Profile
       my settings: My Settings
       my comments: My Comments
       my profile: My Profile
       my settings: My Settings
       my comments: My Comments

-      oauth settings: oauth settings

       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       send message: Send Message
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       send message: Send Message


@@ -2392,15 +2506,13 @@ en:
     account:
       title: "Edit account"
       my settings: My settings
     account:
       title: "Edit account"
       my settings: My settings

-      current email address: "Current Email Address:"
-      new email address: "New Email Address:"
-      email never displayed publicly: "(never displayed publicly)"
-      external auth: "External Authentication:"
+      current email address: "Current Email Address"
+      external auth: "External Authentication"

       openid:
         link: "https://wiki.openstreetmap.org/wiki/OpenID"
         link text: "what is this?"
       public editing:
       openid:
         link: "https://wiki.openstreetmap.org/wiki/OpenID"
         link text: "what is this?"
       public editing:

-        heading: "Public editing:"
+        heading: "Public editing"

         enabled: "Enabled. Not anonymous and can edit data."
         enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
         enabled link text: "what is this?"
         enabled: "Enabled. Not anonymous and can edit data."
         enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits"
         enabled link text: "what is this?"


@@ -2410,21 +2522,18 @@ en:
         heading: "Public editing"
         html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
       contributor terms:
         heading: "Public editing"
         html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. <b>Since the 0.6 API changeover, only public users can edit map data</b>. (<a href=\"https://wiki.openstreetmap.org/wiki/Anonymous_edits\">find out why</a>).<ul><li>Your email address will not be revealed by becoming public.</li><li>This action cannot be reversed and all new users are now public by default.</li></ul>"
       contributor terms:

-        heading: "Contributor Terms:"
+        heading: "Contributor Terms"

         agreed: "You have agreed to the new Contributor Terms."
         not yet agreed: "You have not yet agreed to the new Contributor Terms."
         review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
         link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"
         link text: "what is this?"
         agreed: "You have agreed to the new Contributor Terms."
         not yet agreed: "You have not yet agreed to the new Contributor Terms."
         review link text: "Please follow this link at your convenience to review and accept the new Contributor Terms."
         agreed_with_pd: "You have also declared that you consider your edits to be in the Public Domain."
         link: "https://www.osmfoundation.org/wiki/License/Contributor_Terms"
         link text: "what is this?"

-      profile description: "Profile Description:"
-      preferred languages: "Preferred Languages:"
-      preferred editor: "Preferred Editor:"
-      image: "Image:"
+      image: Image

       gravatar:
         gravatar: "Use Gravatar"
         link: "https://wiki.openstreetmap.org/wiki/Gravatar"
       gravatar:
         gravatar: "Use Gravatar"
         link: "https://wiki.openstreetmap.org/wiki/Gravatar"

-        link text: "what is this?"
+        what_is_gravatar: "What is Gravatar?"

         disabled: "Gravatar has been disabled."
         enabled: "Display of your Gravatar has been enabled."
       new image: "Add an image"
         disabled: "Gravatar has been disabled."
         enabled: "Display of your Gravatar has been enabled."
       new image: "Add an image"


@@ -2432,38 +2541,17 @@ en:
       delete image: "Remove the current image"
       replace image: "Replace the current image"
       image size hint: "(square images at least 100x100 work best)"
       delete image: "Remove the current image"
       replace image: "Replace the current image"
       image size hint: "(square images at least 100x100 work best)"

-      home location: "Home Location:"
+      home location: "Home Location"

       no home location: "You have not entered your home location."
       no home location: "You have not entered your home location."

-      latitude: "Latitude:"
-      longitude: "Longitude:"

       update home location on click: "Update home location when I click on the map?"
       save changes button: Save Changes
       make edits public button: Make all my edits public
       return to profile: Return to profile
       update home location on click: "Update home location when I click on the map?"
       save changes button: Save Changes
       make edits public button: Make all my edits public
       return to profile: Return to profile

+      oauth1 settings: OAuth 1 settings
+      oauth2 applications: OAuth 2 applications
+      oauth2 authorizations: OAuth 2 authorizations

       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."

-    confirm:
-      heading: Check your email!
-      introduction_1: |
-        We sent you a confirmation email.
-      introduction_2: |
-        Confirm your account by clicking on the link in the email and you'll be able to start mapping.
-      press confirm button: "Press the confirm button below to activate your account."
-      button: Confirm
-      success: "Confirmed your account, thanks for signing up!"
-      already active: "This account has already been confirmed."
-      unknown token: "That confirmation code has expired or does not exist."
-      reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
-    confirm_resend:
-      success_html: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist %{sender} as we are unable to reply to any confirmation requests."
-      failure: "User %{name} not found."
-    confirm_email:
-      heading: Confirm a change of email address
-      press confirm button: "Press the confirm button below to confirm your new email address."
-      button: Confirm
-      success: "Confirmed your change of email address!"
-      failure: "An email address has already been confirmed with this token."
-      unknown_token: "That confirmation code has expired or does not exist."

     set_home:
       flash success: "Home location saved successfully"
     go_public:
     set_home:
       flash success: "Home location saved successfully"
     go_public:


@@ -2482,7 +2570,7 @@ en:
     suspended:
       title: Account Suspended
       heading: Account Suspended
     suspended:
       title: Account Suspended
       heading: Account Suspended

-      webmaster: webmaster
+      support: support

       body_html: |
         <p>
           Sorry, your account has been automatically suspended due to
       body_html: |
         <p>
           Sorry, your account has been automatically suspended due to


@@ -2490,7 +2578,7 @@ en:
         </p>
         <p>
           This decision will be reviewed by an administrator shortly, or
         </p>
         <p>
           This decision will be reviewed by an administrator shortly, or

-          you may contact the %{webmaster} if you wish to discuss this.
+          you may contact %{webmaster} if you wish to discuss this.

         </p>
     auth_failure:
       connection_failed: Connection to authentication provider failed
         </p>
     auth_failure:
       connection_failed: Connection to authentication provider failed


@@ -2535,20 +2623,16 @@ en:
     new:
       title: "Creating block on %{name}"
       heading_html: "Creating block on %{name}"
     new:
       title: "Creating block on %{name}"
       heading_html: "Creating block on %{name}"

-      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."
       tried_contacting: "I have contacted the user and asked them to stop."
       tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications."
       period: "How long, starting now, the user will be blocked from the API for."
       tried_contacting: "I have contacted the user and asked them to stop."
       tried_waiting: "I have given a reasonable amount of time for the user to respond to those communications."

-      needs_view: "User needs to log in before this block will be cleared"

       back: "View all blocks"
     edit:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"
       back: "View all blocks"
     edit:
       title: "Editing block on %{name}"
       heading_html: "Editing block on %{name}"

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

       period: "How long, starting now, the user will be blocked from the API for."
       show: "View this block"
       back: "View all blocks"
       period: "How long, starting now, the user will be blocked from the API for."
       show: "View this block"
       back: "View all blocks"

-      needs_view: "Does the user need to log in before this block will be cleared?"

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


@@ -2603,8 +2687,9 @@ en:
     show:
       title: "%{block_on} blocked by %{block_by}"
       heading_html: "%{block_on} blocked by %{block_by}"
     show:
       title: "%{block_on} blocked by %{block_by}"
       heading_html: "%{block_on} blocked by %{block_by}"

-      created: "Created"
-      status: "Status"
+      created: "Created:"
+      duration: "Duration:"
+      status: "Status:"

       show: "Show"
       edit: "Edit"
       revoke: "Revoke!"
       show: "Show"
       edit: "Edit"
       revoke: "Revoke!"


@@ -2632,6 +2717,7 @@ en:
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s notes"
       subheading_html: "Notes submitted or commented on by %{user}"
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s notes"
       subheading_html: "Notes submitted or commented on by %{user}"

+      no_notes: No notes

       id: "Id"
       creator: "Creator"
       description: "Description"
       id: "Id"
       creator: "Creator"
       description: "Description"


@@ -2651,7 +2737,7 @@ en:
       custom_dimensions: "Set custom dimensions"
       format: "Format:"
       scale: "Scale:"
       custom_dimensions: "Set custom dimensions"
       format: "Format:"
       scale: "Scale:"

-      image_size: "Image will show standard layer at "
+      image_dimensions: "Image will show standard layer at %{width} x %{height}"

       download: "Download"
       short_url: "Short URL"
       include_marker: "Include marker"
       download: "Download"
       short_url: "Short URL"
       include_marker: "Include marker"


@@ -2679,6 +2765,7 @@ en:
           other: You are within %{count} feet of this point
       base:
         standard: Standard
           other: You are within %{count} feet of this point
       base:
         standard: Standard

+        cyclosm: CyclOSM

         cycle_map: Cycle Map
         transport_map: Transport Map
         hot: Humanitarian
         cycle_map: Cycle Map
         transport_map: Transport Map
         hot: Humanitarian


@@ -2693,6 +2780,7 @@ en:
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
       donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
       terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
       copyright: "© <a href='%{copyright_url}'>OpenStreetMap contributors</a>"
       donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
       terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"

+      cyclosm: "Tiles style by <a href='%{cyclosm_url}' target='_blank'>CyclOSM</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"

       thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
       opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"
       hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
       thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
       opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"
       hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"


@@ -2823,7 +2911,6 @@ en:
       centre_map: Centre map here
   redactions:
     edit:
       centre_map: Centre map here
   redactions:
     edit:

-      description: "Description"

       heading: "Edit redaction"
       title: "Edit redaction"
     index:
       heading: "Edit redaction"
       title: "Edit redaction"
     index:


@@ -2831,7 +2918,6 @@ en:
       heading: "List of redactions"
       title: "List of redactions"
     new:
       heading: "List of redactions"
       title: "List of redactions"
     new:

-      description: "Description"

       heading: "Enter information for new redaction"
       title: "Creating new redaction"
     show:
       heading: "Enter information for new redaction"
       title: "Creating new redaction"
     show: