X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/217f61663048cb3040663d607364ab10937dbe9a..c87d316a1d65ce7fa4b47a6027b2ea5a7b3dbbcc:/config/locales/en.yml diff --git a/config/locales/en.yml b/config/locales/en.yml index fbd31e4b0..30e8f6e98 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -42,6 +42,7 @@ en: diary_comment: "Diary Comment" diary_entry: "Diary Entry" friend: "Friend" + issue: "Issue" language: "Language" message: "Message" node: "Node" @@ -58,6 +59,7 @@ en: relation: "Relation" relation_member: "Relation Member" relation_tag: "Relation Tag" + report: "Report" session: "Session" trace: "Trace" tracepoint: "Trace Point" @@ -160,6 +162,15 @@ en: remote: name: "Remote Control" description: "Remote Control (JOSM or Merkaartor)" + auth: + providers: + none: None + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Wikipedia api: notes: comment: @@ -221,29 +232,29 @@ en: discussion: Discussion still_open: "Changeset still open - discussion will open once the changeset is closed." node: - title: "Node: %{name}" - history_title: "Node History: %{name}" + title_html: "Node: %{name}" + history_title_html: "Node History: %{name}" way: - title: "Way: %{name}" - history_title: "Way History: %{name}" + title_html: "Way: %{name}" + history_title_html: "Way History: %{name}" nodes: "Nodes" - also_part_of: + also_part_of_html: one: "part of way %{related_ways}" other: "part of ways %{related_ways}" relation: - title: "Relation: %{name}" - history_title: "Relation History: %{name}" + title_html: "Relation: %{name}" + history_title_html: "Relation History: %{name}" members: "Members" relation_member: - entry: "%{type} %{name}" - entry_role: "%{type} %{name} as %{role}" + entry_html: "%{type} %{name}" + entry_role_html: "%{type} %{name} as %{role}" type: node: "Node" way: "Way" relation: "Relation" containing_relation: - entry: "Relation %{relation_name}" - entry_role: "Relation %{relation_name} (as %{relation_role})" + entry_html: "Relation %{relation_name}" + entry_role_html: "Relation %{relation_name} (as %{relation_role})" not_found: sorry: "Sorry, %{type} #%{id} could not be found." type: @@ -362,6 +373,7 @@ en: in_language_title: "Diary Entries in %{language}" new: New Diary Entry new_title: Compose a new entry in my user diary + my_diary: My Diary no_entries: No diary entries recent_entries: "Recent diary entries" older_entries: Older Entries @@ -382,7 +394,7 @@ en: diary_entry: posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}" comment_link: Comment on this entry - reply_link: Reply to this entry + reply_link: Send a message to the author comment_count: zero: No comments one: "%{count} comment" @@ -419,15 +431,27 @@ en: comment: Comment newer_comments: "Newer Comments" older_comments: "Older Comments" + friendships: + make_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." geocoder: search: title: - latlon: 'Results from Internal' - ca_postcode: 'Results from Geocoder.CA' - osm_nominatim: 'Results from OpenStreetMap Nominatim' - geonames: 'Results from GeoNames' - osm_nominatim_reverse: 'Results from OpenStreetMap Nominatim' - geonames_reverse: 'Results from GeoNames' + latlon_html: 'Results from Internal' + ca_postcode_html: 'Results from Geocoder.CA' + osm_nominatim_html: 'Results from OpenStreetMap Nominatim' + geonames_html: 'Results from GeoNames' + osm_nominatim_reverse_html: 'Results from OpenStreetMap Nominatim' + geonames_reverse_html: 'Results from GeoNames' search_osm_nominatim: prefix_format: "%{name}" prefix: @@ -1070,11 +1094,10 @@ en: reopen: reopened: Issue status has been set to 'Open' comments: - created_at: "On %{datetime}" + comment_from_html: "Comment from %{user_link} on %{comment_created_at}" reassign_param: Reassign Issue? reports: - updated_at: "On %{datetime}" - reported_by_html: "Reported as %{category} by %{user}" + reported_by_html: "Reported as %{category} by %{user} on %{updated_at}" helper: reportable_title: diary_comment: "%{entry_title}, comment #%{comment_id}" @@ -1174,13 +1197,13 @@ en: subject: "[OpenStreetMap] %{user} commented on a diary entry" hi: "Hi %{to_user}," header: "%{from_user} has commented on the 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}" + footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}" message_notification: subject_header: "[OpenStreetMap] %{subject}" hi: "Hi %{to_user}," header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:" - footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}" - friend_notification: + footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}" + friendship_notification: hi: "Hi %{to_user}," subject: "[OpenStreetMap] %{user} added you as a friend" had_added_you: "%{user} has added you as a friend on OpenStreetMap." @@ -1200,7 +1223,9 @@ en: import_failures_url: "https://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: + one: loaded successfully with %{trace_points} out of a possible 1 point. + other: loaded successfully with %{trace_points} out of a possible %{possible_points} points. signup_confirm: subject: "[OpenStreetMap] Welcome to OpenStreetMap" greeting: "Hi there!" @@ -1330,7 +1355,7 @@ en: about: next: Next copyright_html: ©OpenStreetMap
contributors - used_by_html: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices" + used_by_html: "%{name} provides map data for thousands of web sites, mobile apps, and hardware devices" lede_text: | OpenStreetMap is built by a community of mappers that contribute and maintain data about roads, trails, cafés, railway stations, and much more, all over the world. @@ -1358,13 +1383,13 @@ en: under the same licence. See the Copyright and License page for details. legal_title: Legal - legal_html: | + legal_1_html: | This site and many other related services are formally operated by the OpenStreetMap Foundation (OSMF) on behalf of the community. Use of all OSMF operated services is subject to our Terms of Use, - Acceptable Use Policies and our Privacy Policy -
+ Acceptable Use Policies and our Privacy Policy. + legal_2_html: | Please contact the OSMF if you have licensing, copyright or other legal questions.
@@ -1373,11 +1398,11 @@ en: copyright: foreign: title: About this translation - text: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence + html: In the event of a conflict between this translated page and %{english_original_link}, the English page shall take precedence english_link: the English original native: title: About this page - 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}. + html: 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: @@ -1394,26 +1419,30 @@ en: may distribute the result only under the same licence. The full legal code explains your rights and responsibilities. - intro_3_html: | - The cartography in our map tiles, and our documentation, are - licensed under the Creative - Commons Attribution-ShareAlike 2.0 license (CC BY-SA). + intro_3_1_html: | + Our documentation is licensed under the + Creative + Commons Attribution-ShareAlike 2.0 license (CC BY-SA 2.0). credit_title_html: How to credit OpenStreetMap credit_1_html: | We require that you use the credit “© OpenStreetMap contributors”. - credit_2_html: | + credit_2_1_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 + Database License. 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: | + 'OpenStreetMap' to this full address) and to opendatacommons.org. + credit_3_1_html: | + The map tiles in the “standard style” at www.openstreetmap.org are a + Produced Work by the OpenStreetMap Foundation using OpenStreetMap data + under the Open Database License. If you are using these tiles please use + the following attribution: + “Base map and data from OpenStreetMap and OpenStreetMap Foundation”. + credit_4_html: | For a browsable electronic map, the credit should appear in the corner of the map. For example: attribution_example: @@ -1521,9 +1550,9 @@ en: remote_failed: "Editing failed - make sure JOSM or Merkaartor is loaded and the remote control option is enabled" edit: 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}." + not_public_description_html: "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})" + anon_edits_html: "(%{link})" anon_edits_link: "https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits" anon_edits_link_text: "Find out why this is the case." flash_player_required_html: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can download Flash Player from Adobe.com. Several other options are also available for editing OpenStreetMap.' @@ -1541,7 +1570,7 @@ en: map_image: "Map Image (shows standard layer)" embeddable_html: "Embeddable HTML" licence: "Licence" - export_details: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).' + export_details_html: 'OpenStreetMap data is licensed under the Open Data Commons Open Database License (ODbL).' too_large: advice: "If the above export fails, please consider using one of the sources listed below:" body: "This area is too large to be exported as OpenStreetMap XML Data. Please zoom in or select a smaller area, or use one of the sources listed below for bulk data downloads." @@ -1911,7 +1940,7 @@ en: oauth: authorize: title: "Authorize access to your account" - request_access: "The application %{app_name} is requesting access to your account, %{user}. Please check whether you would like the application to have the following capabilities. You may choose as many or as few as you like." + request_access_html: "The application %{app_name} is requesting access to your account, %{user}. 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." @@ -1923,7 +1952,7 @@ en: grant_access: "Grant Access" authorize_success: title: "Authorization request allowed" - allowed: "You have granted application %{app_name} access to your account." + allowed_html: "You have granted application %{app_name} access to your account." verification: "The verification code is %{code}." authorize_failure: title: "Authorization request failed" @@ -1965,7 +1994,8 @@ en: 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." + no_apps_html: "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." + oauth: OAuth registered_apps: "You have the following client applications registered:" register_new: "Register your application" form: @@ -2062,7 +2092,7 @@ en: new: title: "Sign Up" 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_html: 'Please contact the webmaster to arrange for an account to be created - we will try and deal with the request as quickly as possible.' about: header: Free and editable html: | @@ -2096,7 +2126,7 @@ en: consider_pd: "In addition to the above, I consider my contributions to be in the Public Domain" consider_pd_why: "what's this?" consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain - guidance: 'Information to help understand these terms: a human readable summary and some informal translations' + guidance_html: 'Information to help understand these terms: a human readable summary and some informal translations' continue: Continue declined: "https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined" decline: "Decline" @@ -2198,7 +2228,7 @@ en: disabled link text: "why can't I edit?" public editing note: heading: "Public editing" - text: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. Since the 0.6 API changeover, only public users can edit map data. (find out why)." + html: "Currently your edits are anonymous and people cannot send you messages or see your location. To show what you edited and allow people to contact you through the website, click the button below. Since the 0.6 API changeover, only public users can edit map data. (find out why)." contributor terms: heading: "Contributor Terms:" agreed: "You have agreed to the new Contributor Terms." @@ -2258,25 +2288,14 @@ en: flash success: "Home location saved successfully" go_public: flash success: "All your edits are now public, and you are now allowed to edit." - make_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." index: title: Users heading: Users showing: 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}" + summary_html: "%{name} created from %{ip_address} on %{date}" + summary_no_ip_html: "%{name} created on %{date}" confirm: Confirm Selected Users hide: Hide Selected Users empty: No matching users found @@ -2284,7 +2303,7 @@ en: title: Account Suspended heading: Account Suspended webmaster: webmaster - body: | + body_html: |

Sorry, your account has been automatically suspended due to suspicious activity. @@ -2429,7 +2448,7 @@ en: next: "Next »" previous: "« Previous" notes: - mine: + index: title: "Notes submitted or commented on by %{user}" heading: "%{user}'s notes" subheading_html: "Notes submitted or commented on by %{user}" @@ -2472,12 +2491,18 @@ en: out: Zoom Out locate: title: Show My Location - popup: You are within {distance} {unit} of this point + metersPopup: + one: You are within one meter of this point + other: You are within %{count} meters of this point + feetPopup: + one: You are within one foot of this point + other: You are within %{count} feet of this point base: standard: Standard cycle_map: Cycle Map transport_map: Transport Map hot: Humanitarian + opnvkarte: ÖPNVKarte layers: header: Map Layers notes: Map Notes @@ -2488,6 +2513,9 @@ en: copyright: "© OpenStreetMap contributors" donate_link_text: "" terms: "Website and API terms" + thunderforest: "Tiles courtesy of Andy Allan" + opnvkarte: "Tiles courtesy of MeMoMaps" + hotosm: "Tiles style by Humanitarian OpenStreetMap Team hosted by OpenStreetMap France" site: edit_tooltip: Edit the map edit_disabled_tooltip: Zoom in to edit the map