X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/751e8ad32c864f50eae9e9359d74a11dc44de007..bd1420a7c51b7d1c3a64bc02756393c7ad2025f5:/config/locales/en-GB.yml?ds=sidebyside diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index b633c35ce..831d127c9 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -4,6 +4,7 @@ # Author: Abijeet Patro # Author: Andibing # Author: BEANS +# Author: Bjh21 # Author: Bpfhjquevaps # Author: Bruce89 # Author: Caliburn @@ -20,10 +21,13 @@ # Author: Kosovastar # Author: Macofe # Author: Meno25 +# Author: Michel Bakni # Author: Mvolz # Author: Sampablokuper +# Author: Samwilson # Author: Shirayuki # Author: Smsm1 +# Author: Tlubenov # Author: TomH # Author: ديفيد --- @@ -35,6 +39,8 @@ en-GB: friendly: '%e %B %Y at %H:%M' blog: '%e %B %Y' helpers: + file: + prompt: Choose file submit: diary_comment: create: Save @@ -47,7 +53,7 @@ en-GB: create: Send client_application: create: Register - update: Edit + update: Update redaction: create: Create redaction update: Save redaction @@ -70,6 +76,7 @@ en-GB: diary_comment: Diary Comment diary_entry: Diary Entry friend: Friend + issue: Issue language: Language message: Message node: Node @@ -86,6 +93,7 @@ en-GB: relation: Relation relation_member: Relation Member relation_tag: Relation Tag + report: Report session: Session trace: Trace tracepoint: Trace Point @@ -97,6 +105,12 @@ en-GB: way_node: Way Node way_tag: Way Tag attributes: + client_application: + callback_url: Callback URL + support_url: Support URL + allow_write_api: modify the map + allow_read_gpx: read their private GPS traces + allow_write_gpx: upload GPS traces diary_comment: body: Body diary_entry: @@ -111,12 +125,15 @@ en-GB: trace: user: User visible: Visible - name: Name + name: Filename size: Size latitude: Latitude longitude: Longitude public: Public description: Description + gpx_file: Upload GPX File + visibility: Visibility + tagstring: Tags message: sender: Sender title: Subject @@ -129,6 +146,9 @@ en-GB: description: Description languages: Languages pass_crypt: Password + help: + trace: + tagstring: comma delimited datetime: distance_in_words_ago: about_x_hours: @@ -185,6 +205,14 @@ en-GB: remote: name: Remote Control description: Remote Control (JOSM or Merkaartor) + auth: + providers: + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Wikipedia api: notes: comment: @@ -226,6 +254,8 @@ en-GB: view_history: View History view_details: View Details location: 'Location:' + common_details: + coordinates_html: '%{latitude}, %{longitude}' changeset: title: 'Changeset: %{id}' belongs_to: Author @@ -236,8 +266,8 @@ en-GB: relation: Relations (%{count}) relation_paginated: Relations (%{x}-%{y} of %{count}) comment: Comments (%{count}) - hidden_commented_by: Hidden comment from %{user} %{when} - commented_by: Comment from %{user} %{when} + hidden_commented_by_html: Hidden comment from %{user} %{when} + commented_by_html: Comment from %{user} %{when} changesetxml: Changeset XML osmchangexml: osmChange XML feed: @@ -317,16 +347,17 @@ en-GB: open_title: 'Unresolved note #%{note_name}' closed_title: 'Resolved note #%{note_name}' hidden_title: 'Hidden note #%{note_name}' - opened_by: Created by %{user} %{when} - opened_by_anonymous: Created by anonymous %{when} - commented_by: Comment from %{user} %{when} - commented_by_anonymous: Comment from anonymous %{when} - closed_by: Resolved by %{user} %{when} - closed_by_anonymous: Resolved by anonymous %{when} - reopened_by: Reactivated by %{user} %{when} - reopened_by_anonymous: Reactivated by anonymous %{when} - hidden_by: Hidden by %{user} %{when} + opened_by_html: Created by %{user} %{when} + opened_by_anonymous_html: Created by anonymous %{when} + commented_by_html: Comment from %{user} %{when} + commented_by_anonymous_html: Comment from anonymous %{when} + closed_by_html: Resolved by %{user} %{when} + closed_by_anonymous_html: Resolved by anonymous %{when} + reopened_by_html: Reactivated by %{user} %{when} + reopened_by_anonymous_html: Reactivated by anonymous %{when} + hidden_by_html: Hidden by %{user} %{when} report: Report this note + coordinates_html: '%{latitude}, %{longitude}' query: title: Query Features introduction: Click on the map to find nearby features. @@ -413,7 +444,7 @@ en-GB: 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' @@ -450,6 +481,18 @@ en-GB: 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: @@ -531,14 +574,16 @@ en-GB: hospital: Hospital hunting_stand: Hunting Stand ice_cream: Ice Cream + internet_cafe: Internet Cafe kindergarten: Nursery School + language_school: Language school library: Library marketplace: Marketplace monastery: Monastery motorcycle_parking: Motorcycle Parking + music_school: Music School nightclub: Night Club nursing_home: Nursing Home - office: Office parking: Parking parking_entrance: Parking Entrance parking_space: Parking Space @@ -547,20 +592,15 @@ en-GB: police: Police post_box: Post Box post_office: Post Office - preschool: Pre-School prison: Prison pub: Pub public_building: Public Building recycling: Recycling Point restaurant: Restaurant - retirement_home: Retirement Home - sauna: Sauna school: School shelter: Shelter - shop: Shop shower: Shower social_centre: Social Centre - social_club: Social Club social_facility: Social Facility studio: Studio swimming_pool: Swimming Pool @@ -576,12 +616,12 @@ en-GB: waste_basket: Waste Bin waste_disposal: Waste Disposal water_point: Water Point - youth_centre: Youth Centre boundary: administrative: Administrative Boundary census: Census Boundary national_park: National Park protected_area: Protected Area + "yes": Boundary bridge: aqueduct: Aqueduct boardwalk: Promenade @@ -590,6 +630,17 @@ en-GB: viaduct: Viaduct "yes": Bridge building: + apartment: Apartment + apartments: Apartments + cabin: Cabin + college: College Building + commercial: Commercial Building + construction: Building under Construction + garage: Garage + garages: Garages + house: House + industrial: Industrial Building + roof: Roof "yes": Building craft: brewery: Brewery @@ -651,7 +702,6 @@ en-GB: tertiary_link: Tertiary Road track: Track traffic_signals: Traffic Signals - trail: Trail trunk: Trunk Road trunk_link: Trunk Road turning_loop: Turning Loop @@ -670,7 +720,6 @@ en-GB: fort: Fort heritage: Heritage Site house: House - icon: Icon manor: Manor memorial: Memorial mine: Mine @@ -715,7 +764,6 @@ en-GB: reservoir_watershed: Reservoir Watershed residential: Residential Area retail: Retail - road: Road Area village_green: Village Green vineyard: Vineyard "yes": Landuse @@ -872,7 +920,6 @@ en-GB: subdivision: Subdivision suburb: Suburb town: Town - unincorporated_area: Unincorporated Area village: Village "yes": Place railway: @@ -898,6 +945,7 @@ en-GB: switch: Railway Points tram: Tramway tram_stop: Tram Stop + yard: Railway Yard shop: alcohol: Off Licence antiques: Antiques @@ -931,12 +979,10 @@ en-GB: estate_agent: Estate Agent farm: Farm Shop fashion: Fashion Shop - fish: Fishmonger florist: Florist food: Food Shop funeral_directors: Funeral Directors furniture: Furniture - gallery: Gallery garden_centre: Garden Centre general: General Store gift: Gift Shop @@ -953,7 +999,6 @@ en-GB: laundry: Laundry lottery: Lottery mall: Mall - market: Market massage: Massage mobile_phone: Mobile Phone Shop motorcycle: Motorcycle Shop @@ -965,7 +1010,6 @@ en-GB: paint: Paint Shop pawnbroker: Pawnbroker pet: Pet Shop - pharmacy: Pharmacy photo: Photo Shop seafood: Seafood second_hand: Second-hand Shop @@ -1032,11 +1076,6 @@ en-GB: level8: City Boundary level9: Village Boundary level10: Suburb Boundary - description: - title: - osm_nominatim: Location from OpenStreetMap - Nominatim - geonames: Location from GeoNames types: cities: Cities towns: Towns @@ -1044,6 +1083,9 @@ en-GB: results: no_results: No results found more_results: More results + issues: + index: + reports: Reports layouts: project_name: title: OpenStreetMap @@ -1093,43 +1135,36 @@ en-GB: text: Make a Donation learn_more: Learn More more: More - notifier: + user_mailer: diary_comment_notification: 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} + 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.' see_their_profile: You can see their profile at %{userurl}. befriend_them: You can also add them as a friend at %{befriendurl}. - gpx_notification: - greeting: Hi, - your_gpx_file: It looks like your GPX file - with_description: with the description - and_the_tags: 'and the following tags:' - and_no_tags: and no tags. - failure: - subject: '[OpenStreetMap] GPX Import failure' - 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. + gpx_failure: + failed_to_import: 'failed to import. Here is the error:' + import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures + subject: '[OpenStreetMap] GPX Import failure' + gpx_success: + 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. + subject: '[OpenStreetMap] GPX Import success' signup_confirm: subject: '[OpenStreetMap] Welcome to OpenStreetMap' greeting: Hi there! @@ -1140,28 +1175,16 @@ en-GB: information to get you started. email_confirm: subject: '[OpenStreetMap] Confirm your e-mail address' - email_confirm_plain: - greeting: Hi, - hopefully_you: Someone (hopefully you) would like to change their email address - over at %{server_url} to %{new_address}. - click_the_link: If this is you, please click the link below to confirm the change. - email_confirm_html: greeting: Hi, hopefully_you: Someone (hopefully you) would like to change their email address over at %{server_url} to %{new_address}. click_the_link: If this is you, please click the link below to confirm the change. lost_password: subject: '[OpenStreetMap] Password reset request' - lost_password_plain: 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. - lost_password_html: - greeting: Hi, - hopefully_you: Someone (possibly you) has asked for the password to be reset - on this e-mail 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 greeting: Hi, @@ -1282,8 +1305,8 @@ en-GB: 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. @@ -1310,10 +1333,7 @@ en-GB: subject \nto our Terms of Use, \nAcceptable Use Policies and our Privacy - Policy\n
\nPlease contact - the OSMF \nif you have licensing, copyright or other legal questions.\n
\nOpenStreetMap, - the magnifying glass logo and State of the Map are registered - trademarks of the OSMF." + Policy." partners_title: Partners copyright: foreign: @@ -1340,18 +1360,16 @@ en-GB: build upon our data, you 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 - licenced under the Creative - Commons Attribution-ShareAlike 2.0 licence (CC BY-SA). + intro_3_1_html: "Our documentation is licensed under the \nCreative\nCommons + Attribution-ShareAlike 2.0 licence (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 Licence, and if using our map tiles, that the cartography is - licenced as CC BY-SA. You may do this by linking to + 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 licence(s). In media @@ -1359,7 +1377,7 @@ en-GB: 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: |- + credit_4_html: |- For a browsable electronic map, the credit should appear in the corner of the map. For example: attribution_example: @@ -1727,11 +1745,6 @@ en-GB: identifiable: Identifiable (shown in trace list and as identifiable, ordered points with timestamps) new: - upload_gpx: 'Upload GPX File:' - description: 'Description:' - tags: 'Tags:' - tags_help: comma delimited - visibility: 'Visibility:' visibility_help: what does this mean? visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces help: Help @@ -1751,18 +1764,6 @@ en-GB: edit: title: Editing trace %{name} heading: Editing trace %{name} - filename: 'Filename:' - download: download - uploaded_at: 'Uploaded:' - points: 'Points:' - start_coord: 'Start coordinate:' - map: map - edit: edit - owner: 'Owner:' - description: 'Description:' - tags: 'Tags:' - tags_help: comma delimited - visibility: 'Visibility:' visibility_help: what does this mean? visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces trace_optionals: @@ -1889,13 +1890,6 @@ en-GB: 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. - 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. - allow_write_notes: modify notes. index: title: My OAuth Details my_tokens: My Authorised Applications @@ -1911,19 +1905,7 @@ en-GB: 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. - allow_write_notes: modify notes. not_found: sorry: Sorry, that %{type} could not be found. create: @@ -2004,8 +1986,6 @@ en-GB: reset_password: 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: Did not find that token, check the URL maybe? @@ -2021,9 +2001,6 @@ en-GB: html: |-

