Add social sharing functionality

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 46b3608f47a1ec3830efe8d080341f994968a356..2ea67992daaa83e52ddb3cf7009f5d030ed748b0 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -3,8 +3,10 @@
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Author: Alefar
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Author: Alefar

+# Author: Amire80

 # Author: Andibing
 # Author: BEANS
 # Author: Andibing
 # Author: BEANS

+# Author: Back ache

 # Author: Bjh21
 # Author: Bpfhjquevaps
 # Author: Bruce89
 # Author: Bjh21
 # Author: Bpfhjquevaps
 # Author: Bruce89


@@ -81,7 +83,6 @@ en-GB:
       message: Message
       node: Node
       node_tag: Node Tag
       message: Message
       node: Node
       node_tag: Node Tag

-      notifier: Notifier

       old_node: Old Node
       old_node_tag: Old Node Tag
       old_relation: Old Relation
       old_node: Old Node
       old_node_tag: Old Node Tag
       old_relation: Old Relation


@@ -171,41 +172,41 @@ en-GB:
   datetime:
     distance_in_words_ago:
       about_x_hours:
   datetime:
     distance_in_words_ago:
       about_x_hours:

-        one: about 1 hour ago
+        one: about %{count} hour ago

         other: about %{count} hours ago
       about_x_months:
         other: about %{count} hours ago
       about_x_months:

-        one: about 1 month ago
+        one: about %{count} month ago

         other: about %{count} months ago
       about_x_years:
         other: about %{count} months ago
       about_x_years:

-        one: about 1 year ago
+        one: about %{count} year ago

         other: about %{count} years ago
       almost_x_years:
         other: about %{count} years ago
       almost_x_years:

-        one: almost 1 year ago
+        one: almost %{count} year ago

         other: almost %{count} years ago
       half_a_minute: half a minute ago
       less_than_x_seconds:
         other: almost %{count} years ago
       half_a_minute: half a minute ago
       less_than_x_seconds:

-        one: less than 1 second ago
+        one: less than %{count} second ago

         other: less than %{count} seconds ago
       less_than_x_minutes:
         other: less than %{count} seconds ago
       less_than_x_minutes:

-        one: less than a minute ago
+        one: less than %{count} minute ago

         other: less than %{count} minutes ago
       over_x_years:
         other: less than %{count} minutes ago
       over_x_years:

-        one: over 1 year ago
+        one: over %{count} year ago

         other: over %{count} years ago
       x_seconds:
         other: over %{count} years ago
       x_seconds:

-        one: 1 second ago
+        one: '%{count} second ago'

         other: '%{count} seconds ago'
       x_minutes:
         other: '%{count} seconds ago'
       x_minutes:

-        one: 1 minute ago
+        one: '%{count} minute ago'

         other: '%{count} minutes ago'
       x_days:
         other: '%{count} minutes ago'
       x_days:

-        one: 1 day ago
+        one: '%{count} day ago'

         other: '%{count} days ago'
       x_months:
         other: '%{count} days ago'
       x_months:

-        one: 1 month ago
+        one: '%{count} month ago'

         other: '%{count} months ago'
       x_years:
         other: '%{count} months ago'
       x_years:

-        one: 1 year ago
+        one: '%{count} year ago'

         other: '%{count} years ago'
   editor:
     default: Default (currently %{name})
         other: '%{count} years ago'
   editor:
     default: Default (currently %{name})


@@ -218,10 +219,8 @@ en-GB:
   auth:
     providers:
       none: None
   auth:
     providers:
       none: None

-      openid: OpenID

       google: Google
       facebook: Facebook
       google: Google
       facebook: Facebook

-      windowslive: Windows Live

       github: GitHub
       wikipedia: Wikipedia
   api:
       github: GitHub
       wikipedia: Wikipedia
   api:


@@ -279,14 +278,6 @@ en-GB:
         for a note to confirm your new email address.
       success: User information updated successfully.
   browse:
         for a note to confirm your new email address.
       success: User information updated successfully.
   browse:

-    created: Created
-    closed: Closed
-    created_html: Created <abbr title='%{title}'>%{time}</abbr>
-    closed_html: Closed <abbr title='%{title}'>%{time}</abbr>
-    created_by_html: Created <abbr title='%{title}'>%{time}</abbr> by %{user}
-    deleted_by_html: Deleted <abbr title='%{title}'>%{time}</abbr> by %{user}
-    edited_by_html: Edited <abbr title='%{title}'>%{time}</abbr> by %{user}
-    closed_by_html: Closed <abbr title='%{title}'>%{time}</abbr> by %{user}

     version: Version
     in_changeset: Changeset
     anonymous: anonymous
     version: Version
     in_changeset: Changeset
     anonymous: anonymous


@@ -296,27 +287,6 @@ en-GB:
     view_history: View History
     view_details: View Details
     location: 'Location:'
     view_history: View History
     view_details: View Details
     location: 'Location:'

-    changeset:
-      title: 'Changeset: %{id}'
-      belongs_to: Author
-      node: Nodes (%{count})
-      node_paginated: Nodes (%{x}-%{y} of %{count})
-      way: Ways (%{count})
-      way_paginated: Ways (%{x}-%{y} of %{count})
-      relation: Relations (%{count})
-      relation_paginated: Relations (%{x}-%{y} of %{count})
-      comment: Comments (%{count})
-      hidden_commented_by_html: Hidden comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      changesetxml: Changeset XML
-      osmchangexml: osmChange XML
-      feed:
-        title: Changeset %{id}
-        title_comment: Changeset %{id} - %{comment}
-      join_discussion: Log in to join the discussion
-      discussion: Discussion
-      still_open: Changeset still open - discussion will open once the changeset is
-        closed.

     node:
       title_html: 'Node: %{name}'
       history_title_html: 'Node History: %{name}'
     node:
       title_html: 'Node: %{name}'
       history_title_html: 'Node History: %{name}'


@@ -367,8 +337,6 @@ en-GB:
         way: way
         relation: relation
     start_rjs:
         way: way
         relation: relation
     start_rjs:

-      feature_warning: Loading %{num_features} features, which may make your browser
-        slow or unresponsive. Are sure you want to display this data?

       load_data: Load Data
       loading: Loading...
     tag_details:
       load_data: Load Data
       loading: Loading...
     tag_details:


@@ -386,21 +354,24 @@ en-GB:
       introduction: Click on the map to find nearby features.
       nearby: Nearby features
       enclosing: Enclosing features
       introduction: Click on the map to find nearby features.
       nearby: Nearby features
       enclosing: Enclosing features

+  changeset_comments:
+    feeds:
+      comment:
+        comment: 'New comment on changeset #%{changeset_id} by %{author}'
+        commented_at_by_html: Updated %{when} by %{user}
+      comments:
+        comment: 'New comment on changeset #%{changeset_id} by %{author}'
+      show:
+        title_all: OpenStreetMap changeset discussion
+        title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'
+      timeout:
+        sorry: Sorry, the list of changeset comments you requested took too long to
+          retrieve.

   changesets:
   changesets:

-    changeset_paging_nav:
-      showing_page: Page %{page}
-      next: Next »
-      previous: « Previous

     changeset:
       anonymous: Anonymous
       no_edits: (no edits)
       view_changeset_details: View changeset details
     changeset:
       anonymous: Anonymous
       no_edits: (no edits)
       view_changeset_details: View changeset details

-    changesets:
-      id: ID
-      saved_at: Saved at
-      user: User
-      comment: Comment
-      area: Area

     index:
       title: Changesets
       title_user: Changesets by %{user}
     index:
       title: Changesets
       title_user: Changesets by %{user}


@@ -413,24 +384,39 @@ en-GB:
       no_more_area: No more changesets in this area.
       no_more_user: No more changesets by this user.
       load_more: Load more
       no_more_area: No more changesets in this area.
       no_more_user: No more changesets by this user.
       load_more: Load more

+      feed:
+        title: Changeset %{id}
+        title_comment: Changeset %{id} - %{comment}
+        created: Created
+        closed: Closed
+        belongs_to: Author
+    show:
+      title: 'Changeset: %{id}'
+      discussion: Discussion
+      join_discussion: Log in to join the discussion
+      still_open: Changeset still open - discussion will open once the changeset is
+        closed.
+      subscribe: Subscribe
+      unsubscribe: Unsubscribe
+      hide_comment: hide
+      unhide_comment: unhide
+      comment: Comment
+      changesetxml: Changeset XML
+      osmchangexml: osmChange XML
+    paging_nav:
+      nodes: Nodes (%{count})
+      nodes_paginated: Nodes (%{x}-%{y} of %{count})
+      ways: Ways (%{count})
+      ways_paginated: Ways (%{x}-%{y} of %{count})
+      relations: Relations (%{count})
+      relations_paginated: Relations (%{x}-%{y} of %{count})

     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.
     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.

-  changeset_comments:
-    comment:
-      comment: 'New comment on changeset #%{changeset_id} by %{author}'
-      commented_at_by_html: Updated %{when} by %{user}
-    comments:
-      comment: 'New comment on changeset #%{changeset_id} by %{author}'
-    index:
-      title_all: OpenStreetMap changeset discussion
-      title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'
-    timeout:
-      sorry: Sorry, the list of changeset comments you requested took too long to
-        retrieve.

   dashboards:
     contact:
       km away: '%{count}km away'
       m away: '%{count}m away'
   dashboards:
     contact:
       km away: '%{count}km away'
       m away: '%{count}m away'

+      latest_edit_html: 'Latest edit (%{ago}):'

     popup:
       your location: Your location
       nearby mapper: Nearby mapper
     popup:
       your location: Your location
       nearby mapper: Nearby mapper


@@ -459,9 +445,8 @@ en-GB:
       new_title: Compose a new entry in my user diary
       my_diary: My Diary
       no_entries: No diary entries
       new_title: Compose a new entry in my user diary
       my_diary: My Diary
       no_entries: No diary entries

+    page:

       recent_entries: Recent diary entries
       recent_entries: Recent diary entries

-      older_entries: Older Entries
-      newer_entries: Newer Entries

     edit:
       title: Edit diary entry
       marker_text: Diary entry location
     edit:
       title: Edit diary entry
       marker_text: Diary entry location


@@ -470,7 +455,6 @@ en-GB:
       user_title: '%{user}''s diary'
       leave_a_comment: Leave a comment
       login_to_leave_a_comment_html: '%{login_link} to leave a comment'
       user_title: '%{user}''s diary'
       leave_a_comment: Leave a comment
       login_to_leave_a_comment_html: '%{login_link} to leave a comment'

-      login: Login

     no_such_entry:
       title: No such diary entry
       heading: 'No entry with the id: %{id}'
     no_such_entry:
       title: No such diary entry
       heading: 'No entry with the id: %{id}'


@@ -482,7 +466,6 @@ en-GB:
       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:

-        zero: No comments

         one: '%{count} comment'
         other: '%{count} comments'
       edit_link: Edit this entry
         one: '%{count} comment'
         other: '%{count} comments'
       edit_link: Edit this entry


@@ -510,12 +493,19 @@ en-GB:
       all:
         title: OpenStreetMap diary entries
         description: Recent diary entries from users of OpenStreetMap
       all:
         title: OpenStreetMap diary entries
         description: Recent diary entries from users of OpenStreetMap

-    comments:
+  diary_comments:
+    page:

       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment

-      newer_comments: Newer Comments
-      older_comments: Older Comments
+  doorkeeper:
+    errors:
+      messages:
+        account_selection_required: The authorisation server requires end-user account
+          selection
+        consent_required: The authorisation server requires end-user consent
+        interaction_required: The authorisation server requires end-user interaction
+        login_required: The authorisation server requires end-user authentication

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


@@ -529,13 +519,6 @@ en-GB:
       success: '%{name} was removed from your friends.'
       not_a_friend: '%{name} is not one of your friends.'
   geocoder:
       success: '%{name} was removed from your friends.'
       not_a_friend: '%{name} is not one of your friends.'
   geocoder:

-    search:
-      title:
-        latlon_html: Results from <a href="https://openstreetmap.org/">Internal</a>
-        osm_nominatim_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        osm_nominatim_reverse_html: Results from <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>

     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:


@@ -1127,7 +1110,7 @@ en-GB:
       no_results: No results found
       more_results: More results
   issues:
       no_results: No results found
       more_results: More results
   issues:

-    index:
+    page:

       reports: Reports
   layouts:
     logo:
       reports: Reports
   layouts:
     logo:


@@ -1135,44 +1118,25 @@ en-GB:
     home: Go to Home Location
     logout: Log Out
     log_in: Log In
     home: Go to Home Location
     logout: Log Out
     log_in: Log In

-    log_in_tooltip: Log in with an existing account

     sign_up: Sign Up
     start_mapping: Start Mapping
     sign_up: Sign Up
     start_mapping: Start Mapping

-    sign_up_tooltip: Create an account for editing

     edit: Edit
     history: History
     export: Export
     edit: Edit
     history: History
     export: Export

-    data: Data
-    export_data: Export Data

     gps_traces: GPS Traces
     gps_traces: GPS Traces

-    gps_traces_tooltip: Manage GPS traces

     user_diaries: User Diaries
     user_diaries: User Diaries

-    user_diaries_tooltip: View user diaries

     edit_with: Edit with %{editor}
     edit_with: Edit with %{editor}

-    tag_line: The Free Wiki World Map

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

-    intro_2_create_account: Create a user account
-    partners_ucl: UCL
-    partners_bytemark: Bytemark Hosting

     partners_partners: partners
     osm_offline: The OpenStreetMap database is currently offline while essential database
       maintenance work is carried out.
     osm_read_only: The OpenStreetMap database is currently in read-only mode while
       essential database maintenance work is carried out.
     partners_partners: partners
     osm_offline: The OpenStreetMap database is currently offline while essential database
       maintenance work is carried out.
     osm_read_only: The OpenStreetMap database is currently in read-only mode while
       essential database maintenance work is carried out.

-    donate: Support OpenStreetMap by %{link} to the Hardware Upgrade Fund.

     help: Help
     about: About
     copyright: Copyright
     help: Help
     about: About
     copyright: Copyright

-    community: Community
-    community_blogs: Community Blogs
-    community_blogs_title: Blogs from members of the OpenStreetMap community
-    foundation: Foundation
-    foundation_title: The OpenStreetMap Foundation
-    make_a_donation:
-      title: Support OpenStreetMap with a monetary donation
-      text: Make a Donation

     learn_more: Learn More
     more: More
   user_mailer:
     learn_more: Learn More
     more: More
   user_mailer:


@@ -1199,10 +1163,6 @@ en-GB:
       failed_to_import: 'failed to import. Here is the error:'
       subject: '[OpenStreetMap] GPX Import failure'
     gpx_success:
       failed_to_import: 'failed to import. Here is the error:'
       subject: '[OpenStreetMap] GPX Import failure'
     gpx_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.

       subject: '[OpenStreetMap] GPX Import success'
     signup_confirm:
       subject: '[OpenStreetMap] Welcome to OpenStreetMap'
       subject: '[OpenStreetMap] GPX Import success'
     signup_confirm:
       subject: '[OpenStreetMap] Welcome to OpenStreetMap'


@@ -1249,7 +1209,6 @@ en-GB:
         your_note: '%{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}.'
         your_note: '%{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}.'

-      details: 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,


@@ -1262,9 +1221,6 @@ en-GB:
           you are watching created by %{changeset_author}'
         partial_changeset_with_comment: with comment '%{changeset_comment}'
         partial_changeset_without_comment: without comment
           you are watching created by %{changeset_author}'
         partial_changeset_with_comment: with comment '%{changeset_comment}'
         partial_changeset_without_comment: without comment

-      details: More details about the changeset can be found at %{url}.
-      unsubscribe: To unsubscribe from updates to this changeset, visit %{url} and
-        click "Unsubscribe".

   confirmations:
     confirm:
       heading: Check your email!
   confirmations:
     confirm:
       heading: Check your email!


@@ -1276,8 +1232,6 @@ en-GB:
       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.
       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:
     confirm_resend:
       failure: User %{name} not found.
     confirm_email:


@@ -1291,7 +1245,6 @@ en-GB:
   messages:
     inbox:
       title: Inbox
   messages:
     inbox:
       title: Inbox

-      my_inbox: My Inbox

       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'


@@ -1299,22 +1252,21 @@ en-GB:
       old_messages:
         one: '%{count} old message'
         other: '%{count} old messages'
       old_messages:
         one: '%{count} old message'
         other: '%{count} old messages'

-      from: From
-      subject: Subject
-      date: Date

       no_messages_yet_html: You have no messages yet. Why not get in touch with some
         of the %{people_mapping_nearby_link}?
       people_mapping_nearby: people mapping nearby
       no_messages_yet_html: You have no messages yet. Why not get in touch with some
         of the %{people_mapping_nearby_link}?
       people_mapping_nearby: people mapping nearby

+    messages_table:
+      from: From
+      to: To
+      subject: Subject
+      date: Date

     message_summary:
       unread_button: Mark as unread
       read_button: Mark as read
     message_summary:
       unread_button: Mark as unread
       read_button: Mark as read

-      reply_button: Reply

       destroy_button: Delete
     new:
       title: Send message
       send_message_to_html: Send a new message to %{name}
       destroy_button: Delete
     new:
       title: Send message
       send_message_to_html: Send a new message to %{name}

-      subject: Subject
-      body: Body

       back_to_inbox: Back to inbox
     create:
       message_sent: Message sent
       back_to_inbox: Back to inbox
     create:
       message_sent: Message sent


@@ -1329,59 +1281,44 @@ en-GB:
       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

-      to: To
-      subject: Subject
-      date: Date

       no_sent_messages_html: You have no sent messages yet. Why not get in touch with
         some of the %{people_mapping_nearby_link}?
       people_mapping_nearby: people mapping nearby
       no_sent_messages_html: You have no sent messages yet. Why not get in touch with
         some of the %{people_mapping_nearby_link}?
       people_mapping_nearby: people mapping nearby

-    reply:
-      wrong_user: You are logged in as `%{user}' but the message you have asked to
-        reply to was not sent to that user. Please login as the correct user in order
-        to reply.

     show:
       title: Read message
     show:
       title: Read message

-      from: From
-      subject: Subject
-      date: Date

       reply_button: Reply
       unread_button: Mark as unread
       destroy_button: Delete
       back: Back
       reply_button: Reply
       unread_button: Mark as unread
       destroy_button: Delete
       back: Back

-      to: To
-      wrong_user: You are logged in as `%{user}' but the message you have asked to
-        read was not sent by or to that user. Please login as the correct user in
-        order to read it.

     sent_message_summary:
       destroy_button: Delete
     sent_message_summary:
       destroy_button: Delete

+    heading:
+      my_inbox: My Inbox

     mark:
       as_read: Message marked as read
       as_unread: Message marked as unread
     destroy:
       destroyed: Message deleted
   passwords:
     mark:
       as_read: Message marked as read
       as_unread: Message marked as unread
     destroy:
       destroyed: Message deleted
   passwords:

-    lost_password:
+    new:

       title: Lost password
       heading: Forgotten Password?
       title: Lost password
       heading: Forgotten Password?

-      email address: E-mail address
+      email address: E-mail Address

       new password button: Reset password
       help_text: Enter the e-mail address you used to sign up, we will send a link
         to it that you can use to reset your password.
       new password button: Reset password
       help_text: Enter the e-mail 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:
+    edit:

       title: Reset password
       heading: Reset Password for %{user}
       reset: 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?
       flash token bad: Did not find that token, check the URL maybe?

+    update:
+      flash changed: Your password has been changed.

   profiles:
     edit:
       image: Image
       gravatar:
         gravatar: Use Gravatar
   profiles:
     edit:
       image: Image
       gravatar:
         gravatar: Use Gravatar

-        link: https://wiki.openstreetmap.org/wiki/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


@@ -1394,61 +1331,29 @@ en-GB:
       update home location on click: Update home location when I click on the map?
   sessions:
     new:
       update home location on click: Update home location when I click on the map?
   sessions:
     new:

-      title: Login
-      heading: Login
-      email or username: 'E-mail Address or Username:'
-      password: 'Password:'
-      openid_html: '%{logo} OpenID:'
+      email or username: E-mail Address or Username
+      password: Password

       remember: Remember me
       lost password link: Lost your password?
       remember: Remember me
       lost password link: Lost your password?

-      login_button: Login

       register now: Register now
       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>.

       auth failure: Sorry, could not log in with those details.
       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 of OpenStreetMap
       logout_button: Logout
     destroy:
       title: Logout
       heading: Logout of OpenStreetMap
       logout_button: Logout

+  shared:
+    pagination:
+      diary_comments:
+        older: Older Comments
+        newer: Newer Comments
+      diary_entries:
+        older: Older Entries
+        newer: Newer Entries
+      traces:
+        older: Older Traces
+        newer: Newer Traces

   site:
     about:
   site:
     about:

-      next: Next
-      copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors

       lede_text: OpenStreetMap is built by a community of mappers that contribute
         and maintain data about roads, trails, cafés, railway stations, and much more,
         all over the world.
       lede_text: OpenStreetMap is built by a community of mappers that contribute
         and maintain data about roads, trails, cafés, railway stations, and much more,
         all over the world.


@@ -1458,26 +1363,17 @@ en-GB:
         aerial imagery, GPS devices, and low-tech field maps to verify that OSM
         is accurate and up to date.
       community_driven_title: Community Driven
         aerial imagery, GPS devices, and low-tech field maps to verify that OSM
         is accurate and up to date.
       community_driven_title: Community Driven

-      community_driven_html: |-
-        OpenStreetMap's community is diverse, passionate, and growing every day. Our contributors include enthusiast mappers, GIS professionals, engineers running the OSM servers, humanitarians mapping disaster-affected areas, and many more.
-        To learn more about the community, see the <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>, <a href='%{diary_path}'>user diaries</a>, <a href='https://blogs.openstreetmap.org/'>community blogs</a>, and the <a href='https://www.osmfoundation.org/'>OSM Foundation</a> website.

       open_data_title: Open Data
       open_data_title: Open Data

-      open_data_html: |-
-        OpenStreetMap is <i>open data</i>: you are free to use it for any purpose
+      open_data_1_html: |-
+        OpenStreetMap is %{open_data}: you are free to use it for any purpose

         as long as you credit OpenStreetMap and its contributors. If you alter or
         build upon the data in certain ways, you may distribute the result only
         as long as you credit OpenStreetMap and its contributors. If you alter or
         build upon the data in certain ways, you may distribute the result only

-        under the same licence. See the <a href='%{copyright_path}'>Copyright and
-        Licence page</a> for details.
+        under the same licence. See the %{copyright_license_link} for details.
+      open_data_copyright_license: Copyright and Licence page

       legal_title: Legal
       legal_title: Legal

-      legal_1_html: "This site and many other related services are formally operated
-        by the  \n<a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a>
-        (OSMF) \non behalf of the community. Use of all OSMF operated services is
-        subject \nto our <a href=\"https://wiki.osmfoundation.org/wiki/Terms_of_Use\">Terms
-        of Use</a>, <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nAcceptable
-        Use Policies</a> and our <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privacy
-        Policy</a>."

       partners_title: Partners
     copyright:
       partners_title: Partners
     copyright:

+      title: Copyright and Licence

       foreign:
         title: About this translation
         html: In the event of a conflict between this translated page and %{english_original_link},
       foreign:
         title: About this translation
         html: In the event of a conflict between this translated page and %{english_original_link},


@@ -1491,87 +1387,21 @@ en-GB:
         native_link: British English version
         mapping_link: start mapping
       legal_babble:
         native_link: British English version
         mapping_link: start mapping
       legal_babble:

-        title_html: Copyright and Licence
-        intro_1_html: |-
-          OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> is <i>open data</i>, licensed under the <a
-          href="https://opendatacommons.org/licenses/odbl/">Open Data
-          Commons Open Database License</a> (ODbL) by the  <a
-          href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
-        intro_2_html: You are free to copy, distribute,  transmit and adapt our data,
-          as long as you credit OpenStreetMap and its contributors. If you alter or
-          build upon our data, you may distribute the result only under the same licence.
-          The full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
-          code</a> explains your rights and responsibilities.
-        intro_3_1_html: "Our documentation is licensed under the \n<a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative\nCommons
-          Attribution-ShareAlike 2.0</a> licence (CC BY-SA 2.0)."
+        introduction_3_html: Our documentation is licensed under the %{creative_commons_link}
+          license (CC BY-SA 2.0).

         credit_title_html: How to credit OpenStreetMap
         credit_title_html: How to credit OpenStreetMap

-        credit_4_html: |-
-          To make clear that the data is available under the Open
-          Database License, you may link to
-          <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
-          Alternatively, and as a requirement if you are distributing OSM in a
-          data form, you can name and link directly to the licence(s). In media
-          where links are not possible (e.g. printed works), we suggest you
-          direct your readers to openstreetmap.org (perhaps by expanding
-          'OpenStreetMap' to this full address) and to opendatacommons.org.
-          In this example, the credit appears in the corner of the map.

         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
           title: Attribution example
         more_title_html: Finding out more
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
           title: Attribution example
         more_title_html: Finding out more

-        more_1_html: |-
-          Read more about using our data, and how to credit us, at the <a
-          href="https://osmfoundation.org/Licence">OSMF Licence page</a>.
-        more_2_html: |-
-          Although OpenStreetMap is open data, we cannot provide a
-          free-of-charge map API for third-parties.
-          See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
-          <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
-          and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.
+        more_1_1_osmf_licence_page: OSMF Licence page

         contributors_title_html: Our contributors
         contributors_intro_html: |-
           Our contributors are thousands of individuals. We also include
           openly-licenced data from national mapping agencies
           and other sources, among them:
         contributors_title_html: Our contributors
         contributors_intro_html: |-
           Our contributors are thousands of individuals. We also include
           openly-licenced data from national mapping agencies
           and other sources, among them:

-        contributors_at_html: |-
-          <strong>Austria</strong>: Contains data from
-          <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
-          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
-          Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT with amendments</a>).
-        contributors_ca_html: |-
-          <strong>Canada</strong>: Contains data from
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), and StatCan (Geography Division,
-          Statistics Canada).
-        contributors_fi_html: |-
-          <strong>Finland</strong>: Contains data from the
-          National Land Survey of Finland's Topographic Database
-          and other datasets, under the
-          <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI Licence</a>.
-        contributors_fr_html: '<strong>France</strong>: Contains data sourced from
-          Direction Générale des Impôts.'
-        contributors_nl_html: '<strong>Netherlands</strong>: Contains &copy; AND data,
-          2007 (<a href="http://www.and.com">www.and.com</a>)'
-        contributors_nz_html: |-
-          <strong>New Zealand</strong>: Contains data sourced from the
-          <a href="https://data.linz.govt.nz/">LINZ Data Service</a> and
-          licensed for reuse under
-          <a href="https://creativecommons.org/licenses/by/4.0/">CC BY 4.0</a>.
-        contributors_si_html: |-
-          <strong>Slovenia</strong>: Contains data from the
-          <a href="http://www.gu.gov.si/en/">Surveying and Mapping Authority</a> and
-          <a href="http://www.mkgp.gov.si/en/">Ministry of Agriculture, Forestry and Food</a>
-          (public information of Slovenia).
-        contributors_za_html: '<strong>South Africa</strong>: Contains data sourced
-          from <a href="http://www.ngi.gov.za/">Chief Directorate: National Geo-Spatial
-          Information</a>, State copyright reserved.'
-        contributors_gb_html: '<strong>United Kingdom</strong>: Contains Ordnance
-          Survey data &copy; Crown copyright and database right 2010-19.'
-        contributors_footer_1_html: For further details of these, and other sources
-          that have been used to help improve OpenStreetMap, please see the <a href="https://wiki.openstreetmap.org/wiki/Contributors">Contributors
-          page</a> on the OpenStreetMap Wiki.
+        contributors_cz_cc_licence: Creative Commons Attribution 4.0 International
+          licence (CC BY 4.0)

         contributors_footer_2_html: Inclusion of data in OpenStreetMap does not imply
           that the original data provider endorses OpenStreetMap, provides any warranty,
           or accepts any liability.
         contributors_footer_2_html: Inclusion of data in OpenStreetMap does not imply
           that the original data provider endorses OpenStreetMap, provides any warranty,
           or accepts any liability.


@@ -1579,17 +1409,9 @@ en-GB:
         infringement_1_html: OSM contributors are reminded never to add data from
           any copyrighted sources (e.g. Google Maps or printed maps) without explicit
           permission from the copyright holders.
         infringement_1_html: OSM contributors are reminded never to add data from
           any copyrighted sources (e.g. Google Maps or printed maps) without explicit
           permission from the copyright holders.

-        trademarks_title_html: <span id="trademarks"></span>Trademarks
-        trademarks_1_html: OpenStreetMap, the magnifying glass logo, and State of
-          the Map are registered trademarks of the OpenStreetMap Foundation. If you
-          have questions about your use of the marks, please see our <a href="https://wiki.osmfoundation.org/wiki/Trademark_Policy">Trademark
-          Policy</a>.

     index:
       js_1: You are either using a browser that does not support JavaScript, or you
         have disabled JavaScript.
     index:
       js_1: You are either using a browser that does not support JavaScript, or you
         have disabled JavaScript.

-      permalink: Permalink
-      shortlink: Shortlink
-      createnote: Add a note

       license:
         copyright: Copyright OpenStreetMap and contributors, under an open licence
       remote_failed: Editing failed - make sure JOSM or Merkaartor is loaded and that
       license:
         copyright: Copyright OpenStreetMap and contributors, under an open licence
       remote_failed: Editing failed - make sure JOSM or Merkaartor is loaded and that


@@ -1601,16 +1423,9 @@ en-GB:
       user_page_link: user page
       anon_edits_link_text: Find out why this is the case.
       id_not_configured: iD has not been configured
       user_page_link: user page
       anon_edits_link_text: Find out why this is the case.
       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:
       title: Export
     export:
       title: Export

-      area_to_export: Area to Export

       manually_select: Manually select a different area
       manually_select: Manually select a different area

-      format_to_export: Format to Export
-      osm_xml_data: OpenStreetMap XML Data
-      map_image: Map Image (shows standard layer)
-      embeddable_html: Embeddable HTML

       licence: Licence
       too_large:
         advice: 'If the above export fails, please consider using one of the sources
       licence: Licence
       too_large:
         advice: 'If the above export fails, please consider using one of the sources


@@ -1629,23 +1444,9 @@ en-GB:
           title: Geofabrik Downloads
           description: Regularly-updated extracts of continents, countries, and selected
             cities
           title: Geofabrik Downloads
           description: Regularly-updated extracts of continents, countries, and selected
             cities

-        metro:
-          title: Metro Extracts
-          description: Extracts for major world cities and their surrounding areas

         other:
           title: Other Sources
           description: Additional sources listed on the OpenStreetMap wiki
         other:
           title: Other Sources
           description: Additional sources listed on the OpenStreetMap wiki

-      options: Options
-      format: Format
-      scale: Scale
-      max: max
-      image_size: Image Size
-      zoom: Zoom
-      add_marker: Add a marker to the map
-      latitude: 'Lat:'
-      longitude: 'Lon:'
-      output: Output
-      paste_html: Paste HTML to embed in website

       export_button: Export
     fixthemap:
       title: Report a problem/Fix the map
       export_button: Export
     fixthemap:
       title: Report a problem/Fix the map


@@ -1656,17 +1457,8 @@ en-GB:
           explanation_html: If you have noticed a problem with our map data, for example
             a road is missing or your address, the best way to proceed is to join
             the OpenStreetMap community and add or repair the data yourself.
           explanation_html: If you have noticed a problem with our map data, for example
             a road is missing or your address, the best way to proceed is to join
             the OpenStreetMap community and add or repair the data yourself.

-        add_a_note:
-          instructions_html: Just click <a class='icon note'></a> or the same icon
-            on the map display. This will add a marker to the map, which you can move
-            by dragging. Add your message, then click save, and other mappers will
-            investigate.

       other_concerns:
         title: Other concerns
       other_concerns:
         title: Other concerns

-        explanation_html: "If you have concerns about how our data is being used or
-          about the contents please consult our\n<a href='/copyright'>copyright page</a>
-          for more legal information, or contact the appropriate \n<a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF
-          working group</a>."

     help:
       title: Getting Help
       introduction: OpenStreetMap has several resources for learning about the project,
     help:
       title: Getting Help
       introduction: OpenStreetMap has several resources for learning about the project,


@@ -1679,17 +1471,10 @@ en-GB:
       beginners_guide:
         title: Beginners' Guide
         description: Community maintained guide for beginners.
       beginners_guide:
         title: Beginners' Guide
         description: Community maintained guide for beginners.

-      help:
-        title: Help Forum
-        description: Ask a question or look up answers on OpenStreetMap's question-and-answer
-          site.

       mailing_lists:
         title: Mailing Lists
         description: Ask a question or discuss interesting matters on a wide range
           of topical or regional mailing lists.
       mailing_lists:
         title: Mailing Lists
         description: Ask a question or discuss interesting matters on a wide range
           of topical or regional mailing lists.

-      forums:
-        description: Questions and discussions for those that prefer a bulletin board
-          style interface.

       irc:
         title: IRC
         description: Interactive chat in many different languages and on many topics.
       irc:
         title: IRC
         description: Interactive chat in many different languages and on many topics.


@@ -1707,7 +1492,6 @@ en-GB:
       close: Close
     search:
       search: Search
       close: Close
     search:
       search: Search

-      get_directions: Get directions

       get_directions_title: Find directions between two points
       from: From
       to: To
       get_directions_title: Find directions between two points
       from: From
       to: To


@@ -1733,34 +1517,24 @@ en-GB:
           footway: Footway
           rail: Railway
           subway: Subway
           footway: Footway
           rail: Railway
           subway: Subway

-          tram:
-          - Light rail
-          - tram
-          cable:
-          - Cable car
-          - chairlift
-          runway:
-          - Airport Runway
-          - taxiway
-          apron:
-          - Airport apron
-          - terminal
+          cable_car: Cable car
+          chair_lift: Chair lift
+          runway: Airport Runway
+          taxiway: Taxiway
+          apron: Airport apron

           admin: Administrative boundary
           forest: Forest
           wood: Wood
           golf: Golf course
           park: Park
           admin: Administrative boundary
           forest: Forest
           wood: Wood
           golf: Golf course
           park: Park

+          common: Common

           resident: Residential area
           resident: Residential area

-          common:
-          - Common
-          - meadow

           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area
           heathland: Heathland
           retail: Retail area
           industrial: Industrial area
           commercial: Commercial area
           heathland: Heathland

-          lake:
-          - Lake
-          - reservoir
+          lake: Lake
+          reservoir: Reservoir

           farm: Farm
           brownfield: Brownfield site
           cemetery: Cemetery
           farm: Farm
           brownfield: Brownfield site
           cemetery: Cemetery


@@ -1769,14 +1543,12 @@ en-GB:
           centre: Sports centre
           reserve: Nature reserve
           military: Military area
           centre: Sports centre
           reserve: Nature reserve
           military: Military area

-          school:
-          - School
-          - university
+          school: School
+          university: University

           building: Significant building
           station: Railway station
           building: Significant building
           station: Railway station

-          summit:
-          - Summit
-          - peak
+          summit: Summit
+          peak: Peak

           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access
           tunnel: Dashed casing = tunnel
           bridge: Black casing = bridge
           private: Private access


@@ -1830,8 +1602,6 @@ en-GB:
       title: Editing trace %{name}
       heading: Editing trace %{name}
       visibility_help: what does this mean?
       title: Editing trace %{name}
       heading: Editing trace %{name}
       visibility_help: what does this mean?

-    trace_optionals:
-      tags: Tags

     show:
       title: Viewing trace %{name}
       heading: Viewing trace %{name}
     show:
       title: Viewing trace %{name}
       heading: Viewing trace %{name}


@@ -1851,14 +1621,10 @@ en-GB:
       delete_trace: Delete this trace
       trace_not_found: Trace not found!
       visibility: 'Visibility:'
       delete_trace: Delete this trace
       trace_not_found: Trace not found!
       visibility: 'Visibility:'

-    trace_paging_nav:
-      showing_page: Page %{page}
-      older: Older Traces
-      newer: Newer Traces

     trace:
       pending: PENDING
       count_points:
     trace:
       pending: PENDING
       count_points:

-        one: 1 point
+        one: '%{count} point'

         other: '%{count} points'
       more: more
       trace_details: View Trace Details
         other: '%{count} points'
       more: more
       trace_details: View Trace Details


@@ -1868,8 +1634,6 @@ en-GB:
       identifiable: IDENTIFIABLE
       private: PRIVATE
       trackable: TRACKABLE
       identifiable: IDENTIFIABLE
       private: PRIVATE
       trackable: TRACKABLE

-      by: by
-      in: in

     index:
       public_traces: Public GPS traces
       public_traces_from: Public GPS traces from %{user}
     index:
       public_traces: Public GPS traces
       public_traces_from: Public GPS traces from %{user}


@@ -1878,8 +1642,6 @@ en-GB:
       upload_trace: Upload a trace
     destroy:
       scheduled_for_deletion: Trace scheduled for deletion
       upload_trace: Upload a trace
     destroy:
       scheduled_for_deletion: Trace scheduled for deletion

-    make_public:
-      made_public: Trace made public

     offline_warning:
       message: The GPX file upload system is currently unavailable
     offline:
     offline_warning:
       message: The GPX file upload system is currently unavailable
     offline:


@@ -1903,73 +1665,8 @@ en-GB:
         to the web interface to view the Contributor Terms. You do not need to agree,
         but you must view them.
   oauth:
         to the web interface to view the Contributor Terms. You do not need to agree,
         but you must view them.
   oauth:

-    authorize:
-      title: Authorise access to your account
-      request_access_html: 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:'
-      allow_read_prefs: read your user preferences.
-      allow_write_prefs: modify your user preferences.
-      allow_write_diary: create diary entries, comments and make friends.
-      allow_write_api: modify the map.
-      allow_read_gpx: read your private GPS traces.
-      allow_write_gpx: upload GPS traces.
-      allow_write_notes: modify notes.
-      grant_access: Grant Access
-    authorize_success:
-      title: Authorisation request allowed
-      allowed_html: You have granted application %{app_name} access to your account.
-      verification: The verification code is %{code}.
-    authorize_failure:
-      title: Authorisation request failed
-      denied: You have denied application %{app_name} access to your account.
-      invalid: The authorisation token is not valid.
-    revoke:
-      flash: You've revoked the token for %{application}

     permissions:
       missing: You have not permitted the application access to this facility
     permissions:
       missing: You have not permitted the application access to this facility

