From: Tom Hughes Date: Wed, 1 Jul 2020 07:28:08 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/2661' X-Git-Tag: live~2078 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/05858662021553ce0b86720dd62ccbd08788979f?hp=63c0b697a4bcde9db5711c590e462cf87d411576 Merge remote-tracking branch 'upstream/pull/2661' --- diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..b765f00f5 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +version: 2 +updates: + - package-ecosystem: "bundler" + versioning-strategy: "increase-if-necessary" + directory: "/" + schedule: + interval: "daily" + - package-ecosystem: "npm" + versioning-strategy: "increase-if-necessary" + directory: "/" + schedule: + interval: "daily" diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 6a1338851..366058e7d 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -69,7 +69,7 @@ Metrics/ClassLength: # Offense count: 74 Metrics/CyclomaticComplexity: - Max: 22 + Max: 28 # Offense count: 722 # Configuration parameters: CountComments, ExcludedMethods. diff --git a/Gemfile b/Gemfile index 95958032c..35058f334 100644 --- a/Gemfile +++ b/Gemfile @@ -49,12 +49,12 @@ gem "composite_primary_keys", "~> 12.0.0" gem "config" gem "delayed_job_active_record" gem "dynamic_form" -gem "http_accept_language", "~> 2.0.0" +gem "http_accept_language", "~> 2.1.1" gem "i18n-js", ">= 3.0.0" gem "oauth-plugin", ">= 0.5.1" gem "openstreetmap-deadlock_retry", ">= 1.3.0", :require => "deadlock_retry" gem "rack-cors" -gem "rails-i18n", "~> 4.0.0" +gem "rails-i18n", "~> 6.0.0" gem "rinku", ">= 2.0.6", :require => "rails_rinku" gem "strong_migrations" gem "validates_email_format_of", ">= 1.5.1" @@ -143,7 +143,7 @@ group :test do gem "erb_lint", :require => false gem "factory_bot_rails" gem "minitest", "~> 5.1" - gem "puma", "~> 3.11" + gem "puma", "~> 4.3" gem "rails-controller-testing" gem "rubocop" gem "rubocop-minitest" diff --git a/Gemfile.lock b/Gemfile.lock index 36c210434..3b47153b7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,24 +71,24 @@ GEM activerecord (>= 3.2, < 7.0) rake (>= 10.4, < 14.0) ast (2.4.1) - autoprefixer-rails (9.7.6) + autoprefixer-rails (9.8.4) execjs aws-eventstream (1.1.0) - aws-partitions (1.329.0) - aws-sdk-core (3.100.0) + aws-partitions (1.336.0) + aws-sdk-core (3.102.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.34.1) + aws-sdk-kms (1.35.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.68.1) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-s3 (1.72.0) + aws-sdk-core (~> 3, >= 3.102.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) - aws-sigv4 (1.1.4) - aws-eventstream (~> 1.0, >= 1.0.2) + aws-sigv4 (1.2.1) + aws-eventstream (~> 1, >= 1.0.2) better_errors (2.7.1) coderay (>= 1.0.0) erubi (>= 1.0.0) @@ -117,7 +117,7 @@ GEM cancancan (3.1.0) canonical-rails (0.2.8) rails (>= 4.1, < 6.1) - capybara (3.32.2) + capybara (3.33.0) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -151,7 +151,7 @@ GEM activerecord (>= 3.0, < 6.1) delayed_job (>= 3.0, < 5) docile (1.3.2) - dry-configurable (0.11.5) + dry-configurable (0.11.6) concurrent-ruby (~> 1.0) dry-core (~> 0.4, >= 0.4.7) dry-equalizer (~> 0.2) @@ -167,7 +167,7 @@ GEM concurrent-ruby (~> 1.0) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-schema (1.5.1) + dry-schema (1.5.2) concurrent-ruby (~> 1.0) dry-configurable (~> 0.8, >= 0.8.3) dry-core (~> 0.4) @@ -182,7 +182,7 @@ GEM dry-equalizer (~> 0.3) dry-inflector (~> 0.1, >= 0.1.2) dry-logic (~> 1.0, >= 1.0.2) - dry-validation (1.5.0) + dry-validation (1.5.1) concurrent-ruby (~> 1.0) dry-container (~> 0.7, >= 0.7.1) dry-core (~> 0.4) @@ -200,15 +200,15 @@ GEM erubi (1.9.0) execjs (2.7.0) exifr (1.3.6) - factory_bot (5.2.0) - activesupport (>= 4.2.0) - factory_bot_rails (5.2.0) - factory_bot (~> 5.2.0) - railties (>= 4.2.0) + factory_bot (6.0.2) + activesupport (>= 5.0.0) + factory_bot_rails (6.0.0) + factory_bot (~> 6.0.0) + railties (>= 5.0.0) faraday (1.0.1) multipart-post (>= 1.2, < 3) ffi (1.13.1) - ffi-libarchive (1.0.0) + ffi-libarchive (1.0.3) ffi (~> 1.0) fspath (3.1.2) gd2-ffij (0.4.0) @@ -219,10 +219,10 @@ GEM hashie (4.1.0) html_tokenizer (0.0.7) htmlentities (4.3.4) - http_accept_language (2.0.5) - i18n (0.9.5) + http_accept_language (2.1.1) + i18n (1.8.3) concurrent-ruby (~> 1.0) - i18n-js (3.7.0) + i18n-js (3.7.1) i18n (>= 0.6.6) image_optim (0.26.5) exifr (~> 1.2, >= 1.2.2) @@ -246,7 +246,7 @@ GEM json (2.3.0) jwt (2.2.1) kgio (2.11.3) - kramdown (2.2.1) + kramdown (2.3.0) rexml libxml-ruby (3.2.0) listen (3.2.1) @@ -321,14 +321,15 @@ GEM omniauth-oauth2 (~> 1.4) openstreetmap-deadlock_retry (1.3.0) parallel (1.19.2) - parser (2.7.1.3) - ast (~> 2.4.0) + parser (2.7.1.4) + ast (~> 2.4.1) pg (1.2.3) popper_js (1.16.0) progress (3.5.2) psych (3.1.0) public_suffix (4.0.5) - puma (3.12.6) + puma (4.3.5) + nio4r (~> 2.0) quad_tile (1.0.1) r2 (0.2.7) rack (2.2.3) @@ -355,18 +356,18 @@ GEM bundler (>= 1.3.0) railties (= 6.0.3.2) sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.4) - actionpack (>= 5.0.1.x) - actionview (>= 5.0.1.x) - activesupport (>= 5.0.1.x) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - rails-i18n (4.0.2) - i18n (~> 0.6) - rails (>= 4.0) + rails-i18n (6.0.0) + i18n (>= 0.7, < 2) + railties (>= 6.0.0, < 7) railties (6.0.3.2) actionpack (= 6.0.3.2) activesupport (= 6.0.3.2) @@ -385,16 +386,16 @@ GEM rinku (2.0.6) rotp (6.0.0) addressable (~> 2.7) - rubocop (0.85.1) + rubocop (0.86.0) parallel (~> 1.10) parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.7) rexml - rubocop-ast (>= 0.0.3) + rubocop-ast (>= 0.0.3, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.0.3) + rubocop-ast (0.1.0) parser (>= 2.7.0.1) rubocop-minitest (0.9.0) rubocop (>= 0.74) @@ -420,7 +421,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - secure_headers (6.3.0) + secure_headers (6.3.1) selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) @@ -464,7 +465,7 @@ GEM websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.3.0) + zeitwerk (2.3.1) PLATFORMS ruby @@ -500,7 +501,7 @@ DEPENDENCIES ffi-libarchive gd2-ffij (>= 0.4.0) htmlentities - http_accept_language (~> 2.0.0) + http_accept_language (~> 2.1.1) i18n-js (>= 3.0.0) image_optim_rails jbuilder (~> 2.7) @@ -526,14 +527,14 @@ DEPENDENCIES openstreetmap-deadlock_retry (>= 1.3.0) pg psych - puma (~> 3.11) + puma (~> 4.3) quad_tile (~> 1.0.1) r2 (~> 0.2.7) rack-cors rack-uri_sanitizer rails (= 6.0.3.2) rails-controller-testing - rails-i18n (~> 4.0.0) + rails-i18n (~> 6.0.0) rinku (>= 2.0.6) rotp rubocop diff --git a/README.md b/README.md index 9162a38de..81b8ce7bf 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,10 @@ The software is also known as "openstreetmap-website". This repository consists of: -* The web site, including user accounts, diary entries, user-to-user messaging -* The XML-based editing [API](https://wiki.openstreetmap.org/wiki/API_v0.6) -* The integrated versions of the [Potlatch](https://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](https://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](https://wiki.openstreetmap.org/wiki/ID) editors -* The Browse pages - a web front-end to the OpenStreetMap data +* The web site, including user accounts, diary entries, user-to-user messaging. +* The XML-based editing [API](https://wiki.openstreetmap.org/wiki/API_v0.6). +* The integrated versions of the [Potlatch](https://wiki.openstreetmap.org/wiki/Potlatch_1), [Potlatch 2](https://wiki.openstreetmap.org/wiki/Potlatch_2) and [iD](https://wiki.openstreetmap.org/wiki/ID) editors. +* The Browse pages - a web front-end to the OpenStreetMap data. * The GPX uploads, browsing and API. A fully-functional Rails Port installation depends on other services, including map tile @@ -27,15 +27,15 @@ a copy of which can be found in the [LICENSE](LICENSE) file. # Installation The Rails Port is a Ruby on Rails application that uses PostgreSQL as its database, and has a large -number of dependencies for installation. For full details please see [INSTALL.md](INSTALL.md) +number of dependencies for installation. For full details please see [INSTALL.md](INSTALL.md). # Development We're always keen to have more developers! Pull requests are very welcome. * Bugs are recorded in the [issue tracker](https://github.com/openstreetmap/openstreetmap-website/issues). -* Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components -* Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap) +* Some bug reports are also found on the [OpenStreetMap trac](https://trac.openstreetmap.org/) system, in the "[website](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=website&order=priority)" and "[api](https://trac.openstreetmap.org/query?status=new&status=assigned&status=reopened&component=api&order=priority)" components. +* Translation is managed by [Translatewiki](https://translatewiki.net/wiki/Translating:OpenStreetMap). * There is a [rails-dev@openstreetmap.org](https://lists.openstreetmap.org/listinfo/rails-dev) mailing list for development discussion. * IRC - there is the #osm-dev channel on irc.oftc.net. diff --git a/app/models/trace.rb b/app/models/trace.rb index 49e4a041b..5496bec45 100644 --- a/app/models/trace.rb +++ b/app/models/trace.rb @@ -26,6 +26,8 @@ # class Trace < ApplicationRecord + require "open3" + self.table_name = "gpx_files" belongs_to :user, :counter_cache => true diff --git a/config/application.rb b/config/application.rb index 651d32907..54390ba29 100644 --- a/config/application.rb +++ b/config/application.rb @@ -53,6 +53,10 @@ module OpenStreetMap # Use memcached for caching if required config.cache_store = :mem_cache_store, Settings.memcache_servers, { :namespace => "rails:cache" } if Settings.key?(:memcache_servers) + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + # Use logstash for logging if required if Settings.key?(:logstash_path) config.logstasher.enabled = true diff --git a/config/environments/production.rb b/config/environments/production.rb index 407650d2d..ca186492e 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -73,10 +73,6 @@ Rails.application.configure do # Set this to true and configure the email server for immediate delivery to raise delivery errors. # config.action_mailer.raise_delivery_errors = false - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation cannot be found). - config.i18n.fallbacks = true - # Send deprecation notices to registered listeners. config.active_support.deprecation = :notify diff --git a/config/locales/be-Tarask.yml b/config/locales/be-Tarask.yml index 3e2f03d3b..435eda635 100644 --- a/config/locales/be-Tarask.yml +++ b/config/locales/be-Tarask.yml @@ -813,6 +813,11 @@ be-Tarask: more_info_2: 'іх можна знайсьці на:' success: subject: '[OpenStreetMap] імпарт GPX адбыўся пасьпяхова' + loaded_successfully: + one: пасьпяхова загружаны з %{trace_points} з 1 магчымага пункту. + few: пасьпяхова загружаныя %{trace_points} пункты з магчымых %{possible_points}. + many: пасьпяхова загружаныя %{trace_points} пунктаў з магчымых %{possible_points}. + other: пасьпяхова загружаныя %{trace_points} пунктаў з магчымых %{possible_points}. signup_confirm: subject: '[OpenStreetMap] Вітаем у OpenStreetMap' email_confirm: diff --git a/config/locales/ce.yml b/config/locales/ce.yml index 54cab8e89..1ce058bd9 100644 --- a/config/locales/ce.yml +++ b/config/locales/ce.yml @@ -385,6 +385,9 @@ ce: posted_by_html: 'ДӀабахийтина %{link_user} %{created}, мотт: %{language_link}' comment_link: Йитта коммент reply_link: Жоп ло + comment_count: + few: '%{count} коммент яц' + other: '%{count} коммент яц' edit_link: Хийца дӀаяздар hide_link: Къайладаккха дӀаяздар unhide_link: Гучудаккха хӀара дӀаяздар diff --git a/config/locales/de.yml b/config/locales/de.yml index 0b435f704..116c02332 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -104,7 +104,7 @@ de: models: acl: Zugriffssteuerungsliste changeset: Änderungssatz - changeset_tag: Änderungssatz-Attribut + changeset_tag: Änderungssatz-Tag country: Land diary_comment: Blog-Kommentar diary_entry: Blog-Eintrag @@ -113,19 +113,19 @@ de: language: Sprache message: Nachricht node: Knoten - node_tag: Knoten-Attribut + node_tag: Knoten-Tag notifier: Melder old_node: Alter Knoten - old_node_tag: Altes Knoten-Attribut + old_node_tag: Alter-Knoten-Tag old_relation: Alte Relation old_relation_member: Alte-Relation-Mitglied - old_relation_tag: Alte-Relation-Attribut - old_way: Alte Linie - old_way_node: Alte-Linie-Knoten - old_way_tag: Alte-Linie-Attribut + old_relation_tag: Alte-Verbindung-Tag + old_way: Alter Weg + old_way_node: Alter-Weg-Knoten + old_way_tag: Alter-Weg-Attribut relation: Relation - relation_member: Relations-Mitglied - relation_tag: Relation-Attribut + relation_member: Verbindungs-Mitglied + relation_tag: Verbindungs-Tag report: Meldung session: Sitzung trace: Spur @@ -283,7 +283,7 @@ de: way: Wege (%{count}) way_paginated: Wege (%{x}–%{y} von %{count}) relation: Relationen (%{count}) - relation_paginated: Relationen (%{x}–%{y} von %{count}) + relation_paginated: Verbindungen (%{x}–%{y} von %{count}) comment: Kommentare (%{count}) hidden_commented_by: Versteckter Diskussionsbeitrag von %{user} %{when} @@ -333,13 +333,13 @@ de: type: node: Knoten way: Weg - relation: die Relation + relation: die Verbindung changeset: den Änderungssatz note: Hinweis redacted: redaction: Schwärzung %{id} - message_html: 'Weil hier etwas geschwärzt wurde kann Version %{version} dieses - %{type} nicht angezeigt werden. Mehr erfahren: %{redaction_link}.' + message_html: 'Die Version %{version} dieses %{type} kann nicht angezeigt werden, + weil hier etwas geschwärzt wurde. Mehr erfahren: %{redaction_link}.' type: node: s Knotens way: s Weges @@ -409,8 +409,7 @@ de: no_more_user: Keine weiteren Änderungssätze von diesem Benutzer. load_more: Mehr laden timeout: - sorry: Entschuldigung, es hat leider zu lange gedauert, die angeforderten Änderungssätze - abzurufen. + sorry: Es hat leider zu lange gedauert, die angeforderten Änderungssätze abzurufen. changeset_comments: comment: comment: Neuer Diskussionsbeitrag zum Änderungssatz Nr. %{changeset_id} von @@ -434,7 +433,7 @@ de: location: 'Ort:' latitude: 'Breitengrad:' longitude: 'Längengrad:' - use_map_link: Ort auf Karte auswählen + use_map_link: Karte benutzen index: title: Benutzer-Blogs title_friends: Blogs deiner Freunde diff --git a/config/locales/hu.yml b/config/locales/hu.yml index d6e9c0df0..1d903cf52 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -1269,7 +1269,7 @@ hu: email_confirm_html: greeting: Szia! hopefully_you: 'Valaki (remélhetőleg Te) meg szeretné változtatni az e-mail - címét erről: %{server_url} erre: %{new_address}.' + címét az %{server_url} oldalon erre: %{new_address}.' click_the_link: Ha ez Te vagy, akkor a módosítás megerősítéséhez kattints az alábbi hivatkozásra. lost_password: diff --git a/config/locales/it.yml b/config/locales/it.yml index cddc03886..f7b947f48 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -319,10 +319,9 @@ it: changeset: gruppo di modifiche note: nota redacted: - redaction: Redazione %{id} + redaction: Revisione %{id} message_html: La versione %{version} di questo %{type} non può essere mostrata - in quanto è stata redatta. Per favore, fai riferimento a %{redaction_link} - per i dettagli. + in quanto è stata rimossa. Fare riferimento a %{redaction_link} per i dettagli. type: node: nodo way: percorso @@ -2832,7 +2831,7 @@ it: redactions: edit: description: Descrizione - heading: Modifica Redazione + heading: Modifica revisione title: Modifica revisione index: empty: Nessuna revisione disponibile. @@ -2858,7 +2857,7 @@ it: not_empty: La revisione non è vuota. Si prega di non-redigere tutte le versioni appartenenti a questa revisione prima di eliminarla. flash: Revisione eliminata. - error: Si è verificato un errore durante l'eliminazione. + error: Si è verificato un errore durante l'eliminazione di questa revisione. validations: leading_whitespace: ha uno spazio come carattere iniziale trailing_whitespace: ha uno spazio come carattere finale diff --git a/config/locales/ja.yml b/config/locales/ja.yml index af19f1c62..303edd404 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -413,6 +413,7 @@ ja: in_language_title: '%{language} の日記エントリ' new: 日記エントリを新規作成 new_title: 自分の日記にエントリを新規作成 + my_diary: 自分の日記 no_entries: 日記エントリはありません recent_entries: 最近の日記エントリ older_entries: 以前のエントリ diff --git a/config/locales/ko.yml b/config/locales/ko.yml index f655e9a4a..ea1982d91 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1812,6 +1812,11 @@ ko: trace_uploaded: GPX 파일을 올리고 있으며 데이터베이스에 삽입을 기다리고 있습니다. 이 작업은 보통 반 시간 내에 수행하며 완료되면 이메일을 보낼 것입니다. upload_failed: 죄송합니다. GPX 업로드를 실패했습니다. 관리자는 해당 오류에 대해 알림을 받았습니다. 다시 시도해 주십시오 + traces_waiting: + one: 올리기를 기다리는 궤적 %{count}개가 있습니다. 대기중인 다른 사용자의 올리기를 막지 않도록 올리기가 끝날 때까지 더 + 기다려주십시오. + other: 올리기를 기다리는 궤적 %{count}개가 있습니다. 대기중인 다른 사용자의 올리기를 막지 않도록 올리기가 끝날 때까지 + 더 기다려주십시오. edit: title: '%{name} 경로 편집' heading: '%{name} 경로 편집' diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 5ded4c018..39304d271 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -22,6 +22,9 @@ ku-Latn: create: Tomar bike diary_entry: create: Biweșîne + update: Rojane bike + issue_comment: + create: Şîroveyekê tevlî bike message: create: Bişîne client_application: @@ -37,6 +40,10 @@ ku-Latn: create: Astengiyê çêbike update: Astengê nû bike activerecord: + errors: + messages: + invalid_email_address: wekî navnîşaneke e-peyamê ya derbasdar nayê xuyan + email_address_not_routable: ne alîkirinbar e models: acl: Lîsteya Kontrolê Têketinan changeset: Qeyda Guhertinan @@ -45,6 +52,7 @@ ku-Latn: diary_comment: Şîroveya rojane diary_entry: Nivîsa Rojane friend: Heval + issue: Pirsgirêk language: Ziman message: Peyam node: Nuqte @@ -61,6 +69,7 @@ ku-Latn: relation: Pêwendî relation_member: Endamê Eleqedar relation_tag: Nîşana Eleqeyê + report: Ragihîne session: Danişîn trace: Rêç tracepoint: Nuqteya Taqîbkirinê @@ -104,6 +113,45 @@ ku-Latn: description: Danasîn languages: Ziman pass_crypt: Şîfre + datetime: + distance_in_words_ago: + about_x_hours: + one: teqrîben berî saetekê + other: teqrîben berî %{count} saetan + about_x_months: + one: teqrîben berî mehekê + other: teqrîben berî %{count} mehan + about_x_years: + one: teqrîben berî salekê + other: teqrîben berî %{count} salan + almost_x_years: + one: hema bêje berî salekê + other: hema bêja berî %{count} salan + half_a_minute: berî nîv deqeyê + less_than_x_seconds: + one: kêmtirî saniyeyekê + other: kêmtirî berî %{count} saniyeyan + less_than_x_minutes: + one: berî kêmtir deqeyekê + other: berî kêmtir ji %{count} deqeyan + over_x_years: + one: berî zêdetirî salekê + other: berî zêdetirî %{count} salan + x_seconds: + one: berî saniyeyekê + other: Berî %{count} saniyeyan + x_minutes: + one: Berî deqeyekê + other: Berî %{count} deqeyan + x_days: + one: berî rojekê + other: berî %{count} rojan + x_months: + one: berî mehekê + other: beî %{count} mehan + x_years: + one: berî salekê + other: berî %{count} salan editor: default: Standard (vêga %{name}) potlatch: @@ -118,17 +166,26 @@ ku-Latn: remote: name: Ji Dûr Ve Îdarekirin description: Ji dûr ve kontrol (JOSM yan jî Merkaartor) + auth: + providers: + none: Tune + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Wîkîpediya api: notes: comment: - opened_at_html: Berî %{when} hate çêkirin - opened_at_by_html: Berî %{when} ji aliyê %{user} ve hate çêkirin - commented_at_html: Berî %{when} hate nûkirin - commented_at_by_html: Berî %{when} ji aliyê %{user} ve hate rojanekirin - closed_at_html: Berî %{when} hatte çareserkirin - closed_at_by_html: Berî %{when} ji aliyê %{user} ve hate çareserkirin - reopened_at_html: Berî %{when} jinûve hate aktîvkirin - reopened_at_by_html: Berî %{when} ji aliyê %{user} ve jinûve hate aktîvkirin + opened_at_html: '%{when} hate çêkirin' + opened_at_by_html: '%{when} ji aliyê %{user} ve hate çêkirin' + commented_at_html: '%{when} hate nûkirin' + commented_at_by_html: '%{when} ji aliyê %{user} ve hate rojanekirin' + closed_at_html: '%{when} hate çareserkirin' + closed_at_by_html: '%{when} ji aliyê %{user} ve hate çareserkirin' + reopened_at_html: '%{when} ji nû ve hate aktîvkirin' + reopened_at_by_html: '%{when} ji aliyê %{user} ve jinûve hate aktîvkirin' rss: title: Notên OpenStreetMapê description_area: Lîsteya notên herêma te yên ku hatine raporkirin, şirovekirin @@ -144,16 +201,16 @@ ku-Latn: browse: created: Hate çêkirin closed: Hate girtin - created_html: Berî %{time} hatiye çêkirin - closed_html: Berî %{time} hatiye girtin - created_by_html: Ji aliyê %{user} ve berî %{time} - hatiye çêkirin - deleted_by_html: Ji aliyê %{user} ve berî %{time} - hatiye jêbirin - edited_by_html: Ji aliyê %{user} ve berî %{time} - hatiye sererastkirin - closed_by_html: Ji aliyê %{user} ve berî %{time} - hatiye girtin + created_html: %{time} hatiye çêkirin + closed_html: %{time} hatiye girtin + created_by_html: Ji aliyê %{user} ve %{time} hatiye + çêkirin + deleted_by_html: Ji aliyê %{user} ve %{time} hatiye + jêbirin + edited_by_html: Ji aliyê %{user} ve %{time} hatiye + sererastkirin + closed_by_html: Ji aliyê %{user} ve %{time} hatiye + girtin version: Guherto in_changeset: Qeyda Guhertinan anonymous: anonîm @@ -173,9 +230,8 @@ ku-Latn: relation: Eleqe (%{count}) relation_paginated: Eleqe (%{x}-%{y} bi tevahî %{count}) comment: Şîrove (%{count}) - hidden_commented_by: Şîroveya veşartî yê ji alî %{user} ve, berî %{when} - commented_by: Şîrove ji aliyê %{user} ve, berî %{when} + hidden_commented_by: Şîroveya veşartî yê ji alî %{user} ve %{when} + commented_by: Şîrove ji aliyê %{user} ve, %{when} changesetxml: Desteya guhertinan a XML osmchangexml: osmChange XML feed: @@ -246,7 +302,9 @@ ku-Latn: tag: Ji bo nîşana %{key}=%{value} rûpela terîfkirinê ya wîkî'yê wikidata_link: Maddeya %{page} a li ser Wîkîdaneyê wikipedia_link: Gotara %{page} ya li ser Wîkîpediyayê + wikimedia_commons_link: Hêmana %{page} li ser Wîkîmediya Commonsê telephone_link: Li %{phone_number} bigere + colour_preview: Pêşdîtina rengê %{colour_value} note: title: 'Not: %{id}' new_note: Notê nû @@ -258,19 +316,18 @@ ku-Latn: hatiye çêkirin opened_by_anonymous: Berî %{when} wek anonîm hate çêkirin. - commented_by: Şiroveya ji %{user} yê berî %{when} - commented_by_anonymous: Şîrove ji alî bikarhênerek anonîm ve berî %{when} - closed_by: Ji aliyê %{user} ve berî %{when} - hate çareserkirin - closed_by_anonymous: Ji aliyê bikarhênerek anonîm ve berî %{when} + commented_by: Şiroveya ji %{user} %{when} + commented_by_anonymous: Şîrove ji alî bikarhênerek anonîm ve %{when} + closed_by: Ji aliyê %{user} ve %{when} hate + çareserkirin + closed_by_anonymous: Ji aliyê bikarhênerek anonîm ve %{when} hate çareserkirin - reopened_by: Ji aliyê %{user} ve berî %{when} + reopened_by: Ji aliyê %{user} ve %{when} ji nû ve hate aktîvkirin - reopened_by_anonymous: Ji aliyê bikarhênerek anonîm ve berî %{when} + reopened_by_anonymous: Ji aliyê bikarhênerek anonîm ve %{when} ji nû ve hate aktîvkirin - hidden_by: Ji aliyê %{user} ve berî %{when} - hate veşartin + hidden_by: Ji aliyê %{user} ve %{when} hate + veşartin report: Vê nîşeyê gilî bike query: title: Taybetmendiyan Nîşan Bide @@ -312,10 +369,16 @@ ku-Latn: comment: comment: Şîroveya nû yê li ser qeyda guhertinan a %{changeset_id} yê ji alî %{author} ve - commented_at_by_html: Berî %{when} ji aliyê %{user} ve hate rojanekirin + commented_at_by_html: '%{when} ji aliyê %{user} ve hate rojanekirin' + comments: + comment: 'Şîroveya nû li ser desteya guhertinan ya #%{changeset_id} ji aliyê + %{author} ve' index: title_all: Gotûbêja qeyda guhertinên OpenStreetMapê title_particular: Gotûbêja qeyda guhertinan a %{changeset_id} yê OpenStreetMapê + timeout: + sorry: Bibore, bidestxistina lîsteya şîroveyên desteya guhertinan ê ku te xwest + demeke dirêj girt. diary_entries: new: title: Nivîsa nû yê rojane @@ -335,6 +398,7 @@ ku-Latn: in_language_title: Nivîsên Rojane yên bi %{language} new: Nivîsa nû yê rojane new_title: Di rojnivîska min de nivîsekî nû binivîse + my_diary: Rojnivîska min no_entries: Nivîsên rojane tine recent_entries: Nivîsên rojane yên dawîn older_entries: Nivîsên Kevintir @@ -362,15 +426,17 @@ ku-Latn: zero: Bêşîrove one: '%{count} şîrove' other: '%{count} şîrove' - edit_link: Vê nivîse biguherîne + edit_link: Vê nivîsê biguherîne hide_link: Vê nivîsê biveşêre - confirm: Pesend bike + unhide_link: Veşartina vê nivîsê rake + confirm: Tesdîq bike report: Vê ketanê gilî bike diary_comment: comment_from_html: Şîroveya %{link_user} a %{comment_created_at} - hide_link: Vê şiroveyê vebişêre + hide_link: Vê şîroveyê biveşêre + unhide_link: Veşartina vê şîroveyê rake confirm: Pesend bike - report: Vê şîroveyê rapor bike + report: Vê şîroveyê ragihîne location: location: 'Cih:' view: Bibîne @@ -388,7 +454,7 @@ ku-Latn: comments: has_commented_on: '%{display_name} van nivîsên rojane yên li xwarê şirove kir' post: Nivîs - when: Kengî + when: Kengê comment: Şîrove newer_comments: Şîroveyên nûtir older_comments: Şîroveyên kevintir @@ -939,7 +1005,7 @@ ku-Latn: "yes": Dikan tourism: alpine_hut: Qulûbeya çiyayê - apartment: Qata apartmanê + apartment: Apartmana Tatîlê artwork: Berhemên hunerî attraction: Cihên balkêş bed_and_breakfast: Pansiyona tevî 'taştê û nivîn' @@ -1016,8 +1082,8 @@ ku-Latn: status: Rewş reports: Rapor last_updated: Rojanekirina dawî - last_updated_time_html: Berî %{time} - last_updated_time_user_html: %{time} berê ji %{user} + last_updated_time_html: %{time} + last_updated_time_user_html: %{time} ji %{user} link_to_reports: Raporan Bibîne reports_count: one: 1 Rapor @@ -1057,9 +1123,11 @@ ku-Latn: reopen: reopened: Rewşa pirsgirêk wekî "Vekirî" hat eyarkirin comments: + comment_from_html: Şîrove ji %{user_link} li ser %{comment_created_at} reassign_param: Bila pirsgirêk ji nû ve bê tayînkirin? reports: - reported_by_html: Ji aliyê %{user} ve wekî %{category} hat raporkirin + reported_by_html: Ji aliyê %{user} ve wekî %{category} hat raporkirin li ser + %{updated_at} helper: reportable_title: diary_comment: '%{entry_title}, şîrove #%{comment_id}' @@ -1132,6 +1200,8 @@ ku-Latn: intro_text: OpenStreetMap xerîteyekî dinyayê ye ku ji aliyê kesên wek te ve tê çêkirin û emilandina we belaş e û di bin lîsansa azad de ye. intro_2_create_account: Ji xwe re hesabekî çêbike + hosting_partners_html: Xizmeta hewandinê tê piştgirîkirin ji aliyê %{ucl}, %{bytemark}, + û %{partners} din ve. partners_ucl: University College London partners_bytemark: Bytemark Hosting partners_partners: şirîkên me @@ -1189,8 +1259,11 @@ ku-Latn: more_info_2: 'ji vir dikarî bibînî:' success: subject: '[OpenStreetMap] Împortkirina GPXê bi ser ket' - loaded_successfully: Ji nuqteyên %{possible_points} yê muhtemel bi %{trace_points} - bi awayekî serkefî hate barkirin. + loaded_successfully: + one: ji nuqteyekê %{possible_points} yê muhtemel bi %{trace_points} bi awayekî + serkefî hate barkirin. + other: Ji nuqteyên %{possible_points} yê muhtemel bi %{trace_points} bi + awayekî serkefî hate barkirin. signup_confirm: subject: '[OpenStreetMap] Bi xêr hatî OpenStreetMapê' greeting: Merhebaǃ @@ -1266,10 +1339,11 @@ ku-Latn: şiroveyek nivîsand' subject_other: '[OpenStreetMap] %{commenter} desteyekî guherandinê ê ku tu pê eleqedar dibî şirove kir' - your_changeset: '%{commenter} li ser desteyekî te yê guherandinê ê ku di %{time} - de hatibû çêkirin, şiroveyek berda' - commented_changeset: '%{commenter} li ser desteya guhertinê yê ku tu dişopînî - şiroveyek berda, ji aliyê %{changeset_author} ve di %{time} de hatiye çêkirin' + your_changeset: '%{commenter} li ser desteyekî te yê guherandinê şîroveyekê + berda di %{time} de' + commented_changeset: '%{commenter} di %{time} de li ser desteya guhertinê + yê ku tu dişopînî şiroveyek berda, ji aliyê %{changeset_author} ve hatiye + çêkirin' partial_changeset_with_comment: tevî şiroveya '%{changeset_comment}' partial_changeset_without_comment: bêyî şirove details: Dêtayên zêdetir yên derbarê desteya guherandinê de hûn dikarin ji %{url} @@ -1380,9 +1454,13 @@ ku-Latn: rûpela lîsans û mafê daneriyê.' legal_title: Zagonî legal_1_html: |- - Ev malper û gelek xizmetên din yên pêwendîdar bi awayekî fermî ji aliyê Weqfa OpenStreetMapê (OSMF) ve li ser navê civatê tê birêvebirin. Bikaranîna hemû karûbarên ku ji aliyê OSMF ve tê birêvebirin mijara - Politikayên Bikaranînê yê Qebûlbar û Politikaya me ya Veşarîtiyê ye -
Eger di derbarê lîsanskirin, mafê daneriyê de pirsên we hebin an jî ji bo pirsên we yên din ên qanûnî xêra xwe bi OSMF re bikevin têkiliyê.
OpenStreetMap, logoya mercekê û State of the Map marqeyên ticarî yên qeydkirî yê OSMFê nin. + Ev malper û gelek xizmetên din yên pêwendîdar bi awayekî fermî ji aliyê Weqfa OpenStreetMapê (OSMF) ve li ser navê civatê tê birêvebirin. Bikaranîna hemû karûbarên ku ji aliyê OSMF ve tê birêvebirin mijara Mercên Bikaranînê, + Politikayên Bikaranînê yê Qebûlbar û Politikaya me ya Veşarîtiyê ye. + legal_2_html: Eger di derbarê lîsanskirin, mafê daneriyê de pirsên we hebin + an jî ji bo pirsên we yên din ên qanûnî xêra xwe bi + OSMF re têkiliyê deynin.
OpenStreetMap, logoya mercekê û State of + the Map marqeyên + ticarî yên qeydkirî yê OSMFê nin. partners_title: Şirîkên me copyright: foreign: @@ -1447,6 +1525,10 @@ ku-Latn: contributors_at_html: |- Awistirya: Daneyên ji Stadt Wien (di bin CC BY de), Land Vorarlberg û Land Tirol (tevî guhertinan di bin lîsansa CC BY AT de) dihundirrîne. + contributors_au_html: |- + Awistralya: Daneyên ji + PSMA Australia Limited yên ku ji aliyê Commonwealth of Australia ve li bin + CC BY 4.0 hatine lîsanskirin dihewîne. contributors_ca_html: |- Keneda: Daneyên ji GeoBase®, GeoGratis (© Department of Natural Resources Canada), CanVec (© Department of Natural @@ -1469,12 +1551,17 @@ ku-Latn: Slovenya: Daneyên ji Surveying and Mapping Authority û Ministry of Agriculture, Forestry and Food (agahiyên ji xelkê re vekirî yên Slovenyayê) dihundirrîne. + contributors_es_html: |- + Spanya: Daneyên ji + Spanish National Geographic Institute (IGN) û + National Cartographic System (SCNE) + yên ji bo cardinbikaranînê di bin CC BY 4.0 de hatine lîsanskirin dihewîne. contributors_za_html: |- Afrîkaya Başûr: Daneyên ku ji Chief Directorate: National Geo-Spatial Information hatine bidestxistin dihundirrîne. Mafê daneriyê yê dewletê parastî ye. contributors_gb_html: |- Mîrnişîna Yekbûyî: Daneyên Ordnance - Survey data © dihundirrîne; mafê daneriyê yê Crownê û mafê databasê parastî ne 2010-12. + Survey data © dihundirrîne; mafê daneriyê yê Crownê û mafê databasê parastî ne 2010-19. contributors_footer_1_html: |- Ji bo dêtayên van û çavkaniyên din yên ku di pêşdebirina OpenStreeteMapê de hatine bikaranîn agahiyên zêdetir werbigrî, xêra xwe ji ser OpenStreetMap Wiki'yê binêre rûpela Beşdaran. @@ -1608,7 +1695,7 @@ ku-Latn: xwediyê çend çavkaniyan e. welcome: url: /welcome - title: Bi xêr hatî OSMê + title: Bi xêr hatî OpenStreetMapê description: Bi vê rêbernameya kurt ê ku tê de esasên OpenStreetMapê heye dest pê bike. beginners_guide: @@ -1617,8 +1704,9 @@ ku-Latn: description: Civata me, ji bo kesên ku nû dest pê kirine rêbertî dike. help: url: https://help.openstreetmap.org/ - title: help.openstreetmap.org - description: Pirsek bipirsin an binêrin cewabên li ser malpera OSMê ya pirs-û-bersivê. + title: Foruma Alîkariyê + description: Pirsek bipirsin an binêrin cewabên li ser malpera OpenStreetMapê + ya pirs-û-bersivê. mailing_lists: title: Lîsteya E-nameyan description: Di lîsteyên e-nameyan yên deverî an jî herêmî yên cur bi cur @@ -1635,11 +1723,14 @@ ku-Latn: description: Alikariya ji bo şirket û komeleyên ku derbasî nexşe û xizmetên din yên bi bingeha OpenStreetMapê dibin. welcomemat: + url: https://welcome.openstreetmap.org/ title: Ji bo rêxistinan + description: Tevî sazî an komeleyekê planên te yên ji bo OpenStreetMapê hene? + Tiştê ku ji te re lazim e di Rûpela Xêrhatinê de peyda bike. wiki: url: https://wiki.openstreetmap.org/ - title: wiki.openstreetmap.org - description: Ji bo belgeyên OSMyê yên bi berfirehî binêrin wîkiyê. + title: Wîkiya OpenStreetMapê + description: Ji bo belgeyên OpenStreetMapyê yên bi berfirehî binêrin wîkiyê. sidebar: search_results: Encamên lêgerînê close: Bigire @@ -1728,7 +1819,7 @@ ku-Latn: preview: Pêşdîtin markdown_help: title_html: |- - Bi Markdown + Bi kramdown hate analîzkirin headings: Sernivîs heading: Sernivîs @@ -1783,7 +1874,8 @@ ku-Latn: paragraph_1_html: OpenStreetMap ji bo hînbûna projeyê, pirskirin û cewabdana pirsan, û ji bo nîqaşên ku bi hevkarî têne kirin û ji bo belgekirina mijarên nexşeyê xwediyê çend çavkaniyan e. Ji vir alîkariyê - werbigrin. + werbigire. Bi sazî an komeleyeke dixwazî planan çêkî ji bo OpenStreetMapê? + Rûpela Xêrhatinê kontrol bike. start_mapping: Dest bi çêkirina nexşeyan bike add_a_note: title: Ji bo sererastkirinê wextê te tine? Wê gavê notek lê zêde bike! @@ -1811,6 +1903,7 @@ ku-Latn: tags_help: bi bêhnokê hatiye veqetandin visibility: Kî dikare bibîneː visibility_help: Ev tê çi wateyê? + visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces help: Alîkarî help_url: https://wiki.openstreetmap.org/wiki/Upload create: @@ -1818,6 +1911,8 @@ ku-Latn: trace_uploaded: Dosyeya te ya GPXê hate barkirin û ji bo ku li databasê were zêdekirin li bendê ye. Ev kar pirrî caran di nîv saetê de temam dibe û gava ku temam be wê ji te re e-peyamek were şandin. + upload_failed: Bibore, barkirina GPXê têk çû. Admîneke hate haydarkirin ji ber + xetayê. Ji kerama xwe cardin biceribîne traces_waiting: one: '%{count} şopê te yê ku li hêviya barkirinê disekine heye. Ji bo ku ji bikarhênerên din re nebî asteng, xêra xwe hêj ku te zêdetir şopan bar nekir, @@ -1871,7 +1966,9 @@ ku-Latn: newer: Şopên nûtir trace: pending: LI BENDÊ YE - count_points: '%{count} nuqte' + count_points: + one: Nuqteyekê + other: '%{count} nuqte' more: dêtay trace_details: Dêtayên Şopê Bibîne view_map: Nexşeyê bibîne @@ -1913,6 +2010,7 @@ ku-Latn: other: Dosyeya GPXê yê bi %{count} nuqteyan ya ji %{user} description_without_count: Dosyeya GPXê yê ji %{user} application: + permission_denied: Destûra te tine ji bo gihîna vê kiryarê require_cookies: cookies_needed: Tê xuyan ku te kûkiyan girtiye - xêra xwe berî ku tu dewam bikî, kûkiyan di geroka xwe de aktîv bike. @@ -1988,6 +2086,7 @@ ku-Latn: no_apps_html: Gelo sepanek heye tu bixwazibî wê qeyd bikî û pê standarda %{oauth} biemilînî ji bo ku digel me bi kar bînî? Berî ku tu ji OAuthê vê xizmetê bixwazibî divê tu sepanê xwe yê webê bidî qeydkirin. + oauth: OAuth registered_apps: Van sepanên telebkar bide qeydkirinː register_new: Sepanê xwe qeyd bike form: @@ -2125,15 +2224,30 @@ ku-Latn: kirǃ terms declined: Em xemgîn in ji ber ku te şertên beşdariyê yê nû qebûl nekir. Ji bo zêdetir agahiyan xêra xwe binêre vê rûpela wîkiyê. + terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined terms: - title: Şertên beşdariyê - heading: Şertên beşdariyê - consider_pd: Tevî vê peymana li jorê, tu dikarî bibijêrî ku beşdariyên te wek - Malê Giştî (malê ku ne aîdî şexsekî ye) were qebûlkirin. + title: Şertûmerc + heading: Şertûmerc + heading_ct: Şertên beşdariyê + read and accept with tou: Ji kerema xwe peymana beşdariyê û mercên bikaranînê + bixwîne û herdu qutîkan kontrol bike gava temam bû û dû re pêlî bişkoka dewamkirinê + bike. + contributor_terms_explain: Ev peymana şertûmercan ji bo beşdariyên te yên heyî + û ji bo yên dahatûyê hukm dike. + read_ct: Min peymana mercên beşdariyê yê li jor xwend û qebûl kir + tou_explain_html: Ev %{tou_link} bikaranîna malperê û jêrxana ku ji aliyê OSMF + ve tê temînkirin bi rê ve dibe. Ji kerema xwe bitikîne ser lînkê, nivîsê bixwîne + û qebûl bike. + read_tou: Min Şertûmercên Bikaranînê xwend û qebûl kir + consider_pd: Tevî evên li jorê, tu dikarî bibijêrî ku beşdariyên te wek Malê + Giştî (malê ku ne aîdî şexsekî ye) were qebûlkirin. consider_pd_why: Ev çi ye? + consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain guidance_html: 'Li vir agahiyên alîkar yên ji bo tu van şertan fam bikî hene: kurteyek ku dikare were xwendin û çend tercumeyên nefermî' + continue: Dewam bike + declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined decline: Red bike you need to accept or decline: Ji bo ku dewam bikî, xêra xwe şertên beşdariyê bixwîne û piştre qebûl an jî red bike. @@ -2172,7 +2286,7 @@ ku-Latn: ct status: Şertên beşdariyêː ct undecided: Bêqerar ct declined: Redkirî - latest edit: 'Guherandina axirkî %{ago}:' + latest edit: 'Guherandina axirkî (%{ago}):' email address: 'Navnîşana e-nameyê:' created from: Ji van hate çêkirinː status: 'Rewş:' @@ -2255,6 +2369,7 @@ ku-Latn: bikî û qebûl bikî xêra xwe vê lînkê taqîb bike. agreed_with_pd: Herwiha te beyan kir ku tu dixwazî guherandinên te wek Malê Giştî were qebûlkirin. + link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: Ev çi ye? profile description: Danasîna profîlêː preferred languages: Zimanên ku têne tercîhkirinː @@ -2262,6 +2377,7 @@ ku-Latn: image: 'Wêne:' gravatar: gravatar: Gravatarê bi kar bîne + link: https://wiki.openstreetmap.org/wiki/Gravatar link text: ev çi ye disabled: Gravatar hate neçalakkirin. enabled: Gravatarê te niha dikare were xuyan. @@ -2427,7 +2543,7 @@ ku-Latn: heading_html: Rakirina astengiya ku ji aliyê %{block_by} ve li ser %{block_on} hatiye çêkirin time_future: Wê astengî di %{time} de xilas bibe. - past: Ev astengî berî %{time} xilas bûye û niha nikare were rakirin. + past: Ev astengî %{time} xilas bûye û niha nikare were rakirin. confirm: Tu bawer î ku tu dixwazî vî astengiyê rabikî? revoke: Betal bike! flash: Ev astengî hate betalkirin. @@ -2435,11 +2551,23 @@ ku-Latn: time_future: Di %{time} de diqede. until_login: Heta ku bikarhêner têkeve aktîv e time_future_and_until_login: Di %{time} de û gava ku bikarhêner têket wê biqede. - time_past: Berî %{time} qediya. + time_past: '%{time} qediya.' block_duration: hours: one: 1 saetê other: '%{count} saetan' + days: + one: 1 roj + other: '%{count} rojan' + weeks: + one: 1 heftî + other: '%{count} heftiyan' + months: + one: 1 meh + other: '%{count} mehan' + years: + one: 1 sal + other: '%{count} salan' blocks_on: title: Astengiyên ser %{name} heading_html: Lîsteya astengiyên ser %{name} @@ -2519,6 +2647,12 @@ ku-Latn: out: Dûr bike locate: title: Cihê min nîşan bide + metersPopup: + one: Tu di nava 1 metreya vê nuqteyê de yî + other: Tu di nava %{count} metreyên vê nuqteyê de yî + feetPopup: + one: Tu 1 gav di nava vê nuqteyê de yî + other: Tu d nava %{count} gavên vê nuqteyê de yî base: standard: Standard cycle_map: Nexşeya bisiklête @@ -2533,6 +2667,12 @@ ku-Latn: title: Tebeqeyên nexşeyê copyright: © Beşdarên OpenStreetMapê donate_link_text: + terms: Mercên malper û APIyê + thunderforest: Kiremît bi destûra Andy + Allan + hotosm: Şêweya kiremîtan ji aliyê Tîma + Mirovayî ya OpenStreetMapê ve, hewandin ji aliyê OpenStreetMap Fransa ve site: edit_tooltip: Nexşeyê sererast bike edit_disabled_tooltip: Ji bo sererastkirina nexşeyê nêzîk bike @@ -2571,7 +2711,9 @@ ku-Latn: directions: ascend: Bilind bike engines: + fossgis_osrm_bike: Bisiklêt (OSMR) fossgis_osrm_car: Erebe (OSRM) + fossgis_osrm_foot: Pê (OSMR) graphhopper_bicycle: Bisiklêt (GraphHopper) graphhopper_car: Erebe (GraphHopper) graphhopper_foot: Peyade (GraphHopper) @@ -2593,7 +2735,21 @@ ku-Latn: offramp_right_with_exit_name_directions: Li alî rastê di ser %{name} re ji EXÄ°T'a %{exit} here ber bi %{directions} ve offramp_right_with_name: Ji rampayê li alî rastê ber bi %{name} ve biçe + offramp_right_with_directions: Bikeve rampeyê ji aliyê rastê ber bi %{directions} + ve + offramp_right_with_name_directions: Bikeve rampeyê ji aliyê rastê ji ser %{name}, + ber bi %{directions} ve + onramp_right_without_exit: Bizivire rastê ji rampeyê, ji ser %{name} + onramp_right_with_directions: Bizivire rastê ji ser rampeyê, ber bi %{directions} + ve + onramp_right_with_name_directions: Bizivire rastê ji ser rampeyê ji ser %{name}, + ber bi %{directions} ve onramp_right_without_directions: Ji ser rampayê bi alî rastê ve bizivire + onramp_right: Bizivire rastê ji ser rampeyê + endofroad_right_without_exit: Di dawiya cadeyê de bizivire aliyê rastê ji + ser %{name} + merge_right_without_exit: Bigihîje yê din ji ser %{name} + fork_right_without_exit: Li duriyanê bizivire aliyê rastê, ji ser %{name} turn_right_without_exit: Ji ser %{name} bi alî rastê ve bizivire sharp_right_without_exit: Ji ser %{name} bi alî rastê ve vîrajek tûj uturn_without_exit: Bi dirêjahiya %{name} wek U'yê vegere @@ -2601,6 +2757,28 @@ ku-Latn: turn_left_without_exit: Ji ser %{name} bi alî çepê ve bizivire offramp_left: Here rampaya li çepê offramp_left_with_exit: Li alî çepê ji EXÄ°T'a %{exit} derbikeve + offramp_left_with_exit_name: Ji aliyê çepê here cihê derketinê %{exit}, ji + ser %{name} + offramp_left_with_exit_directions: Ji aliyê çepê here cihê derketinê %{exit}, + ber bi %{directions} ve + offramp_left_with_exit_name_directions: Here cihê derketinê %{exit} ji aliyê + çepê, ji ser %{name}, ber bi %{directions} ve + offramp_left_with_name: Bikeve rampeyê ji aliyê çepê ji ser %{name} + offramp_left_with_directions: Bikeve rampeyê ji aliyê çepê, ber bi %{directions} + ve + offramp_left_with_name_directions: Bikeve rampeyê ji aliyê çepê ji ser %{name}, + ber bi %{directions} ve + onramp_left_without_exit: Bizivire aliyê çepê ji ser %{name} + onramp_left_with_directions: Bizivire aliyê çepê ji ser rampeyê, ber bi %{directions} + ve + onramp_left_with_name_directions: Bizivire aliyê çepê ji ser %{name}, ber + bi%{directions} ve + onramp_left_without_directions: Bizivire aliyê çepê ji ser rampeyê + onramp_left: Bizivire aliyê çepê ji ser rampeyê + endofroad_left_without_exit: Li dawiya cadeyê bizivire aliyê çepê ji ser %{name} + merge_left_without_exit: Bigihîje yê çepê ji ser %{name} + fork_left_without_exit: Li duriyanê bizivire aliyê çepê, ji ser %{name} + slight_left_without_exit: Piçekî bi aliyê çepê ve ji ser %{name} via_point_without_exit: (ji ser nuqteyê) follow_without_exit: '%{name} bişopîne' roundabout_without_exit: Ji çerxeriyê ber bi %{name} ve biçe @@ -2612,7 +2790,11 @@ ku-Latn: end_oneway_without_exit: Dawiya rêya yek-alî yê %{name} roundabout_with_exit: Li çerxeriyê exit'a %{exit} bi kar bîne û ber bi %{name} ve biçe + roundabout_with_exit_ordinal: Li çerxeriyê cihê derketinê yê %{exit} bi kar + bîne ji ser %{name} + exit_roundabout: Ji çerxeriyê derkeve ji ser %{name} unnamed: rêya bênav + courtesy: Îstîqamet bi xêra %{link} exit_counts: first: 1em second: 2yem @@ -2669,4 +2851,9 @@ ku-Latn: versiyonên wê ji nû ve sererast bike. flash: Redaksiyon hate rakirin. error: Gava ku ev redaksiyon dihate rakirin xetayek derket. + validations: + leading_whitespace: cihên vala yê li pêş hene + trailing_whitespace: li dawiyê cihên vala hene + invalid_characters: karakterên nederbasdar dihewîne + url_characters: karakterên URLyê yên xisûsî (%{characters}) dihewîne ... diff --git a/config/locales/ru.yml b/config/locales/ru.yml index c65b4d347..e1eb0bac1 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -465,6 +465,7 @@ ru: in_language_title: Дневниковые записи на языке %{language} new: Новая запись в дневнике new_title: Создать новую запись в моём дневнике + my_diary: Мой дневник no_entries: Нет записей в дневнике recent_entries: Недавние записи в дневнике older_entries: Более старые записи @@ -1321,6 +1322,11 @@ ru: import_failures_url: http://wiki.openstreetmap.org/wiki/GPX_Import_Failures success: subject: '[OpenStreetMap] Импорт GPX прошёл успешно' + loaded_successfully: + one: успешно загружена %{trace_points} точка из %{possible_points} возможной. + few: успешно загружены %{trace_points} точки из %{possible_points} возможных. + many: успешно загружено %{trace_points} точек из %{possible_points} возможных. + other: "" signup_confirm: subject: '[OpenStreetMap] Добро пожаловать в OpenStreetMap' greeting: Привет! diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index f16332980..8f7635a40 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -750,7 +750,7 @@ zh-CN: greenfield: 绿地 industrial: 工业区 landfill: 垃圾填埋场 - meadow: 草地 + meadow: 草甸 military: 军事区 mine: 矿井 orchard: 果园 @@ -850,7 +850,7 @@ zh-CN: forest: 森林 geyser: 间歇泉 glacier: 冰川 - grassland: 草地 + grassland: 草原 heath: 希思地貌 hill: 希尔地貌 island: 岛 @@ -1668,7 +1668,7 @@ zh-CN: resident: 居住区 common: - 公地 - - 草地 + - 草甸 retail: 零售区 industrial: 工业区 commercial: 商业区 diff --git a/config/puma.rb b/config/puma.rb index 5ed443774..283e163b1 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -4,13 +4,13 @@ # the maximum value specified for Puma. Default is set to 5 threads for minimum # and maximum; this matches the default thread size of Active Record. # -max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +max_threads_count = ENV.fetch("RAILS_MAX_THREADS", 5) min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } threads min_threads_count, max_threads_count # Specifies the `port` that Puma will listen on to receive requests; default is 3000. # -port ENV.fetch("PORT") { 3000 } +port ENV.fetch("PORT", 3000) # Specifies the `environment` that Puma will run in. # diff --git a/package.json b/package.json index 964bda4c1..82bc5ead5 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,6 @@ "private": true, "dependencies": {}, "devDependencies": { - "eslint": "^6.8.0" + "eslint": "^7.3.1" } } diff --git a/yarn.lock b/yarn.lock index 249a4d621..2a6861aa7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -28,10 +28,10 @@ acorn-jsx@^5.2.0: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ== -acorn@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" - integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== +acorn@^7.2.0: + version "7.3.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd" + integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== ajv@^6.10.0, ajv@^6.10.2: version "6.12.0" @@ -43,12 +43,10 @@ ajv@^6.10.0, ajv@^6.10.2: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-escapes@^4.2.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== - dependencies: - type-fest "^0.11.0" +ansi-colors@^3.2.1: + version "3.2.4" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" + integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA== ansi-regex@^4.1.0: version "4.1.0" @@ -105,7 +103,7 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -chalk@^2.0.0, chalk@^2.1.0: +chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -114,31 +112,14 @@ chalk@^2.0.0, chalk@^2.1.0: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== +chalk@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" + integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" -chardet@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== - -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== - dependencies: - restore-cursor "^3.1.0" - -cli-width@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= - color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -168,16 +149,14 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== +cross-spawn@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" debug@^4.0.1: version "4.1.1" @@ -186,7 +165,7 @@ debug@^4.0.1: dependencies: ms "^2.1.1" -deep-is@~0.1.3: +deep-is@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= @@ -203,52 +182,55 @@ emoji-regex@^7.0.1: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA== -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +enquirer@^2.3.5: + version "2.3.5" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.5.tgz#3ab2b838df0a9d8ab9e7dff235b0e8712ef92381" + integrity sha512-BNT1C08P9XD0vNg3J475yIUG+mVdp9T6towYFHUv897X0KoHBjB1shyrNmhmtHWKP17iSWgo7Gqh7BBuzLZMSA== + dependencies: + ansi-colors "^3.2.1" escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -eslint-scope@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9" - integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw== +eslint-scope@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" + integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w== dependencies: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" - integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== +eslint-utils@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== dependencies: eslint-visitor-keys "^1.1.0" -eslint-visitor-keys@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" - integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== +eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint@^6.8.0: - version "6.8.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" - integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig== +eslint@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.3.1.tgz#76392bd7e44468d046149ba128d1566c59acbe19" + integrity sha512-cQC/xj9bhWUcyi/RuMbRtC3I0eW8MH0jhRELSvpKYkWep3C6YZ2OkvcvJVUeO6gcunABmzptbXBuDoXsjHmfTA== dependencies: "@babel/code-frame" "^7.0.0" ajv "^6.10.0" - chalk "^2.1.0" - cross-spawn "^6.0.5" + chalk "^4.0.0" + cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" - eslint-scope "^5.0.0" - eslint-utils "^1.4.3" - eslint-visitor-keys "^1.1.0" - espree "^6.1.2" - esquery "^1.0.1" + enquirer "^2.3.5" + eslint-scope "^5.1.0" + eslint-utils "^2.0.0" + eslint-visitor-keys "^1.2.0" + espree "^7.1.0" + esquery "^1.2.0" esutils "^2.0.2" file-entry-cache "^5.0.1" functional-red-black-tree "^1.0.1" @@ -257,45 +239,43 @@ eslint@^6.8.0: ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" - inquirer "^7.0.0" is-glob "^4.0.0" js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.3.0" + levn "^0.4.1" lodash "^4.17.14" minimatch "^3.0.4" - mkdirp "^0.5.1" natural-compare "^1.4.0" - optionator "^0.8.3" + optionator "^0.9.1" progress "^2.0.0" - regexpp "^2.0.1" - semver "^6.1.2" - strip-ansi "^5.2.0" - strip-json-comments "^3.0.1" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" table "^5.2.3" text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^6.1.2: - version "6.2.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" - integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== +espree@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.1.0.tgz#a9c7f18a752056735bf1ba14cb1b70adc3a5ce1c" + integrity sha512-dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw== dependencies: - acorn "^7.1.1" + acorn "^7.2.0" acorn-jsx "^5.2.0" - eslint-visitor-keys "^1.1.0" + eslint-visitor-keys "^1.2.0" esprima@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48" - integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q== +esquery@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" + integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== dependencies: - estraverse "^4.0.0" + estraverse "^5.1.0" esrecurse@^4.1.0: version "4.2.1" @@ -304,25 +284,21 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1: +estraverse@^4.1.0, estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== +estraverse@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642" + integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -external-editor@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - fast-deep-equal@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" @@ -333,18 +309,11 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@~2.0.6: +fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -figures@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - file-entry-cache@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" @@ -412,13 +381,6 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -iconv-lite@^0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" @@ -450,25 +412,6 @@ inherits@2: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inquirer@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29" - integrity sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg== - dependencies: - ansi-escapes "^4.2.1" - chalk "^3.0.0" - cli-cursor "^3.1.0" - cli-width "^2.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.15" - mute-stream "0.0.8" - run-async "^2.4.0" - rxjs "^6.5.3" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" - is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" @@ -479,11 +422,6 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - is-glob@^4.0.0, is-glob@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" @@ -491,11 +429,6 @@ is-glob@^4.0.0, is-glob@^4.0.1: dependencies: is-extglob "^2.1.1" -is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -524,24 +457,19 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= -levn@^0.3.0, levn@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" + prelude-ls "^1.2.1" + type-check "~0.4.0" -lodash@^4.17.14, lodash@^4.17.15: +lodash@^4.17.14: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -566,21 +494,11 @@ ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -mute-stream@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" - integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -588,29 +506,17 @@ once@^1.3.0: dependencies: wrappy "1" -onetime@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" - integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== - dependencies: - mimic-fn "^2.1.0" - -optionator@^0.8.3: - version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" - -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" parent-module@^1.0.0: version "1.0.1" @@ -624,15 +530,15 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= +path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== progress@^2.0.0: version "2.0.3" @@ -644,24 +550,16 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -regexpp@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" - integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== +regexpp@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" + integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - rimraf@2.6.3: version "2.6.3" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" @@ -669,51 +567,22 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -run-async@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8" - integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg== - dependencies: - is-promise "^2.1.0" - -rxjs@^6.5.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" - integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== - dependencies: - tslib "^1.9.0" +semver@^7.2.1: + version "7.3.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" + integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== -"safer-buffer@>= 2.1.2 < 3": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -semver@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.1.2: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== dependencies: - shebang-regex "^1.0.0" + shebang-regex "^3.0.0" -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= - -signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== slice-ansi@^2.1.0: version "2.1.0" @@ -738,16 +607,7 @@ string-width@^3.0.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - -strip-ansi@^5.1.0, strip-ansi@^5.2.0: +strip-ansi@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== @@ -761,10 +621,10 @@ strip-ansi@^6.0.0: dependencies: ansi-regex "^5.0.0" -strip-json-comments@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" - integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== +strip-json-comments@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180" + integrity sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w== supports-color@^5.3.0: version "5.5.0" @@ -795,34 +655,12 @@ text-table@^0.2.0: resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -through@^2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== dependencies: - os-tmpdir "~1.0.2" - -tslib@^1.9.0: - version "1.11.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" - integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== - -type-check@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= - dependencies: - prelude-ls "~1.1.2" - -type-fest@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== + prelude-ls "^1.2.1" type-fest@^0.8.1: version "0.8.1" @@ -841,14 +679,14 @@ v8-compile-cache@^2.0.3: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e" integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g== -which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" -word-wrap@~1.2.3: +word-wrap@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==