X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ac0603d055759a1448a05607e12006c69a39e0d3..8090e086daad67eac711ad6fd6a5eba6f28d44fd:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index f909f1e5c..3ff65904d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -94,7 +94,6 @@ en: changeset: title: "Changeset" changeset: "Changeset: %{id}" - download: "Download %{changeset_xml_link} or %{osmchange_xml_link}" changesetxml: "Changeset XML" osmchangexml: "osmChange XML" feed: @@ -121,6 +120,8 @@ en: next_relation_tooltip: "Next relation" prev_changeset_tooltip: "Previous changeset" next_changeset_tooltip: "Next changeset" + prev_note_tooltip: "Previous note" + next_note_tooltip: "Next note" changeset_details: created_at: "Created at:" closed_at: "Closed at:" @@ -157,27 +158,27 @@ en: node: "View node on larger map" way: "View way on larger map" relation: "View relation on larger map" + note: "View note on larger map" edit: area: "Edit area" node: "Edit node" way: "Edit way" relation: "Edit relation" + note: "Edit note" node_details: coordinates: "Coordinates:" part_of: "Part of:" node_history: node_history: "Node History" node_history_title: "Node History: %{node_name}" - download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" - view_details: "view details" + view_details: "View details" node: node: "Node" node_title: "Node: %{node_name}" - download: "%{download_xml_link}, %{view_history_link} or %{edit_link}" download_xml: "Download XML" - view_history: "view history" - edit: "edit" + view_history: "View history" + edit: "Edit node" not_found: sorry: "Sorry, the %{type} with the id %{id}, could not be found." type: @@ -193,11 +194,11 @@ en: relation: relation changeset: changeset paging_nav: - showing_page: "Showing page" + showing_page: "page" of: "of" redacted: redaction: "Redaction %{id}" - message: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details." + message_html: "Version %{version} of this %{type} cannot be shown as it has been redacted. Please see %{redaction_link} for details." type: node: "node" way: "way" @@ -208,9 +209,8 @@ en: relation_history: relation_history: "Relation History" relation_history_title: "Relation History: %{relation_name}" - download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" - view_details: "view details" + view_details: "View details" relation_member: entry: "%{type} %{name}" entry_role: "%{type} %{name} as %{role}" @@ -221,33 +221,30 @@ en: relation: relation: "Relation" relation_title: "Relation: %{relation_name}" - download: "%{download_xml_link} or %{view_history_link}" download_xml: "Download XML" - view_history: "view history" - start: - view_data: "View data for current map view" - manually_select: "Manually select a different area" + view_history: "View history" start_rjs: + notes_layer_name: "Browse Notes" data_layer_name: "Browse Map Data" data_frame_title: "Data" zoom_or_select: "Zoom in or select an area of the map to view" - drag_a_box: "Drag a box on the map to select an area" + view_data: "View data for current map view" manually_select: "Manually select a different area" hide_areas: "Hide areas" show_areas: "Show areas" - loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below." + loaded_an_area_with_num_features: "You have loaded an area which contains %{num_features} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than %{max_features} features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below." load_data: "Load Data" - unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than %{max_bbox_size})" + unable_to_load_size: "Unable to load: Bounding box size of %{bbox_size} is too large (must be smaller than %{max_bbox_size})" loading: "Loading..." show_history: "Show History" wait: "Wait..." - history_for_feature: "History for [[feature]]" + history_for_feature: "History for %{feature}" details: "Details" private_user: "private user" - edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]" + edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}" object_list: heading: "Object list" - back: "Display object list" + back: "Back to object list" type: node: "Node" way: "Way" @@ -256,13 +253,13 @@ en: details: "Details" selected: type: - node: "Node [[id]]" - way: "Way [[id]]" + node: "Node %{id}" + way: "Way %{id}" # There is no 'relation' type because it is not represented in OpenLayers history: type: - node: "Node [[id]]" - way: "Way [[id]]" + node: "Node %{id}" + way: "Way %{id}" # There is no 'relation' type because it is not represented in OpenLayers tag_details: tags: "Tags:" @@ -274,28 +271,35 @@ en: nodes: "Nodes:" part_of: "Part of:" also_part_of: - one: "also part of way %{related_ways}" - other: "also part of ways %{related_ways}" + one: "part of way %{related_ways}" + other: "part of ways %{related_ways}" way_history: way_history: "Way History" way_history_title: "Way History: %{way_name}" - download: "%{download_xml_link} or %{view_details_link}" download_xml: "Download XML" - view_details: "view details" + view_details: "View details" way: way: "Way" way_title: "Way: %{way_name}" - download: "%{download_xml_link}, %{view_history_link} or %{edit_link}" download_xml: "Download XML" - view_history: "view history" - edit: "edit" + view_history: "View history" + edit: "Edit way" + note: + open_title: "Unresolved issue: %{note_name}" + closed_title: "Resolved issue: %{note_name}" + opened: "Opened:" + last_modified: "Last modified:" + closed: "Closed:" + at_html: "%{when} ago" + at_by_html: "%{when} ago by %{user}" + description: "Description:" + comments: "Comments:" changeset: changeset_paging_nav: - showing_page: "Showing page %{page}" + showing_page: "Page %{page}" next: "Next »" previous: "« Previous" changeset: - id: "#%{id}" still_editing: "(still editing)" anonymous: "Anonymous" no_comment: "(none)" @@ -322,12 +326,14 @@ en: heading_user_bbox: "Changesets" heading_friend: "Changesets" heading_nearby: "Changesets" - description: "Recent changes" + description: "Browse recent contributions to the map" description_user: "Changesets by %{user}" description_bbox: "Changesets within %{bbox}" description_user_bbox: "Changesets by %{user} within %{bbox}" description_friend: "Changesets by your friends" description_nearby: "Changesets by nearby users" + empty_user_html: "It looks you haven't made any edits yet. To get started, check out the Beginners Guide." + empty_anon_html: "No edits made yet." timeout: sorry: "Sorry, the list of changesets you requested took too long to retrieve." diary_entry: @@ -342,7 +348,7 @@ 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: @@ -372,7 +378,8 @@ en: comment_link: Comment on this entry reply_link: Reply to this entry comment_count: - one: 1 comment + zero: No comments + one: "%{count} comment" other: "%{count} comments" edit_link: Edit this entry hide_link: Hide this entry @@ -400,7 +407,7 @@ en: post: Post when: When comment: Comment - ago: %{ago} ago + ago: "%{ago} ago" newer_comments: "Newer Comments" older_comments: "Older Comments" export: @@ -412,7 +419,7 @@ en: map_image: "Map Image (shows standard layer)" embeddable_html: "Embeddable HTML" licence: "Licence" - export_details: 'OpenStreetMap data is licensed under the Creative Commons Attribution-ShareAlike 2.0 license.' + export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).' too_large: heading: "Area Too Large" body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area." @@ -443,14 +450,8 @@ en: us_postcode: 'Results from Geocoder.us' 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}" - suffix_place: ", %{distance} %{direction} of %{placename}" - suffix_parent: "%{suffix} (%{parentdistance} %{parentdirection} of %{parentname})" - suffix_suburb: "%{suffix}, %{parentname}" search_osm_nominatim: prefix_format: "%{name}" prefix: @@ -916,15 +917,12 @@ en: weir: "Weir" 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}" results: no_results: "No results found" more_results: "More results" @@ -949,11 +947,10 @@ en: h1: OpenStreetMap logo: alt_text: OpenStreetMap logo - welcome_user: "Welcome, %{user_link}" welcome_user_link_tooltip: Your user page home: home home_tooltip: Go to home location - inbox: "inbox (%{count})" + inbox_html: "inbox %{count}" inbox_tooltip: zero: Your inbox contains no unread messages one: Your inbox contains 1 unread message @@ -1008,10 +1005,6 @@ en: community_blogs_title: "Blogs from members of the OpenStreetMap community" foundation: Foundation foundation_title: The OpenStreetMap Foundation - sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!' - 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 @@ -1026,123 +1019,109 @@ en: text: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}. native_link: THIS_LANGUAGE_NAME_HERE version mapping_link: start mapping - legal_babble: | -

Copyright and License

-

- OpenStreetMap is open data, licensed under the Creative - Commons Attribution-ShareAlike 2.0 licence (CC BY-SA). -

-

- You are free to copy, distribute, transmit and adapt our maps - and data, as long as you credit OpenStreetMap and its - contributors. If you alter or build upon our maps or data, you + legal_babble: + title_html: Copyright and License + intro_1_html: | + OpenStreetMap is open data, licensed under the Open Data + Commons Open Database License (ODbL). + intro_2_html: | + You are free to copy, distribute, transmit and adapt our data, + as long as you credit OpenStreetMap and its + contributors. If you alter or build upon our data, you may distribute the result only under the same licence. The - full legal + full legal code explains your rights and responsibilities. -

- -

How to credit OpenStreetMap

-

- If you are using OpenStreetMap map images, we request that - your credit reads at least “© OpenStreetMap - contributors, CC BY-SA”. If you are using map data only, - we request “Map data © OpenStreetMap contributors, - CC BY-SA”. -

-

- Where possible, OpenStreetMap should be hyperlinked to http://www.openstreetmap.org/ - and CC BY-SA to http://creativecommons.org/licenses/by-sa/2.0/. If - you are using a medium where links are not possible (e.g. a - printed work), we suggest you direct your readers to - www.openstreetmap.org (perhaps by expanding - ‘OpenStreetMap’ to this full address) and to - www.creativecommons.org. -

