X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/256637f6cb34977356b30059a39af53e9e92702d..04c6d38649d0794eeb09e3b62e866efe6a9f95e2:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index e887a71aa..25794cc9f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -251,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." @@ -399,6 +392,7 @@ en: relation: "relation" start_rjs: feature_warning: "Loading %{num_features} features, which may make your browser slow or unresponsive. Are you sure you want to display this data?" + feature_error: "Features could not be loaded: %{message}" load_data: "Load Data" loading: "Loading..." tag_details: @@ -491,18 +485,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}" @@ -534,6 +516,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" @@ -629,15 +625,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: @@ -1525,9 +1512,11 @@ en: reports: Reports last_updated: Last Updated last_updated_time_ago_user_html: "%{time_ago} by %{user}" + reporting_users: Reporting Users reports_count: one: "%{count} Report" other: "%{count} Reports" + more_reporters: "and %{count} more" reported_item: Reported Item states: ignored: Ignored @@ -1562,7 +1551,8 @@ en: reopened: Issue status has been set to 'Open' comments: comment_from_html: "Comment from %{user_link} on %{comment_created_at}" - reassign_param: Reassign Issue? + reassign_to_moderators: Reassign Issue to Moderators + reassign_to_administrators: Reassign Issue to Administrators reports: reported_by_html: "Reported as %{category} by %{user} on %{updated_at}" helper: @@ -1661,7 +1651,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." @@ -1796,14 +1786,17 @@ en: destroy_button: "Delete" back: "Back" wrong_user: "You are logged in as '%{user}' but the message you have asked to read was not sent by or to that user. Please log in as the correct user in order to read it." - mark: - as_read: "Message marked as read" - as_unread: "Message marked as unread" - unmute: - notice: "Message has been moved to Inbox" - error: "The message could not be moved to the Inbox." destroy: destroyed: "Message deleted" + read_marks: + create: + notice: "Message marked as read" + destroy: + notice: "Message marked as unread" + mutes: + destroy: + notice: "Message has been moved to Inbox" + error: "The message could not be moved to the Inbox." mailboxes: heading: my_inbox: "My Inbox" @@ -1955,6 +1948,9 @@ en: preview: Preview help: Help pagination: + changeset_comments: + older: Older Comments + newer: Newer Comments diary_comments: older: Older Comments newer: Newer Comments @@ -2623,13 +2619,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: @@ -2888,6 +2885,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 @@ -3053,6 +3070,7 @@ en: open_title: "Unresolved note #%{note_name}" closed_title: "Resolved note #%{note_name}" hidden_title: "Hidden note #%{note_name}" + description_when_author_is_deleted: "deleted" 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}"