X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/05e212027339733cf39aa9b7536c3f5f69ba0962..b0e15608750417351c2ac3d9ffa6d13fcf6c8ccb:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index d98ac61d6..7e096def5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -87,6 +87,9 @@ en: download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" + feed: + title: "Changeset {{id}}" + title_comment: "Changeset {{id}} - {{comment}}" changeset_navigation: user: name_tooltip: "View edits by {{user}}" @@ -117,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}})" @@ -129,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" @@ -150,6 +154,7 @@ en: node: node way: way relation: relation + changeset: changeset paging_nav: showing_page: "Showing page" of: "of" @@ -260,9 +265,9 @@ en: title_user_bbox: "Changesets by {{user}} within {{bbox}}" heading: "Changesets" - heading_user: "Changesets by {{user}}" - heading_bbox: "Changesets within {{bbox}}" - heading_user_bbox: "Changesets by {{user}} within {{bbox}}" + heading_user: "Changesets" + heading_bbox: "Changesets" + heading_user_bbox: "Changesets" description: "Recent changes" description_user: "Changesets by {{user}}" @@ -278,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 @@ -317,6 +322,16 @@ en: edit_link: Edit this entry diary_comment: comment_from: "Comment from {{link_user}} at {{comment_created_at}}" + feed: + user: + title: "OpenStreetMap diary entries for {{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}}" + all: + title: "OpenStreetMap diary entries" + description: "Recent diary entries from users of OpenStreetMap" export: start: area_to_export: "Area to Export" @@ -358,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}}" @@ -371,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: @@ -414,8 +429,10 @@ en: view_tooltip: View maps edit: Edit edit_tooltip: Edit maps + edit_zoom_alert: You must zoom in to edit the map history: History history_tooltip: Changeset history + history_zoom_alert: You must zoom in to see the editing history export: Export export_tooltip: Export map data gps_traces: GPS Traces @@ -441,7 +458,12 @@ en: shop_tooltip: Shop with branded OpenStreetMap merchandise shop_url: http://wiki.openstreetmap.org/wiki/Merchandise sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!' - alt_donation: Make a Donation + license: + alt: CC by-sa 2.0 + title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License + make_a_donation: + title: Support OpenStreetMap with a monetary donation + text: Make a Donation notifier: diary_comment_notification: subject: "[OpenStreetMap] {{user}} commented on your diary entry" @@ -507,7 +529,7 @@ en: video_to_openstreetmap: "introductory video to OpenStreetMap" more_videos: "There are {{more_videos_link}}." more_videos_here: "more videos here" - get_reading: 'Get reading about OpenStreetMap on the wiki

or the opengeodata blog which has podcasts to listen to also!' + get_reading: 'Get reading about OpenStreetMap on the wiki or the opengeodata blog which has podcasts to listen to also!' wiki_signup: 'You may also want to sign up to the OpenStreetMap wiki.' user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]].' current_user: 'A list of current users in categories, based on where in the world they are, is available from Category:Users_by_geographical_region.' @@ -533,14 +555,6 @@ en: greeting: "Hi," hopefully_you: "Someone (possibly you) has asked for the password to be reset on this email address's openstreetmap.org account." click_the_link: "If this is you, please click the link below to reset your password." - reset_password: - subject: "[OpenStreetMap] Password reset" - reset_password_plain: - greeting: "Hi," - reset: "Your password has been reset to {{new_password}}" - reset_password_html: - greeting: "Hi," - reset: "Your password has been reset to {{new_password}}" message: inbox: title: "Inbox" @@ -574,7 +588,7 @@ en: my_inbox: "My {{inbox_link}}" inbox: "inbox" outbox: "outbox" - you_have_sent_messages: "You have {{sent_count}} sent messages" + you_have_sent_messages: "You have {{count}} sent messages" to: "To" subject: "Subject" date: "Date" @@ -601,9 +615,9 @@ en: deleted: "Message deleted" site: index: - js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript." - js_2: "OpenStreetMap uses javascript for its slippy map." - js_3: 'You may want to try the Tiles@Home static tile browser if you are unable to enable javascript.' + js_1: "You are either using a browser that doesn't support JavaScript, or you have disabled JavaScript." + js_2: "OpenStreetMap uses JavaScript for its slippy map." + js_3: 'You may want to try the Tiles@Home static tile browser if you are unable to enable JavaScript.' permalink: Permalink shortlink: Shortlink license: @@ -685,7 +699,9 @@ en: centre: "Sports centre" reserve: "Nature reserve" military: "Military area" - school: "School; university" + school: + - School + - university building: "Significant building" station: "Railway station" summit: @@ -698,6 +714,11 @@ en: destination: "Destination access" construction: "Roads under construction" trace: + visibility: + private: "Private (only shared as anonymous, unordered points)" + public: "Public (shown in trace list and as anonymous, unordered points)" + trackable: "Trackable (only shared as anonymous, ordered points with timestamps)" + identifiable: "Identifiable (shown in trace list and as identifiable, ordered points with timestamps)" create: upload_trace: "Upload GPS Trace" trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion." @@ -716,6 +737,9 @@ en: tags: "Tags:" tags_help: "comma delimited" save_button: "Save Changes" + visibility: "Visibility:" + visibility_help: "what does this mean?" + visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" no_such_user: title: "No such user" heading: "The user {{user}} does not exist" @@ -725,9 +749,9 @@ en: description: "Description" tags: "Tags" tags_help: "comma delimited" - public: "Public?" - public_help: "what does this mean?" - public_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" + visibility: "Visibility" + visibility_help: "what does this mean?" + visibility_help_url: "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces" upload_button: "Upload" help: "Help" help_url: "http://wiki.openstreetmap.org/wiki/Upload" @@ -753,10 +777,10 @@ en: description: "Description:" tags: "Tags:" none: "None" - make_public: "Make this track public permanently" edit_track: "Edit this track" delete_track: "Delete this track" trace_not_found: "Trace not found!" + visibility: "Visibility:" trace_paging_nav: showing: "Showing page" of: "of" @@ -784,7 +808,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." @@ -793,47 +817,103 @@ en: allow_write_api: "modify the map." allow_read_gpx: "read your private GPS traces." allow_write_gpx: "upload GPS traces." - token: - none: "You have not authorised any clients to act on your behalf. You do not have to do anything now to authorise them, as they will ask for authorisation when they need it. After that time you can return here to revoke those permissions if you do not want the clients to have your authorisation any more." - application: "Application" - issued: "Issued" + 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" + title: "Lost password" heading: "Forgotten Password?" email address: "Email Address:" - new password button: "Send me a new password" + new password button: "Reset password" notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon." notice email cannot find: "Couldn't find that email address, sorry." reset_password: - title: "reset password" - flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)" + title: "Reset password" + heading: "Reset Password for {{user}}" + 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?" new: 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: @@ -852,7 +932,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 @@ -867,41 +947,36 @@ 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 return to profile: Return to profile 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." - my apps: "My client applications" - developers: "Application Developers" - dev_intro: "Have you written an application which you would like to register to make {{link}} requests to the OpenStreetMap server?" - register_app: "Register your application" - apps_registered: "You have the following client applications registered:" - register_another_app: "Register another application" confirm: heading: Confirm a user account press confirm button: "Press the confirm button below to activate your account."