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

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

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


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


@@ -317,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


@@ -355,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'


@@ -476,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}


@@ -1151,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'


@@ -1325,7 +1317,6 @@ 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
       auth failure: Sorry, could not log in with those details.
     destroy:
       title: Logout


@@ -1479,7 +1470,6 @@ en-GB:
       title: Any questions?
     sidebar:
       search_results: Search Results
       title: Any questions?
     sidebar:
       search_results: Search Results

-      close: Close

     search:
       search: Search
       get_directions_title: Find directions between two points
     search:
       search: Search
       get_directions_title: Find directions between two points


@@ -1675,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:'


@@ -1824,12 +1812,9 @@ 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
     block:
       not_revoked: (not revoked)
       show: Show