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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 73e8191bdae7719463aedd32d1243d987110c895..47b53b774583a3edc2a974e8f5b7dafa81494ab2 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Author: Alefar
 # Export driver: phpyaml
 # Author: Abijeet Patro
 # Author: Alefar

+# Author: Amire80

 # Author: Andibing
 # Author: BEANS
 # Author: Back ache
 # Author: Andibing
 # Author: BEANS
 # Author: Back ache


@@ -336,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:


@@ -355,6 +354,19 @@ 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:
     changeset_paging_nav:
       showing_page: Page %{page}
   changesets:
     changeset_paging_nav:
       showing_page: Page %{page}


@@ -364,12 +376,6 @@ en-GB:
       anonymous: Anonymous
       no_edits: (no edits)
       view_changeset_details: View changeset details
       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}


@@ -410,18 +416,6 @@ en-GB:
       relations_paginated: Relations (%{x}-%{y} of %{count})
     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.
       relations_paginated: Relations (%{x}-%{y} of %{count})
     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'
   dashboards:
     contact:
       km away: '%{count}km away'


@@ -455,6 +449,7 @@ 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
       older_entries: Older Entries
       newer_entries: Newer Entries
       recent_entries: Recent diary entries
       older_entries: Older Entries
       newer_entries: Newer Entries


@@ -466,7 +461,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}'


@@ -506,7 +500,7 @@ en-GB:
         title: OpenStreetMap diary entries
         description: Recent diary entries from users of OpenStreetMap
   diary_comments:
         title: OpenStreetMap diary entries
         description: Recent diary entries from users of OpenStreetMap
   diary_comments:

-    index:
+    page:

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


@@ -1124,7 +1118,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:


@@ -1137,33 +1131,20 @@ en-GB:
     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_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
-    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:


@@ -1236,7 +1217,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,


@@ -1249,9 +1229,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!


@@ -1294,7 +1271,6 @@ en-GB:
     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
       destroy_button: Delete
     new:
       title: Send message


@@ -1316,19 +1292,12 @@ en-GB:
       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
       reply_button: Reply
       unread_button: Mark as unread
       destroy_button: Delete
       back: Back
     show:
       title: Read message
       reply_button: Reply
       unread_button: Mark as unread
       destroy_button: Delete
       back: Back

-      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
     heading:
     sent_message_summary:
       destroy_button: Delete
     heading:


@@ -1370,15 +1339,11 @@ 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
-      tab_title: Login

       email or username: E-mail Address or Username
       password: Password
       remember: Remember me
       lost password link: Lost your password?
       email or username: E-mail Address or Username
       password: Password
       remember: Remember me
       lost password link: Lost your password?

-      login_button: Login

       register now: Register now
       register now: Register now

-      with external: 'Alternatively, use a third party to login:'

       auth failure: Sorry, could not log in with those details.
     destroy:
       title: Logout
       auth failure: Sorry, could not log in with those details.
     destroy:
       title: Logout


@@ -1386,7 +1351,6 @@ en-GB:
       logout_button: Logout
   site:
     about:
       logout_button: Logout
   site:
     about:

-      next: Next

       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.


@@ -1397,6 +1361,12 @@ en-GB:
         is accurate and up to date.
       community_driven_title: Community Driven
       open_data_title: Open Data
         is accurate and up to date.
       community_driven_title: Community Driven
       open_data_title: Open Data

+      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
+        under the same licence. See the %{copyright_license_link} for details.
+      open_data_copyright_license: Copyright and Licence page

       legal_title: Legal
       partners_title: Partners
     copyright:
       legal_title: Legal
       partners_title: Partners
     copyright:


@@ -1414,16 +1384,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:

+        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
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
           title: Attribution example
         more_title_html: Finding out more
         credit_title_html: How to credit OpenStreetMap
         attribution_example:
           alt: Example of how to attribute OpenStreetMap on a webpage
           title: Attribution example
         more_title_html: Finding out more

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


@@ -1445,8 +1420,6 @@ 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
       manually_select: Manually select a different area
     export:
       title: Export
       manually_select: Manually select a different area


@@ -1516,7 +1489,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


@@ -1648,9 +1620,6 @@ 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:
-      older: Older Traces
-      newer: Newer Traces

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


@@ -1670,6 +1639,9 @@ en-GB:
       description: Browse recent GPS track uploads
       tagged_with: ' tagged with %{tags}'
       upload_trace: Upload a trace
       description: Browse recent GPS track uploads
       tagged_with: ' tagged with %{tags}'
       upload_trace: Upload a trace

+    page:
+      older: Older Traces
+      newer: Newer Traces

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


@@ -1696,93 +1668,9 @@ en-GB:
       need_to_see_terms: Your access to the API is temporarily suspended. Please log-in
         to the web interface to view the Contributor Terms. You do not need to agree,
         but you must view them.
       need_to_see_terms: Your access to the API is temporarily suspended. Please log-in
         to the web interface to view the Contributor Terms. You do not need to agree,
         but you must view them.

-    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
-      microsoft:
-        title: Login with Microsoft
-        alt: Login with a Microsoft Account
-      github:
-        title: Login with GitHub
-        alt: Login with a GitHub Account
-      wikipedia:
-        title: Login with Wikipedia
-        alt: Login with a Wikipedia Account

   oauth:
   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


@@ -1791,14 +1679,11 @@ 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

       display name description: Your publicly displayed username. You can change this
         later in the preferences.
       external auth: 'Third Party Authentication:'
       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
       external auth: 'Third Party Authentication:'
       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!

-      use external auth: Alternatively, use a third party to login

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


@@ -1875,9 +1760,10 @@ en-GB:
       heading: Users
       summary_html: '%{name} created from %{ip_address} on %{date}'
       summary_no_ip_html: '%{name} created on %{date}'
       heading: Users
       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


@@ -1892,10 +1778,6 @@ 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.
   user_role:
     filter:
       not_a_role: The string `%{role}' is not a valid role.


@@ -1907,16 +1789,12 @@ en-GB:
       are_you_sure: Are you sure you want to grant the role `%{role}' to the user
         `%{name}'?
       confirm: Confirm
       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:
       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}'?
       confirm: Confirm
     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}'?
       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.


@@ -1928,13 +1806,10 @@ 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.

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


@@ -1947,14 +1822,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_html: This block will end in %{time}.
-      past_html: 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.


@@ -1980,7 +1847,6 @@ en-GB:
       status: 'Status:'
       show: Show
       edit: Edit
       status: 'Status:'
       show: Show
       edit: Edit

-      revoke: Revoke!

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


@@ -1989,7 +1855,6 @@ en-GB:
       not_revoked: (not revoked)
       show: Show
       edit: Edit
       not_revoked: (not revoked)
       show: Show
       edit: Edit

-      revoke: Revoke!

     blocks:
       display_name: Blocked User
       creator_name: Creator
     blocks:
       display_name: Blocked User
       creator_name: Creator


@@ -2047,7 +1912,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: