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 da3afb2ee8fa0051619703e947265ef57d09f650..cb7e24ee0d580b302a79be9aeeaa4271763e8f31 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -392,6 +392,7 @@ en:
         relation: "relation"
     start_rjs:
       feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are you sure you want to display this data?"
         relation: "relation"
     start_rjs:
       feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are you sure you want to display this data?"

+      feature_error: "Features could not be loaded: %{message}"

       load_data: "Load Data"
       loading: "Loading..."
     tag_details:
       load_data: "Load Data"
       loading: "Loading..."
     tag_details:


@@ -835,7 +836,7 @@ en:
           census: "Census Boundary"
           national_park: "National Park"
           political: "Electoral Boundary"
           census: "Census Boundary"
           national_park: "National Park"
           political: "Electoral Boundary"

-          protected_area : "Protected Area"
+          protected_area: "Protected Area"

           "yes": "Boundary"
         bridge:
           aqueduct: "Aqueduct"
           "yes": "Boundary"
         bridge:
           aqueduct: "Aqueduct"


@@ -986,7 +987,7 @@ en:
           turning_circle: "Turning Circle"
           turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"
           turning_circle: "Turning Circle"
           turning_loop: "Turning Loop"
           unclassified: "Unclassified Road"

-          "yes" : "Road"
+          "yes": "Road"

         historic:
           aircraft: "Historic Aircraft"
           archaeological_site: "Archaeological Site"
         historic:
           aircraft: "Historic Aircraft"
           archaeological_site: "Archaeological Site"


@@ -1166,7 +1167,7 @@ en:
           trench: "Trench"
           "yes": "Military"
         mountain_pass:
           trench: "Trench"
           "yes": "Military"
         mountain_pass:

-          "yes" : "Mountain Pass"
+          "yes": "Mountain Pass"

         natural:
           atoll: "Atoll"
           bare_rock: "Bare Rock"
         natural:
           atoll: "Atoll"
           bare_rock: "Bare Rock"


@@ -1511,9 +1512,11 @@ en:
       reports: Reports
       last_updated: Last Updated
       last_updated_time_ago_user_html: "%{time_ago} by %{user}"
       reports: Reports
       last_updated: Last Updated
       last_updated_time_ago_user_html: "%{time_ago} by %{user}"

+      reporting_users: Reporting Users

       reports_count:
         one: "%{count} Report"
         other: "%{count} Reports"
       reports_count:
         one: "%{count} Report"
         other: "%{count} Reports"

+      more_reporters: "and %{count} more"

       reported_item: Reported Item
       states:
         ignored: Ignored
       reported_item: Reported Item
       states:
         ignored: Ignored


@@ -1548,7 +1551,8 @@ en:
       reopened: Issue status has been set to 'Open'
     comments:
       comment_from_html: "Comment from %{user_link} on %{comment_created_at}"
       reopened: Issue status has been set to 'Open'
     comments:
       comment_from_html: "Comment from %{user_link} on %{comment_created_at}"

-      reassign_param: Reassign Issue?
+      reassign_to_moderators: Reassign Issue to Moderators
+      reassign_to_administrators: Reassign Issue to Administrators

     reports:
       reported_by_html: "Reported as %{category} by %{user} on %{updated_at}"
     helper:
     reports:
       reported_by_html: "Reported as %{category} by %{user} on %{updated_at}"
     helper:


@@ -1620,8 +1624,6 @@ en:
     partners_corpmembers: "OSMF corporate members"
     partners_partners: "partners"
     tou: "Terms of Use"
     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
     nothing_to_preview: "Nothing to preview."
     help: Help
     about: About


@@ -1629,6 +1631,11 @@ en:
     communities: Communities
     learn_more: "Learn More"
     more: More
     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}"
   user_mailer:
     diary_comment_notification:
       description: "OpenStreetMap Diary Entry #%{id}"


@@ -2245,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"
         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."
       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"
       id_not_configured: "iD has not been configured"
     export:
       title: "Export"


@@ -3066,6 +3074,7 @@ en:
       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"

+      description_when_author_is_deleted: "deleted"

       event_opened_by_html: "Created by %{user} %{time_ago}"
       event_opened_by_anonymous_html: "Created by anonymous %{time_ago}"
       event_commented_by_html: "Comment from %{user} %{time_ago}"
       event_opened_by_html: "Created by %{user} %{time_ago}"
       event_opened_by_anonymous_html: "Created by anonymous %{time_ago}"
       event_commented_by_html: "Comment from %{user} %{time_ago}"