X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/daa254351106c4d2c1bef08a88aa946dec6f6411..81857a744613f3a9f3aa4fb1848e9a9768e174c7:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 7ed296695..d66482639 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -40,6 +40,7 @@ en: 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: attributes: @@ -341,7 +342,6 @@ en: way_paginated: "Ways (%{x}-%{y} of %{count})" relation: "Relations (%{count})" relation_paginated: "Relations (%{x}-%{y} of %{count})" - comment: "Comments (%{count})" hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}" comment_by_html: "Comment from %{user} %{time_ago}" changesetxml: "Changeset XML" @@ -427,6 +427,15 @@ en: introduction: "Click on the map to find nearby features." nearby: "Nearby features" enclosing: "Enclosing features" + old_nodes: + not_found: + sorry: "Sorry, node #%{id} version %{version} could not be found." + old_ways: + not_found: + sorry: "Sorry, way #%{id} version %{version} could not be found." + old_relations: + not_found: + sorry: "Sorry, relation #%{id} version %{version} could not be found." changesets: changeset_paging_nav: showing_page: "Page %{page}" @@ -514,6 +523,7 @@ en: show: title: "%{user}'s Diary | %{title}" user_title: "%{user}'s Diary" + discussion: "Discussion" leave_a_comment: "Leave a comment" login_to_leave_a_comment_html: "%{login_link} to leave a comment" login: "Login" @@ -1439,9 +1449,9 @@ en: one: "%{count} report" other: "%{count} reports" no_reports: No reports - report_created_at: "First reported at %{datetime}" - last_resolved_at: "Last resolved at %{datetime}" - last_updated_at: "Last updated at %{datetime} by %{displayname}" + report_created_at_html: "First reported at %{datetime}" + last_resolved_at_html: "Last resolved at %{datetime}" + last_updated_at_html: "Last updated at %{datetime} by %{displayname}" resolve: Resolve ignore: Ignore reopen: Reopen @@ -1590,6 +1600,7 @@ en: loaded: one: "loaded successfully with %{trace_points} out of a possible %{count} point." other: "loaded successfully with %{trace_points} out of a possible %{count} points." + all_your_traces_html: "All your successfully uploaded GPX traces can be found at %{url}." subject: "[OpenStreetMap] GPX Import success" signup_confirm: subject: "[OpenStreetMap] Welcome to OpenStreetMap" @@ -1751,7 +1762,7 @@ en: new: title: "Lost password" heading: "Forgotten Password?" - email address: "Email Address:" + 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: @@ -1809,9 +1820,9 @@ en: new: title: "Login" heading: "Login" - email or username: "Email Address or Username:" - password: "Password:" - openid_html: "%{logo} OpenID:" + email or username: "Email Address or Username" + password: "Password" + openid_html: "%{logo} OpenID" remember: "Remember me" lost password link: "Lost your password?" login_button: "Login" @@ -1870,6 +1881,7 @@ en: image: Image alt: Alt text url: URL + codeblock: Code block richtext_field: edit: Edit preview: Preview @@ -2160,12 +2172,7 @@ en: no_iframe_support: "Your browser doesn't support HTML iframes, which are necessary for this feature." export: title: "Export" - area_to_export: "Area to Export" manually_select: "Manually select a different area" - format_to_export: "Format to Export" - osm_xml_data: "OpenStreetMap XML Data" - map_image: "Map Image (shows standard layer)" - embeddable_html: "Embeddable HTML" licence: "Licence" licence_details_html: OpenStreetMap data is licensed under the %{odbl_link} (ODbL). odbl: Open Data Commons Open Database License @@ -2185,17 +2192,6 @@ en: other: title: "Other Sources" description: "Additional sources listed on the OpenStreetMap Wiki" - options: "Options" - format: "Format" - scale: "Scale" - max: "max" - image_size: "Image Size" - zoom: "Zoom" - add_marker: "Add a marker to the map" - latitude: "Lat:" - longitude: "Lon:" - output: "Output" - paste_html: "Paste HTML to embed in website" export_button: "Export" fixthemap: title: Report a problem / Fix the map @@ -2232,18 +2228,14 @@ en: url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide title: Beginners' Guide description: Community maintained guide for beginners. - help: - url: https://help.openstreetmap.org/ - title: Help Forum - description: Ask a question or look up answers on OpenStreetMap's question-and-answer site. + community: + url: https://community.openstreetmap.org/ + title: Help & Community Forum + description: A shared place for to seek help and have conversations about OpenStreetMap. mailing_lists: url: https://lists.openstreetmap.org/ title: Mailing Lists description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. - community: - url: https://community.openstreetmap.org/ - title: Community forum - description: A shared place for conversations about OpenStreetMap. irc: url: https://irc.openstreetmap.org/ title: IRC @@ -2305,41 +2297,36 @@ en: cycleway_national: "National cycleway" cycleway_regional: "Regional cycleway" cycleway_local: "Local cycleway" + cycleway_mtb: "Mountain bike route" footway: "Footway" rail: "Railway" train: "Train" subway: "Subway" ferry: "Ferry" light_rail: "Light rail" - tram_only: "Tram" + tram: "Tram" trolleybus: "Trolleybus" bus: "Bus" - cable: - - Cable car - - chair lift - runway: - - Airport Runway - - taxiway - apron_only: "Airport apron" + cable_car: "Cable car" + chair_lift: "Chair lift" + runway: "Airport Runway" + taxiway: "Taxiway" + apron: "Airport apron" admin: "Administrative boundary" - orchard: - - Orchard - - vineyard - forest: - - Forest - - wood + capital: "Capital" + city: "City" + orchard: "Orchard" + vineyard: "Vineyard" + forest: "Forest" + wood: "Wood" farmland: "Farmland" - grass: - - Grass - - meadow + grass: "Grass" + meadow: "Meadow" bare_rock: "Bare rock" sand: "Sand" golf: "Golf course" park: "Park" - common: - - Common - - meadow - - garden + common: "Common" built_up: "Built-up area" resident: "Residential area" retail: "Retail area" @@ -2347,9 +2334,8 @@ en: commercial: "Commercial area" heathland: "Heathland" scrubland: "Scrubland" - lake: - - Lake - - reservoir + lake: "Lake" + reservoir: "Reservoir" intermittent_water: "Intermittent waterbody" glacier: "Glacier" reef: "Reef" @@ -2360,17 +2346,16 @@ en: allotments: "Allotments" pitch: "Sports pitch" centre: "Sports centre" + beach: "Beach" reserve: "Nature reserve" military: "Military area" - school: - - School - - university - - hospital + school: "School" + university: "University" + hospital: "Hospital" building: "Significant building" station: "Railway station" - summit: - - Summit - - peak + summit: "Summit" + peak: "Peak" tunnel: "Dashed casing = tunnel" bridge: "Black casing = bridge" private: "Private access" @@ -2379,7 +2364,9 @@ en: bus_stop: "Bus stop" stop: "Stop" bicycle_shop: "Bicycle shop" + bicycle_rental: "Bicycle rental" bicycle_parking: "Bicycle parking" + bicycle_parking_small: "Small bicycle parking" toilets: "Toilets" welcome: title: Welcome! @@ -2615,6 +2602,7 @@ en: oauth_clients: new: title: "Register a new application" + disabled: "Registration of OAuth 1 applications has been disabled" edit: title: "Edit your application" show: @@ -2693,7 +2681,9 @@ en: title: "My Authorized Applications" application: "Application" permissions: "Permissions" + last_authorized: "Last Authorized" no_applications_html: "You have not yet authorized any %{oauth2} applications." + oauth_2: "OAuth 2" application: revoke: "Revoke Access" confirm_revoke: "Revoke access for this application?" @@ -2796,6 +2786,7 @@ en: importer: "Revoke importer access" block_history: "Active Blocks" moderator_history: "Blocks Given" + revoke_all_blocks: "Revoke all blocks" comments: "Comments" create_block: "Block this User" activate_user: "Activate this User" @@ -2898,6 +2889,16 @@ en: confirm: "Are you sure you wish to revoke this block?" revoke: "Revoke!" flash: "This block has been revoked." + revoke_all: + title: "Revoking all blocks on %{block_on}" + heading_html: "Revoking all blocks on %{block_on}" + empty: "%{name} has no active blocks." + confirm: "Are you sure you wish to revoke %{active_blocks}?" + active_blocks: + one: "%{count} active block" + other: "%{count} active blocks" + revoke: "Revoke!" + flash: "All active blocks have been revoked." helper: time_future_html: "Ends in %{time}." until_login: "Active until the user logs in." @@ -3014,6 +3015,7 @@ en: reactivate: Reactivate comment_and_resolve: Comment & Resolve comment: Comment + log_in_to_comment: "Log in to comment on this note" report_link_html: "If this note contains sensitive information that needs to be removed, you can %{link}." other_problems_resolve: "For all other problems with the note, please resolve it yourself with a comment." other_problems_resolved: "For all other problems, resolving is sufficient." @@ -3070,7 +3072,6 @@ en: transport_map: Transport Map tracestracktop_topo: Tracestrack Topo hot: Humanitarian - opnvkarte: ÖPNVKarte layers: header: Map Layers notes: Map Notes @@ -3087,8 +3088,6 @@ en: osm_france: OpenStreetMap France thunderforest_credit: "Tiles courtesy of %{thunderforest_link}" 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}"