X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d1fe40ac69719f4f835fbcd44a06368f9136d343..be7248bace3b5dcd4498df75d09a70fff75a86e5:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index ca7063f5c..cd7d67947 100644 --- 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" + count: + at_least_pattern: "%{count}+" helpers: file: prompt: Choose file @@ -212,7 +214,7 @@ en: openid: OpenID google: Google facebook: Facebook - windowslive: Windows Live + microsoft: Microsoft github: GitHub wikipedia: Wikipedia api: @@ -228,6 +230,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 +353,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 +519,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 @@ -555,10 +559,31 @@ en: 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. + 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 @@ -1403,9 +1428,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}" @@ -1753,6 +1778,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. @@ -1781,9 +1809,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 @@ -2433,7 +2461,6 @@ en: visibility: "Visibility:" confirm_delete: "Delete this trace?" trace_paging_nav: - showing_page: "Page %{page}" older: "Older Traces" newer: "Newer Traces" trace: @@ -2524,6 +2551,7 @@ en: 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 @@ -2693,6 +2721,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 @@ -2875,7 +2904,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" @@ -2959,6 +2990,7 @@ en: cyclosm: CyclOSM cycle_map: Cycle Map transport_map: Transport Map + tracestracktop_topo: Tracestrack Topo hot: Humanitarian opnvkarte: ÖPNVKarte layers: @@ -2979,6 +3011,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: