X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f70ec189894ef6bc37355cad7990420065a0b2cb..bab39572a17146d5b6e696f0ba584a89daac10c7:/config/locales/en-GB.yml?ds=sidebyside diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index e9bcdb560..c2e46e43f 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -76,7 +76,7 @@ en-GB: diary_comment: Diary Comment diary_entry: Diary Entry friend: Friend - issue: ÐÑоблем + issue: Issue language: Language message: Message node: Node @@ -205,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: @@ -246,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 @@ -256,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: @@ -337,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. @@ -563,14 +574,14 @@ en-GB: hospital: Hospital hunting_stand: Hunting Stand ice_cream: Ice Cream - internet_cafe: ÐнÑеÑÐ½ÐµÑ ÐаÑе + internet_cafe: Internet Cafe kindergarten: Nursery School - language_school: Ðзиково ÑÑилиÑе + language_school: Language school library: Library marketplace: Marketplace monastery: Monastery motorcycle_parking: Motorcycle Parking - music_school: ÐÑзикално ÑÑилиÑе + music_school: Music School nightclub: Night Club nursing_home: Nursing Home parking: Parking @@ -610,7 +621,7 @@ en-GB: census: Census Boundary national_park: National Park protected_area: Protected Area - "yes": ÐÑаниÑа + "yes": Boundary bridge: aqueduct: Aqueduct boardwalk: Promenade @@ -619,17 +630,17 @@ en-GB: viaduct: Viaduct "yes": Bridge building: - apartment: ÐпаÑÑÐ°Ð¼ÐµÐ½Ñ - apartments: ÐпаÑÑаменÑи - cabin: Ðабина - college: СгÑада Ðолеж - commercial: ТÑÑговÑка СгÑада - construction: СгÑада в ÑÑÑоеж - garage: ÐаÑаж - garages: ÐаÑажи - house: ÐÑÑа - industrial: ÐндÑÑÑÑиална ÑгÑада - roof: ÐокÑив + 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 @@ -1065,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 @@ -1079,7 +1085,7 @@ en-GB: more_results: More results issues: index: - reports: ÐÑÑеÑи + reports: Reports layouts: project_name: title: OpenStreetMap @@ -1129,7 +1135,7 @@ 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}, @@ -1150,24 +1156,16 @@ en-GB: 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: - 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. + 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! @@ -2001,8 +1999,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? @@ -2018,9 +2014,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 @@ -2206,10 +2199,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.