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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index f2d5b0987db7ef333dbf835d477e003a362484ce..ce7f9d925f9de3c06533a1fbd9406f8e1e0abba2 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -3,7 +3,6 @@
 # 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


@@ -66,10 +65,6 @@ en-GB:
         create: Create block
         update: Update block
   activerecord:
         create: Create block
         update: Update block
   activerecord:

-    errors:
-      messages:
-        invalid_email_address: does not appear to be a valid e-mail address
-        email_address_not_routable: is not routable

     models:
       acl: Access Control List
       changeset: Changeset
     models:
       acl: Access Control List
       changeset: Changeset


@@ -138,7 +133,6 @@ en-GB:
         longitude: Longitude
         public: Public
         description: Description
         longitude: Longitude
         public: Public
         description: Description

-        gpx_file: Upload GPX File

         visibility: Visibility
         tagstring: Tags
       message:
         visibility: Visibility
         tagstring: Tags
       message:


@@ -321,7 +315,6 @@ en-GB:
         note: note
     timeout:
       title: Timeout Error
         note: note
     timeout:
       title: Timeout Error

-      sorry: Sorry, the data for the %{type} with the id %{id}, took too long to retrieve.

       type:
         node: node
         way: way
       type:
         node: node
         way: way


@@ -359,8 +352,6 @@ en-GB:
       comment:
         comment: 'New comment on changeset #%{changeset_id} by %{author}'
         commented_at_by_html: Updated %{when} by %{user}
       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'
       show:
         title_all: OpenStreetMap changeset discussion
         title_particular: 'OpenStreetMap changeset #%{changeset_id} discussion'


@@ -368,20 +359,9 @@ en-GB:
         sorry: Sorry, the list of changeset comments you requested took too long to
           retrieve.
   changesets:
         sorry: Sorry, the list of changeset comments you requested took too long to
           retrieve.
   changesets:

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

     changeset:
     changeset:

-      anonymous: Anonymous

       no_edits: (no edits)
       view_changeset_details: View changeset details
       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}


@@ -457,8 +437,6 @@ en-GB:
       no_entries: No diary entries
     page:
       recent_entries: Recent diary entries
       no_entries: No diary entries
     page:
       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


@@ -493,8 +471,6 @@ en-GB:
       report: Report this comment
     location:
       location: 'Location:'
       report: Report this comment
     location:
       location: 'Location:'

-      view: View
-      edit: Edit

     feed:
       user:
         title: OpenStreetMap diary entries for %{user}
     feed:
       user:
         title: OpenStreetMap diary entries for %{user}


@@ -510,8 +486,6 @@ en-GB:
       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment

-      newer_comments: Newer Comments
-      older_comments: Older Comments

   doorkeeper:
     errors:
       messages:
   doorkeeper:
     errors:
       messages:


@@ -1116,10 +1090,6 @@ en-GB:
         level8: City Boundary
         level9: Village Boundary
         level10: Suburb Boundary
         level8: City Boundary
         level9: Village Boundary
         level10: Suburb Boundary

-      types:
-        cities: Cities
-        towns: Towns
-        places: Places

     results:
       no_results: No results found
       more_results: More results
     results:
       no_results: No results found
       more_results: More results


@@ -1137,29 +1107,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
     edit_with: Edit with %{editor}
     user_diaries: User Diaries
     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

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


@@ -1183,7 +1144,6 @@ en-GB:
       see_their_profile: You can see their profile at %{userurl}.
       befriend_them: You can also add them as a friend at %{befriendurl}.
     gpx_failure:
       see_their_profile: You can see their profile at %{userurl}.
       befriend_them: You can also add them as a friend at %{befriendurl}.
     gpx_failure:

-      failed_to_import: 'failed to import. Here is the error:'

       subject: '[OpenStreetMap] GPX Import failure'
     gpx_success:
       subject: '[OpenStreetMap] GPX Import success'
       subject: '[OpenStreetMap] GPX Import failure'
     gpx_success:
       subject: '[OpenStreetMap] GPX Import success'


@@ -1234,7 +1194,6 @@ en-GB:
           on. The note is near %{place}.'
     changeset_comment_notification:
       hi: Hi %{to_user},
           on. The note is near %{place}.'
     changeset_comment_notification:
       hi: Hi %{to_user},

-      greeting: Hi,

       commented:
         subject_own: '[OpenStreetMap] %{commenter} has commented on one of your changesets'
         subject_other: '[OpenStreetMap] %{commenter} has commented on a changeset
       commented:
         subject_own: '[OpenStreetMap] %{commenter} has commented on one of your changesets'
         subject_other: '[OpenStreetMap] %{commenter} has commented on a changeset


@@ -1286,7 +1245,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


@@ -1359,15 +1317,24 @@ en-GB:
       password: Password
       remember: Remember me
       lost password link: Lost your password?
       password: Password
       remember: Remember me
       lost password link: Lost your password?

-      register now: Register now

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

       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.


@@ -1503,10 +1470,8 @@ en-GB:
       title: Any questions?
     sidebar:
       search_results: Search Results
       title: Any questions?
     sidebar:
       search_results: Search Results

-      close: Close

     search:
       search: Search
     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


@@ -1617,8 +1582,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}


@@ -1657,13 +1620,8 @@ 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
     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:


@@ -1699,7 +1657,6 @@ en-GB:
         account for you automatically.
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
         account for you automatically.
       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!
     terms:
       continue: Sign Up
       terms accepted: Thanks for accepting the new contributor terms!
     terms:


@@ -1708,8 +1665,6 @@ en-GB:
       consider_pd: In addition to the above, I consider my contributions to be in
         the Public Domain
       consider_pd_why: what's this?
       consider_pd: In addition to the above, I consider my contributions to be in
         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
-      decline: Decline

       you need to accept or decline: Please read and then either accept or decline
         the new Contributor Terms to continue.
       legale_select: 'Country of residence:'
       you need to accept or decline: Please read and then either accept or decline
         the new Contributor Terms to continue.
       legale_select: 'Country of residence:'


@@ -1802,17 +1757,11 @@ en-GB:
       already_has_role: The user already has role %{role}.
       doesnt_have_role: The user does not have role %{role}.
     grant:
       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

     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

   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.


@@ -1863,17 +1812,14 @@ en-GB:
       heading_html: '%{block_on} blocked by %{block_by}'
       created: 'Created:'
       status: 'Status:'
       heading_html: '%{block_on} blocked by %{block_by}'
       created: 'Created:'
       status: 'Status:'

-      show: Show

       edit: Edit
       edit: Edit

-      confirm: Are you sure?

       reason: 'Reason for block:'
       revoker: 'Revoker:'
       reason: 'Reason for block:'
       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
     block:
       not_revoked: (not revoked)
       show: Show
       edit: Edit

-    blocks:
+    page:

       display_name: Blocked User
       creator_name: Creator
       reason: Reason for block
       display_name: Blocked User
       creator_name: Creator
       reason: Reason for block


@@ -1910,6 +1856,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: