]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/4425'
authorTom Hughes <tom@compton.nu>
Thu, 21 Dec 2023 18:46:22 +0000 (18:46 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 21 Dec 2023 18:46:22 +0000 (18:46 +0000)
1  2 
config/locales/en.yml

diff --combined config/locales/en.yml
index 7ff2bfd0676ed460f1b4a66afc209529e34da16c,1fecd2a241247a59218c212367621a5fdfbde6c1..b157e8cbc61d466d762e106e04436737c8d6854c
@@@ -40,12 -40,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
 +      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"
    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"
        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"
 +      to: "To"
        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"
 +      unmute_button: "Move to Inbox"
      new:
        title: "Send message"
        send_message_to_html: "Send a new message to %{name}"
        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"
 -      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"
 +    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:
        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"
 +    unmute:
 +      notice: "Message has been moved to Inbox"
 +      error: "The message could not be moved to the Inbox."
      destroy:
        destroyed: "Message deleted"
    passwords:
            tram_only: "Tram"
            trolleybus: "Trolleybus"
            bus: "Bus"
-           cable:
-             - Cable car
-             - chair lift
-           runway:
-             - Airport Runway
-             - taxiway
+           cable_car: "Cable car"
+           chair_lift: "Chair lift"
+           runway_only: "Airport Runway"
+           taxiway: "Taxiway"
            apron_only: "Airport apron"
            admin: "Administrative boundary"
-           orchard:
-             - Orchard
-             - vineyard
-           forest:
-             - Forest
-             - wood
+           orchard_only: "Orchard"
+           vineyard: "Vineyard"
+           forest_only: "Forest"
+           wood: "Wood"
            farmland: "Farmland"
-           grass:
-             - Grass
-             - meadow
+           grass_only: "Grass"
+           meadow: "Meadow"
            bare_rock: "Bare rock"
            sand: "Sand"
            golf: "Golf course"
            park: "Park"
-           common:
-             - Common
-             - meadow
-             - garden
+           common_only: "Common"
            built_up: "Built-up area"
            resident: "Residential area"
            retail: "Retail area"
            commercial: "Commercial area"
            heathland: "Heathland"
            scrubland: "Scrubland"
-           lake:
-             - Lake
-             - reservoir
+           lake_only: "Lake"
+           reservoir: "Reservoir"
            intermittent_water: "Intermittent waterbody"
            glacier: "Glacier"
            reef: "Reef"
            centre: "Sports centre"
            reserve: "Nature reserve"
            military: "Military area"
-           school:
-             - School
-             - university
-             - hospital
+           school_only: "School"
+           university: "University"
+           hospital: "Hospital"
            building: "Significant building"
            station: "Railway station"
-           summit:
-             - Summit
-             - peak
+           summit_only: "Summit"
+           peak: "Peak"
            tunnel: "Dashed casing = tunnel"
            bridge: "Black casing = bridge"
            private: "Private access"
        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"
        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
        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}"