]> git.openstreetmap.org Git - rails.git/commitdiff
Merge branch 'pull/5117'
authorAnton Khorev <tony29@yandex.ru>
Thu, 19 Sep 2024 13:49:29 +0000 (16:49 +0300)
committerAnton Khorev <tony29@yandex.ru>
Thu, 19 Sep 2024 13:49:29 +0000 (16:49 +0300)
1  2 
config/locales/en.yml

diff --combined config/locales/en.yml
index fc2ab125e42414fb5c71d83098d5a4fb9e37632f,d3826f23c09cc8abd048f68f862ac3aa1bc3e974..bdfc37ac6ca37581e71b57e25c5d954782816414
@@@ -38,6 -38,8 +38,6 @@@ en
    activerecord:
      errors:
        messages:
 -        invalid_email_address: does not appear to be a valid e-mail address
 -        email_address_not_routable: is not routable
          display_name_is_user_n: can't be user_n unless n is your user id
        models:
          user_mute:
          longitude: "Longitude"
          public: "Public"
          description: "Description"
-         gpx_file: Upload GPX File
+         gpx_file: Choose GPS Trace File
          visibility: Visibility
          tagstring: Tags
        message:
          note: note
      timeout:
        title: Timeout Error
 -      sorry: "Sorry, the data for the %{type} with the id %{id}, took too long to retrieve."
 +      sorry: "Sorry, the data for the %{type} with the id %{id} took too long to retrieve."
        type:
          node: node
          way: way
        introduction: "Click on the map to find nearby features."
        nearby: "Nearby features"
        enclosing: "Enclosing features"
 +  nodes:
 +    timeout:
 +      sorry: "Sorry, the data for the node with the id %{id} took too long to retrieve."
    old_nodes:
      not_found:
        sorry: "Sorry, node #%{id} version %{version} could not be found."
 +    timeout:
 +      sorry: "Sorry, the history of the node with the id %{id} took too long to retrieve."
 +  ways:
 +    timeout:
 +      sorry: "Sorry, the data for the way with the id %{id} took too long to retrieve."
    old_ways:
      not_found:
        sorry: "Sorry, way #%{id} version %{version} could not be found."
 +    timeout:
 +      sorry: "Sorry, the history of the way with the id %{id} took too long to retrieve."
 +  relations:
 +    timeout:
 +      sorry: "Sorry, the data for the relation with the id %{id} took too long to retrieve."
    old_relations:
      not_found:
        sorry: "Sorry, relation #%{id} version %{version} could not be found."
 +    timeout:
 +      sorry: "Sorry, the history of the relation with the id %{id} took too long to retrieve."
    changeset_comments:
      feeds:
        comment:
        timeout:
          sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
    changesets:
 -    changeset_paging_nav:
 -      showing_page: "Page %{page}"
 -      next: "Next »"
 -      previous: "« Previous"
      changeset:
        anonymous: "Anonymous"
        no_edits: "(no edits)"
        no_entries: No diary entries
      page:
        recent_entries: "Recent diary entries"
 -      older_entries: Older Entries
 -      newer_entries: Newer Entries
      edit:
        title: Edit Diary Entry
        marker_text: Diary entry location
        post: Post
        when: When
        comment: Comment
 -      newer_comments: "Newer Comments"
 -      older_comments: "Older Comments"
      new:
        heading: Add a comment to the following diary entry discussion?
    doorkeeper:
          level9: "Village Boundary"
          level10: "Suburb Boundary"
          level11: "Neighbourhood Boundary"
 -      types:
 -        cities: Cities
 -        towns: Towns
 -        places: Places
      results:
        no_results: "No results found"
        more_results: "More results"
          ignored: Ignored
          open: Open
          resolved: Resolved
 -      older_issues: Older Issues
 -      newer_issues: Newer Issues
      show:
        title: "%{status} Issue #%{issue_id}"
        reports:
      history: History
      export: Export
      issues: Issues
 -    data: Data
 -    export_data: Export Data
      gps_traces: GPS Traces
 -    gps_traces_tooltip: Manage GPS traces
      user_diaries: User Diaries
      edit_with: Edit with %{editor}
 -    tag_line: The Free Wiki World Map
      intro_header: Welcome to OpenStreetMap!
      intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
 -    intro_2_create_account: "Create a user account"
      hosting_partners_2024_html: "Hosting is supported by %{fastly}, %{corpmembers}, and other %{partners}."
      partners_fastly: "Fastly"
      partners_corpmembers: "OSMF corporate members"
      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."
 -    donate: "Support OpenStreetMap by %{link} to the Hardware Upgrade Fund."
      help: Help
      about: About
      copyright: Copyright
      communities: Communities
 -    community: Community
 -    community_blogs: "Community Blogs"
 -    community_blogs_title: "Blogs from members of the OpenStreetMap community"
      learn_more: "Learn More"
      more: More
    user_mailer:
        befriend_them: "You can also add them as a friend at %{befriendurl}."
        befriend_them_html: "You can also add them as a friend at %{befriendurl}."
      gpx_description:
-       description_with_tags: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
-       description_with_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
-       description_with_no_tags: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
-       description_with_no_tags_html: "It looks like your GPX file %{trace_name} with the description %{trace_description} and no tags"
+       description_with_tags: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+       description_with_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and the following tags: %{tags}"
+       description_with_no_tags: "It looks like your file %{trace_name} with the description %{trace_description} and no tags"
+       description_with_no_tags_html: "It looks like your file %{trace_name} with the description %{trace_description} and no tags"
      gpx_failure:
        hi: "Hi %{to_user},"
-       failed_to_import: "failed to import. Here is the error:"
+       failed_to_import: "failed to be imported as a GPS trace file. Please verify that your file is a valid GPX file or an archive containing GPX file(s) in the supported format (.tar.gz, .tar.bz2, .tar, .zip, .gpx.gz, .gpx.bz2). Could there be a format or syntax issue with your file? Here is the importing error:"
        more_info: "More information about GPX import failures and how to avoid them can be found at %{url}."
        more_info_html: "More information about GPX import failures and how to avoid them can be found at %{url}."
        import_failures_url: "https://wiki.openstreetmap.org/wiki/GPX_Import_Failures"
      changeset_comment_notification:
        description: "OpenStreetMap Changeset #%{id}"
        hi: "Hi %{to_user},"
 -      greeting: "Hi,"
        commented:
          subject_own: "[OpenStreetMap] %{commenter} has commented on one of your changesets"
          subject_other: "[OpenStreetMap] %{commenter} has commented on a changeset you are interested in"
        body: "Sorry there is no message with that id."
      outbox:
        title: "Outbox"
 -      actions: "Actions"
        messages:
          one: "You have %{count} sent message"
          other: "You have %{count} sent messages"
        edit: Edit
        preview: Preview
        help: Help
 +    pagination:
 +      diary_comments:
 +        older: Older Comments
 +        newer: Newer Comments
 +      diary_entries:
 +        older: Older Entries
 +        newer: Newer Entries
 +      issues:
 +        older: Older Issues
 +        newer: Newer Issues
 +      traces:
 +        older: Older Traces
 +        newer: Newer Traces
 +      user_blocks:
 +        older: Older Blocks
 +        newer: Newer Blocks
 +      users:
 +        older: Older Users
 +        newer: Newer Users
    site:
      about:
 -      next: Next
        heading_html: "%{copyright}OpenStreetMap %{br} contributors"
        copyright_symbol_html: "&copy;"
        used_by_html: "%{name} provides map data for thousands of websites, mobile apps, and hardware devices"
        close: Close
      search:
        search: Search
 -      get_directions: "Get directions"
        get_directions_title: "Find directions between two points"
        from: "From"
        to: "To"
            hospital: "Hospital"
            building: "Significant building"
            station: "Railway station"
 +          railway_halt: "Railway halt"
 +          subway_station: "Subway station"
 +          tram_stop: "Tram stop"
            summit: "Summit"
            peak: "Peak"
            tunnel: "Dashed casing = tunnel"
            destination: "Destination access"
            construction: "Roads under construction"
            bus_stop: "Bus stop"
 -          stop: "Stop"
            bicycle_shop: "Bicycle shop"
            bicycle_rental: "Bicycle rental"
            bicycle_parking: "Bicycle parking"
        visibility_help_url: "https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
      update:
        updated: Trace updated
 -    trace_optionals:
 -      tags: "Tags"
      show:
        title: "Viewing Trace %{name}"
        heading: "Viewing Trace %{name}"
        my_traces: "My Traces"
        traces_from: "Public Traces from %{user}"
        remove_tag_filter: "Remove Tag Filter"
 -    page:
 -      older: "Older Traces"
 -      newer: "Newer Traces"
      destroy:
        scheduled_for_deletion: "Trace scheduled for deletion"
 -    make_public:
 -      made_public: "Trace made public"
      offline_warning:
        message: "The GPX file upload system is currently unavailable"
      offline:
          contributor_terms_url: "https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms"
          contributor_terms: "contributor terms"
        tou: "terms of use"
 -      external auth: "Third Party Authentication:"
        continue: Sign Up
        terms accepted: "Thanks for accepting the new contributor terms!"
        email_help:
        summary_no_ip_html: "%{name} created on %{date}"
        empty: No matching users found
      page:
 -      older: "Older Users"
 -      newer: "Newer Users"
        found_users:
          one: "%{count} user found"
          other: "%{count} users found"
        doesnt_have_role: "The user does not have role %{role}."
        not_revoke_admin_current_user: "Cannot revoke administrator role from current user."
      grant:
 -      title: Confirm role granting
 -      heading: Confirm role granting
        are_you_sure: "Are you sure you want to grant the role `%{role}' to the user `%{name}'?"
 -      confirm: "Confirm"
      revoke:
 -      title: Confirm role revoking
 -      heading: Confirm role revoking
        are_you_sure: "Are you sure you want to revoke the role `%{role}' from the user `%{name}'?"
 -      confirm: "Confirm"
    user_blocks:
      model:
        non_moderator_update: "Must be a moderator to create or update a block."
        not_revoked: "(not revoked)"
        show: "Show"
        edit: "Edit"
 -    blocks:
 +    page:
        display_name: "Blocked User"
        creator_name: "Creator"
        reason: "Reason for block"
        status: "Status"
        revoker_name: "Revoked by"
 -      older: "Older Blocks"
 -      newer: "Newer Blocks"
      navigation:
        all_blocks: "All Blocks"
        blocks_on_me: "Blocks on Me"
        anonymous_warning_sign_up: "sign up"
        advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
        add: Add Note
 +    notes_paging_nav:
 +      showing_page: "Page %{page}"
 +      next: "Next"
 +      previous: "Previous"
    javascripts:
      close: Close
      share:
        empty: "No redactions to show."
        heading: "List of Redactions"
        title: "List of Redactions"
 +      new: "New Redaction"
      new:
        heading: "Enter Information for New Redaction"
        title: "Creating New Redaction"