Migrate eslint config to esmodules

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index ec1721ab10bfc7e03dbb169214142839c275768f..a39b45198145890e1bc33a4bf8cadd0cede51f98 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -237,7 +237,6 @@ en-GB:
   accounts:
     edit:
       title: Edit account
   accounts:
     edit:
       title: Edit account

-      my settings: My settings

       external auth: External Authentication
       openid:
         link text: what is this?
       external auth: External Authentication
       openid:
         link text: what is this?


@@ -260,9 +259,6 @@ en-GB:
       show:
         title: Terms
         heading: Terms
       show:
         title: Terms
         heading: Terms

-        consider_pd: In addition to the above, I consider my contributions to be in
-          the Public Domain
-        consider_pd_why: what's this?

         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:'


@@ -1079,10 +1075,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.
     partners_partners: partners
     intro_text: OpenStreetMap is a map of the world, created by people like you and
       free to use under an open licence.
     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.

     help: Help
     about: About
     copyright: Copyright
     help: Help
     about: About
     copyright: Copyright


@@ -1196,11 +1188,13 @@ en-GB:
       unread_button: Mark as unread
       destroy_button: Delete
       back: Back
       unread_button: Mark as unread
       destroy_button: Delete
       back: Back

-    mark:
-      as_read: Message marked as read
-      as_unread: Message marked as unread

     destroy:
       destroyed: Message deleted
     destroy:
       destroyed: Message deleted

+    read_marks:
+      create:
+        notice: Message marked as read
+      destroy:
+        notice: Message marked as unread

     mailboxes:
       heading:
         my_inbox: My Inbox
     mailboxes:
       heading:
         my_inbox: My Inbox


@@ -1352,12 +1346,13 @@ en-GB:
         copyright: Copyright OpenStreetMap and contributors, under an open licence
       remote_failed: Editing failed - make sure JOSM or Merkaartor is loaded and that
         the remote control option is enabled
         copyright: Copyright OpenStreetMap and contributors, under an open licence
       remote_failed: Editing failed - make sure JOSM or Merkaartor is loaded and that
         the remote control option is enabled

-    edit:
+    not_public_flash:

       not_public: You have not set your edits to be public.
       not_public_description_html: You can no longer edit the map unless you do so.
         You can set your edits as public from your %{user_page}.
       user_page_link: user page
       anon_edits_link_text: Find out why this is the case.
       not_public: You have not set your edits to be public.
       not_public_description_html: You can no longer edit the map unless you do so.
         You can set your edits as public from your %{user_page}.
       user_page_link: user page
       anon_edits_link_text: Find out why this is the case.

+    edit:

       id_not_configured: iD has not been configured
     export:
       title: Export
       id_not_configured: iD has not been configured
     export:
       title: Export


@@ -1619,7 +1614,6 @@ en-GB:
       my notes: My Notes
       my messages: My Messages
       my profile: My Profile
       my notes: My Notes
       my messages: My Messages
       my profile: My Profile

-      my settings: My Settings

       my comments: My Comments
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       my comments: My Comments
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me


@@ -1668,10 +1662,10 @@ en-GB:
       show:
         title: Users
         heading: Users
       show:
         title: Users
         heading: Users

-        empty: No matching users found

       page:
         confirm: Confirm Selected Users
         hide: Hide Selected Users
       page:
         confirm: Confirm Selected Users
         hide: Hide Selected Users

+        empty: No matching users found

       user:
         summary_html: '%{name} created from %{ip_address} on %{date}'
         summary_no_ip_html: '%{name} created on %{date}'
       user:
         summary_html: '%{name} created from %{ip_address} on %{date}'
         summary_no_ip_html: '%{name} created on %{date}'