X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/523bb3169ad8b9be7c2564d8ee869b0e2fcd7c9b..d23763d6cdbf5ec11f0e83f8e6e8fb32ed973e6a:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index a2347d4bc..2f1e4d016 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -204,9 +204,9 @@ en: one: "%{count} year ago" other: "%{count} years ago" printable_name: - with_id: "%{id}" - with_version: "%{id}, v%{version}" + version: "v%{version}" with_name_html: "%{name} (%{id})" + current_and_old_links_html: "%{current_link}, %{old_link}" editor: default: "Default (currently %{name})" id: @@ -342,14 +342,10 @@ 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" osmchangexml: "osmChange XML" - feed: - title: "Changeset %{id}" - title_comment: "Changeset %{id} - %{comment}" join_discussion: "Log in to join the discussion" discussion: Discussion still_open: "Changeset still open - discussion will open once the changeset is closed." @@ -428,6 +424,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}" @@ -456,6 +461,22 @@ en: no_more_area: "No more changesets in this area." no_more_user: "No more changesets by this user." load_more: "Load more" + feed: + title: "Changeset %{id}" + title_comment: "Changeset %{id} - %{comment}" + subscribe: + heading: Subscribe to the following changeset discussion? + button: Subscribe to discussion + unsubscribe: + heading: Unsubscribe from the following changeset discussion? + button: Unsubscribe from discussion + heading: + title: "Changeset %{id}" + created_by_html: "Created by %{link_user} on %{created}." + no_such_entry: + title: "No such changeset" + heading: "No entry with the id: %{id}" + body: "Sorry, there is no changeset with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong." timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." changeset_comments: @@ -515,6 +536,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" @@ -567,6 +589,12 @@ en: comment: Comment newer_comments: "Newer Comments" older_comments: "Older Comments" + subscribe: + heading: Subscribe to the following diary entry discussion? + button: Subscribe to discussion + unsubscribe: + heading: Unsubscribe from the following diary entry discussion? + button: Unsubscribe from discussion doorkeeper: errors: messages: @@ -1556,12 +1584,15 @@ en: more: More user_mailer: diary_comment_notification: + description: "OpenStreetMap Diary Entry #%{id}" subject: "[OpenStreetMap] %{user} commented on a diary entry" hi: "Hi %{to_user}," header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:" header_html: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:" footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}" footer_html: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}" + footer_unsubscribe: "You can unsubscribe from the discussion at %{unsubscribeurl}" + footer_unsubscribe_html: "You can unsubscribe from the discussion at %{unsubscribeurl}" message_notification: subject: "[OpenStreetMap] %{message_title}" hi: "Hi %{to_user}," @@ -1610,6 +1641,7 @@ en: hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account." click_the_link: "If this is you, please click the link below to reset your password." note_comment_notification: + description: "OpenStreetMap Note #%{id}" anonymous: An anonymous user greeting: "Hi," commented: @@ -1636,6 +1668,7 @@ en: details: "More details about the note can be found at %{url}." details_html: "More details about the note can be found at %{url}." changeset_comment_notification: + description: "OpenStreetMap Changeset #%{id}" hi: "Hi %{to_user}," greeting: "Hi," commented: @@ -1650,8 +1683,8 @@ en: partial_changeset_without_comment: "without comment" details: "More details about the changeset can be found at %{url}." details_html: "More details about the changeset can be found at %{url}." - unsubscribe: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".' - unsubscribe_html: 'To unsubscribe from updates to this changeset, visit %{url} and click "Unsubscribe".' + unsubscribe: "You can unsubscribe from updates to this changeset at %{url}." + unsubscribe_html: "You can unsubscribe from updates to this changeset at %{url}." confirmations: confirm: heading: Check your email! @@ -1813,7 +1846,7 @@ en: heading: "Login" email or username: "Email Address or Username" password: "Password" - openid_html: "%{logo} OpenID:" + openid_html: "%{logo} OpenID" remember: "Remember me" lost password link: "Lost your password?" login_button: "Login" @@ -2219,18 +2252,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 @@ -2597,6 +2626,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: @@ -2675,6 +2705,7 @@ 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: @@ -3065,7 +3096,6 @@ en: transport_map: Transport Map tracestracktop_topo: Tracestrack Topo hot: Humanitarian - opnvkarte: ÖPNVKarte layers: header: Map Layers notes: Map Notes @@ -3082,8 +3112,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}"