- -

Finding out more

-

- Read more about using our data at the Creative + Commons Attribution-ShareAlike 2.0 license (CC-BY-SA). + credit_title_html: How to credit OpenStreetMap + credit_1_html: | + We require that you use the credit “© OpenStreetMap + contributors”. + credit_2_html: | + You must also make it clear that the data is available under the Open + Database License, and if using our map tiles, that the cartography is + licensed as CC-BY-SA. You may do this by linking to + this copyright page. + Alternatively, and as a requirement if you are distributing OSM in a + data form, you can name and link directly to the license(s). In media + where links are not possible (e.g. printed works), we suggest you + direct your readers to openstreetmap.org (perhaps by expanding + 'OpenStreetMap' to this full address), to opendatacommons.org, and + if relevant, to creativecommons.org. + credit_3_html: | + For a browsable electronic map, the credit should appear in the corner of the map. + For example: + attribution_example: + alt: Example of how to attribute OpenStreetMap on a webpage + title: Attribution example + more_title_html: Finding out more + more_1_html: | + Read more about using our data, and how to credit us, at the Legal FAQ. -

-

- OSM contributors are reminded never to add data from any - copyrighted sources (e.g. Google Maps or printed maps) without - explicit permission from the copyright holders. -

-

+ more_2_html: | Although OpenStreetMap is open data, we cannot provide a free-of-charge map API for third-party developers. - See our API Usage Policy, Tile Usage Policy and Nominatim Usage Policy. -

- -

Our contributors

-

- Our CC BY-SA licence requires you to “give the Original - Author credit reasonable to the medium or means You are - utilising”. Individual OSM mappers do not request a - credit over and above that to “OpenStreetMap - contributors”, but where data from a national mapping - agency or other major source has been included in - OpenStreetMap, it may be reasonable to credit them by directly - reproducing their credit or by linking to it on this page. -

- - - - - -

+ contributors_title_html: Our contributors + contributors_intro_html: | + Our contributors are thousands of individuals. We also include + openly-licensed data from national mapping agencies + and other sources, among them: + contributors_at_html: | + Austria: Contains data from + Stadt Wien (under + CC BY), + Land Vorarlberg and + Land Tirol (under CC-BY AT with amendments). + contributors_ca_html: | + Canada: Contains data from + GeoBase®, GeoGratis (© Department of Natural + Resources Canada), CanVec (© Department of Natural + Resources Canada), and StatCan (Geography Division, + Statistics Canada). + contributors_fr_html: | + France: Contains data sourced from + Direction Générale des Impôts. + contributors_nl_html: | + Netherlands: Contains © AND data, 2007 + (www.and.com) + contributors_nz_html: | + New Zealand: Contains data sourced from + Land Information New Zealand. Crown Copyright reserved. + contributors_za_html: | + South Africa: Contains data sourced from + Chief Directorate: + National Geo-Spatial Information, State copyright reserved. + contributors_gb_html: | + United Kingdom: Contains Ordnance + Survey data © Crown copyright and database right + 2010-12. + contributors_footer_1_html: | + For further details of these, and other sources that have been used + to help improve OpenStreetMap, please see the Contributors + page on the OpenStreetMap Wiki. + contributors_footer_2_html: | Inclusion of data in OpenStreetMap does not imply that the original data provider endorses OpenStreetMap, provides any warranty, or accepts any liability. -

