From 3daeb21273310e6fe4e13f90b3f530f3688c0044 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Mon, 21 Mar 2016 07:18:44 +0100 Subject: [PATCH] Localisation updates from https://translatewiki.net. --- config/locales/ca.yml | 6 +- config/locales/de.yml | 2 +- config/locales/en-GB.yml | 180 ++++++++++++++++++++++++++++++++++++--- config/locales/id.yml | 2 +- config/locales/is.yml | 8 ++ config/locales/mk.yml | 1 + config/locales/ru.yml | 8 ++ config/locales/vi.yml | 22 +++-- config/locales/zh-CN.yml | 6 +- 9 files changed, 205 insertions(+), 30 deletions(-) diff --git a/config/locales/ca.yml b/config/locales/ca.yml index af1a7ced4..c19c1ecfa 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1712,7 +1712,7 @@ ca: allow_read_gpx: llegir les vostres traces GPS privades. allow_write_gpx: carregar traces GPS. allow_write_notes: modificar les notes. - grant_access: Permetre Accés + grant_access: Concedeix accés oauthorize_success: title: Sol·licitud d'autorització permesa allowed: Heu permès que l'aplicació %{app_name} accedeixi al vostre compte. @@ -1961,8 +1961,8 @@ ca: administrator: Aquest usuari és administrador moderator: Aquest usuari és moderador grant: - administrator: Concedir accés d'administrador - moderator: Concedir accés de moderador + administrator: Concedeix accés d'administrador + moderator: Concedeix accés de moderador revoke: administrator: Revocar l'accés d'administrador moderator: Revocar l'accés de moderador diff --git a/config/locales/de.yml b/config/locales/de.yml index f6be6da66..ce5522046 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -770,7 +770,7 @@ de: employment_agency: Arbeitsamt estate_agent: Immobilienhändler government: Amt - insurance: Krankenversicherungsbüro + insurance: Versicherungsbüro lawyer: Rechtsanwalt ngo: NGO telecommunication: Telekommunikationsbüro diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 20d406ebd..45824fa1b 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -582,32 +582,41 @@ en-GB: tertiary: Tertiary Road tertiary_link: Tertiary Road track: Track + traffic_signals: Traffic Signals trail: Trail trunk: Trunk Road trunk_link: Trunk Road unclassified: Unclassified Road unsurfaced: Unsurfaced Road + "yes": Road historic: archaeological_site: Archaeological Site battlefield: Battlefield boundary_stone: Boundary Stone building: Historic Building + bunker: Bunker castle: Castle church: Church + city_gate: City Gate citywalls: City Walls fort: Fort + heritage: Heritage Site house: House icon: Icon manor: Manor memorial: Memorial mine: Mine monument: Monument + roman_road: Roman Road ruins: Ruins + stone: Stone tomb: Tomb tower: Tower wayside_cross: Wayside Cross wayside_shrine: Wayside Shrine wreck: Wreck + junction: + "yes": Junction landuse: allotments: Allotments basin: Basin @@ -639,14 +648,19 @@ en-GB: road: Road Area village_green: Village Green vineyard: Vineyard + "yes": Landuse leisure: beach_resort: Beach Resort bird_hide: Bird Hide + club: Club common: Common Land + dog_park: Dog Park fishing: Fishing Area + fitness_centre: Fitness Centre fitness_station: Fitness Station garden: Garden golf_course: Golf Course + horse_riding: Horse Riding ice_rink: Ice Rink marina: Marina miniature_golf: Miniature Golf @@ -655,6 +669,7 @@ en-GB: pitch: Sports Pitch playground: Playground recreation_ground: Recreation Ground + resort: Resort sauna: Sauna slipway: Slipway sports_centre: Sports Centre @@ -662,6 +677,13 @@ en-GB: swimming_pool: Swimming Pool track: Running Track water_park: Water Park + "yes": Leisure + man_made: + lighthouse: Lighthouse + pipeline: Pipeline + tower: Tower + works: Factory + "yes": Man-made military: airfield: Military Airfield barracks: Barracks @@ -681,6 +703,7 @@ en-GB: forest: Forest geyser: Geyser glacier: Glacier + grassland: Grassland heath: Heath hill: Hill island: Island @@ -693,6 +716,8 @@ en-GB: reef: Reef ridge: Ridge rock: Rock + saddle: Saddle + sand: Sand scree: Scree scrub: Scrub spring: Spring @@ -706,6 +731,7 @@ en-GB: wood: Wood office: accountant: Accountant + administrative: Administration architect: Architect company: Company employment_agency: Employment Agency @@ -718,6 +744,8 @@ en-GB: travel_agent: Travel Agency "yes": Office place: + allotments: Allotments + block: Block airport: Airport city: City country: Country @@ -742,6 +770,7 @@ en-GB: town: Town unincorporated_area: Unincorporated Area village: Village + "yes": Place railway: abandoned: Abandoned Railway construction: Railway under construction @@ -974,9 +1003,9 @@ en-GB: legal_babble: title_html: Copyright and Licence intro_1_html: |- - OpenStreetMap is open data, licensed under the ® is open data, licensed under the Open Data - Commons Open Database Licence (ODbL) by the (ODbL) by the OpenStreetMap Foundation (OSMF). 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 @@ -1102,6 +1131,14 @@ en-GB: or building. tag_html: A tag is a bit of data about a node or way, like a restaurant's name or a road's speed limit. + rules: + title: Rules! + paragraph_1_html: "OpenStreetMap has few formal rules but we expect all participants + to collaborate\nwith, and communicate with, the community. If you are considering\nany + activities other than editing by hand, please read and follow the guidelines + on \nImports + and \nAutomated + Edits." questions: title: Any questions? paragraph_1_html: |- @@ -1144,11 +1181,30 @@ en-GB: url: /welcome title: Welcome to OSM description: Start with this quick guide covering the OpenStreetMap basics. + beginners_guide: + url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide + title: Beginners' Guide + description: Community maintained guide for beginners. help: url: https://help.openstreetmap.org/ title: help.openstreetmap.org description: Ask a question or look up answers on OSM's question-and-answer site. + mailing_lists: + title: Mailing Lists + description: Ask a question or discuss interesting matters on a wide range of + topical or regional mailing lists. + forums: + title: Forums + description: Questions and discussions for those that prefer a bulletin board + style interface. + irc: + title: IRC + description: Interactive chat in many different languages and on many topics. + switch2osm: + title: switch2osm + description: Help for companies and organisations switching to OpenStreetMap + based maps and other services. wiki: url: http://wiki.openstreetmap.org/ title: wiki.openstreetmap.org @@ -1156,8 +1212,8 @@ en-GB: about_page: next: Next copyright_html: ©OpenStreetMap
contributors - used_by: '%{name} powers map data on hundreds of web sites, mobile apps, and hardware - devices' + used_by: '%{name} powers map data on 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. @@ -1177,6 +1233,12 @@ en-GB: build upon the data in certain ways, you may distribute the result only under the same licence. See the Copyright and Licence page for details. + legal_title: Legal + legal_html: "This site and many other related services are formally operated by + the \nOpenStreetMap Foundation (OSMF) + \non behalf of the community.\n
\nPlease contact + the OSMF \nif you have licensing, copyright or other legal questions and + issues." partners_title: Partners notifier: diary_comment_notification: @@ -1397,6 +1459,10 @@ en-GB: close: Close search: search: Search + get_directions: Get directions + get_directions_title: Find directions between two points + from: From + to: To where_am_i: Where am I? where_am_i_title: Describe the current location using the search engine submit_text: Go @@ -1404,6 +1470,7 @@ en-GB: table: entry: motorway: Motorway + main_road: Main road trunk: Trunk road primary: Primary road secondary: Secondary road @@ -1624,6 +1691,7 @@ en-GB: allow_read_gpx: read your private GPS traces. allow_write_gpx: upload GPS traces. allow_write_notes: modify notes. + grant_access: Grant Access oauthorize_success: title: Authorisation request allowed allowed: You have granted application %{app_name} access to your account. @@ -1709,6 +1777,7 @@ en-GB: register now: Register now with username: 'Already have an OpenStreetMap account? Please login with your username and password:' + with external: 'Alternatively, use a third party to login:' new to osm: New to OpenStreetMap? to make changes: To make changes to the OpenStreetMap data, you must have an account. @@ -1722,6 +1791,28 @@ en-GB: 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: + openid: + title: Login with OpenID + alt: Login with an OpenID URL + google: + title: Login with Google + alt: Login with a Google OpenID + facebook: + title: Login with Facebook + alt: Login with a Facebook Account + windowslive: + title: Login with Windows Live + alt: Login with a Windows Live Account + yahoo: + title: Login with Yahoo + alt: Login with a Yahoo OpenID + wordpress: + title: Login with Wordpress + alt: Login with a Wordpress OpenID + aol: + title: Login with AOL + alt: Login with an AOL OpenID logout: title: Logout heading: Logout of OpenStreetMap @@ -1766,8 +1857,12 @@ en-GB: display name: 'Display Name:' display name description: Your publicly displayed username. You can change this later in the preferences. + external auth: 'Third Party Authentication:' password: 'Password:' confirm password: 'Confirm Password:' + use external auth: Alternatively, use a third party to login + auth no password: With third party authentication a password is not required, + but some extra tools or server may still need one. continue: Sign Up terms accepted: Thanks for accepting the new contributor terms! terms declined: We are sorry that you have decided to not accept the new Contributor @@ -1799,6 +1894,7 @@ en-GB: heading: The user %{user} does not exist body: Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong. + deleted: deleted view: my diary: My Diary new diary entry: new diary entry @@ -1850,16 +1946,16 @@ en-GB: revoke: administrator: Revoke administrator access moderator: Revoke moderator access - block_history: blocks received - moderator_history: blocks given + block_history: Active Blocks + moderator_history: Blocks Given comments: Comments - create_block: block this user - activate_user: activate this user - deactivate_user: deactivate this user + create_block: Block this User + activate_user: Activate this User + deactivate_user: Deactivate this User confirm_user: Confirm this user - hide_user: hide this user - unhide_user: unhide this user - delete_user: delete this user + hide_user: Hide this User + unhide_user: Unhide this User + delete_user: Delete this User confirm: Confirm friends_changesets: friends' changesets friends_diaries: friends' diary entries @@ -1875,6 +1971,7 @@ en-GB: current email address: 'Current Email Address:' new email address: 'New Email Address:' email never displayed publicly: (never displayed publicly) + external auth: 'External Authentication:' openid: link: http://wiki.openstreetmap.org/wiki/OpenID link text: what is this? @@ -1935,6 +2032,7 @@ en-GB: you'll be able to start mapping. press confirm button: Press the confirm button below to activate your account. button: Confirm + success: Confirmed your account, thanks for signing up! already active: This account has already been confirmed. unknown token: That confirmation code has expired or does not exist. reconfirm_html: If you need us to resend the confirmation email, click @@ -1953,6 +2051,7 @@ en-GB: button: Confirm success: Confirmed your change of email address! failure: An e-mail address has already been confirmed with this token. + unknown_token: That confirmation code has expired or does not exist. set_home: flash success: Home location saved successfully go_public: @@ -1992,6 +2091,21 @@ en-GB:

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

+ auth_failure: + connection_failed: Connection to authentication provider failed + invalid_credentials: Invalid authentication credentials + no_authorization_code: No authorisation code + unknown_signature_algorithm: Unknown signature algorithm + invalid_scope: Invalid scope + auth_association: + heading: Your ID is not associated with a OpenStreetMap account yet. + option_1: |- + If you are new to OpenStreetMap, please create a new account + using the form below. + option_2: |- + If you already have an account, you can login to your account + using your username and password and then associate the account + with your ID in your user settings. user_role: filter: not_an_administrator: Only administrators can perform user role management, @@ -2107,6 +2221,8 @@ en-GB: heading: '%{block_on} blocked by %{block_by}' time_future: Ends in %{time} time_past: Ended %{time} ago + created: Created + ago: '%{time} ago' status: Status show: Show edit: Edit @@ -2157,6 +2273,7 @@ en-GB: link: Link or HTML long_link: Link short_link: Short Link + geo_uri: Geo URI embed: HTML custom_dimensions: Set custom dimensions format: 'Format:' @@ -2168,6 +2285,9 @@ en-GB: center_marker: Centre map on marker paste_html: Paste HTML to embed in website view_larger_map: View Larger Map + only_standard_layer: Only the standard layer can be exported as an image + embed: + report_problem: Report a problem key: title: Map Key tooltip: Legend @@ -2227,6 +2347,42 @@ en-GB: edit_help: Move the map and zoom in on a location you want to edit, then click here. directions: + engines: + graphhopper_bicycle: Bicycle (GraphHopper) + graphhopper_foot: Foot (GraphHopper) + mapquest_bicycle: Bicycle (MapQuest) + mapquest_car: Car (MapQuest) + mapquest_foot: Foot (MapQuest) + osrm_car: Car (OSRM) + mapzen_bicycle: Bicycle (Mapzen) + mapzen_car: Car (Mapzen) + mapzen_foot: Foot (Mapzen) + directions: Directions + distance: Distance + errors: + no_route: Couldn't find a route between those two places. + no_place: Sorry - couldn't find that place. + instructions: + continue_without_exit: Continue on %{name} + slight_right_without_exit: Slight right onto %{name} + turn_right_without_exit: Turn right onto %{name} + sharp_right_without_exit: Sharp right onto %{name} + uturn_without_exit: U-turn along %{name} + sharp_left_without_exit: Sharp left onto %{name} + turn_left_without_exit: Turn left onto %{name} + slight_left_without_exit: Slight left onto %{name} + via_point_without_exit: (via point) + follow_without_exit: Follow %{name} + roundabout_without_exit: At roundabout take %{name} + leave_roundabout_without_exit: Leave roundabout - %{name} + stay_roundabout_without_exit: Stay on roundabout - %{name} + start_without_exit: Start at end of %{name} + destination_without_exit: Reach destination + against_oneway_without_exit: Go against one-way on %{name} + end_oneway_without_exit: End of one-way on %{name} + roundabout_with_exit: At roundabout take exit %{exit} onto %{name} + unnamed: unnamed road + courtesy: Directions courtesy of %{link} time: Time query: node: Node diff --git a/config/locales/id.yml b/config/locales/id.yml index 968702644..3d72b115c 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -1235,7 +1235,7 @@ id: Jika Anda mengubah atau membangun dari data dengan cara tertentu, Anda dapat menyebarkan hasilnya hanya di bawah lisensi yang sama. Lihat halaman Hak Cipta dan Lisensi untuk perinciannya.' - legal_title: Hukum + legal_title: Legal legal_html: |- Situs ini dan layanan terkait lainnya dioperasikan secara resmi oleh OpenStreetMap Foundation (OSMF) atas nama komunitas.
diff --git a/config/locales/is.yml b/config/locales/is.yml index 70aabd2db..3bd38c272 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -199,6 +199,8 @@ is: title_user: Breytingar eftir %{user} load_more: Hlaða inn fleiri rss: + commented_at_html: Uppfært fyrir %{when} síðan + commented_at_by_html: Uppfært fyrir %{when} síðan af %{user} full: Öll umræðan diary_entry: new: @@ -283,6 +285,7 @@ is: manually_select: Velja annað svæði á kortinu format_to_export: Skráasnið osm_xml_data: OpenStreetMap XML gögn + map_image: Kortamynd (sýnir staðallagið) embeddable_html: HTML til að bæta á vefsíðu licence: Leyfi export_details: OpenStreetMap gögnin eru með Open @@ -291,6 +294,10 @@ is: body: Svæðið sem þú ert að reyna að flytja út á OpenStreetMap á XML-sniði er of stórt. Auktu aðdráttinn eða veldu smærra svæði, nú eða notaðu eina af eftirfarandi leiðum til að flytja inn mikið magn gagna. + geofabrik: + title: Niðurhöl frá Geofabrik + other: + title: Aðrar heimildir options: Valmöguleikar format: 'Snið:' scale: Skali @@ -326,6 +333,7 @@ is: drag_lift: Toglyfta gondola: Eggjalyfta aeroway: + aerodrome: Flugsvæði apron: Flughlað gate: Hlið helipad: Þyrlupallur diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 723a393a1..b0224abba 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -2282,6 +2282,7 @@ mk: center_marker: Сосред. картата на бележникот paste_html: Ископирајте го HTML-кодот за да го вметнете во страницата. view_larger_map: Преглед на поголема карта + only_standard_layer: Само стандардниот слој може да се извезува како слика embed: report_problem: Пријави проблем key: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index cd485854f..e9a6a0b91 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1158,6 +1158,12 @@ ru: название ресторана или скоростное ограничение конкретной дороги. rules: title: Правила! + paragraph_1_html: В OpenStreetMap есть лишь несколько формальных правил, но + мы бы хотели, чтоб все участники сотрудничали и взаимодействовали с сообществом. + Если речь идёт о любых действиях, кроме редактирования вручную, пожалуйста, + прочитайте рекомендацияи по импорту + и автоматизированным + правкам и следуйте им в дальнейшем. questions: title: Появились вопросы? paragraph_1_html: |- @@ -2331,6 +2337,8 @@ ru: center_marker: Центрировать карту на маркер paste_html: HTML-код для встраивания на сайт view_larger_map: Посмотреть более крупную карту + only_standard_layer: Только стандартный слой может быть экспортирован в виде + изображения embed: report_problem: Сообщить о проблеме key: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 91d3a5bea..a90c588b4 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1857,6 +1857,7 @@ vi: heading: Người dùng %{user} không tồn tại body: Rất tiếc, không có người dùng với tên %{user}. Xin hãy kiểm tra chính tả, hoặc có lẽ bạn đã theo một liên kết sai. + deleted: đã xóa view: my diary: Nhật ký của Tôi new diary entry: mục nhật ký mới @@ -1908,16 +1909,16 @@ vi: revoke: administrator: Rút quyền quản lý viên moderator: Rút quyền điều hành viên - block_history: tác vụ cấm người này - moderator_history: tác vụ cấm bởi người này + block_history: Tác vụ Cấm Người Này + moderator_history: Tác vụ Cấm bởi Người Này comments: Bình luận - create_block: cấm người dùng này - activate_user: kích hoạt tài khoản này - deactivate_user: vô hiệu hóa tài khoản này - confirm_user: xác nhận người dùng này - hide_user: ẩn tài khoản này - unhide_user: hiện tài khoản này - delete_user: xóa tài khoản này + create_block: Cấm Người dùng Này + activate_user: Kích hoạt Tài khoản Này + deactivate_user: Vô hiệu hóa Tài khoản Này + confirm_user: Xác nhận Người dùng Này + hide_user: Ẩn Tài khoản Này + unhide_user: Hiện Tài khoản Này + delete_user: Xóa Tài khoản Này confirm: Xác nhận friends_changesets: bộ thay đổi của bạn bè friends_diaries: mục nhật ký của bạn bè @@ -2243,6 +2244,9 @@ vi: center_marker: Chuyển ghim vào giữa bản đồ paste_html: Dán HTML để nhúng vào trang Web view_larger_map: Xem Bản đồ Rộng hơn + only_standard_layer: Chỉ có thể xuất lớp chuẩn ra hình ảnh + embed: + report_problem: Báo vấn đề key: title: Chú giải Bản đồ tooltip: Chú giải Bản đồ diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 175a456c0..b0a7022bc 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1680,8 +1680,7 @@ zh-CN: new: title: 注册 no_auto_account_create: 很遗憾，我们目前无法为您自动创建一个帐户。 - contact_webmaster: 请联系网站管理员来安排创建一个账户 - - 我们将尽快尝试处理您的请求。 + contact_webmaster: 请联系网站管理员来安排创建一个账户 - 我们将尽快尝试处理您的请求。 about: header: 自由且可编辑 html: |- @@ -1857,8 +1856,7 @@ zh-CN: unknown token: 确认码已经过期或不存在。 reconfirm_html: 如果您需要我们重新发送确认邮件，请点击这里。 confirm_resend: - success: 我们已经发送一封新的确认电子邮件到 %{email}，只要您确认您的帐户，您就可以开始制图了。

如果您使用的反垃圾邮件系统发送确认请求，那么请确保您的白名单中有 - webmaster@openstreetmap.org，因为我们无法回复任何确认请求。 + success: 我们已经发送一封新的确认电子邮件到 %{email}，只要您确认您的帐户，您就可以开始制图了。

如果您使用的反垃圾邮件系统发送确认请求，那么请确保您的白名单中有%{sender}，因为我们无法回复任何确认请求。 failure: 用户 %{name} 未找到。 confirm_email: heading: 确认电子邮件地址修改 -- 2.43.2