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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 25794cc9fde873a5d041605d5f2db5efa7bf005a..cb7e24ee0d580b302a79be9aeeaa4271763e8f31 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -836,7 +836,7 @@ en:
           census: "Census Boundary"
           national_park: "National Park"
           political: "Electoral Boundary"
-          protected_area : "Protected Area"
+          protected_area: "Protected Area"
           "yes": "Boundary"
         bridge:
           aqueduct: "Aqueduct"
@@ -987,7 +987,7 @@ en:
           turning_circle: "Turning Circle"
           turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"
-          "yes" : "Road"
+          "yes": "Road"
         historic:
           aircraft: "Historic Aircraft"
           archaeological_site: "Archaeological Site"
@@ -1167,7 +1167,7 @@ en:
           trench: "Trench"
           "yes": "Military"
         mountain_pass:
-          "yes" : "Mountain Pass"
+          "yes": "Mountain Pass"
         natural:
           atoll: "Atoll"
           bare_rock: "Bare Rock"
@@ -1624,8 +1624,6 @@ en:
     partners_corpmembers: "OSMF corporate members"
     partners_partners: "partners"
     tou: "Terms of Use"
-    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."
     nothing_to_preview: "Nothing to preview."
     help: Help
     about: About
@@ -1633,6 +1631,11 @@ en:
     communities: Communities
     learn_more: "Learn More"
     more: More
+    offline_flash:
+      osm_offline: "The OpenStreetMap database is currently offline while essential maintenance work is carried out."
+      osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential maintenance work is carried out."
+      expected_restore_html: "Services are expected to be restored in %{time}."
+      announcement: "You can read the announcement here."
   user_mailer:
     diary_comment_notification:
       description: "OpenStreetMap Diary Entry #%{id}"
@@ -2249,13 +2252,14 @@ en:
         license_url: "https://openstreetmap.org/copyright"
         project_url: "https://openstreetmap.org"
       remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and 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_html: "(%{link})"
       anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."
+    edit:
       id_not_configured: "iD has not been configured"
     export:
       title: "Export"