Unlike other maps, OpenStreetMap is completely created by people like you, and it's free for anyone to fix, update, download and use.

Sign up to get started contributing. We'll send an email to confirm your account.

- license_agreement: When you confirm your account you will need to agree to the - contributor - terms. email address: 'Email Address:' confirm email address: 'Confirm Email Address:' not_displayed_publicly_html: Your address is not displayed publicly, see our @@ -2209,10 +2186,11 @@ en-GB: reconfirm_html: If you need us to resend the confirmation email, click here. confirm_resend: - success: We've sent a new 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 - %{sender} as we are unable to reply to any confirmation requests. + success_html: We've sent a new 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 %{sender} as we are unable to reply to any confirmation + requests. failure: User %{name} not found. confirm_email: heading: Confirm a change of e-mail address @@ -2226,17 +2204,6 @@ en-GB: 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 @@ -2352,10 +2319,11 @@ en-GB: revoke: Revoke! flash: This block has been revoked. helper: - time_future: Ends in %{time}. + time_future_html: Ends in %{time}. until_login: Active until the user logs in. - time_future_and_until_login: Ends in %{time} and after the user has logged in. - time_past: Ended %{time}. + time_future_and_until_login_html: Ends in %{time} and after the user has logged + in. + time_past_html: Ended %{time}. block_duration: hours: one: 1 hour @@ -2396,7 +2364,7 @@ en-GB: 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} @@ -2439,7 +2407,6 @@ en-GB: out: Zoom Out locate: title: Show My Location - popup: You are within {distance} {unit} of this point base: standard: Standard cycle_map: Cycle Map @@ -2548,6 +2515,17 @@ en-GB: roundabout_with_exit: At roundabout take exit %{exit} onto %{name} unnamed: unnamed road courtesy: Directions courtesy of %{link} + exit_counts: + first: 1st + second: 2nd + third: 3rd + fourth: 4th + fifth: 5th + sixth: 6th + seventh: 7th + eighth: 8th + ninth: 9th + tenth: 10th time: Time query: node: Node @@ -2593,4 +2571,6 @@ en-GB: this redaction before destroying it. flash: Redaction destroyed. error: There was an error destroying this redaction. + validations: + invalid_characters: contains invalid characters ...