X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/747f6c02ecc6f3c30013f18d40d70f647738a9f0..72c7d202a8325b4e9054ffc98e8db3928ac4347a:/config/locales/en-GB.yml diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 704054e7b..254b39da2 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -32,6 +32,7 @@ # Author: Smsm1 # Author: Tlubenov # Author: TomH +# Author: Wehwei # Author: ديفيد --- en-GB: @@ -54,6 +55,9 @@ en-GB: client_application: create: Register update: Update + doorkeeper_application: + create: Register + update: Update redaction: create: Create redaction update: Save redaction @@ -125,6 +129,8 @@ en-GB: latitude: Latitude longitude: Longitude language: Language + doorkeeper/application: + name: Name friend: user: User friend: Friend @@ -577,15 +583,15 @@ en-GB: aeroway: aerodrome: Aerodrome airstrip: Airstrip - apron: Apron - gate: Gate + apron: Airport Apron + gate: Airport Gate hangar: Hangar helipad: Helipad holding_position: Holding Position parking_position: Parking Position runway: Runway taxiway: Taxiway - terminal: Terminal + terminal: Airport Terminal amenity: animal_shelter: Animal Shelter arts_centre: Arts Centre @@ -629,7 +635,7 @@ en-GB: fire_station: Fire Station food_court: Food Court fountain: Fountain - fuel: Fuel + fuel: Filling Station gambling: Gambling grave_yard: Graveyard grit_bin: Grit Bin @@ -811,8 +817,8 @@ en-GB: brownfield: Brownfield Land cemetery: Cemetery commercial: Commercial Area - conservation: Conservation - construction: Construction + conservation: Conservation Area + construction: Construction Area farmland: Farmland farmyard: Farmyard forest: Forest @@ -831,7 +837,7 @@ en-GB: reservoir: Reservoir reservoir_watershed: Reservoir Watershed residential: Residential Area - retail: Retail + retail: Retail Area village_green: Village Green vineyard: Vineyard "yes": Landuse @@ -1051,7 +1057,7 @@ en-GB: deli: Delicatessen department_store: Department Store discount: Discount Items Shop - doityourself: DIY store + doityourself: DIY Shop dry_cleaning: Dry Cleaning electronics: Electronics Shop estate_agent: Estate Agent @@ -1068,7 +1074,7 @@ en-GB: grocery: Grocery Shop hairdresser: Hairdresser hardware: Hardware Store - hifi: Hi-Fi + hifi: Hi-Fi Shop houseware: Houseware Shop interior_decoration: Interior Decoration jewelry: Jewellers @@ -1109,7 +1115,7 @@ en-GB: artwork: Artwork attraction: Attraction bed_and_breakfast: Bed and Breakfast - cabin: Cabin + cabin: Tourist Cabin camp_site: Camp Site caravan_site: Caravan Site chalet: Chalet @@ -1449,9 +1455,6 @@ en-GB: 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 support if you wish - to discuss this. auth failure: Sorry, could not log in with those details. openid_logo_alt: Log in with an OpenID auth_providers: @@ -1487,8 +1490,8 @@ en-GB: about: next: Next copyright_html: ©OpenStreetMap
contributors - used_by_html: '%{name} provides map data for thousands of web sites, mobile - apps, and hardware devices' + used_by_html: '%{name} provides map data for thousands of websites, 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. @@ -1545,20 +1548,13 @@ en-GB: 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_1_html: 'Where you use OpenStreetMap data, you are required to do the + following two things:' 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 - 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 - 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_4_html: |- For a browsable electronic map, the credit should appear in the corner of the map. For example: @@ -1628,8 +1624,8 @@ en-GB: 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 + href="https://wiki.osmfoundation.org/wiki/Takedown_procedure">takedown procedure + or file directly at our on-line filing page. trademarks_title_html: Trademarks trademarks_1_html: OpenStreetMap, the magnifying glass logo, and State of @@ -1743,7 +1739,7 @@ en-GB: description: Ask a question or discuss interesting matters on a wide range of topical or regional mailing lists. forums: - title: Forums + title: Forums (Legacy) description: Questions and discussions for those that prefer a bulletin board style interface. irc: @@ -1984,7 +1980,7 @@ en-GB: cookies_needed: You appear to have cookies disabled - please enable cookies in your browser before continuing. setup_user_auth: - blocked_zero_hour: You have an urgent message on the OpenStreetMap web site. + blocked_zero_hour: You have an urgent message on the OpenStreetMap website. You need to read the message before you will be able to save your edits. blocked: Your access to the API has been blocked. Please log-in to the web interface to find out more. @@ -2067,9 +2063,6 @@ en-GB: title: Sign Up no_auto_account_create: Unfortunately we are not currently able to create an account for you automatically. - contact_support_html: Please contact support 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: |- @@ -2180,13 +2173,6 @@ en-GB: suspended: title: Account Suspended heading: Account Suspended - body_html: |- -

- Sorry, your account has been automatically suspended due to suspicious activity. -

-

- This decision will be reviewed by an administrator shortly, or you may contact %{webmaster} if you wish to discuss this. -

auth_failure: connection_failed: Connection to authentication provider failed invalid_credentials: Invalid authentication credentials