-  oauth_clients:
-    new:
-      title: Register a new application
-    edit:
-      title: Edit your application
-    show:
-      title: OAuth details for %{app_name}
-      key: 'Consumer Key:'
-      secret: 'Consumer Secret:'
-      url: 'Request Token URL:'
-      access_url: 'Access Token URL:'
-      authorize_url: 'Authorise URL:'
-      support_notice: We support HMAC-SHA1 (recommended) and RSA-SHA1 signatures.
-      edit: Edit Details
-      delete: Delete Client
-      confirm: Are you sure?
-      requests: 'Requesting the following permissions from the user:'
-    index:
-      title: My OAuth Details
-      my_tokens: My Authorised Applications
-      list_tokens: 'The following tokens have been issued to applications in your
-        name:'
-      application: Application Name
-      issued_at: Issued At
-      revoke: Revoke!
-      my_apps: My Client Applications
-      no_apps_html: Do you have an application you would like to register for use
-        with us using the %{oauth} standard? You must register your web application
-        before it can make OAuth requests to this service.
-      registered_apps: 'You have the following client applications registered:'
-      register_new: Register your application
-    form:
-      requests: 'Request the following permissions from the user:'
-    not_found:
-      sorry: Sorry, that %{type} could not be found.
-    create:
-      flash: Registered the information successfully
-    update:
-      flash: Updated the client information successfully
-    destroy:
-      flash: Destroyed the client application registration

   oauth2_applications:
     new:
       title: Register a new application
   oauth2_applications:
     new:
       title: Register a new application


@@ -1978,17 +1675,9 @@ en-GB:
       title: Sign Up
       no_auto_account_create: Unfortunately we are not currently able to create an
         account for you automatically.
       title: Sign Up
       no_auto_account_create: Unfortunately we are not currently able to create an
         account for you automatically.

-      about:
-        header: Free and editable
-      email address: 'Email Address:'
-      confirm email address: 'Confirm Email Address:'
-      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 description: Your publicly displayed username. You can change this
         later in the preferences.
       external auth: 'Third Party Authentication:'

-      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:
       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!
     terms:


@@ -1998,8 +1687,6 @@ en-GB:
         the Public Domain
       consider_pd_why: what's this?
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
         the Public Domain
       consider_pd_why: what's this?
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain

-      guidance_html: 'Information to help understand these terms: a <a href="%{summary}">human
-        readable summary</a> and some <a href="%{translations}">informal translations</a>'

       decline: Decline
       you need to accept or decline: Please read and then either accept or decline
         the new Contributor Terms to continue.
       decline: Decline
       you need to accept or decline: Please read and then either accept or decline
         the new Contributor Terms to continue.


@@ -2019,7 +1706,6 @@ en-GB:
       deleted: deleted
     show:
       my diary: My Diary
       deleted: deleted
     show:
       my diary: My Diary

-      new diary entry: new diary entry

       my edits: My Edits
       my traces: My Traces
       my notes: My Notes
       my edits: My Edits
       my traces: My Traces
       my notes: My Notes


@@ -2040,13 +1726,10 @@ en-GB:
       ct status: 'Contributor terms:'
       ct undecided: Undecided
       ct declined: Declined
       ct status: 'Contributor terms:'
       ct undecided: Undecided
       ct declined: Declined

-      latest edit: 'Latest edit (%{ago}):'

       email address: 'Email address:'
       created from: 'Created from:'
       status: 'Status:'
       spam score: 'Spam Score:'
       email address: 'Email address:'
       created from: 'Created from:'
       status: 'Status:'
       spam score: 'Spam Score:'

-      description: Description
-      user location: User location

       role:
         administrator: This user is an administrator
         moderator: This user is a moderator
       role:
         administrator: This user is an administrator
         moderator: This user is a moderator


@@ -2061,27 +1744,22 @@ en-GB:
       comments: Comments
       create_block: Block this User
       activate_user: Activate this User
       comments: Comments
       create_block: Block this User
       activate_user: Activate this User

-      deactivate_user: Deactivate this User

       confirm_user: Confirm this user
       hide_user: Hide this User
       unhide_user: Unhide this User
       delete_user: Delete this User
       confirm: Confirm
       confirm_user: Confirm this user
       hide_user: Hide this User
       unhide_user: Unhide this User
       delete_user: Delete this User
       confirm: Confirm

-    set_home:
-      flash success: Home location saved successfully

     go_public:
       flash success: All your edits are now public, and you are now allowed to edit.
     index:
       title: Users
       heading: Users
     go_public:
       flash success: All your edits are now public, and you are now allowed to edit.
     index:
       title: Users
       heading: Users

-      showing:
-        one: Page %{page} (%{first_item} of %{items})
-        other: Page %{page} (%{first_item}-%{last_item} of %{items})

       summary_html: '%{name} created from %{ip_address} on %{date}'
       summary_no_ip_html: '%{name} created on %{date}'
       summary_html: '%{name} created from %{ip_address} on %{date}'
       summary_no_ip_html: '%{name} created on %{date}'

+      empty: No matching users found
+    page:

       confirm: Confirm Selected Users
       hide: Hide Selected Users
       confirm: Confirm Selected Users
       hide: Hide Selected Users

-      empty: No matching users found

     suspended:
       title: Account Suspended
       heading: Account Suspended
     suspended:
       title: Account Suspended
       heading: Account Suspended


@@ -2096,31 +1774,17 @@ en-GB:
       option_1: |-
         If you are new to OpenStreetMap, please create a new account
         using the form below.
       option_1: |-
         If you are new to OpenStreetMap, please create a new account
         using the form below.

-      option_2: |-
-        If you already have an account, you can login to your account
-        using your username and password and then associate the account
-        with your ID in your user settings.

   user_role:
     filter:
       not_a_role: The string `%{role}' is not a valid role.
       already_has_role: The user already has role %{role}.
       doesnt_have_role: The user does not have role %{role}.
     grant:
   user_role:
     filter:
       not_a_role: The string `%{role}' is not 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}'?
       are_you_sure: Are you sure you want to grant the role `%{role}' to the user
         `%{name}'?

-      confirm: Confirm
-      fail: Could not grant role `%{role}' to user `%{name}'. Please check that the
-        user and role are both valid.

     revoke:
     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}'?
       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_blocks:
     model:
       non_moderator_update: Must be a moderator to create or update a block.
   user_blocks:
     model:
       non_moderator_update: Must be a moderator to create or update a block.


@@ -2132,25 +1796,14 @@ en-GB:
       title: Creating block on %{name}
       heading_html: Creating block on %{name}
       period: How long, starting now, the user will be blocked from the API for.
       title: Creating block on %{name}
       heading_html: Creating block on %{name}
       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.
-      back: View all blocks

     edit:
       title: Editing block on %{name}
       heading_html: Editing block on %{name}
       period: How long, starting now, the user will be blocked from the API for.
     edit:
       title: Editing block on %{name}
       heading_html: Editing block on %{name}
       period: How long, starting now, the user will be blocked from the API for.

-      show: View this block
-      back: View all blocks

     filter:
     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.
     create:
       block_period: The blocking period must be one of the values selectable in the
         drop-down list.
     create:

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

       flash: Created a block on user %{name}.
     update:
       only_creator_can_edit: Only the moderator who created this block can edit it.
       flash: Created a block on user %{name}.
     update:
       only_creator_can_edit: Only the moderator who created this block can edit it.


@@ -2159,14 +1812,6 @@ en-GB:
       title: User blocks
       heading: List of user blocks
       empty: No blocks have been made yet.
       title: User blocks
       heading: List of user blocks
       empty: No blocks have been made yet.

-    revoke:
-      title: Revoking block on %{block_on}
-      heading_html: Revoking block on %{block_on} by %{block_by}
-      time_future: This block will end in %{time}.
-      past: This block ended %{time} and cannot be revoked now.
-      confirm: Are you sure you wish to revoke this block?
-      revoke: Revoke!
-      flash: This block has been revoked.

     helper:
       time_future_html: Ends in %{time}.
       until_login: Active until the user logs in.
     helper:
       time_future_html: Ends in %{time}.
       until_login: Active until the user logs in.


@@ -2175,7 +1820,7 @@ en-GB:
       time_past_html: Ended %{time}.
       block_duration:
         hours:
       time_past_html: Ended %{time}.
       block_duration:
         hours:

-          one: 1 hour
+          one: '%{count} hour'

           other: '%{count} hours'
     blocks_on:
       title: Blocks on %{name}
           other: '%{count} hours'
     blocks_on:
       title: Blocks on %{name}


@@ -2192,31 +1837,25 @@ en-GB:
       status: 'Status:'
       show: Show
       edit: Edit
       status: 'Status:'
       show: Show
       edit: Edit

-      revoke: Revoke!

       confirm: Are you sure?
       reason: 'Reason for block:'
       confirm: Are you sure?
       reason: 'Reason for block:'

-      back: View all blocks

       revoker: 'Revoker:'
       needs_view: The user needs to log in before this block will be cleared.
     block:
       not_revoked: (not revoked)
       show: Show
       edit: Edit
       revoker: 'Revoker:'
       needs_view: The user needs to log in before this block will be cleared.
     block:
       not_revoked: (not revoked)
       show: Show
       edit: Edit

-      revoke: Revoke!
-    blocks:
+    page:

       display_name: Blocked User
       creator_name: Creator
       reason: Reason for block
       status: Status
       revoker_name: Revoked by
       display_name: Blocked User
       creator_name: Creator
       reason: Reason for block
       status: Status
       revoker_name: Revoked by

-      showing_page: Page %{page}
-      next: Next »
-      previous: « Previous

   notes:
     index:
       title: Notes submitted or commented on by %{user}
       heading: '%{user}''s notes'
   notes:
     index:
       title: Notes submitted or commented on by %{user}
       heading: '%{user}''s notes'

-      subheading_html: Notes submitted or commented on by %{user}
+      subheading_html: Notes %{submitted} or %{commented} by %{user}

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


@@ -2228,15 +1867,6 @@ en-GB:
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'
       open_title: 'Unresolved note #%{note_name}'
       closed_title: 'Resolved note #%{note_name}'
       hidden_title: 'Hidden note #%{note_name}'

-      opened_by_html: Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      opened_by_anonymous_html: Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_html: Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      commented_by_anonymous_html: Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_html: Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      closed_by_anonymous_html: Resolved by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_html: Reactivated by %{user} <abbr title='%{exact_time}'>%{when}</abbr>
-      reopened_by_anonymous_html: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}</abbr>
-      hidden_by_html: Hidden by %{user} <abbr title='%{exact_time}'>%{when}</abbr>

       anonymous_warning: This note includes comments from anonymous users which should
         be independently verified.
       hide: Hide
       anonymous_warning: This note includes comments from anonymous users which should
         be independently verified.
       hide: Hide


@@ -2252,6 +1882,8 @@ en-GB:
       advice: Your note is public and may be used to update the map, so don't enter
         personal information or information from copyrighted maps or directory listings.
       add: Add Note
       advice: Your note is public and may be used to update the map, so don't enter
         personal information or information from copyrighted maps or directory listings.
       add: Add Note

+    notes_paging_nav:
+      showing_page: Page %{page}

   javascripts:
     close: Close
     share:
   javascripts:
     close: Close
     share:


@@ -2272,7 +1904,6 @@ en-GB:
       center_marker: Centre map on marker
       paste_html: Paste HTML to embed in website
       view_larger_map: View Larger Map
       center_marker: Centre map on marker
       paste_html: Paste HTML to embed in website
       view_larger_map: View Larger Map

-      only_standard_layer: Only the standard layer can be exported as an image

     embed:
       report_problem: Report a problem
     key:
     embed:
       report_problem: Report a problem
     key:


@@ -2297,8 +1928,6 @@ en-GB:
         gps: Public GPS Traces
         overlays: Enable overlays for troubleshooting the map
         title: Layers
         gps: Public GPS Traces
         overlays: Enable overlays for troubleshooting the map
         title: Layers

-      copyright: © <a href='%{copyright_url}'>OpenStreetMap contributors</a>
-      donate_link_text: <a class='donate-attr' href='%{donate_url}'>Make a Donation</a>

     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map


@@ -2308,13 +1937,6 @@ en-GB:
       map_data_zoom_in_tooltip: Zoom in to see map data
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features
       map_data_zoom_in_tooltip: Zoom in to see map data
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features

-    changesets:
-      show:
-        comment: Comment
-        subscribe: Subscribe
-        unsubscribe: Unsubscribe
-        hide_comment: hide
-        unhide_comment: unhide

     edit_help: Move the map and zoom in on a location you want to edit, then click
       here.
     directions:
     edit_help: Move the map and zoom in on a location you want to edit, then click
       here.
     directions: