X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/4cfb632b5e7e32d8298a3be327fc37d3180b8a7e..44c30fa6cece25f8c68d26e34a798334d3ddd0de:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index d64c11782..530dad207 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -212,7 +212,7 @@ en: openid: OpenID google: Google facebook: Facebook - windowslive: Windows Live + microsoft: Microsoft github: GitHub wikipedia: Wikipedia api: @@ -228,6 +228,7 @@ en: 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})" @@ -350,6 +351,7 @@ en: history_title_html: "Way History: %{name}" nodes: "Nodes" nodes_count: + one: "%{count} node" other: "%{count} nodes" also_part_of_html: one: "part of way %{related_ways}" @@ -515,9 +517,9 @@ en: comment_link: Comment on this entry reply_link: Send a message to the author comment_count: - zero: No comments one: "%{count} comment" other: "%{count} comments" + no_comments: No comments edit_link: Edit this entry hide_link: Hide this entry unhide_link: Unhide this entry @@ -590,9 +592,13 @@ en: geocoder: search: title: - latlon_html: 'Results from Internal' - osm_nominatim_html: 'Results from OpenStreetMap Nominatim' - osm_nominatim_reverse_html: 'Results from OpenStreetMap Nominatim' + results_from_html: 'Results from %{results_link}' + latlon: Internal + latlon_url: https://openstreetmap.org/ + osm_nominatim: OpenStreetMap Nominatim + osm_nominatim_url: https://nominatim.openstreetmap.org/ + osm_nominatim_reverse: OpenStreetMap Nominatim + osm_nominatim_reverse_url: https://nominatim.openstreetmap.org/ search_osm_nominatim: prefix_format: "%{name}" prefix: @@ -1399,9 +1405,9 @@ en: show: title: "%{status} Issue #%{issue_id}" reports: - zero: No reports 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}" @@ -1749,6 +1755,9 @@ en: home location: "Home Location" no home location: "You have not entered your home location." update home location on click: "Update home location when I click on the map?" + show: "Show" + delete: "Delete" + undelete: "Undo delete" update: success: Profile updated. failure: Couldn't update profile. @@ -1777,9 +1786,9 @@ en: facebook: title: Login with Facebook alt: Login with a Facebook Account - windowslive: - title: Login with Windows Live - alt: Login with a Windows Live Account + microsoft: + title: Login with Microsoft + alt: Login with a Microsoft Account github: title: Login with GitHub alt: Login with a GitHub Account @@ -2011,14 +2020,22 @@ en: contributors_nz_linz_data_service_url: https://data.linz.govt.nz/ contributors_nz_cc_by: CC BY 4.0 contributors_nz_cc_by_url: https://creativecommons.org/licenses/by/4.0/ + contributors_rs_credit_html: | + %{serbia}: Contains data from the %{rgz_link} and %{open_data_portal} + (public information of Serbia), 2018. + contributors_rs_serbia: Serbia + contributors_rs_rgz: Serbian Geodetic Authority + contributors_rs_rgz_url: https://geosrbija.rs/ + contributors_rs_open_data_portal: National Open Data Portal + contributors_rs_open_data_portal_url: https://data.gov.rs/sr/ contributors_si_credit_html: | %{slovenia}: Contains data from the %{gu_link} and %{mkgp_link} (public information of Slovenia). contributors_si_slovenia: Slovenia contributors_si_gu: Surveying and Mapping Authority - contributors_si_gu_url: http://www.gu.gov.si/en/ + contributors_si_gu_url: https://www.gov.si/en/state-authorities/bodies-within-ministries/surveying-and-mapping-authority/ contributors_si_mkgp: Ministry of Agriculture, Forestry and Food - contributors_si_mkgp_url: http://www.mkgp.gov.si/en/ + contributors_si_mkgp_url: https://www.gov.si/en/state-authorities/ministries/ministry-of-agriculture-forestry-and-food/ contributors_es_credit_html: | %{spain}: Contains data sourced from the Spanish National Geographic Institute (%{ign_link}) and @@ -2026,16 +2043,16 @@ en: licensed for reuse under %{cc_by_link}. contributors_es_spain: Spain contributors_es_ign: IGN - contributors_es_ign_url: http://www.ign.es/ + contributors_es_ign_url: https://www.ign.es/ contributors_es_scne: SCNE - contributors_es_scne_url: http://www.scne.es/ + contributors_es_scne_url: https://www.scne.es/ contributors_es_cc_by: CC BY 4.0 contributors_es_cc_by_url: https://creativecommons.org/licenses/by/4.0/ contributors_za_credit_html: | %{south_africa}: Contains data sourced from %{ngi_link}, State copyright reserved. contributors_za_south_africa: South Africa contributors_za_ngi: "Chief Directorate: National Geo-Spatial Information" - contributors_za_ngi_url: http://www.ngi.gov.za/ + contributors_za_ngi_url: https://ngi.dalrrd.gov.za/ contributors_gb_credit_html: | %{united_kingdom}: Contains Ordnance Survey data © Crown copyright and database right @@ -2421,7 +2438,6 @@ en: visibility: "Visibility:" confirm_delete: "Delete this trace?" trace_paging_nav: - showing_page: "Page %{page}" older: "Older Traces" newer: "Newer Traces" trace: @@ -2681,6 +2697,7 @@ en: 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 @@ -2863,7 +2880,9 @@ en: 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" @@ -2876,15 +2895,15 @@ en: open_title: "Unresolved note #%{note_name}" closed_title: "Resolved note #%{note_name}" hidden_title: "Hidden note #%{note_name}" - opened_by_html: "Created by %{user} %{when}" - opened_by_anonymous_html: "Created by anonymous %{when}" - commented_by_html: "Comment from %{user} %{when}" - commented_by_anonymous_html: "Comment from anonymous %{when}" - closed_by_html: "Resolved by %{user} %{when}" - closed_by_anonymous_html: "Resolved by anonymous %{when}" - reopened_by_html: "Reactivated by %{user} %{when}" - reopened_by_anonymous_html: "Reactivated by anonymous %{when}" - hidden_by_html: "Hidden by %{user} %{when}" + 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_commented_by_anonymous_html: "Comment from anonymous %{time_ago}" + event_closed_by_html: "Resolved by %{user} %{time_ago}" + event_closed_by_anonymous_html: "Resolved by anonymous %{time_ago}" + event_reopened_by_html: "Reactivated by %{user} %{time_ago}" + event_reopened_by_anonymous_html: "Reactivated by anonymous %{time_ago}" + event_hidden_by_html: "Hidden by %{user} %{time_ago}" report: report this note coordinates_html: "%{latitude}, %{longitude}" anonymous_warning: This note includes comments from anonymous users which should be independently verified. @@ -2947,6 +2966,7 @@ en: cyclosm: CyclOSM cycle_map: Cycle Map transport_map: Transport Map + tracestracktop_topo: Tracestrack Topo hot: Humanitarian opnvkarte: ÖPNVKarte layers: @@ -2967,6 +2987,8 @@ en: 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: