X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/621a144cfc7d48fd267d54509ca76419e99cc7b5..ef2cca8bd0b736cc9bbd11c0e1b31c77fed6a1c4:/config/locales/en.yml?ds=sidebyside diff --git a/config/locales/en.yml b/config/locales/en.yml index 3b049b12a..a053a7793 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -87,7 +87,17 @@ 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: + paging: + user: + prev: "« {{id}}" + next: "{{id}} »" + all: + prev: "« {{id}}" + next: "{{id}} »" user: name_tooltip: "View edits by {{user}}" prev_tooltip: "Previous edit by {{user}}" @@ -117,6 +127,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 +140,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 +161,7 @@ en: node: node way: way relation: relation + changeset: changeset paging_nav: showing_page: "Showing page" of: "of" @@ -200,19 +212,19 @@ en: type: node: "Node" way: "Way" - # There's no 'relation' type because it isn't represented in OpenLayers + # There is no 'relation' type because it is not represented in OpenLayers api: "Retrieve this area from the API" details: "Details" selected: type: node: "Node [[id]]" way: "Way [[id]]" - # There's no 'relation' type because it isn't represented in OpenLayers + # There is no 'relation' type because it is not represented in OpenLayers history: type: node: "Node [[id]]" way: "Way [[id]]" - # There's no 'relation' type because it isn't represented in OpenLayers + # There is no 'relation' type because it is not represented in OpenLayers tag_details: tags: "Tags:" way_details: @@ -236,8 +248,9 @@ en: edit: "edit" changeset: changeset_paging_nav: - showing_page: "Showing page" - of: "of" + showing_page: "Showing page {{page}}" + next: "Next »" + previous: "« Previous" changeset: id: "#{{id}}" still_editing: "(still editing)" @@ -278,17 +291,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 @@ -315,8 +328,22 @@ en: one: 1 comment other: "{{count}} comments" edit_link: Edit this entry + hide_link: Hide this entry + confirm: Confirm diary_comment: comment_from: "Comment from {{link_user}} at {{comment_created_at}}" + hide_link: Hide this comment + confirm: Confirm + 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" @@ -356,22 +383,49 @@ en: uk_postcode: 'Results from NPEMap / FreeThe Postcode' ca_postcode: 'Results from Geocoder.CA' osm_namefinder: 'Results from OpenStreetMap Namefinder' + osm_nominatim: 'Results from OpenStreetMap Nominatim' 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}}" + search_osm_nominatim: + prefix + highway: + motorway: "Motorway" + trunk: "Trunk road" + primary: "Primary road" + secondary: "Secondary road" + tertiary: "Tertiary road" + unclassified: "Unclassified road" + residential: "Residential road" + track: "Track" + footway: "Footpath" + cycleway: "Cycle path" + bridleway: "Bridleway" + place: + city: "City" + town: "Town" + suburb: "Suburb" + village: "Village" + hamlet: "Hamlet" + railway: + station: "Station" + amenity: + bus_stop: "Bus stop" + pub: "Pub" description: title: osm_namefinder: '{{types}} from OpenStreetMap Namefinder' + osm_nominatim: 'Location from OpenStreetMap Nominatim' geonames: 'Location from GeoNames' types: cities: Cities towns: Towns places: Places description_osm_namefinder: - prefix: "{{distance}} {{direction}} of {{type}} " + prefix: "{{distance}} {{direction}} of {{type}}" results: no_results: "No results found" distance: @@ -402,7 +456,7 @@ en: inbox: "inbox ({{count}})" inbox_tooltip: zero: Your inbox contains no unread messages - one: Your inbox contians 1 unread message + one: Your inbox contains 1 unread message other: Your inbox contains {{count}} unread messages logout: logout logout_tooltip: "Log out" @@ -441,19 +495,20 @@ 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" - banner1: "* Please do not reply to this email. *" - banner2: "* Use the OpenStreetMap web site to reply. *" hi: "Hi {{to_user}}," header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:" footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}" message_notification: subject: "[OpenStreetMap] {{user}} sent you a new message" - banner1: "* Please do not reply to this email. *" - banner2: "* Use the OpenStreetMap web site to reply. *" hi: "Hi {{to_user}}," header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:" footer1: "You can also read the message at {{readurl}}" @@ -470,15 +525,13 @@ en: and_no_tags: "and no tags." failure: subject: "[OpenStreetMap] GPX Import failure" - failed_to_import: "failed to import. Here's the error:" + failed_to_import: "failed to import. Here is the error:" more_info_1: "More information about GPX import failures and how to avoid" more_info_2: "them can be found at:" import_failures_url: "http://wiki.openstreetmap.org/wiki/GPX_Import_Failures" success: subject: "[OpenStreetMap] GPX Import success" - loaded_successfully: | - loaded successfully with {{trace_points}} out of a possible - {{possible_points}} points. + loaded_successfully: loaded successfully with {{trace_points}} out of a possible {{possible_points}} points. signup_confirm: subject: "[OpenStreetMap] Confirm your email address" signup_confirm_plain: @@ -491,7 +544,8 @@ en: more_videos: "There are more videos here:" the_wiki: "Get reading about OpenStreetMap on the wiki:" the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_Guide" - opengeodata: "OpenGeoData.org is OpenStreetMap's blog, and it has podcasts too:" + blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:" + opengeodata: "OpenGeoData.org is OpenStreetMap founder Steve Coast's blog, and it has podcasts too:" wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:" wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page" # next four translations are in pairs : please word wrap appropriately @@ -507,7 +561,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, catch up with the latest news via the OpenStreetMap blog or Twitter, or browse through OpenStreetMap founder Steve Coast's OpenGeoData blog for the potted history of the project, 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 +587,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" @@ -565,6 +611,7 @@ en: send_button: "Send" back_to_inbox: "Back to inbox" message_sent: "Message sent" + limit_exceeded: "You have sent a lot of messages recently. Please wait a while before trying to send any more." no_such_user: title: "No such user or message" heading: "No such user or message" @@ -574,7 +621,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 +648,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 does not 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: @@ -613,7 +660,7 @@ en: project_name: "OpenStreetMap project" project_url: "http://openstreetmap.org" edit: - not_public: "You haven't set your edits to be public." + not_public: "You have not set your edits to be public." not_public_description: "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: "({{link}})" @@ -627,6 +674,7 @@ en: search: search: Search where_am_i: "Where am I?" + where_am_i_title: Describe the current location using the search engine submit_text: "Go" search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near Lünen' more examples..." key: @@ -685,7 +733,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 +748,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 +771,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 +783,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 +811,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" + edit_track: "Edit this trace" + delete_track: "Delete this trace" trace_not_found: "Trace not found!" + visibility: "Visibility:" trace_paging_nav: showing: "Showing page" of: "of" @@ -780,47 +838,125 @@ en: public_traces_from: "Public GPS traces from {{user}}" tagged_with: " tagged with {{tags}}" delete: - scheduled_for_deletion: "Track scheduled for deletion" + scheduled_for_deletion: "Trace scheduled for deletion" make_public: - made_public: "Track made public" + made_public: "Trace made public" + application: + require_cookies: + cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing." + setup_user_auth: + blocked: "Your access to the API has been blocked. Please log-in to the web interface to find out more." + oauth: + 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." + allow_write_prefs: "modify your user preferences." + allow_write_diary: "create diary entries, comments and make friends." + allow_write_api: "modify the map." + allow_read_gpx: "read your private GPS traces." + allow_write_gpx: "upload GPS traces." + 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.