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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 67dce974e4ab467b92ab6464d18b6341aed9ea2a..997e68373c7912bf828fb43f14403a5282ad048f 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


@@ -277,8 +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

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


@@ -288,25 +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})
-      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}'


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


@@ -403,6 +381,32 @@ 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.
   changeset_comments:
     timeout:
       sorry: Sorry, the list of changesets you requested took too long to retrieve.
   changeset_comments:


@@ -450,6 +454,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


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


@@ -500,7 +504,8 @@ 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


@@ -1143,8 +1148,6 @@ en-GB:
     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
     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.
     partners_partners: partners
     osm_offline: The OpenStreetMap database is currently offline while essential database
       maintenance work is carried out.


@@ -1232,7 +1235,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,


@@ -1245,9 +1247,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!


@@ -1312,19 +1311,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:


@@ -1342,10 +1334,6 @@ en-GB:
       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.

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

     edit:
       title: Reset password
       heading: Reset Password for %{user}
     edit:
       title: Reset password
       heading: Reset Password for %{user}


@@ -1370,43 +1358,12 @@ 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
       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:'
-      no account: Don't have an account?

       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
-        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
-        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
     destroy:
       title: Logout
       heading: Logout of OpenStreetMap


@@ -1424,9 +1381,16 @@ 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:

+      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},


@@ -1440,17 +1404,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
+        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.


@@ -1461,9 +1429,6 @@ en-GB:
     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


@@ -1678,9 +1643,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:


@@ -1694,14 +1656,15 @@ 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}
       description: Browse recent GPS track uploads
       tagged_with: ' tagged with %{tags}'
       upload_trace: Upload a trace
     index:
       public_traces: Public GPS traces
       public_traces_from: Public GPS traces from %{user}
       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:


@@ -1804,14 +1767,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

       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:


@@ -1888,14 +1846,12 @@ en-GB:
     index:
       title: Users
       heading: Users
     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


@@ -1910,10 +1866,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.


@@ -1946,15 +1898,11 @@ 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:
     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:


@@ -1966,14 +1914,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.


@@ -1999,26 +1939,20 @@ 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:
       display_name: Blocked User
       creator_name: Creator
       reason: Reason for block
       status: Status
       revoker_name: Revoked by
     blocks:
       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}
   notes:
     index:
       title: Notes submitted or commented on by %{user}


@@ -2070,7 +2004,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:


@@ -2104,13 +2037,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: