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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 2ea67992daaa83e52ddb3cf7009f5d030ed748b0..be09b6190779cf18e50e37e4380fbc5ddd868350 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -66,10 +66,6 @@ en-GB:
         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
@@ -138,7 +134,6 @@ en-GB:
         longitude: Longitude
         public: Public
         description: Description
-        gpx_file: Upload GPX File
         visibility: Visibility
         tagstring: Tags
       message:
@@ -321,7 +316,6 @@ en-GB:
         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
@@ -359,8 +353,6 @@ en-GB:
       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'
@@ -369,7 +361,6 @@ en-GB:
           retrieve.
   changesets:
     changeset:
-      anonymous: Anonymous
       no_edits: (no edits)
       view_changeset_details: View changeset details
     index:
@@ -481,8 +472,6 @@ en-GB:
       report: Report this comment
     location:
       location: 'Location:'
-      view: View
-      edit: Edit
     feed:
       user:
         title: OpenStreetMap diary entries for %{user}
@@ -1102,10 +1091,6 @@ en-GB:
         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
@@ -1160,7 +1145,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:
-      failed_to_import: 'failed to import. Here is the error:'
       subject: '[OpenStreetMap] GPX Import failure'
     gpx_success:
       subject: '[OpenStreetMap] GPX Import success'
@@ -1211,7 +1195,6 @@ en-GB:
           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
@@ -1335,7 +1318,6 @@ en-GB:
       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
@@ -1489,7 +1471,6 @@ en-GB:
       title: Any questions?
     sidebar:
       search_results: Search Results
-      close: Close
     search:
       search: Search
       get_directions_title: Find directions between two points
@@ -1677,7 +1658,6 @@ en-GB:
         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:
@@ -1686,8 +1666,7 @@ 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_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
-      decline: Decline
+      consider_pd_why_url: https://wiki.osmfoundation.org/wiki/Licence_and_Legal_FAQ/Why_would_I_want_my_contributions_to_be_public_domain
       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:'
@@ -1835,12 +1814,9 @@ en-GB:
       heading_html: '%{block_on} blocked by %{block_by}'
       created: 'Created:'
       status: 'Status:'
-      show: Show
       edit: Edit
-      confirm: Are you sure?
       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