+ infringement_title_html: Copyright infringement + infringement_1_html: | + OSM contributors are reminded never to add data from any + copyrighted sources (e.g. Google Maps or printed maps) without + explicit permission from the copyright holders. + infringement_2_html: | + If you believe that copyrighted material has been inappropriately + added to the OpenStreetMap database or this site, please refer + to our takedown + procedure or file directly at our + on-line filing page. notifier: diary_comment_notification: subject: "[OpenStreetMap] %{user} commented on your diary entry" @@ -1176,13 +1155,12 @@ en: subject: "[OpenStreetMap] GPX Import success" 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: + subject: "[OpenStreetMap] Welcome to OpenStreetMap" greeting: "Hi there!" - hopefully_you: "Someone (hopefully you) would like to create an account over at" - # next two translations run-on : please word wrap appropriately - click_the_link_1: "If this is you, welcome! Please click the link below to confirm your" - click_the_link_2: "account and read on for more information about OpenStreetMap." + created: "Someone (hopefully you) just created an account at %{site_url}." + confirm: "Before we do anything else, we need to confirm that this request came from you, so if it did then please click the link below to confirm your account:" + welcome: "We would like to welcome you and provide you with some additional information to get you started." + signup_confirm_plain: introductory_video: "You can watch an introductory video to OpenStreetMap here:" more_videos: "There are more videos here:" the_wiki: "Get reading about OpenStreetMap on the wiki:" @@ -1192,15 +1170,9 @@ en: ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:" 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 - user_wiki_1: "It is recommended that you create a user wiki page, which includes" - user_wiki_2: "category tags noting where you are, such as [[Category:Users_in_London]]." - current_user_1: "A list of current users in categories, based on where in the world" - current_user_2: "they are, is available from:" + 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:" signup_confirm_html: - greeting: "Hi there!" - hopefully_you: "Someone (hopefully you) would like to create an account over at" - click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap" introductory_video: "You can watch an %{introductory_video_link}." video_to_openstreetmap: "introductory video to OpenStreetMap" more_videos: "There are %{more_videos_link}." @@ -1232,6 +1204,14 @@ 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." + note_comment_notification: + anonymous: An anonymous user + subject_own: "[OpenStreetMap] %{commenter} has commented on one of your notes" + subject_other: "[OpenStreetMap] %{commenter} has commented on a note you are interested in" + greeting: "Hi," + your_note: "%{commenter} has left a comment on one of your map notes near %{place}." + commented_note: "%{commenter} has left a comment on a map note you have commented on. The note is near %{place}." + details: "More details about the note can be found at %{url}." message: inbox: title: "Inbox" @@ -1284,14 +1264,12 @@ en: wrong_user: "You are logged in as `%{user}' but the message you have asked to reply to was not sent to that user. Please login as the correct user in order to reply." read: title: "Read message" - reading_your_messages: "Reading your messages" from: "From" subject: "Subject" date: "Date" reply_button: "Reply" unread_button: "Mark as unread" back_to_inbox: "Back to inbox" - reading_your_sent_messages: "Reading your sent messages" to: "To" back_to_outbox: "Back to outbox" 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 login as the correct user in order to read it." @@ -1308,11 +1286,10 @@ en: js_2: "OpenStreetMap uses JavaScript for its slippy map." permalink: Permalink shortlink: Shortlink + createnote: Add a note license: - notice: "Licensed under the %{license_name} license by the %{project_name} and its contributors." - license_name: "Creative Commons Attribution-Share Alike 2.0" - license_url: "http://creativecommons.org/licenses/by-sa/2.0/" - project_name: "OpenStreetMap project" + copyright: "Copyright OpenStreetMap and contributors, under an open license" + license_url: "http://openstreetmap.org/copyright" project_url: "http://openstreetmap.org" remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled" edit: @@ -1421,7 +1398,7 @@ en: text: Text image: Image alt: Alt text - url: url + url: URL trace: visibility: private: "Private (only shared as anonymous, unordered points)" @@ -1487,9 +1464,9 @@ en: trace_not_found: "Trace not found!" visibility: "Visibility:" trace_paging_nav: - showing_page: "Showing page %{page}" - next: "Next »" - previous: "« Previous" + showing_page: "Page %{page}" + older: "Older Traces" + newer: "Newer Traces" trace: pending: "PENDING" count_points: "%{count} points" @@ -1510,7 +1487,9 @@ en: public_traces: "Public GPS traces" your_traces: "Your GPS traces" public_traces_from: "Public GPS traces from %{user}" + description: "Browse recent GPS track uploads" tagged_with: " tagged with %{tags}" + empty_html: "Nothing here yet. Upload a new trace or learn more about GPS tracing on the wiki page." delete: scheduled_for_deletion: "Trace scheduled for deletion" make_public: @@ -1524,7 +1503,7 @@ en: require_cookies: cookies_needed: "You appear to have cookies disabled - please enable cookies in your browser before continuing." require_moderator: - not_a_moderator: "You need to be a moderator to perform that action." + not_a_moderator: "You need to be a moderator to perform that action." setup_user_auth: 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." @@ -1556,6 +1535,8 @@ en: authorize_url: "Authorise URL:" support_notice: "We support HMAC-SHA1 (recommended) as well as plain text in SSL mode." edit: "Edit Details" + delete: "Delete Client" + confirm: "Are you sure?" requests: "Requesting the following permissions from the user:" allow_read_prefs: "read their user preferences." allow_write_prefs: "modify their user preferences." @@ -1615,8 +1596,6 @@ en: account not active: "Sorry, your account is not active yet.
Please use the link in the account confirmation email to activate your account, or request a new confirmation email." account is suspended: Sorry, your account has been suspended due to suspicious activity.
Please contact the webmaster if you wish to discuss this. auth failure: "Sorry, could not log in with those details." - notice: "Find out more about OpenStreetMap's upcoming license change (translations) (discussion)" - notice_terms: "OpenStreetMap is moving to a new licence on 1st April 2012. It's just as open as our current one, but the legal bits are much better suited to our map database. We'd love to keep your contributions in OpenStreetMap, but we can only do so if you agree to let us distribute them under the new licence. Otherwise, we'll have to remove them from the database.

Please log in, then take a few seconds to review and accept the new terms. Thank you!" openid missing provider: "Sorry, could not contact your OpenID provider" openid invalid: "Sorry, your OpenID seems to be malformed" openid_logo_alt: "Log in with an OpenID" @@ -1687,6 +1666,7 @@ en: continue: Continue + flash welcome: "Thanks for signing up. We've sent a welcome message to %{email} with some hints on getting started." flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.

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." terms accepted: "Thanks for accepting the new contributor terms!" terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see this wiki page." @@ -1717,6 +1697,7 @@ en: new diary entry: new diary entry my edits: my edits my traces: my traces + my notes: my map notes my settings: my settings my comments: my comments oauth settings: oauth settings @@ -1726,8 +1707,9 @@ en: diary: diary edits: edits traces: traces - remove as friend: remove as friend - add as friend: add as friend + notes: map notes + remove as friend: unfriend + add as friend: add friend mapper since: "Mapper since:" ago: "(%{time_in_words_ago} ago)" ct status: "Contributor terms:" @@ -1741,7 +1723,7 @@ en: spam score: "Spam Score:" description: Description user location: User location - if set location: "If you set your location, a pretty map and stuff will appear here. You can set your home location on your %{settings_link} page." + if set location: "Set your home location on the %{settings_link} page to see nearby users." settings_link_text: settings your friends: Your friends no friends: You have not added any friends yet. @@ -1758,8 +1740,8 @@ en: revoke: administrator: "Revoke administrator access" moderator: "Revoke moderator access" - block_history: "view blocks received" - moderator_history: "view blocks given" + block_history: "blocks received" + moderator_history: "blocks given" comments: "comments" create_block: "block this user" activate_user: "activate this user" @@ -1769,10 +1751,10 @@ en: unhide_user: "unhide this user" delete_user: "delete this user" confirm: "Confirm" - friends_changesets: "Browse all changesets by friends" - friends_diaries: "Browse all diary entries by friends" - nearby_changesets: "Browse all changesets by nearby users" - nearby_diaries: "Browse all diary entries by nearby users" + friends_changesets: "friends' changesets" + friends_diaries: "friends' diary entries" + nearby_changesets: "nearby user changesets" + nearby_diaries: "nearby user diary entries" popup: your location: "Your location" nearby mapper: "Nearby mapper" @@ -1809,6 +1791,10 @@ en: preferred languages: "Preferred Languages:" preferred editor: "Preferred Editor:" image: "Image:" + gravatar: + gravatar: "Use Gravatar" + link: "http://wiki.openstreetmap.org/wiki/Gravatar" + link text: "what is this?" new image: "Add an image" keep image: "Keep the current image" delete image: "Remove the current image" @@ -1847,10 +1833,14 @@ en: go_public: flash success: "All your edits are now public, and you are now allowed to edit." make_friend: - success: "%{name} is now your 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}." remove_friend: + heading: "Unfriend %{user}?" + button: "Unfriend" success: "%{name} was removed from your friends." not_a_friend: "%{name} is not one of your friends." filter: @@ -1859,8 +1849,8 @@ en: title: Users heading: Users showing: - one: Showing page %{page} (%{first_item} of %{items}) - other: Showing page %{page} (%{first_item}-%{last_item} of %{items}) + one: Page %{page} (%{first_item} of %{items}) + other: Page %{page} (%{first_item}-%{last_item} of %{items}) summary: "%{name} created from %{ip_address} on %{date}" summary_no_ip: "%{name} created on %{date}" confirm: Confirm Selected Users @@ -1959,6 +1949,9 @@ en: status: "Status" revoker_name: "Revoked by" not_revoked: "(not revoked)" + showing_page: "Page %{page}" + next: "Next »" + previous: "« Previous" helper: time_future: "Ends in %{time}." until_login: "Active until the user logs in." @@ -1985,6 +1978,33 @@ en: back: "View all blocks" revoker: "Revoker:" needs_view: "The user needs to log in before this block will be cleared." + note: + description: + opened_at: "Created %{when} ago" + opened_at_by: "Created %{when} ago by %{user}" + commented_at: "Updated %{when} ago" + commented_at_by: "Updated %{when} ago by %{user}" + closed_at: "Resolved %{when} ago" + closed_at_by: "Resolved %{when} ago by %{user}" + reopened_at: "Reactivated %{when} ago" + reopened_at_by: "Reactivated %{when} ago by %{user}" + rss: + title: "OpenStreetMap Notes" + description_area: "A list of notes, reported, commented on or closed in your area [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]" + description_item: "An rss feed for note %{id}" + closed: "closed note (near %{place})" + new: "new note (near %{place})" + comment: "new comment (near %{place})" + mine: + title: "Notes submitted or commented on by %{user}" + heading: "%{user}'s notes" + subheading: "Notes submitted or commented on by %{user}" + id: "Id" + creator: "Creator" + description: "Description" + created_at: "Created at" + last_changed: "Last changed" + ago_html: "%{when} ago" javascripts: map: base: @@ -2001,6 +2021,27 @@ en: history_tooltip: View edits for this area history_disabled_tooltip: Zoom in to view edits for this area history_zoom_alert: You must zoom in to view edits for this area + createnote_tooltip: Add a note to the map + createnote_disabled_tooltip: Zoom in to add a note to the map + createnote_zoom_alert: You must zoom in to add a note to the map + notes: + new: + intro: "Move the marker to the correct position and add your comment in the box below:" + add: Add Note + show: + title: Note %{id} + anonymous_warning: This note includes comments from anonymous users which should be independently verified. + opened_by: "created by %{user} at %{time}" + opened_by_anonymous: "created by anonymous at %{time}" + commented_by: "comment from %{user} at %{time}" + commented_by_anonymous: "comment from anonymous at %{time}" + closed_by: "resolved by %{user} at %{time}" + closed_by_anonymous: "resolved by anonymous at %{time}" + reopened_by: "reactivated by %{user} at %{time}" + reopened_by_anonymous: "reactivated by anonymous at %{time}" + resolve: Resolve + comment_and_resolve: Comment & Resolve + comment: Comment redaction: edit: description: "Description" @@ -2017,11 +2058,11 @@ en: submit: "Create redaction" title: "Creating new redaction" show: - description: "Description" + description: "Description:" heading: "Showing redaction \"%{title}\"" title: "Showing redaction" user: "Creator:" - edit: "Edit this redaction." + edit: "Edit this redaction" destroy: "Remove this redaction" confirm: "Are you sure?" create: