X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2b7a48029bff06c190544f91c5969b09aeae552b..84a3a41531cd283ddfe5a86de1a0656c8cdd2185:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index f9fe33041..a7125a3a7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -20,9 +20,6 @@ en: create: Add Comment message: create: Send - client_application: - create: Register - update: Update oauth2_application: create: Register update: Update @@ -254,13 +251,6 @@ en: openid: link: "https://wiki.openstreetmap.org/wiki/OpenID" link text: "what is this?" - public editing: - heading: "Public editing" - enabled: "Enabled. Not anonymous and can edit data." - enabled link: "https://wiki.openstreetmap.org/wiki/Anonymous_edits" - enabled link text: "what is this?" - disabled: "Disabled and cannot edit data, all previous edits are anonymous." - disabled link text: "why can't I edit?" contributor terms: heading: "Contributor Terms" agreed: "You have agreed to the new Contributor Terms." @@ -321,7 +311,6 @@ en: readable_summary: human readable summary informal_translations: informal translations continue: "Continue" - declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" cancel: "Cancel" you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue." legale_select: "Country of residence:" @@ -329,6 +318,8 @@ en: france: "France" italy: "Italy" rest_of_world: "Rest of the world" + update: + terms accepted: "Thanks for accepting the new contributor terms!" terms_declined_flash: terms_declined_html: We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see %{terms_declined_link}. terms_declined_link: this wiki page @@ -493,18 +484,6 @@ en: created: "Created" closed: "Closed" belongs_to: "Author" - 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: - 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." show: title: "Changeset: %{id}" created: "Created: %{when}" @@ -536,6 +515,20 @@ en: sorry: "Sorry, changeset #%{id} could not be found." timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." + changeset_subscriptions: + show: + 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: + 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." dashboards: contact: km away: "%{count}km away" @@ -549,7 +542,7 @@ en: title: My Dashboard no_home_location_html: "%{edit_profile_link} and set your home location to see nearby users." edit_your_profile: Edit your profile - followings: Followings + followings: Followings no followings: You have not followed any user yet. nearby users: "Other nearby users" no nearby users: "There are no other users who admit to mapping nearby yet." @@ -631,15 +624,6 @@ en: heading: Unsubscribe from the following diary entry discussion? button: Unsubscribe from discussion diary_comments: - index: - title: "Diary Comments added by %{user}" - heading: "%{user}'s Diary Comments" - subheading_html: "Diary Comments added by %{user}" - no_comments: "No diary comments" - page: - post: Post - when: When - comment: Comment new: heading: Add a comment to the following diary entry discussion? doorkeeper: @@ -686,17 +670,20 @@ en: not_found: title: File not found description: Couldn't find a file/directory/API operation by that name on the OpenStreetMap server (HTTP 404) - friendships: - make_friend: - heading: "Do you want to follow %{user}?" - button: "Follow User" + follows: + show: + follow: + heading: "Do you want to follow %{user}?" + button: "Follow User" + unfollow: + heading: "Do you want to unfollow %{user}?" + button: "Unfollow User" + create: success: "You are now following %{name}!" failed: "Sorry, your request to follow %{name} has failed." already_followed: "You already follow %{name}." limit_exceeded: "You have followed a lot of users recently. Please wait a while before trying to follow any more." - remove_friend: - heading: "Do you want to unfollow %{user}?" - button: "Unfollow" + destroy: success: "You successfully unfollowed %{name}." not_followed: "You are not following %{name}." geocoder: @@ -1660,7 +1647,7 @@ en: header_html: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:" footer: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}" footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}" - friendship_notification: + follow_notification: hi: "Hi %{to_user}," subject: "[OpenStreetMap] %{user} followed you" followed_you: "%{user} is now following you on OpenStreetMap." @@ -1870,8 +1857,6 @@ en: preferences: show: title: My Preferences - preferred_editor: Preferred Editor - preferred_languages: Preferred Languages preferred_site_color_scheme: Preferred Website Color Scheme site_color_schemes: auto: Auto @@ -1882,11 +1867,7 @@ en: auto: Auto light: Light dark: Dark - edit_preferences: Edit Preferences - edit: - title: Edit Preferences save: Update Preferences - cancel: Cancel update: failure: Couldn't update preferences. update_success_flash: @@ -1960,6 +1941,9 @@ en: preview: Preview help: Help pagination: + changeset_comments: + older: Older Comments + newer: Newer Comments diary_comments: older: Older Comments newer: Newer Comments @@ -2628,13 +2612,14 @@ en: offline: heading: "GPX Storage Offline" message: "The GPX file storage and upload system is currently unavailable." - georss: - title: "OpenStreetMap GPS Traces" - description: - description_with_count: - one: "GPX file with %{count} point from %{user}" - other: "GPX file with %{count} points from %{user}" - description_without_count: "GPX file from %{user}" + feeds: + show: + title: "OpenStreetMap GPS Traces" + description: + description_with_count: + one: "GPX file with %{count} point from %{user}" + other: "GPX file with %{count} points from %{user}" + description_without_count: "GPX file from %{user}" application: permission_denied: You do not have permission to access that action require_cookies: @@ -2781,7 +2766,6 @@ en: contributor_terms_url: "https://osmfoundation.org/wiki/Licence/Contributor_Terms" contributor_terms: "contributor terms" continue: Sign Up - terms accepted: "Thanks for accepting the new contributor terms!" email_help: privacy_policy: privacy policy privacy_policy_url: https://osmfoundation.org/wiki/Privacy_Policy @@ -2894,6 +2878,26 @@ en: user: summary_html: "%{name} created from %{ip_address} on %{date}" summary_no_ip_html: "%{name} created on %{date}" + comments: + index: + heading_html: "%{user}'s Comments" + changesets: "Changesets" + diary_entries: "Diary entries" + no_comments: "No comments" + changeset_comments: + index: + title: "Changeset Comments added by %{user}" + page: + changeset: Changeset + when: When + comment: Comment + diary_comments: + index: + title: "Diary Comments added by %{user}" + page: + post: Post + when: When + comment: Comment suspended: title: Account Suspended heading: Account Suspended