X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/26698d6d267ab410d082a9b774b3ad5f9dc86b05..22377cbdd48a19473feff45d18e57e9501a3aceb:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 1b411a229..6869e966b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -416,6 +416,26 @@ en: title_particular: "OpenStreetMap changeset #%{changeset_id} discussion" timeout: sorry: "Sorry, the list of changeset comments you requested took too long to retrieve." + dashboards: + contact: + km away: "%{count}km away" + m away: "%{count}m away" + popup: + your location: "Your location" + nearby mapper: "Nearby mapper" + friend: "Friend" + 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. + 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" + nearby_changesets: "nearby user changesets" + nearby_diaries: "nearby user diary entries" diary_entries: new: title: New Diary Entry @@ -747,6 +767,7 @@ en: window_construction: "Window Construction" winery: "Winery" "yes": "Craft Shop" + crossing: "Crossing" emergency: access_point: "Access Point" ambulance_station: "Ambulance Station" @@ -1002,6 +1023,7 @@ en: hill: "Hill" hot_spring: "Hot Spring" island: "Island" + isthmus: "Isthmus" land: "Land" marsh: "Marsh" moor: "Moor" @@ -1016,10 +1038,13 @@ en: sand: "Sand" scree: "Scree" scrub: "Scrub" + shingle: "Shingle" spring: "Spring" stone: "Stone" strait: "Strait" tree: "Tree" + tree_row: "Tree Row" + tundra: "Tundra" valley: "Valley" volcano: "Volcano" water: "Water" @@ -1420,8 +1445,9 @@ en: intro_header: Welcome to OpenStreetMap! intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license. intro_2_create_account: "Create a user account" - hosting_partners_html: "Hosting is supported by %{ucl}, %{bytemark}, and other %{partners}." + hosting_partners_html: "Hosting is supported by %{ucl}, %{fastly}, %{bytemark}, and other %{partners}." partners_ucl: "UCL" + partners_fastly: "Fastly" partners_bytemark: "Bytemark Hosting" partners_partners: "partners" tou: "Terms of Use" @@ -1869,10 +1895,10 @@ en: Land Vorarlberg and Land Tirol (under CC BY AT with amendments). contributors_au_html: | - Australia: Contains data sourced from - PSMA Australia Limited + Australia: Incorporates or developed using Administrative Boundaries © + Geoscape Australia licensed by the Commonwealth of Australia under - CC BY 4.0. + Creative Commons Attribution 4.0 International licence (CC BY 4.0). contributors_ca_html: | Canada: Contains data from GeoBase®, GeoGratis (© Department of Natural @@ -2060,7 +2086,7 @@ en: potlatch: removed: Your default OpenStreetMap editor is set as Potlatch. Because Adobe Flash Player has been withdrawn, Potlatch is no longer available to use in a web browser. desktop_html: You can still use Potlatch by downloading the desktop application for Mac and Windows. - id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. Change your user settings here. + id_html: Alternatively, you can set your default editor to iD, which runs in your web browser as Potlatch formerly did. Change your preferences here. sidebar: search_results: Search Results close: Close @@ -2304,6 +2330,11 @@ en: blocked_zero_hour: "You have an urgent message on the OpenStreetMap web site. You need to read the message before you will be able to save your edits." blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more." need_to_see_terms: "Your access to the API is temporarily suspended. Please log-in to the web interface to view the Contributor Terms. You do not need to agree, but you must view them." + settings_menu: + account_settings: Account Settings + oauth1_settings: OAuth 1 settings + oauth2_applications: OAuth 2 applications + oauth2_authorizations: OAuth 2 authorizations oauth: authorize: title: "Authorize access to your account" @@ -2484,6 +2515,7 @@ en: my settings: My Settings my comments: My Comments my_preferences: My Preferences + my_dashboard: My Dashboard blocks on me: Blocks on Me blocks by me: Blocks by Me edit_profile: Edit Profile @@ -2505,13 +2537,6 @@ en: spam score: "Spam Score:" description: Description user location: User location - set_location_html: "Edit your profile and set your home location to see nearby users." - my friends: My friends - no friends: You have not added any friends yet. - km away: "%{count}km away" - m away: "%{count}m away" - nearby users: "Other nearby users" - no nearby users: "There are no other users who admit to mapping nearby yet." role: administrator: "This user is an administrator" moderator: "This user is a moderator" @@ -2532,15 +2557,7 @@ en: unhide_user: "Unhide this User" delete_user: "Delete this User" confirm: "Confirm" - friends_changesets: "friends' changesets" - friends_diaries: "friends' diary entries" - nearby_changesets: "nearby user changesets" - nearby_diaries: "nearby user diary entries" report: Report this User - popup: - your location: "Your location" - nearby mapper: "Nearby mapper" - friend: "Friend" account: title: "Edit account" my settings: My Settings @@ -2569,10 +2586,6 @@ en: link text: "what is this?" save changes button: Save Changes make edits public button: Make all my edits public - return to profile: Return to profile - oauth1 settings: OAuth 1 settings - oauth2 applications: OAuth 2 applications - oauth2 authorizations: OAuth 2 authorizations flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address." flash update success: "User information updated successfully." set_home: