X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/283e7b975b5a80d3f3e8091ce83e8f89b33bb06c..2cfc030bbac65d8cb687ee17e6fbf18ffa5ea2cc:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 21a7ce0f2..cb7e24ee0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -89,7 +89,7 @@ en: support_url: Support URL allow_read_prefs: read their user preferences allow_write_prefs: modify their user preferences - allow_write_diary: create diary entries, comments and make friends + allow_write_diary: create diary entries and comments allow_write_api: modify the map allow_read_gpx: read their private GPS traces allow_write_gpx: upload GPS traces @@ -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: @@ -476,7 +470,7 @@ en: title: "Changesets" title_user: "Changesets by %{user}" title_user_link_html: "Changesets by %{user_link}" - title_friend: "Changesets by my friends" + title_followed: "Changesets by followings" title_nearby: "Changesets by nearby users" empty: "No changesets found." empty_area: "No changesets in this area." @@ -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" @@ -542,17 +538,17 @@ en: popup: your location: "Your location" nearby mapper: "Nearby mapper" - friend: "Friend" + following: "Following" show: 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 - my friends: My friends - no friends: You have not added any friends yet. + 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." - friends_changesets: "friends' changesets" - friends_diaries: "friends' diary entries" + followed_changesets: "changesets" + followed_diaries: "diary entries" nearby_changesets: "nearby user changesets" nearby_diaries: "nearby user diary entries" diary_entries: @@ -563,7 +559,7 @@ en: use_map_link: Use Map index: title: "Users' Diaries" - title_friends: "Friends' Diaries" + title_followed: "Followings' Diaries" title_nearby: "Nearby Users' Diaries" user_title: "%{user}'s Diary" in_language_title: "Diary Entries in %{language}" @@ -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: @@ -684,19 +671,22 @@ 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: "Add %{user} as a friend?" - button: "Add as friend" - success: "%{name} is now your friend!" - failed: "Sorry, failed to add %{name} as a friend." - already_a_friend: "You are already friends with %{name}." - limit_exceeded: "You have friended a lot of users recently. Please wait a while before trying to friend any more." - remove_friend: - heading: "Unfriend %{user}?" - button: "Unfriend" - success: "%{name} was removed from your friends." - not_a_friend: "%{name} is not one of your friends." + 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." + destroy: + success: "You successfully unfollowed %{name}." + not_followed: "You are not following %{name}." geocoder: search: title: @@ -846,7 +836,7 @@ en: census: "Census Boundary" national_park: "National Park" political: "Electoral Boundary" - protected_area : "Protected Area" + protected_area: "Protected Area" "yes": "Boundary" bridge: aqueduct: "Aqueduct" @@ -997,7 +987,7 @@ en: turning_circle: "Turning Circle" turning_loop: "Turning Loop" unclassified: "Unclassified Road" - "yes" : "Road" + "yes": "Road" historic: aircraft: "Historic Aircraft" archaeological_site: "Archaeological Site" @@ -1177,7 +1167,7 @@ en: trench: "Trench" "yes": "Military" mountain_pass: - "yes" : "Mountain Pass" + "yes": "Mountain Pass" natural: atoll: "Atoll" bare_rock: "Bare Rock" @@ -1522,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 @@ -1559,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: @@ -1631,8 +1624,6 @@ en: partners_corpmembers: "OSMF corporate members" partners_partners: "partners" tou: "Terms of Use" - osm_offline: "The OpenStreetMap database is currently offline while essential database maintenance work is carried out." - osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential database maintenance work is carried out." nothing_to_preview: "Nothing to preview." help: Help about: About @@ -1640,6 +1631,11 @@ en: communities: Communities learn_more: "Learn More" more: More + offline_flash: + osm_offline: "The OpenStreetMap database is currently offline while essential maintenance work is carried out." + osm_read_only: "The OpenStreetMap database is currently in read-only mode while essential maintenance work is carried out." + expected_restore_html: "Services are expected to be restored in %{time}." + announcement: "You can read the announcement here." user_mailer: diary_comment_notification: description: "OpenStreetMap Diary Entry #%{id}" @@ -1658,14 +1654,14 @@ 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} added you as a friend" - had_added_you: "%{user} has added you as a friend on OpenStreetMap." + subject: "[OpenStreetMap] %{user} followed you" + followed_you: "%{user} is now following you on OpenStreetMap." see_their_profile: "You can see their profile at %{userurl}." see_their_profile_html: "You can see their profile at %{userurl}." - befriend_them: "You can also add them as a friend at %{befriendurl}." - befriend_them_html: "You can also add them as a friend at %{befriendurl}." + follow_them: "You can also follow them at %{followurl}." + follow_them_html: "You can also follow them at %{followurl}." gpx_details: details: "Your file details:" filename: Filename @@ -1793,14 +1789,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" @@ -1952,6 +1951,9 @@ en: preview: Preview help: Help pagination: + changeset_comments: + older: Older Comments + newer: Newer Comments diary_comments: older: Older Comments newer: Newer Comments @@ -2250,13 +2252,14 @@ en: license_url: "https://openstreetmap.org/copyright" project_url: "https://openstreetmap.org" remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled" - edit: + not_public_flash: not_public: "You have not set your edits to be public." not_public_description_html: "You can no longer edit the map unless you do so. You can set your edits as public from your %{user_page}." user_page_link: user page anon_edits_html: "(%{link})" anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits" anon_edits_link_text: "Find out why this is the case." + edit: id_not_configured: "iD has not been configured" export: title: "Export" @@ -2620,13 +2623,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: @@ -2690,7 +2694,7 @@ en: openid: Sign-in using OpenStreetMap read_prefs: Read user preferences write_prefs: Modify user preferences - write_diary: Create diary entries, comments and make friends + write_diary: Create diary entries and comments write_api: Modify the map read_gpx: Read private GPS traces write_gpx: Upload GPS traces @@ -2809,8 +2813,8 @@ en: edits: Edits traces: Traces notes: Map Notes - remove as friend: Unfriend - add as friend: Add Friend + unfollow: Unfollow + follow: Follow mapper since: "Mapper since:" last map edit: "Last map edit:" no activity yet: "No activity yet" @@ -2885,6 +2889,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 @@ -3050,6 +3074,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}"