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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8b11f639964c252381e9b61e5e1a19bc8d36aef5..7ff2bfd0676ed460f1b4a66afc209529e34da16c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,6 +5,8 @@ en:
     formats:
       friendly: "%e %B %Y at %H:%M"
       blog: "%e %B %Y"
     formats:
       friendly: "%e %B %Y at %H:%M"
       blog: "%e %B %Y"

+  count:
+    at_least_pattern: "%{count}+"

   helpers:
     file:
       prompt: Choose file
   helpers:
     file:
       prompt: Choose file


@@ -38,6 +40,12 @@ en:
       messages:
         invalid_email_address: does not appear to be a valid e-mail address
         email_address_not_routable: is not routable
       messages:
         invalid_email_address: does not appear to be a valid e-mail address
         email_address_not_routable: is not routable

+      models:
+        user_mute:
+          attributes:
+            subject:
+              format: "%{message}"
+          is_already_muted: "is already muted"

     # Translates all the model names, which is used in error handling on the website
     models:
       acl: "Access Control List"
     # Translates all the model names, which is used in error handling on the website
     models:
       acl: "Access Control List"


@@ -212,7 +220,7 @@ en:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

-      microsoft_graph: Microsoft
+      microsoft: Microsoft

       github: GitHub
       wikipedia: Wikipedia
   api:
       github: GitHub
       wikipedia: Wikipedia
   api:


@@ -228,6 +236,7 @@ en:
         reopened_at_by_html: "Reactivated %{when} by %{user}"
       rss:
         title: "OpenStreetMap Notes"
         reopened_at_by_html: "Reactivated %{when} by %{user}"
       rss:
         title: "OpenStreetMap Notes"

+        description_all: "A list of reported, commented on or closed notes"

         description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
         description_item: "An rss feed for note %{id}"
         opened: "new note (near %{place})"
         description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]"
         description_item: "An rss feed for note %{id}"
         opened: "new note (near %{place})"


@@ -253,6 +262,7 @@ en:
         retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
         retain_changeset_discussions: Your changeset discussions, if any, will be retained.
         retain_email: Your email address will be retained.
         retain_notes: Your map notes and note comments, if any, will be retained but hidden from view.
         retain_changeset_discussions: Your changeset discussions, if any, will be retained.
         retain_email: Your email address will be retained.

+        recent_editing_html: "As you have edited recently your account cannot currently be deleted. Deletion will be possible in %{time}."

         confirm_delete: Are you sure?
         cancel: Cancel
   accounts:
         confirm_delete: Are you sure?
         cancel: Cancel
   accounts:


@@ -462,6 +472,7 @@ en:
     contact:
       km away: "%{count}km away"
       m away: "%{count}m away"
     contact:
       km away: "%{count}km away"
       m away: "%{count}m away"

+      latest_edit_html: "Latest edit (%{ago}):"

     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"
     popup:
       your location: "Your location"
       nearby mapper: "Nearby mapper"


@@ -556,10 +567,31 @@ en:
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
   doorkeeper:
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
   doorkeeper:

+    errors:
+      messages:
+        account_selection_required: "The authorization server requires end-user account selection"
+        consent_required: "The authorization server requires end-user consent"
+        interaction_required: "The authorization server requires end-user interaction"
+        login_required: "The authorization server requires end-user authentication"

     flash:
       applications:
         create:
           notice: Application Registered.
     flash:
       applications:
         create:
           notice: Application Registered.

+    openid_connect:
+      errors:
+        messages:
+          # Configuration error messages
+          auth_time_from_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.auth_time_from_resource_owner missing configuration."
+          reauthenticate_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.reauthenticate_resource_owner missing configuration."
+          resource_owner_from_access_token_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.resource_owner_from_access_token missing configuration."
+          select_account_for_resource_owner_not_configured: "Failure due to Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner missing configuration."
+          subject_not_configured: "ID Token generation failed due to Doorkeeper::OpenidConnect.configure.subject missing configuration."
+    scopes:
+      address: "View your physical address"
+      email: "View your email address"
+      openid: "Authenticate your account"
+      phone: "View your phone number"
+      profile: "View your profile information"

   errors:
     contact:
       contact_url: https://wiki.openstreetmap.org/wiki/Contact
   errors:
     contact:
       contact_url: https://wiki.openstreetmap.org/wiki/Contact


