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

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

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index ec1721ab10bfc7e03dbb169214142839c275768f..c4a56827adf701efb5c2725827a894c820a800ae 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1079,10 +1079,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
-    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
@@ -1196,11 +1192,13 @@ en-GB:
       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
+    read_marks:
+      create:
+        notice: Message marked as read
+      destroy:
+        notice: Message marked as unread
     mailboxes:
       heading:
         my_inbox: My Inbox
@@ -1352,12 +1350,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
-    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.
+    edit:
       id_not_configured: iD has not been configured
     export:
       title: Export