X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d227589a6336999c38bffc5e11655100b9a4630a..446227522531bd014c5878d0f3b754ef40c6a134:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index 16f66dbbc..9331e91e7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -120,6 +120,7 @@ en: edited_by: "Edited by:" version: "Version:" in_changeset: "In changeset:" + changeset_comment: "Comment:" containing_relation: entry: "Relation {{relation_name}}" entry_role: "Relation {{relation_name}} (as {{relation_role}})" @@ -132,7 +133,7 @@ en: way: "View way on larger map" relation: "View relation on larger map" node_details: - coordinates: "Coordinates: " + coordinates: "Coordinates:" part_of: "Part of:" node_history: node_history: "Node History" @@ -153,6 +154,7 @@ en: node: node way: way relation: relation + changeset: changeset paging_nav: showing_page: "Showing page" of: "of" @@ -281,17 +283,17 @@ en: new: New Diary Entry new_title: Compose a new entry in your user diary no_entries: No diary entries - recent_entries: "Recent diary entries: " + recent_entries: "Recent diary entries:" older_entries: Older Entries newer_entries: Newer Entries edit: title: "Edit diary entry" - subject: "Subject: " - body: "Body: " - language: "Language: " - location: "Location: " - latitude: "Latitude: " - longitude: "Longitude: " + subject: "Subject:" + body: "Body:" + language: "Language:" + location: "Location:" + latitude: "Latitude:" + longitude: "Longitude:" use_map_link: "use map" save_button: "Save" marker_text: Diary entry location @@ -323,7 +325,7 @@ en: feed: user: title: "OpenStreetMap diary entries for {{user}}" - description: "Recent OpenStreetmap diary entries from {{user}}" + description: "Recent OpenStreetMap diary entries from {{user}}" language: title: "OpenStreetMap diary entries in {{language_name}}" description: "Recent diary entries from users of OpenStreetMap in {{language_name}}" @@ -371,7 +373,7 @@ en: osm_namefinder: 'Results from OpenStreetMap Namefinder' geonames: 'Results from GeoNames' search_osm_namefinder: - prefix: "{{type}} " + prefix: "{{type}}" suffix_place: ", {{distance}} {{direction}} of {{placename}}" suffix_parent: "{{suffix}} ({{parentdistance}} {{parentdirection}} of {{parentname}})" suffix_suburb: "{{suffix}}, {{parentname}}" @@ -384,7 +386,7 @@ en: towns: Towns places: Places description_osm_namefinder: - prefix: "{{distance}} {{direction}} of {{type}} " + prefix: "{{distance}} {{direction}} of {{type}}" results: no_results: "No results found" distance: @@ -690,7 +692,9 @@ en: centre: "Sports centre" reserve: "Nature reserve" military: "Military area" - school: "School; university" + school: + - School + - university building: "Significant building" station: "Railway station" summit: @@ -797,7 +801,7 @@ en: make_public: made_public: "Track made public" oauth: - client_application: + oauthorize: request_access: "The application {{app_name}} is requesting access to your account. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like." allow_to: "Allow the client application to:" allow_read_prefs: "read your user preferences." @@ -806,64 +810,74 @@ en: allow_write_api: "modify the map." allow_read_gpx: "read your private GPS traces." allow_write_gpx: "upload GPS traces." - new: - title: "Register a new application" - submit: "Register" - edit: - title: "Edit your application" - submit: "Edit" - show: - title: "OAuth details for {{app_name}}" - key: "Consumer Key:" - secret: "Consumer Secret:" - url: "Request Token URL:" - access_url: "Access Token URL:" - authorize_url: "Authorise URL:" - support_notice: "We support hmac-sha1 (recommended) as well as plain text in ssl mode." - edit: "Edit Details" - requests: "Requesting the following permissions from the user:" - 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_api: "modify the map." - allow_read_gpx: "read their private GPS traces." - allow_write_gpx: "upload GPS traces." - index: - title: "My OAuth Details" - my_tokens: "My Authorised Applications" - list_tokens: "The following tokens have been issued to applications in your name:" - application: "Application Name" - issued_at: "Issued At" - revoke: "Revoke!" - my_apps: "My Client Applications" - no_apps: "Do you have an application you would like to register for use with us using the {{oauth}} standard? You must register your web application before it can make OAuth requests to this service." - registered_apps: "You have the following client applications registered:" - register_new: "Register your application" - form: - name: "Name" - required: "Required" - url: "Main Application URL" - callback_url: "Callback URL" - support_url: "Support URL" - requests: "Request the following permissions from the user:" - 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_api: "modify the map." - allow_read_gpx: "read their private GPS traces." - allow_write_gpx: "upload GPS traces." - not_found: "Sorry, that {{type}} could not be found." + revoke: + flash: "You've revoked the token for {{application}}" + oauth_clients: + new: + title: "Register a new application" + submit: "Register" + edit: + title: "Edit your application" + submit: "Edit" + show: + title: "OAuth details for {{app_name}}" + key: "Consumer Key:" + secret: "Consumer Secret:" + url: "Request Token URL:" + access_url: "Access Token URL:" + authorize_url: "Authorise URL:" + support_notice: "We support hmac-sha1 (recommended) as well as plain text in ssl mode." + edit: "Edit Details" + requests: "Requesting the following permissions from the user:" + 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_api: "modify the map." + allow_read_gpx: "read their private GPS traces." + allow_write_gpx: "upload GPS traces." + index: + title: "My OAuth Details" + my_tokens: "My Authorised Applications" + list_tokens: "The following tokens have been issued to applications in your name:" + application: "Application Name" + issued_at: "Issued At" + revoke: "Revoke!" + my_apps: "My Client Applications" + no_apps: "Do you have an application you would like to register for use with us using the {{oauth}} standard? You must register your web application before it can make OAuth requests to this service." + registered_apps: "You have the following client applications registered:" + register_new: "Register your application" + form: + name: "Name" + required: "Required" + url: "Main Application URL" + callback_url: "Callback URL" + support_url: "Support URL" + requests: "Request the following permissions from the user:" + 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_api: "modify the map." + allow_read_gpx: "read their private GPS traces." + allow_write_gpx: "upload GPS traces." + not_found: + sorry: "Sorry, that {{type}} could not be found." + create: + flash: "Registered the information successfully" + update: + flash: "Updated the client information successfully" + destroy: + flash: "Destroyed the client application registration" user: login: title: "Login" heading: "Login" please login: "Please login or {{create_user_link}}." create_account: "create an account" - email or username: "Email Address or Username: " - password: "Password: " + email or username: "Email Address or Username:" + password: "Password:" lost password link: "Lost your password?" login_button: "Login" - account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account." + account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account." auth failure: "Sorry, couldn't log in with those details." lost_password: title: "Lost password" @@ -875,8 +889,8 @@ en: reset_password: title: "Reset password" heading: "Reset Password for {{user}}" - password: "Password: " - confirm password: "Confirm Password: " + password: "Password:" + confirm password: "Confirm Password:" reset: "Reset Password" flash changed: "Your password has been changed." flash token bad: "Didn't find that token, check the URL maybe?" @@ -884,15 +898,15 @@ en: title: "Create account" heading: "Create a User Account" no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically." - contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible. ' + contact_webmaster: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.' fill_form: "Fill in the form and we'll send you a quick email to activate your account." license_agreement: 'By creating an account, you agree that all data you submit to the Openstreetmap project is to be (non-exclusively) licensed under this Creative Commons license (by-sa).' - email address: "Email Address: " - confirm email address: "Confirm Email Address: " + email address: "Email Address:" + confirm email address: "Confirm Email Address:" not displayed publicly: 'Not displayed publicly (see privacy policy)' - display name: "Display Name: " - password: "Password: " - confirm password: "Confirm Password: " + display name: "Display Name:" + password: "Password:" + confirm password: "Confirm Password:" signup: Signup flash create success message: "User was successfully created. Check your email for a confirmation note, and you'll be mapping in no time :-)

Please note that you won't be able to login until you've received and confirmed your email address.

If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests." no_such_user: @@ -911,7 +925,7 @@ en: traces: traces remove as friend: remove as friend add as friend: add as friend - mapper since: "Mapper since: " + mapper since: "Mapper since:" ago: "({{time_in_words_ago}} ago)" user image heading: User image delete image: Delete Image @@ -926,30 +940,30 @@ en: no friends: You have not added any friends yet. km away: "{{count}}km away" m away: "{{count}}m away" - nearby users: "Nearby users: " + nearby users: "Nearby users:" no nearby users: "There are no users who admit to mapping nearby yet." change your settings: change your settings my_oauth_details: "View my OAuth details" friend_map: your location: Your location - nearby mapper: "Nearby mapper: " + nearby mapper: "Nearby mapper: [[nearby_user]]" account: title: "Edit account" my settings: My settings email never displayed publicly: "(never displayed publicly)" public editing: - heading: "Public editing: " + heading: "Public editing:" enabled: "Enabled. Not anonymous and can edit data." enabled link: "http://wiki.openstreetmap.org/wiki/Anonymous_edits" enabled link text: "what's this?" disabled: "Disabled and cannot edit data, all previous edits are anonymous." disabled link text: "why can't I edit?" - profile description: "Profile Description: " - preferred languages: "Preferred Languages: " - home location: "Home Location: " + profile description: "Profile Description:" + preferred languages: "Preferred Languages:" + home location: "Home Location:" no home location: "You have not entered your home location." - latitude: "Latitude: " - longitude: "Longitude: " + latitude: "Latitude:" + longitude: "Longitude:" update home location on click: "Update home location when I click on the map?" save changes button: Save Changes make edits public button: Make all my edits public