@@ -1647,8 +1679,6 @@ en:
   messages:
     inbox:
       title: "Inbox"
   messages:
     inbox:
       title: "Inbox"

-      my_inbox: "My Inbox"
-      my_outbox: "My Outbox"

       messages: "You have %{new_messages} and %{old_messages}"
       new_messages:
         one: "%{count} new message"
       messages: "You have %{new_messages} and %{old_messages}"
       new_messages:
         one: "%{count} new message"


@@ -1656,16 +1686,20 @@ en:
       old_messages:
         one: "%{count} old message"
         other: "%{count} old messages"
       old_messages:
         one: "%{count} old message"
         other: "%{count} old messages"

+      no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
+      people_mapping_nearby: "people mapping nearby"
+    messages_table:

       from: "From"
       from: "From"

+      to: "To"

       subject: "Subject"
       date: "Date"
       subject: "Subject"
       date: "Date"

-      no_messages_yet_html: "You have no messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
-      people_mapping_nearby: "people mapping nearby"
+      actions: "Actions"

     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
       reply_button: "Reply"
       destroy_button: "Delete"
     message_summary:
       unread_button: "Mark as unread"
       read_button: "Mark as read"
       reply_button: "Reply"
       destroy_button: "Delete"

+      unmute_button: "Move to Inbox"

     new:
       title: "Send message"
       send_message_to_html: "Send a new message to %{name}"
     new:
       title: "Send message"
       send_message_to_html: "Send a new message to %{name}"


@@ -1679,16 +1713,17 @@ en:
       body: "Sorry there is no message with that id."
     outbox:
       title: "Outbox"
       body: "Sorry there is no message with that id."
     outbox:
       title: "Outbox"

-      my_inbox: "My Inbox"
-      my_outbox: "My Outbox"
+      actions: "Actions"

       messages:
         one: "You have %{count} sent message"
         other: "You have %{count} sent messages"
       messages:
         one: "You have %{count} sent message"
         other: "You have %{count} sent messages"

-      to: "To"
-      subject: "Subject"
-      date: "Date"

       no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
       people_mapping_nearby: "people mapping nearby"
       no_sent_messages_html: "You have no sent messages yet. Why not get in touch with some of the %{people_mapping_nearby_link}?"
       people_mapping_nearby: "people mapping nearby"

+    muted:
+      title: "Muted Messages"
+      messages:
+        one: "%{count} muted message"
+        other: "You have %{count} muted messages"

     reply:
       wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
     show:
     reply:
       wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply."
     show:


@@ -1700,24 +1735,34 @@ en:
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
     sent_message_summary:
       destroy_button: "Delete"
       wrong_user: "You are logged in as `%{user}' but the message you have asked to read was not sent by or to that user. Please login as the correct user in order to read it."
     sent_message_summary:
       destroy_button: "Delete"

+    heading: 
+      my_inbox: "My Inbox"
+      my_outbox: "My Outbox"
+      muted_messages: "Muted messages"

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

+    unmute:
+      notice: "Message has been moved to Inbox"
+      error: "The message could not be moved to the Inbox."

     destroy:
       destroyed: "Message deleted"
   passwords:
     destroy:
       destroyed: "Message deleted"
   passwords:

-    lost_password:
+    new:

       title: "Lost password"
       heading: "Forgotten Password?"
       email address: "Email Address:"
       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."
       title: "Lost password"
       heading: "Forgotten Password?"
       email address: "Email Address:"
       new password button: "Reset password"
       help_text: "Enter the email address you used to sign up, we will send a link to it that you can use to reset your password."

+    create:

       notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
       notice email cannot find: "Could not find that email address, sorry."
       notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
       notice email cannot find: "Could not find that email address, sorry."

-    reset_password:
+    edit:

       title: "Reset password"
       heading: "Reset Password for %{user}"
       reset: "Reset Password"
       title: "Reset password"
       heading: "Reset Password for %{user}"
       reset: "Reset Password"

+      flash token bad: "Did not find that token, check the URL maybe?"
+    update:

       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
   preferences:
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
   preferences:


@@ -1785,7 +1830,7 @@ en:
         facebook:
           title: Login with Facebook
           alt: Login with a Facebook Account
         facebook:
           title: Login with Facebook
           alt: Login with a Facebook Account

-        microsoft_graph:
+        microsoft:

           title: Login with Microsoft
           alt: Login with a Microsoft Account
         github:
           title: Login with Microsoft
           alt: Login with a Microsoft Account
         github:


@@ -1995,6 +2040,12 @@ en:
           Resources Canada), and StatCan (Geography Division,
           Statistics Canada).
         contributors_ca_canada: Canada
           Resources Canada), and StatCan (Geography Division,
           Statistics Canada).
         contributors_ca_canada: Canada

+        contributors_cz_credit_html: |
+          %{czechia}: Contains data from the State Administration of Land Surveying
+          and Cadastre licensed under %{cc_licence_link}
+        contributors_cz_czechia: Czechia
+        contributors_cz_cc_licence: Creative Commons Attribution 4.0 International licence (CC BY 4.0)
+        contributors_cz_cc_licence_url: https://creativecommons.org/licenses/by/4.0/

         contributors_fi_credit_html: |
           %{finland}: Contains data from the
           National Land Survey of Finland's Topographic Database
         contributors_fi_credit_html: |
           %{finland}: Contains data from the
           National Land Survey of Finland's Topographic Database


@@ -2247,6 +2298,7 @@ en:
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"
           primary: "Primary road"
           secondary: "Secondary road"
           unclassified: "Unclassified road"

+          pedestrian: "Pedestrian way"

           track: "Track"
           bridleway: "Bridleway"
           cycleway: "Cycleway"
           track: "Track"
           bridleway: "Bridleway"
           cycleway: "Cycleway"


@@ -2255,36 +2307,53 @@ en:
           cycleway_local: "Local cycleway"
           footway: "Footway"
           rail: "Railway"
           cycleway_local: "Local cycleway"
           footway: "Footway"
           rail: "Railway"

+          train: "Train"

           subway: "Subway"
           subway: "Subway"

-          tram:
-            - Light rail
-            - tram
+          ferry: "Ferry"
+          light_rail: "Light rail"
+          tram_only: "Tram"
+          trolleybus: "Trolleybus"
+          bus: "Bus"

           cable:
             - Cable car
             - chair lift
           runway:
             - Airport Runway
             - taxiway
           cable:
             - Cable car
             - chair lift
           runway:
             - Airport Runway
             - taxiway

-          apron:
-            - Airport apron
-            - terminal
+          apron_only: "Airport apron"

           admin: "Administrative boundary"
           admin: "Administrative boundary"

-          forest: "Forest"
-          wood: "Wood"
+          orchard:
+            - Orchard
+            - vineyard
+          forest:
+            - Forest
+            - wood
+          farmland: "Farmland"
+          grass:
+            - Grass
+            - meadow
+          bare_rock: "Bare rock"
+          sand: "Sand"

           golf: "Golf course"
           park: "Park"
           golf: "Golf course"
           park: "Park"

-          resident: "Residential area"

           common:
             - Common
             - meadow
             - garden
           common:
             - Common
             - meadow
             - garden

+          built_up: "Built-up area"
+          resident: "Residential area"

           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
           heathland: "Heathland"
           retail: "Retail area"
           industrial: "Industrial area"
           commercial: "Commercial area"
           heathland: "Heathland"

+          scrubland: "Scrubland"

           lake:
             - Lake
             - reservoir
           lake:
             - Lake
             - reservoir

+          intermittent_water: "Intermittent waterbody"
+          glacier: "Glacier"
+          reef: "Reef"
+          wetland: "Wetland"

           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"
           farm: "Farm"
           brownfield: "Brownfield site"
           cemetery: "Cemetery"


@@ -2296,6 +2365,7 @@ en:
           school:
             - School
             - university
           school:
             - School
             - university

+            - hospital

           building: "Significant building"
           station: "Railway station"
           summit:
           building: "Significant building"
           station: "Railway station"
           summit:


@@ -2306,6 +2376,8 @@ en:
           private: "Private access"
           destination: "Destination access"
           construction: "Roads under construction"
           private: "Private access"
           destination: "Destination access"
           construction: "Roads under construction"

+          bus_stop: "Bus stop"
+          stop: "Stop"

           bicycle_shop: "Bicycle shop"
           bicycle_parking: "Bicycle parking"
           toilets: "Toilets"
           bicycle_shop: "Bicycle shop"
           bicycle_parking: "Bicycle parking"
           toilets: "Toilets"


@@ -2351,6 +2423,7 @@ en:
         automated_edits: Automated Edits
         automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
       start_mapping: Start Mapping
         automated_edits: Automated Edits
         automated_edits_url: https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct
       start_mapping: Start Mapping

+      continue_authorization: Continue Authorization

       add_a_note:
         title: No Time To Edit? Add a Note!
         para_1: |
       add_a_note:
         title: No Time To Edit? Add a Note!
         para_1: |


@@ -2501,6 +2574,7 @@ en:
       oauth1_settings: OAuth 1 settings
       oauth2_applications: OAuth 2 applications
       oauth2_authorizations: OAuth 2 authorizations
       oauth1_settings: OAuth 1 settings
       oauth2_applications: OAuth 2 applications
       oauth2_authorizations: OAuth 2 authorizations

+      muted_users: Muted Users

   oauth:
     authorize:
       title: "Authorize access to your account"
   oauth:
     authorize:
       title: "Authorize access to your account"


@@ -2527,6 +2601,7 @@ en:
     permissions:
       missing: "You have not permitted the application access to this facility"
     scopes:
     permissions:
       missing: "You have not permitted the application access to this facility"
     scopes:

+      openid: Sign-in using OpenStreetMap

       read_prefs: Read user preferences
       write_prefs: Modify user preferences
       write_diary: Create diary entries, comments and make friends
       read_prefs: Read user preferences
       write_prefs: Modify user preferences
       write_diary: Create diary entries, comments and make friends


@@ -2687,6 +2762,8 @@ en:
       my_dashboard: My Dashboard
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me
       my_dashboard: My Dashboard
       blocks on me: Blocks on Me
       blocks by me: Blocks by Me

+      create_mute: Mute this User
+      destroy_mute: Unmute this User

       edit_profile: Edit Profile
       send message: Send Message
       diary: Diary
       edit_profile: Edit Profile
       send message: Send Message
       diary: Diary


@@ -2696,10 +2773,10 @@ en:
       remove as friend: Unfriend
       add as friend: Add Friend
       mapper since: "Mapper since:"
       remove as friend: Unfriend
       add as friend: Add Friend
       mapper since: "Mapper since:"

+      uid: "User id:"

       ct status: "Contributor terms:"
       ct undecided: Undecided
       ct declined: Declined
       ct status: "Contributor terms:"
       ct undecided: Undecided
       ct declined: Declined

-      latest edit: "Latest edit (%{ago}):"

       email address: "Email address:"
       created from: "Created from:"
       status: "Status:"
       email address: "Email address:"
       created from: "Created from:"
       status: "Status:"


@@ -2707,12 +2784,15 @@ en:
       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"
       role:
         administrator: "This user is an administrator"
         moderator: "This user is a moderator"

+        importer: "This user is a importer"

         grant:
           administrator: "Grant administrator access"
           moderator: "Grant moderator access"
         grant:
           administrator: "Grant administrator access"
           moderator: "Grant moderator access"

+          importer: "Grant importer access"

         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"
         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"

+          importer: "Revoke importer access"

       block_history: "Active Blocks"
       moderator_history: "Blocks Given"
       comments: "Comments"
       block_history: "Active Blocks"
       moderator_history: "Blocks Given"
       comments: "Comments"


@@ -2812,8 +2892,8 @@ en:
     revoke:
       title: "Revoking block on %{block_on}"
       heading_html: "Revoking block on %{block_on} by %{block_by}"
     revoke:
       title: "Revoking block on %{block_on}"
       heading_html: "Revoking block on %{block_on} by %{block_by}"

-      time_future: "This block will end in %{time}."
-      past: "This block ended %{time} and cannot be revoked now."
+      time_future_html: "This block will end in %{time}."
+      past_html: "This block ended %{time} and cannot be revoked now."

       confirm: "Are you sure you wish to revoke this block?"
       revoke: "Revoke!"
       flash: "This block has been revoked."
       confirm: "Are you sure you wish to revoke this block?"
       revoke: "Revoke!"
       flash: "This block has been revoked."


@@ -2874,11 +2954,36 @@ en:
       showing_page: "Page %{page}"
       next: "Next »"
       previous: "« Previous"
       showing_page: "Page %{page}"
       next: "Next »"
       previous: "« Previous"

+  user_mutes:
+    index:
+      title: "Muted Users"
+      my_muted_users: "My muted users"
+      you_have_muted_n_users:
+        one: "You have muted %{count} User"
+        other: "You have muted %{count} users"
+      user_mute_explainer: "Messages of muted users are moved into a separate Inbox and you won't receive email notifications."
+      user_mute_admins_and_moderators: "You can mute Admins and Moderators but their messages will not be muted."
+      table:
+        thead:
+          muted_user: "Muted User"
+          actions: "Actions"
+        tbody:
+          unmute: "Unmute"
+          send_message: "Send message"
+
+    create:
+      notice: "You muted %{name}."
+      error: "%{name} could not be muted. %{full_message}."
+    destroy:
+      notice: "You unmuted %{name}."
+      error: "User could not be unmuted. Please try again."

   notes:
     index:
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s Notes"
   notes:
     index:
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s Notes"

-      subheading_html: "Notes submitted or commented on by %{user}"
+      subheading_html: "Notes %{submitted} or %{commented} by %{user}"
+      subheading_submitted: "submitted"
+      subheading_commented: "commented on"

       no_notes: No notes
       id: "Id"
       creator: "Creator"
       no_notes: No notes
       id: "Id"
       creator: "Creator"


@@ -2962,6 +3067,7 @@ en:
         cyclosm: CyclOSM
         cycle_map: Cycle Map
         transport_map: Transport Map
         cyclosm: CyclOSM
         cycle_map: Cycle Map
         transport_map: Transport Map

+        tracestracktop_topo: Tracestrack Topo

         hot: Humanitarian
         opnvkarte: ÖPNVKarte
       layers:
         hot: Humanitarian
         opnvkarte: ÖPNVKarte
       layers:


@@ -2982,6 +3088,8 @@ en:
       andy_allan: Andy Allan
       opnvkarte_credit: "Tiles courtesy of %{memomaps_link}"
       memomaps: MeMoMaps
       andy_allan: Andy Allan
       opnvkarte_credit: "Tiles courtesy of %{memomaps_link}"
       memomaps: MeMoMaps

+      tracestrack_credit: "Tiles courtesy of %{tracestrack_link}"
+      tracestrack: Tracestrack

       hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}"
       hotosm_name: Humanitarian OpenStreetMap Team
     site:
       hotosm_credit: "Tiles style by %{hotosm_link} hosted by %{osm_france_link}"
       hotosm_name: Humanitarian OpenStreetMap Team
     site:


@@ -2993,6 +3101,7 @@ en:
       map_data_zoom_in_tooltip: Zoom in to see map data
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features
       map_data_zoom_in_tooltip: Zoom in to see map data
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features

+      embed_html_disabled: HTML embedding is not available for this map layer

     changesets:
       show:
         comment: "Comment"
     changesets:
       show:
         comment: "Comment"