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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 14a925f14b9af6947c5bce06282f4db1e0576309..47b53b774583a3edc2a974e8f5b7dafa81494ab2 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1131,29 +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
     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:


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


@@ -1361,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.


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