From: Andy Allan Date: Wed, 9 Jun 2021 14:29:57 +0000 (+0100) Subject: Merge pull request #3208 from osm-hr/update-rcn-color X-Git-Tag: live~2609 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7e5bbce23dcd72876c9947d232813efb48fe83eb?hp=7b3c449b46165610c7b8d64ff1505cd27e619a03 Merge pull request #3208 from osm-hr/update-rcn-color fix map key color for regional OpenCycleMap --- diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f452d8445..aa9de33e2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,7 +17,7 @@ jobs: with: ruby-version: ${{ env.ruby }} - name: Cache gems - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: vendor/bundle key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} @@ -41,7 +41,7 @@ jobs: with: ruby-version: ${{ env.ruby }} - name: Cache gems - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: vendor/bundle key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} @@ -65,14 +65,14 @@ jobs: with: ruby-version: ${{ env.ruby }} - name: Cache gems - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: vendor/bundle key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} restore-keys: | bundle-${{ env.os }}-${{ env.ruby }}- - name: Cache node modules - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: node_modules key: yarn-${{ env.os }}-${{ hashFiles('yarn.lock') }} @@ -100,7 +100,7 @@ jobs: with: ruby-version: ${{ env.ruby }} - name: Cache gems - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: vendor/bundle key: bundle-${{ env.os }}-${{ env.ruby }}-${{ hashFiles('Gemfile.lock') }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 174b6b0d4..d6a06b549 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: ubuntu: [18.04, 20.04] - ruby: [2.5, 2.7, 3.0] + ruby: [2.7, 3.0] runs-on: ubuntu-${{ matrix.ubuntu }} env: RAILS_ENV: test @@ -21,14 +21,14 @@ jobs: with: ruby-version: ${{ matrix.ruby }} - name: Cache gems - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: vendor/bundle key: bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}-${{ hashFiles('Gemfile.lock') }} restore-keys: | bundle-ubuntu-${{ matrix.ubuntu }}-ruby-${{ matrix.ruby }}- - name: Cache node modules - uses: actions/cache@v2.1.5 + uses: actions/cache@v2.1.6 with: path: node_modules key: yarn-ubuntu-${{ matrix.ubuntu }}-${{ hashFiles('yarn.lock') }} diff --git a/.rubocop.yml b/.rubocop.yml index 1931eb55f..49fba1d0c 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -7,7 +7,7 @@ require: - rubocop-rake AllCops: - TargetRubyVersion: 2.5 + TargetRubyVersion: 2.7 NewCops: enable Exclude: - 'vendor/**/*' diff --git a/Gemfile.lock b/Gemfile.lock index cf74e2b03..f20e7cfc8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,8 +77,8 @@ GEM autoprefixer-rails (10.2.5.1) execjs (> 0) aws-eventstream (1.1.1) - aws-partitions (1.462.0) - aws-sdk-core (3.114.0) + aws-partitions (1.465.0) + aws-sdk-core (3.114.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -86,7 +86,7 @@ GEM aws-sdk-kms (1.43.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.95.1) + aws-sdk-s3 (1.96.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -115,12 +115,12 @@ GEM bootstrap_form (4.5.0) actionpack (>= 5.2) activemodel (>= 5.2) - brakeman (5.0.1) + brakeman (5.0.4) browser (5.3.1) builder (3.2.4) bzip2-ffi (1.1.0) ffi (~> 1.0) - cancancan (3.2.1) + cancancan (3.2.2) canonical-rails (0.2.11) rails (>= 4.1, < 6.2) capybara (3.35.3) @@ -135,7 +135,7 @@ GEM coderay (1.1.3) composite_primary_keys (13.0.0) activerecord (~> 6.1.0) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) config (3.1.0) deep_merge (~> 1.2, >= 1.2.1) dry-validation (~> 1.0, >= 1.0.0) @@ -154,10 +154,10 @@ GEM dry-configurable (0.12.1) concurrent-ruby (~> 1.0) dry-core (~> 0.5, >= 0.5.0) - dry-container (0.7.2) + dry-container (0.8.0) concurrent-ruby (~> 1.0) dry-configurable (~> 0.1, >= 0.1.3) - dry-core (0.5.0) + dry-core (0.6.0) concurrent-ruby (~> 1.0) dry-equalizer (0.3.0) dry-inflector (0.2.0) @@ -255,7 +255,7 @@ GEM thor (>= 0.14, < 2.0) json (2.5.1) jwt (2.2.3) - kgio (2.11.3) + kgio (2.11.4) kramdown (2.3.1) rexml libxml-ruby (3.2.1) @@ -265,7 +265,7 @@ GEM logstasher (2.1.5) activesupport (>= 5.2) request_store - loofah (2.9.1) + loofah (2.10.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -275,14 +275,14 @@ GEM method_source (1.0.0) mini_magick (4.11.0) mini_mime (1.0.3) - mini_portile2 (2.5.1) + mini_portile2 (2.5.3) minitest (5.14.4) msgpack (1.4.2) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) nio4r (2.5.7) - nokogiri (1.11.5) + nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.5) @@ -399,16 +399,16 @@ GEM rexml (3.2.5) rinku (2.0.6) rotp (6.2.0) - rubocop (1.15.0) + rubocop (1.16.0) parallel (~> 1.10) parser (>= 3.0.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml - rubocop-ast (>= 1.5.0, < 2.0) + rubocop-ast (>= 1.7.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.5.0) + rubocop-ast (1.7.0) parser (>= 3.0.1.1) rubocop-minitest (0.12.1) rubocop (>= 0.90, < 2.0) @@ -458,7 +458,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - strong_migrations (0.7.6) + strong_migrations (0.7.7) activerecord (>= 5) thor (1.1.0) tilt (2.0.10) diff --git a/INSTALL.md b/INSTALL.md index bd6603eba..c317c8a9d 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -48,9 +48,9 @@ For Fedora, you can install the minimum requirements with: ``` sudo dnf install ruby ruby-devel rubygem-rdoc rubygem-bundler rubygems \ - libxml2-devel js \ + libxml2-devel nodejs \ gcc gcc-c++ git \ - postgresql postgresql-server postgresql-contrib \ + postgresql postgresql-server postgresql-contrib libpq-devel \ perl-podlators ImageMagick libffi-devel gd-devel libarchive-devel \ bzip2-devel nodejs-yarn ``` diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ed01ad89b..ae90d980e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -30,7 +30,7 @@ module ApplicationHelper end def friendly_date_ago(date) - tag.span(time_ago_in_words(date, :scope => :'datetime.distance_in_words_ago'), :title => l(date, :format => :friendly)) + tag.span(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly)) end def body_class diff --git a/app/helpers/changesets_helper.rb b/app/helpers/changesets_helper.rb index b91810e95..4c0236b6b 100644 --- a/app/helpers/changesets_helper.rb +++ b/app/helpers/changesets_helper.rb @@ -12,11 +12,11 @@ module ChangesetsHelper def changeset_details(changeset) if changeset.closed_at > Time.now action = :created - time = time_ago_in_words(changeset.created_at, :scope => :'datetime.distance_in_words_ago') + time = time_ago_in_words(changeset.created_at, :scope => :"datetime.distance_in_words_ago") title = l(changeset.created_at) else action = :closed - time = time_ago_in_words(changeset.closed_at, :scope => :'datetime.distance_in_words_ago') + time = time_ago_in_words(changeset.closed_at, :scope => :"datetime.distance_in_words_ago") title = safe_join([t("browse.created"), ": ", l(changeset.created_at), " ".html_safe, t("browse.closed"), ": ", l(changeset.closed_at)]) end diff --git a/app/helpers/user_roles_helper.rb b/app/helpers/user_roles_helper.rb index 79e7cc012..15231f4d0 100644 --- a/app/helpers/user_roles_helper.rb +++ b/app/helpers/user_roles_helper.rb @@ -1,6 +1,6 @@ module UserRolesHelper def role_icons(user) - safe_join(UserRole::ALL_ROLES.collect { |role| role_icon(user, role) }.compact, " ") + safe_join(UserRole::ALL_ROLES.filter_map { |role| role_icon(user, role) }, " ") end def role_icon(user, role) diff --git a/app/views/browse/_common_details.html.erb b/app/views/browse/_common_details.html.erb index 3748f2f65..356207754 100644 --- a/app/views/browse/_common_details.html.erb +++ b/app/views/browse/_common_details.html.erb @@ -4,7 +4,7 @@

- <% if common_details.changeset.tags['comment'].present? %> + <% if common_details.changeset.tags["comment"].present? %> <%= linkify(common_details.changeset.tags["comment"]) %> <% else %> <%= t "browse.no_comment" %> @@ -13,7 +13,7 @@

<%= t "browse.#{common_details.visible? ? :edited : :deleted}_by_html", - :time => time_ago_in_words(common_details.timestamp, :scope => :'datetime.distance_in_words_ago'), + :time => time_ago_in_words(common_details.timestamp, :scope => :"datetime.distance_in_words_ago"), :user => changeset_user_link(common_details.changeset), :title => l(common_details.timestamp) %> · diff --git a/app/views/diary_entries/comments.html.erb b/app/views/diary_entries/comments.html.erb index 290fba35e..5f08f8d30 100644 --- a/app/views/diary_entries/comments.html.erb +++ b/app/views/diary_entries/comments.html.erb @@ -17,7 +17,7 @@ <% @comments.each do |comment| -%> "> <%= link_to comment.diary_entry.title, diary_entry_path(comment.diary_entry.user, comment.diary_entry) %> - <%= time_ago_in_words(comment.created_at, :scope => :'datetime.distance_in_words_ago') %> + <%= time_ago_in_words(comment.created_at, :scope => :"datetime.distance_in_words_ago") %> <%= comment.body.to_html %> <% end -%> diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 9fd8f1167..0aa9fea50 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -62,10 +62,10 @@ <% if issue.user_updated %> <%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated)), - :time => time_ago_in_words(issue.updated_at, :scope => :'datetime.distance_in_words_ago'), + :time => time_ago_in_words(issue.updated_at, :scope => :"datetime.distance_in_words_ago"), :title => l(issue.updated_at) %> <% else %> - <%= t ".last_updated_time_html", :time => time_ago_in_words(issue.updated_at, :scope => :'datetime.distance_in_words_ago'), + <%= t ".last_updated_time_html", :time => time_ago_in_words(issue.updated_at, :scope => :"datetime.distance_in_words_ago"), :title => l(issue.updated_at) %> <% end %> diff --git a/app/views/traces/_trace.html.erb b/app/views/traces/_trace.html.erb index 7dc20c203..44de2ef06 100644 --- a/app/views/traces/_trace.html.erb +++ b/app/views/traces/_trace.html.erb @@ -30,7 +30,7 @@

- <%= time_ago_in_words(trace.timestamp, :scope => :'datetime.distance_in_words_ago') %> + <%= time_ago_in_words(trace.timestamp, :scope => :"datetime.distance_in_words_ago") %> <%= t ".by" %> <%= link_to trace.user.display_name, user_path(trace.user) %> <% if !trace.tags.empty? %> diff --git a/app/views/user_blocks/revoke.html.erb b/app/views/user_blocks/revoke.html.erb index 1899e5145..9ece75bb5 100644 --- a/app/views/user_blocks/revoke.html.erb +++ b/app/views/user_blocks/revoke.html.erb @@ -28,6 +28,6 @@ <% else %>

- <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :'datetime.distance_in_words_ago')) %> + <%= t(".past", :time => time_ago_in_words(@user_block.ends_at, :scope => :"datetime.distance_in_words_ago")) %>

<% end %> diff --git a/app/views/users/_contact.html.erb b/app/views/users/_contact.html.erb index a5b29411c..c7e10c060 100644 --- a/app/views/users/_contact.html.erb +++ b/app/views/users/_contact.html.erb @@ -21,7 +21,7 @@

<% changeset = contact.changesets.first %> <% if changeset %> - <%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :'datetime.distance_in_words_ago')) %> + <%= t("users.show.latest edit", :ago => time_ago_in_words(changeset.created_at, :scope => :"datetime.distance_in_words_ago")) %> <% comment = changeset.tags["comment"].to_s == "" ? t("browse.no_comment") : changeset.tags["comment"] %> <%= link_to(comment, { :controller => "browse", :action => "changeset", :id => changeset.id }, diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb index 9179e431f..57b89564f 100644 --- a/config/initializers/oauth.rb +++ b/config/initializers/oauth.rb @@ -16,7 +16,7 @@ module OAuth def unescape(value) value.to_s.gsub(/%\h{2}/) do |c| - c[1..-1].to_i(16).chr + c[1..].to_i(16).chr end.force_encoding(Encoding::UTF_8) end end @@ -52,12 +52,12 @@ module OpenStreetMap module ClassMethods def included(controller) controller.class_eval do - def self.before_filter(*names, &blk) - before_action(*names, &blk) + def self.before_filter(...) + before_action(...) end - def self.skip_before_filter(*names, &blk) - skip_before_action(*names, &blk) + def self.skip_before_filter(...) + skip_before_action(...) end end diff --git a/config/initializers/secure_headers.rb b/config/initializers/secure_headers.rb index c97762a37..d3b5a568d 100644 --- a/config/initializers/secure_headers.rb +++ b/config/initializers/secure_headers.rb @@ -28,6 +28,7 @@ csp_policy[:report_uri] << Settings.csp_report_url if Settings.key?(:csp_report_ SecureHeaders::Configuration.default do |config| config.hsts = SecureHeaders::OPT_OUT + config.referrer_policy = "strict-origin-when-cross-origin" if Settings.csp_enforce config.csp = csp_policy diff --git a/config/locales/af.yml b/config/locales/af.yml index e0bfdfb05..87ad80b49 100644 --- a/config/locales/af.yml +++ b/config/locales/af.yml @@ -14,6 +14,8 @@ af: formats: friendly: '%e %B %Y om %H:%M' helpers: + file: + prompt: Lêer kies submit: diary_comment: create: Stoor @@ -26,7 +28,7 @@ af: create: Stuur client_application: create: Registreer - update: Redigeer + update: Opdateer redaction: create: Skep redaksie update: Stoor redaksie @@ -40,7 +42,7 @@ af: errors: messages: invalid_email_address: dit lyk nie of dit 'n geldige e-posadres is nie - email_address_not_routable: kan nie geruil word nie + email_address_not_routable: is nie aanstuurbaar nie models: acl: Toegangsbeheerlys changeset: Wysigingstel @@ -49,6 +51,7 @@ af: diary_comment: Dagboekopmerking diary_entry: Dagboekinskrywing friend: Vriend + issue: Probleem language: Taal message: Boodskap node: Knooppunt @@ -77,7 +80,17 @@ af: way_tag: Weg-merker attributes: client_application: + name: Naam (verplig) + url: Hoof-URL van toepassing (verplig) + callback_url: Callback-URL support_url: Ondersteunings-URL + allow_read_prefs: lees hul gebruikersvoorkeure + allow_write_prefs: verander hul gebruikersvoorkeure + allow_write_diary: skep dagboekinskrywings, lewer kommentaar en ontmoet vriende + allow_write_api: die kaart wysig + allow_read_gpx: lees hul privaat GPS-spore + allow_write_gpx: laai GPS-spore op + allow_write_notes: wysig notas diary_comment: body: Teks diary_entry: @@ -92,7 +105,7 @@ af: trace: user: Gebruiker visible: Sigbaar - name: Naam + name: Spoornaam size: Grootte latitude: Breedtegraad longitude: Lengtegraad @@ -106,22 +119,41 @@ af: title: Onderwerp body: Teks recipient: Ontvanger + redaction: + title: Titel + description: Beskrywing report: + category: 'Kies ''n rede vir u verslag:' details: Verskaf asseblief meer besonderhede oor die probleem (verlang). user: + auth_provider: Verifikasie verskaffer + auth_uid: Verifikasie UID email: E-pos + email_confirmation: Emailbevestiging new_email: 'Nuwe e-posadres:' active: Bedrywig display_name: Skermnaam - description: Beskrywing + description: 'Profielbeskrywing:' home_lat: 'Breedtegraad:' home_lon: 'Lengtegraad:' - languages: Tale + languages: 'Voorkeurtale:' + preferred_editor: Voorkeurprogram vir kaart redigering pass_crypt: Wagwoord + pass_crypt_confirmation: Bevestig wagwoord help: trace: tagstring: komma afgebaken + user_block: + reason: Die red hoekom die gebruiker geblokkeer word. Bly kalm en redelik + en gee soveel moontlike details oor die situasie. Dié berig is vir enigiemand + sigbaar. Hou in gedagte dat nie alle gebruikers die gemeenskapsterme begryp + nie, sp probeer leketaal gebruik sover moontlik. + needs_view: Moet die gebruiker aanmeld voordat dié versperring verwyder word? user: + email_confirmation: U adres word nie openbaar gemaak nie; raadpleeg ons privaatheidsbeleid + vir verdere inligting. new_email: (word nooit openbaar vertoon nie) datetime: distance_in_words_ago: @@ -169,7 +201,16 @@ af: description: iD (aanlynredigeerder) remote: name: Afstandsbeheer - description: Afstandsbeheer (JOSM of Merkaartor) + description: Afstandsbeheer (JOSM, Potlatch, Merkaartor) + auth: + providers: + none: Geen + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Wikipedia api: notes: comment: @@ -207,6 +248,12 @@ af: anonymous: anoniem no_comment: (geen kommentaar) part_of: Deel van + part_of_relations: + one: 1 verhouding + other: '%{count} verhoudings' + part_of_ways: + one: 1 weg + other: '%{count} weë' download_xml: Laai XML af view_history: Beskou geskiedenis view_details: Bekyk detail @@ -241,6 +288,9 @@ af: title_html: 'Weg: %{name}' history_title_html: 'Weggeskiedenis: %{name}' nodes: Knooppunte + nodes_count: + one: 1 nodus + other: '%{count} nodusse' also_part_of_html: one: gedeelte van weg %{related_ways} other: gedeelte van weë %{related_ways} @@ -248,6 +298,9 @@ af: title_html: 'Verwantskap: %{name}' history_title_html: 'Verwantskapgeskiedenis: %{name}' members: Lede + members_count: + one: 1 lid + other: '%{count} lede' relation_member: entry_role_html: '%{type} %{name} as %{role}' type: @@ -258,6 +311,7 @@ af: entry_html: Verwantskap %{relation_name} entry_role_html: Verwantskap %{relation_name} (as %{relation_role}) not_found: + title: Kon nie gevind word sorry: 'Jammer, %{type} #%{id} blyk onverkrygbaar.' type: node: knooppunt @@ -266,6 +320,7 @@ af: changeset: wysigingstel note: nota timeout: + title: Tydlimiet oorskry sorry: Jammer, die gegewens vir die %{type} met die id %{id} neem te lank om op te soek. type: @@ -301,6 +356,9 @@ af: title: 'Nota: %{id}' new_note: Nuwe nota description: Beskrywing + open_title: 'Onopgeloste nota #%{note_name}' + closed_title: 'Opgeloste nota #%{note_name}' + hidden_title: 'Verborge nota #%{note_name}' opened_by_html: Geskep deur %{user} %{when} opened_by_anonymous_html: Geskep deur anoniem %{when} ago @@ -351,6 +409,8 @@ af: comment: comment: 'Nuwe opmerking oor veranderingset #%{changeset_id} deur %{author}' commented_at_by_html: '%{when} gelede deur %{user} bygewerk' + comments: + comment: 'Nuwe opmerking oor veranderingstel #%{changeset_id} deur %{author}' index: title_all: OpenStreetMap bespreking oor wysigingstelle title_particular: 'OpenStreetMap veranderingset #%{changeset_id} bespreking' @@ -362,7 +422,7 @@ af: title: Nuwe dagboekinskrywing form: location: 'Ligging:' - use_map_link: gebruik kaart + use_map_link: Kies op kaart index: title: Gebruikersdagboeke title_friends: Dagboeke van vriende @@ -371,6 +431,7 @@ af: in_language_title: Dagboekinkrywings in %{language} new: Nuwe dagboekinskrywing new_title: Maak 'n nuwe inskrywing in jou dagboek + my_diary: My Dagboek no_entries: Geen dagboekinskrywings nie recent_entries: Onlangse dagboekinskrywings older_entries: Vorige Inskrywings @@ -390,9 +451,10 @@ af: body: Jammer, geen dagboekinskrywing of kommentaar met die id %{id} bestaan nie. Gaan u spelling na, of u het moontlik op 'n foutiewe skakel geklik. diary_entry: - posted_by_html: Plasing deur %{link_user} op %{created} in %{language_link} + posted_by_html: Plasing deur %{link_user} op %{created} in %{language_link}. + updated_at_html: Laas opgedateer op %{updated}. comment_link: Lewer hierop kommentaar - reply_link: Antwoord hierop + reply_link: Stuur 'n boodskap aan die outeur comment_count: zero: Geen opmerkings one: '%{count} opmerking' @@ -425,6 +487,7 @@ af: description: Onlangse dagboekinskrywings deur OpenStreetMap-gebruikers comments: has_commented_on: '%{display_name} het kommentaar gelewer op die volgende dagboekinskrywings' + no_comments: Geen dagboekeopmerkings post: Inskrywing when: Wanneer comment: Kommentaar @@ -432,11 +495,16 @@ af: older_comments: Ouer Kommentaar friendships: make_friend: + heading: '%{user} as vriend toevoeg?' button: As vriend byvoeg success: '%{name} is nou u vriend!' failed: Jammer, kon nie %{name} as 'n vriend byvoeg nie. already_a_friend: U is reeds met %{name} bevriend. + limit_exceeded: U het onlangs baie vriendskapsversoeke gestuur. Wag 'n tyd voordat + u nuwe versoeke probeer stuur. remove_friend: + heading: '%{user} as vriend verwyder?' + button: Verwyder as vriend success: '%{name} is uit u vriendekring verwyder.' not_a_friend: '%{name} is nie een van u vriende nie.' geocoder: @@ -457,10 +525,12 @@ af: chair_lift: Stoelhyser drag_lift: Sleephysbak gondola: Gondel lift + magic_carpet: Towertapythyser platter: Platter Lift pylon: Spantoring station: Lugwegstasie t-bar: T-bar hysbak + "yes": Kabelbaan aeroway: aerodrome: Vliegveld airstrip: Landingstrook @@ -469,11 +539,15 @@ af: hangar: Loods helipad: Helikopterplatform holding_position: Hou Posisie + navigationaid: Lugvaartnavigasiehulp parking_position: Parkeerplek runway: Aanloopbaan + taxilane: Taxibaan taxiway: Rybaan terminal: Terminaal + windsock: Windkous amenity: + animal_boarding: Dierehotel animal_shelter: Dierebeskermingsvereniging arts_centre: Kunssentrum atm: OTM @@ -483,7 +557,9 @@ af: bench: Bankie bicycle_parking: Fietsparkering bicycle_rental: Fietshuur + bicycle_repair_station: Fietsherstelstasie biergarten: Biertuin + blood_bank: Bloedbank boat_rental: Boothuur brothel: Bordeel bureau_de_change: Wisselkantoor @@ -500,6 +576,7 @@ af: clock: Klok college: Kollege community_centre: Gemeenskapsentrum + conference_centre: Konverensiesentrum courthouse: Hof crematorium: Krematorium dentist: Tandarts @@ -507,6 +584,7 @@ af: drinking_water: Drinkwater driving_school: Bestuurskool embassy: Ambassade + events_venue: Onthaallokaal fast_food: Wegneemetes ferry_terminal: Pontterminaal fire_station: Brandweerstasie @@ -519,16 +597,22 @@ af: hospital: Hospitaal hunting_stand: Jagtoring ice_cream: Roomys + internet_cafe: Internetkafee kindergarten: Kleuterskool + language_school: Taalskool library: Biblioteek + loading_dock: Laaistasie marketplace: Markplein + mobile_money_agent: Mobiele betalingagent monastery: Monnikeklooster motorcycle_parking: Motorfietsparkering + music_school: Musiekskool nightclub: Nagklub nursing_home: Verpleging- en versorgingshuis parking: Parkering parking_entrance: Parkeeringang parking_space: Parkeerplek + payment_terminal: Betaalautomaat pharmacy: Apteek place_of_worship: Plek van aanbidding police: Polisie @@ -536,9 +620,13 @@ af: post_office: Poskantoor prison: Tronk pub: Kroeg + public_bath: Openbare bad + public_bookcase: Ruilboekrak public_building: Openbare gebou + ranger_station: Veldwagtershut recycling: Herwinningspunt restaurant: Restaurant + sanitary_dump_station: Sanitêre stortstasie school: Skool shelter: Skuiling shower: Stort @@ -551,18 +639,27 @@ af: theatre: Teater toilets: Toilette townhall: Stadsaal + training: Opleidingsfasiliteit university: Universiteit + vehicle_inspection: Voertuiginspeksie vending_machine: Verkoopmasjien veterinary: Veearts village_hall: Dorpsaal waste_basket: Snippermandjie waste_disposal: Stortingsterrein + waste_dump_site: Afvalstortterrein + watering_place: Drinkplek water_point: Waterpunt + weighbridge: Weegbrug + "yes": Infrastruktuur boundary: + aboriginal_lands: Reservaat administrative: Administratiewe grens census: Sensusgrens national_park: Nasionale park + political: Kiesgrens protected_area: Beskermingsgebied + "yes": Grens bridge: aqueduct: Waterbrug boardwalk: Boardwalk @@ -571,43 +668,93 @@ af: viaduct: Viaduk "yes": Brug building: - apartments: Woonstelblok + apartment: Woonstel + apartments: Woonstelle + barn: Skuur + bungalow: Kothuis + cabin: Blokhut chapel: Kapel - church: Kerk + church: Kerkgebou + civic: Openbare gebou + college: Kollege gebou commercial: Kommersiële-gebou + construction: Gebou in aanbou + detached: Alleenstaande woning dormitory: Studentehuis - farm: Plaasgebou + duplex: Duplekshuis + farm: Plaashuis + farm_auxiliary: Hulpplaashuis garage: Garage + garages: Vulstasies + greenhouse: Kweekhuis + hangar: Loods hospital: Hospitaal-gebou - hotel: Hotel + hotel: Hotelgebou house: Huis + houseboat: Huisboot + hut: Hut industrial: Industriële gebou + kindergarten: Kleuterskoolgebou + manufacture: Produksiegebou office: Kantoorgebou public: Openbare gebou residential: Residensiële gebou retail: Kleinhandel-gebou + roof: Dak + ruins: Vervalle gebou school: Skoolgebou - terrace: Terras - train_station: Spoorwegstasie + semidetached_house: Halfgekoppelde huis + service: Diensgebou + shed: Skuur + stable: Stalle + static_caravan: Karavaan + temple: Tempelgebou + terrace: Terrasgebou + train_station: Spoorwegstasiegebou university: Universiteitsgebou + warehouse: Pakhuis "yes": Gebou + club: + sport: Sportklub + "yes": Klub craft: + beekeper: Byeboer + blacksmith: Smid brewery: Brouery carpenter: Skrynwerker + caterer: Spysenier + confectionery: Gebak + dressmaker: Kleremaker electrician: Elektrisiën + electronics_repair: Elektronieseherstelwerk gardener: Tuinier + glaziery: Glaswerk + handicraft: Handwerk + hvac: Verwarming/ventilasie + metal_construction: Metaalwerk painter: Verwer photographer: Fotograaf plumber: Loodgieter + roofer: Dakdekker + sawmill: Saagmeule shoemaker: Skoenmaker + stonemason: Klipkapper tailor: Snyer + window_construction: Vensterraamwerk + winery: Wynboer "yes": Handwerkwinkel emergency: + access_point: Reddingsdienstoegangspunt ambulance_station: Ambulansstasie assembly_point: Vergaderingspunt defibrillator: Defibrillator + fire_xtinguisher: Brandblusser + fire_water_pond: Bluswaterdam landing_site: Noodlandingsarea + life_ring: Reddingsboei phone: Noodtelefoon + siren: Noodsirene + suction_point: Bluswateropsuigpunt water_tank: Noodwatertenk "yes": Noodgeval highway: @@ -620,6 +767,7 @@ af: cycleway: Fietspad elevator: Hysbak emergency_access_point: Noodtoeganspunt + emergency_bay: Noodstopplek footway: Voetpad ford: Drif give_way: Toegeeteken @@ -649,18 +797,23 @@ af: tertiary: Tersiêre pad tertiary_link: Tersiêre pad track: Spoor + traffic_mirror: Verkeerspieël traffic_signals: Verkeerstekens + trailhead: Wandelvertrekpunt trunk: Hoofroete trunk_link: Hoofroete turning_loop: Draailus unclassified: Ongeklassifiseerde pad "yes": Straat historic: + aircraft: Historiese Vliegtuig archaeological_site: Argeologiese terrein + bomb_crater: Historiese bomkrater battlefield: Slagveld boundary_stone: Grenspaal building: Historiese gebou bunker: Bomskuiling + cannon: Historiese kanon castle: Kasteel church: Kerk city_gate: Stadspoort @@ -670,9 +823,11 @@ af: house: Huis manor: Landgoed memorial: Gedenkteken + milestone: Historiese myl paal mine: Myn mine_shaft: Mynskag monument: Monument + railway: Historiese spoorlyn roman_road: Romeinse pad ruins: Ruïnes stone: Steen @@ -686,6 +841,7 @@ af: "yes": Verkeersaansluiting landuse: allotments: Volkstuine + aquaculture: Akwakultuur basin: Kom cemetery: Begraafplaas commercial: Handelsarea @@ -703,18 +859,24 @@ af: military: Militêre gebied mine: Myn orchard: Vrugteboord + plant_nursery: Kwekery quarry: Steengroef railway: Spoorweg recreation_ground: Ontspanningsterrein reservoir: Reservoir residential: Woongebied retail: Kleinhandel + village_green: Braak vineyard: Wingerd "yes": Landgebruik leisure: + adult_gaming_centre: Spelsentrum vir volwassenes + amusement_arcade: Arkadesaal beach_resort: Strandoord bird_hide: Voëlkykhuisie + bleachers: Paviljoen common: Gemeenskaplike land + dance: Danssaal dog_park: Hondepark firepit: Vuurgat fishing: Visvanggebied @@ -728,6 +890,7 @@ af: miniature_golf: Mini-gholf nature_reserve: Natuurreservaat park: Park + picnic_table: Piekniektafel pitch: Sportveld playground: Speelgrond recreation_ground: Ontspanningsterrein @@ -742,18 +905,28 @@ af: "yes": Vrye tyd man_made: adit: Horisontale skag + advertising: Reklame + antenna: Antenna + avalanche_protection: Sneeustortingbeskerming beacon: Baken + beam: Balk beehive: Byekorf breakwater: Golfbreker bridge: Brug bunker_silo: Bunker + cairn: Steenhoop chimney: Skoorsteen + communications_tower: Antennatoring crane: Kraan + cross: Kruis + dolphin: Meerpaal + dyke: Dyk embankment: Wal flagpole: Vlagpaal groyne: Krip kiln: Oond lighthouse: Vuurtoring + manhole: Mangat mast: Mas mine: Myn mineshaft: Mynskag @@ -761,12 +934,17 @@ af: petroleum_well: Oliebron pier: Pier pipeline: Pypleiding + pumping_station: Pompstasie + reservoir_covered: Bedekte Reservoir silo: Silo + snow_cannon: Sneeukanon storage_tank: Opgaartenk surveillance: Toesig + telescope: Teleskoop tower: Toring wastewater_plant: Rioolaanleg watermill: Watermeul + water_tap: Waterkraan water_tower: Watertoring water_well: Put water_works: Waterwerke @@ -777,10 +955,13 @@ af: airfield: Miliêre vliegveld barracks: Barakke bunker: Bomskuiling + trench: Loopgraaf "yes": Militêre mountain_pass: "yes": Bergpas natural: + atoll: Atol + bare_rock: Kaal rots bay: Baai beach: Strand cape: Kaap @@ -797,12 +978,14 @@ af: grassland: Grasveld heath: Heide hill: Heuwel + hot_spring: Warmwaterbron island: Eiland land: Land marsh: Moeras moor: Vleiland mud: Modder peak: Piek + peninsula: Skiereiland point: Punt reef: Rif ridge: Bergrif @@ -823,22 +1006,33 @@ af: office: accountant: Boekhouer administrative: Administrasie + advertising_agency: Advetensieagentskap architect: Argitek association: Vereniging company: Maatskappy + diplomatic: Diplomatiekekantoor educational_institution: Opvoedkundige instelling employment_agency: Werksagentskap + energy_supplier: Energieverskafferkantoor estate_agent: Eiendomsagent + financial: Finansieële kantoor government: Regeringskantoor insurance: Versekeringskantoor it: IT-kantoor lawyer: Prokureur + logistics: Logistieke kantoor + newspaper: Koerant kantoor ngo: NRO-kantoor + notary: Notaris + religion: Godsdienskantoor + research: Navorsingskantoor + tax_advisor: Belastingadviseur telecommunication: Telekommunikasiekantoor travel_agent: Reisagent "yes": Kantoor place: allotments: Toekennings + archipelago: Argipel city: Stad city_block: Stadsblok country: Land @@ -887,10 +1081,14 @@ af: switch: Spoogwegpunte tram: Tremspoor tram_stop: Tremhalte + yard: Spoorwegterrein shop: + agrarian: Landbouwinkel alcohol: Drankwinkel antiques: Antiek / Oudhede + appliance: Toestellewinkel art: Kunswinkel + baby_goods: Babaware bakery: Bakkery beauty: Skoonheidsalon beverages: Drankgoedwinkel @@ -904,8 +1102,11 @@ af: car_repair: Motorherstel carpet: Mat-/tapytwinkel charity: Liefdadigheidswinkel + cheese: Kaaswinkel chemist: Apteek + chocolate: Sjokolade clothes: Klerewinkel + coffee: Koffiewinkel computer: Rekenaarwinkel confectionery: Banketbakkery convenience: Geriefswinkel @@ -917,33 +1118,45 @@ af: doityourself: Doen-Dit-Self-winkel dry_cleaning: Droogskoonmaker electronics: Elektronikawinkel + erotic: Erotiese winkel estate_agent: Eiendomsagent + fabric: Lapwinkel farm: Plaaswinkel fashion: Modewinkel + fishing: Hengel gereedskap winkel florist: Bloemiste food: Koswinkel + frame: Raamwerk winkel funeral_directors: Begrafnisondernemer furniture: Meubels garden_centre: Kwekery/Tuinsentrum + gas: Gaswinkel general: Algemene handelaar gift: Geskenkewinkel greengrocer: Groentehandelaar grocery: Kruidenierswinkel hairdresser: Haarkapper hardware: Hardewarewinkel + health_food: Gesondheidswinkel + hearing_aids: Gehoortoestelle hifi: Hoëtrou houseware: Huisraadwinkel + ice_cream: Roomyswinkel interior_decoration: Binnenshuise versiering jewelry: Juwelierswinkel kiosk: Kiosk kitchen: Kombuiswinkel laundry: Wassery + locksmith: Slotmaker lottery: Lotery mall: Winkelsentrum massage: Masseer mobile_phone: Selfoonwinkel + money_lender: Geldlener motorcycle: Motorfietswinkel + motorcycle_repair: Motorfiets werkswinkel music: Musiekwinkel + musical_instrument: Musiekinstrumente newsagent: Nuusagent optician: Oogkundige organic: Organiesekoswinkel @@ -954,11 +1167,13 @@ af: photo: Fotowinkel seafood: Seekos second_hand: Tweedehandswinkel + sewing: Naaiwinkel shoes: Skoenwinkel sports: Sportwinkel stationery: Skryfbehoeftewinkel supermarket: Supermark tailor: Snyer + tattoo: Tatoeëerder ticket: Kaartjiewinkel tobacco: Tabakwinkel toys: Speelgoedwinkel @@ -967,6 +1182,7 @@ af: vacant: Vakante winkel variety_store: Verskeidenheidswinkel video: Videowinkel + wholesale: Groothandel wine: Wynwinkel "yes": Winkel tourism: @@ -989,6 +1205,7 @@ af: picnic_site: Piekniekplek theme_park: Pretpark viewpoint: Uitkykpunt + wilderness_hut: Wildernishut zoo: Dieretuin tunnel: building_passage: Geboudeurgang @@ -1015,12 +1232,15 @@ af: "yes": Waterweg admin_levels: level2: Landgrens + level3: Streeksgrens level4: Staatsgrens level5: Streekgrens level6: Countygrens + level7: Munisipale grens level8: Stadsgrens level9: Dorpsgrens level10: Voorstedelike grens + level11: Buurtgrens types: cities: Stede towns: Dorpe @@ -1059,6 +1279,10 @@ af: successful_update: U verslag is suksesvol opgedateer provide_details: Verskaf asseblief die vereiste besonderhede show: + title: '%{status} Probleem #%{issue_id}' + report_created_at: Eerste vermelding op %{datetime} + last_resolved_at: Laas geregmaak op %{datetime} + last_updated_at: Laaste bygewerk op %{datetime} deur %{displayname} resolve: Los op ignore: Ignoreer reopen: Heropen @@ -1107,6 +1331,22 @@ af: diary_comment: spam_label: Hierdie kommentaar op die dagboek is/bevat strooipos offensive_label: Hierdie kommentaar op die dagboek is obseen/afstootlik + threat_label: Hierdie dagboekinskrywing bevat 'n bedreiging + other_label: Ander + user: + spam_label: Dié gebruikersprofiel is / bevat spam + offensive_label: Dié gebruikersprofiel is onwelvoeglik / aanstootgewend + threat_label: Dié gebruikersprofiel bevat 'n bedreiging + vandal_label: Dié gebruiker is 'n vandaal + other_label: Ander + note: + spam_label: Dié opmerking is spam + personal_label: Dié opmerking bevat persoonlike gegewens + abusive_label: Dié opmerking is beledigend + other_label: Ander + create: + successful_report: U verslag is suksesvol geregistreer + provide_details: Verskaf asseblief die vereiste besonderhede layouts: logo: alt_text: OpenStreetMap-embleem @@ -1120,6 +1360,7 @@ af: edit: Redigeer history: Geskiedenis export: Voer uit + issues: Probleme data: Data export_data: Voer data uit gps_traces: GPS-spore @@ -1133,6 +1374,7 @@ af: daarvan is gratis en val onder 'n oop-lisensie. intro_2_create_account: Skep 'n gebruikerrekening partners_partners: vennote + tou: Gebruiksvoorwaardes osm_offline: Die OpenStreetMap-databasis is tans vanlyn terwyl noodsaaklike onderhoud gedoen word. osm_read_only: Die OpenStreetMap-databasis kan tans slegs gelees word terwyl noodsaaklike diff --git a/config/locales/ce.yml b/config/locales/ce.yml index 7fb7aaeb3..3c3106929 100644 --- a/config/locales/ce.yml +++ b/config/locales/ce.yml @@ -200,11 +200,11 @@ ce: title: 'Нисдарш: %{id}' belongs_to: Автор node: ТӀадамаш (%{count}) - node_paginated: ТӀадамаш (%{x}-%{y} чура %{count}) + node_paginated: ТӀадамаш (%{x}-%{y} чуьра %{count}) way: Сиз (%{count}) - way_paginated: Сиз (%{x}-%{y} чура %{count}) + way_paginated: Сиз (%{x}-%{y} чуьра %{count}) relation: Хилар (%{count}) - relation_paginated: Хилар (%{x}-%{y} чура %{count}) + relation_paginated: Хилар (%{x}-%{y} чуьра %{count}) comment: Комменташ (%{count}) hidden_commented_by_html: Къайла комменташ %{user} %{when} хьалха @@ -249,7 +249,7 @@ ce: changeset: нисдарш note: билгалдаккхар timeout: - sorry: Бехк ба билла, цу %{type} хаамаш %{id} чура чубаха докха беха бу. + sorry: Бехк ба билла, цу %{type} хаамаш %{id} чуьра чубаха тӀех беха бу. type: node: тӀадамаш way: сиз @@ -331,7 +331,7 @@ ce: no_more: Кхи цхьа нисдарш цакарий. no_more_area: Кхузахь нисдарш дина дац. no_more_user: Кхузахь хӀокху декъашхочо нисдарш дина дац. - load_more: Чуяха кхин + load_more: Чуйаха кхин timeout: sorry: Ахьа бихина нисдарийн могӀа, арабаккха тӀехь беха бу. changeset_comments: @@ -402,7 +402,7 @@ ce: language: title: Дневникийн дӀайаздарш OpenStreetMap тӀе %{language_name} description: OpenStreetMap декъашхойн тӀехьарлера дневникийн дӀайаздарш %{language_name} - чура + чуьра all: title: Дневникан дӀайаздарш OpenStreetMap description: OpenStreetMap декъашхойн тӀаьххьарлера дӀайаздарш @@ -685,7 +685,7 @@ ce: shop: hifi: Аудио/видео аппаратурийн туька houseware: ПхьегӀийн туька - interior_decoration: Интерьер кечъяр + interior_decoration: Интерьер кечйар music: Музыкийн туька newsagent: Газетийн киоск optician: Оптика @@ -824,7 +824,7 @@ ce: register now: ДӀадазло destroy: title: Болх дӀаберзор - heading: OpenStreetMap чура болх дӀаберзор + heading: OpenStreetMap чуьра болх дӀаберзор logout_button: Болх дӀаберзор site: about: @@ -970,9 +970,9 @@ ce: title: Декъашхой heading: Декъашхой showing: - one: АгӀо %{page} (%{first_item} %{items}) чура - other: АгӀо %{page} (%{first_item}-%{last_item} %{items} чура) - summary_html: '%{name} кхоьллина %{date}, %{ip_address} адрес чура' + one: АгӀо %{page} (%{first_item} %{items}) чуьра + other: АгӀо %{page} (%{first_item}-%{last_item} %{items} чуьра) + summary_html: '%{name} кхоьллина %{date}, %{ip_address} адрес чуьра' summary_no_ip_html: '%{name} кхоьллина %{date}' suspended: webmaster: веб-говзанча diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 2e7da718e..97ddaac4b 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -2324,8 +2324,8 @@ en-GB: show: title: '%{block_on} blocked by %{block_by}' heading_html: '%{block_on} blocked by %{block_by}' - created: Created - status: Status + created: 'Created:' + status: 'Status:' show: Show edit: Edit revoke: Revoke! diff --git a/config/locales/es.yml b/config/locales/es.yml index a03461c06..916fc46a1 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -3,6 +3,7 @@ # Export driver: phpyaml # Author: 2axterix2 # Author: Adjen +# Author: Agent # Author: Aguslr # Author: Alberto Chung # Author: Anarhistička Maca @@ -570,6 +571,8 @@ es: success: ¡%{name} ahora es su amigo! failed: Lo sentimos, no se ha podido añadir a %{name} como un amigo. already_a_friend: Ya eres amigo de %{name}. + limit_exceeded: Ha agregado a muchos amigos recientemente. Por favor espere + un poco antes de intentar agregar más amigos. remove_friend: heading: ¿Quitar a %{user} de los amigos? button: Quitar amistad diff --git a/config/locales/et.yml b/config/locales/et.yml index 9d276abe9..742b1a575 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -453,6 +453,7 @@ et: description: Hiljutised OpenStreetMapi kasutajate päevikusissekanded comments: has_commented_on: '%{display_name} on kommenteerinud järgnevaid päeviku sissekandeid' + no_comments: Päeviku kommentaarid puuduvad. post: Postitus when: Millal comment: Kommentaar @@ -2140,8 +2141,9 @@ et: show: title: 'Blokeeritud: %{block_on} (blokeerinud %{block_by})' heading_html: 'Blokeeritud: %{block_on} (blokeerinud %{block_by})' - created: Loodud - status: Olek + created: 'Loodud:' + duration: 'Kestus:' + status: 'Olek:' show: Näita edit: Redigeeri revoke: Tühista! @@ -2169,6 +2171,7 @@ et: title: Kasutaja %{user} loodud või kommenteeritud märkused heading: Kasutaja %{user} märkused subheading_html: Kasutaja %{user} loodud või kommenteeritud märkused + no_notes: Märkused puuduvad. id: ID creator: Looja description: Kirjeldus diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 368ca8393..fdc2476e1 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -61,6 +61,7 @@ eu: diary_comment: Eguneroko iruzkina diary_entry: Eguneroko sarrera friend: Laguna + issue: Arazoa language: Hizkuntza message: Mezua node: Nodo @@ -92,6 +93,8 @@ eu: client_application: callback_url: Berriz deitzeko URLa support_url: Laguntza URLa + allow_write_api: mapa aldatu + allow_write_notes: oharrak aldatu diary_comment: body: Gorputza diary_entry: @@ -154,6 +157,9 @@ eu: pribatutasun politika, helbide elektronikoei buruzko atala ere bai">pribatutasun politika) informazio gehiagorako. new_email: (inoiz ez da publikoki bistaratuko) + datetime: + distance_in_words_ago: + half_a_minute: duela minutu erdi editor: default: Lehenetsia (orain %{name}) id: @@ -161,7 +167,16 @@ eu: description: iD (nabigatzaile barneko editorea) remote: name: Urrutiko agintea - description: Urrutiko kontrola (JOSM edo Merkaartor) + description: Urrutiko agintea (JOSM, Potlatch, Merkaartor) + auth: + providers: + none: Ezer + openid: OpenID + google: Google + facebook: Facebook + windowslive: Windows Live + github: GitHub + wikipedia: Wikipedia api: notes: comment: @@ -253,6 +268,7 @@ eu: entry_html: '%{relation_name} erlazioa' entry_role_html: '%{relation_name} erlazioa (%{relation_role} rolean)' not_found: + title: Ez da aurkitu sorry: 'Barkatu, %{type} #%{id} ezin izan da aurkitu.' type: node: nodo @@ -366,8 +382,8 @@ eu: new: title: Eguneroko Sarrera Berria form: - location: 'Kokapena:' - use_map_link: erabili mapa + location: Kokapena + use_map_link: Erabili mapa index: title: Erabiltzaileen egunerokoak title_friends: Lagunen egunerokoak @@ -376,6 +392,7 @@ eu: in_language_title: Eguneroko Sarrerak %{language} hizkuntzan new: Eguneroko sarrera berria new_title: Nire erabiltzaile egunerokoan sarrera berri bat sortu + my_diary: Nire egunerokoa no_entries: Eguneroko sarrerarik ez recent_entries: Azkenengoko eguneroko sarrerak older_entries: Sarrera zaharragoak @@ -397,7 +414,7 @@ eu: diary_entry: posted_by_html: '%{link_user}k %{created}n argitaratua %{language_link} hizkuntzan' comment_link: Sarrera honetan iruzkina utzi - reply_link: Sarrera honi erantzun + reply_link: Egileari mezua bidali comment_count: one: iruzkin %{count} zero: Iruzkinik ez @@ -477,6 +494,7 @@ eu: holding_position: Pozisioari eusten parking_position: Aparkatze Posizioa runway: Lurreratze pista + taxilane: Taxi bidea taxiway: Taxi bidea terminal: Terminala amenity: @@ -489,7 +507,9 @@ eu: bench: Bankua bicycle_parking: Txirrinduentzako aparkalekua bicycle_rental: Txirrindu Alokairua + bicycle_repair_station: Bizikletak konpontzeko lekua biergarten: Terraza + blood_bank: Odol-bankua boat_rental: Txalupen alokairua brothel: Putetxea bureau_de_change: Diru-truke Bulegoa @@ -506,6 +526,7 @@ eu: clock: Erlojua college: Unibertsitatea community_centre: Komunitate Zentroa + conference_centre: Hitzaldi zentroa courthouse: Epaitegia crematorium: Erraustegia dentist: Dentista @@ -526,10 +547,12 @@ eu: hunting_stand: Ehiza postua ice_cream: Izozkiak kindergarten: Haurtzaindegia + language_school: Hizkuntza eskola library: Liburutegia marketplace: Merkatua monastery: Monastegia motorcycle_parking: Motorrentzako aparkalekua + music_school: Musika eskola nightclub: Gau-kluba nursing_home: Zaharren egoitza parking: Aparkalekua @@ -542,7 +565,9 @@ eu: post_office: Postetxea prison: Espetxea pub: Pub-a + public_bath: Komun publiko public_building: Eraikin publiko + ranger_station: Basozain estazioa recycling: Birziklatze gune restaurant: Jatetxea school: Eskola @@ -557,18 +582,22 @@ eu: theatre: Antzokia toilets: Komunak townhall: Udaletxea + training: Formakuntza zentroa university: Unibertsitatea + vehicle_inspection: Ibilgailu azterketa vending_machine: Salmenta automatikodun makina veterinary: Albaitaritza klinika village_hall: Herriko aretoa waste_basket: Hondakin Saskia waste_disposal: Hondakin Ezabatze Puntua + waste_dump_site: Zabortegia water_point: Ur-puntua boundary: administrative: Muga Administratiboa census: Erroldaren muga national_park: Parke Nazionala protected_area: Babestutako Eremua + "yes": Muga bridge: aqueduct: Akueduktua boardwalk: Pasalekua @@ -577,21 +606,36 @@ eu: viaduct: Bidezubia "yes": Zubia building: + apartment: Apartamentu + apartments: Apartamentuak + bungalow: Bungalow + cabin: Kabina chapel: Kapera - church: Eliza + church: Elizako eraikina + commercial: Merkataritza eraikin + construction: Eraikitze-lanetan dagoen eraikin + dormitory: Ikasleen egoitza garage: Garajea + greenhouse: Negutegi + hangar: Hangar hospital: Ospitale erakina hotel: Hotela house: Etxe industrial: Eraikin industriala + kindergarten: Haurtzaindegia public: Eraikin publiko + roof: Teilatu school: Eskola eraikina train_station: Tren Geltokia university: Unibertsitate eraikina "yes": Eraikina + club: + "yes": Kluba craft: + blacksmith: Errementaria brewery: Garagardotegia carpenter: Zurgina + caterer: Katering electrician: Argiketaria gardener: Lorezaina painter: Margolaria @@ -599,13 +643,16 @@ eu: plumber: Iturgina shoemaker: Zapatagina tailor: Jostuna + winery: Ardotegi "yes": Artisau denda emergency: ambulance_station: Anbulantzia geralekua assembly_point: Bilera Puntua defibrillator: Desfibriladorea + fire_xtinguisher: Su itzailgailu landing_site: Larrialdi lurreratze-gunea phone: Larrialdi telefonoa + siren: Larrialdietako sirena water_tank: Larrialdietako ur tanga "yes": Larrialdia highway: @@ -745,6 +792,7 @@ eu: "yes": Aisialdia man_made: adit: Galeriara sarrera + antenna: Antena beacon: Itsas argia beehive: Erlauntza breakwater: Dikea @@ -770,6 +818,7 @@ eu: silo: Siloa storage_tank: Biltegiratze tanga surveillance: Zaintza + telescope: Teleskopioa tower: Dorrea wastewater_plant: Ur araztegia watermill: Errota hidraulikoa @@ -787,6 +836,7 @@ eu: mountain_pass: "yes": Mendatea natural: + atoll: Atoloi bay: Badia beach: Hondartza cape: Lurmuturra @@ -809,6 +859,7 @@ eu: moor: Mortua mud: Lohia peak: Gailurra + peninsula: Peninsula point: Puntua reef: Arrezifea ridge: Gailurra @@ -832,6 +883,7 @@ eu: architect: Arkitektoa association: Elkartea company: Enpresa + diplomatic: Bulego diplomatiko educational_institution: Hezkuntza erakundea employment_agency: Enplegu Agentzia estate_agent: Higiezinen Agentea @@ -845,6 +897,7 @@ eu: "yes": Bulegoa place: allotments: Alokatutako baratzeak + archipelago: Artxipelagoa city: Hiria city_block: Hiri Blokea country: Herrialdea @@ -939,6 +992,7 @@ eu: hardware: Hardware-denda hifi: Hi-Fi houseware: Etxeko artikuluetako Denda + ice_cream: Izozki denda interior_decoration: Barne-dekorazioa jewelry: Bitxi-denda kiosk: Kioskoa @@ -965,6 +1019,7 @@ eu: stationery: Paper-denda supermarket: Supermerkatua tailor: Jostuna + tea: Te denda ticket: Tiket denda tobacco: Tabako Denda toys: Jostailu denda @@ -973,6 +1028,7 @@ eu: vacant: Denda Librea variety_store: Askotariko denda video: Bideo-denda + video_games: Bideojoko denda wine: Ardodenda "yes": Denda tourism: @@ -1166,6 +1222,7 @@ eu: partners_ucl: UCLa partners_bytemark: Bytemark Ostatua partners_partners: bazkideak + tou: Erabilera-baldintzak osm_offline: OpenStreetMap datu-basea orain konexiorik gabe dago funtsezko datu-basearen mantentze lanak burutzen diren bitartean. osm_read_only: OpenStreetMap datu-basea irakurtzeko soilik moduan dago, oinarrizko @@ -1344,6 +1401,7 @@ eu: body: Barkatu baina id horrekin ez dago mezurik. outbox: title: Irteerako ontzia + my_inbox: Nire sarrera-ontzia messages: one: '%{count} Mezua bidali duzu' other: ' %{count} Mezuak bidali dituzu' @@ -1454,6 +1512,16 @@ eu: title: Saio-itxiera heading: OpenStreetMap-etik saioa itxi logout_button: Saioa itxi + shared: + markdown_help: + heading: Goiburua + subheading: Azpi-goiburua + unordered: Ordenik gabeko zerrenda + ordered: Ordenatutako zerrenda + url: URL + richtext_field: + edit: Aldatu + preview: Aurreikuspena site: about: next: Hurrengoa @@ -1711,7 +1779,7 @@ eu: description: Hasiberrientzako mantentze-gida komunitarioa. help: url: https://help.openstreetmap.org/ - title: help.openstreetmap.org + title: Laguntza foroa description: Egin galdera bat edo begiratu OSMn galdera-eta-erantzun gunean. mailing_lists: title: Posta Bidaltze Zerrendak @@ -1735,7 +1803,7 @@ eu: Aurkitu jakin beharrekoa Ongietorri Lanpasean. wiki: url: http://wiki.openstreetmap.org/wiki/Eu:Main_Page - title: wiki.openstreetmap.org + title: OpenStreetMap Wiki description: Arakatu wikia informazio zehatzeko OSM dokumentaziorako. sidebar: search_results: Bilaketaren emaitzak @@ -1925,7 +1993,9 @@ eu: newer: Aztarna berriagoak trace: pending: PRIBATUA - count_points: '%{count} puntu' + count_points: + one: puntu 1 + other: '%{count} puntu' more: gehiago trace_details: Ikusi Aztarna Xehetasunak view_map: Mapa ikusi @@ -2034,6 +2104,7 @@ eu: no_apps_html: Gurekin erabiltzeko erregistratu nahi duzun aplikazio bat duzu %{oauth} estandarraren bidez? Zure web aplikazioa erregistratu behar duzu OAuth zerbitzurako eskaera egin aurretik. + oauth: OAuth registered_apps: 'Ondorengo bezero aplikazio erregistratuak dituzu:' register_new: Zure aplikazio erregistratu form: @@ -2077,13 +2148,15 @@ eu: terms: title: Baldintzak heading: Baldintzak - consider_pd: Goiko hitzarmenaz gain, nire ekarpenak Domeinu Publikoan egon behar - direla uste dut + heading_ct: Kolaboratzaile terminoak + consider_pd: Goikoaz gain, nire ekarpenak Domeinu Publikoan egon behar direla + uste dut consider_pd_why: zer da hau? consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain guidance_html: 'Termino hauek ulertzeko informazioa: giza laburpen irakurgarria eta batzuk itzulpen informalak ' + continue: Jarraitu declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined decline: Ez onartu you need to accept or decline: Irakurri eta gero, onartu edo ezetsi Kolaboratzaileen @@ -2171,13 +2244,13 @@ eu: account: title: Kontua aldatu my settings: Nire aukerak - current email address: 'Egungo eposta helbidea:' - external auth: 'Kanpoko Autentifikazioa:' + current email address: Egungo posta helbidea + external auth: Kanpoko Autentifikazioa openid: link: https://wiki.openstreetmap.org/wiki/OpenID link text: zer da hau? public editing: - heading: 'Aldaketa publikoak:' + heading: Aldaketa publikoak enabled: Gaituta. Ez da anonimoa eta datuak editatu ditzake. enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits enabled link text: zer da hau? @@ -2195,7 +2268,7 @@ eu: publikoa bihurtzearekin.

  • Ekintza hau ezin da alderantzikatu eta erabiltzaile berri guztiek lehenespenez publikoak direlako. contributor terms: - heading: 'Kolaboratzaile Terminoak:' + heading: Kolaboratzaile Terminoak agreed: Kolaboratzaile-termino berriak onartu dituzu. not yet agreed: Oraindik ez duzu Laguntzaileen Baldintza berririk onartu. review link text: Mesedez, jarraitu esteka hau zure Kolaboratzaile Terminoaen @@ -2203,10 +2276,11 @@ eu: agreed_with_pd: Zure aldaketak domeinu publikoan egongo direla adierazi duzu. link: https://www.osmfoundation.org/wiki/License/Contributor_Terms link text: zer da hau? - image: 'Irudia:' + image: Irudia gravatar: gravatar: Gravatar erabili link: https://wiki.openstreetmap.org/wiki/Gravatar + what_is_gravatar: Zer da Gravatar? disabled: Gravatar desgaitu da. enabled: Zure Gravatar bistaratzea gaitu da. new image: Irudi bat gehitu @@ -2214,7 +2288,7 @@ eu: delete image: Oraingo irudia kendu replace image: Oraingo irudia ordezkatu image size hint: (gutxienez 100x100ko irudi koadroak hobeto funtzionatzen dute) - home location: 'Etxeko Kokalekua:' + home location: Etxeko Kokalekua no home location: Zure etxe-helbidea ez duzu txertatu. update home location on click: Eguneratu etxeko kokalekua mapan klik egiten dudanean? @@ -2355,8 +2429,9 @@ eu: show: title: '%{block_on} %{block_by}k blokeatu du' heading_html: '%{block_on} %{block_by}k blokeatu du' - created: Sortua - status: Egoera + created: 'Sortua:' + duration: 'Iraupena:' + status: 'Egoera:' show: Erakutsi edit: Aldatu revoke: Ezeztatu! @@ -2424,9 +2499,11 @@ eu: title: Erakutsi nire kokapena base: standard: Arrunta + cyclosm: CyclOSM cycle_map: Bizikletentzako mapa transport_map: Garraioen mapa hot: Humanitarioa + opnvkarte: ÖPNVKarte layers: header: Maparen geruzak notes: Maparen oharrak diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 47059c1fa..ad491d2e6 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -511,6 +511,7 @@ hu: description: Legutóbbi naplóbejegyzések az OpenStreetMap felhasználóitól comments: has_commented_on: '%{display_name} hozzászólt az alábbi naplóbejegyzésekhez' + no_comments: Nincs naplóhozzászólás post: Bejegyzés when: Mikor comment: Hozzászólás @@ -523,6 +524,8 @@ hu: success: '%{name} mostantól az ismerősöd.' failed: Sajnáljuk, sikertelen volt %{name} felvétele ismerősnek. already_a_friend: '%{name} már az ismerősöd.' + limit_exceeded: Sok felhasználóval barátkoztál az utóbbi időben. Kérjük, várj + egy kicsit, mielőtt további ismerősöket próbálnál találni. remove_friend: heading: '%{user} eltávolítása az ismerőseid közül?' button: Ismerős eltávolítása @@ -2736,8 +2739,9 @@ hu: show: title: '%{block_on} blokkolva %{block_by} által' heading_html: '%{block_by} blokkolta %{block_on} felhasználót' - created: Létrehozva - status: Állapot + created: 'Létrehozva:' + duration: 'Időtartam:' + status: 'Állapot:' show: Megjelenítés edit: Szerkesztés revoke: Visszavonás! @@ -2765,6 +2769,7 @@ hu: title: '%{user} által beküldött vagy kommentált jegyzetek' heading: '%{user} jegyzetei' subheading_html: '%{user} által beküldött vagy kommentált jegyzetek' + no_notes: Nincs jegyzet id: ID creator: Létrehozta description: Leírás diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 3c7a9ff18..381001fb3 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -1505,7 +1505,7 @@ ia: greeting: Salute, hopefully_you: Alcuno (probabilemente tu) vole cambiar su adresse de e-mail in %{server_url} a %{new_address}. - click_the_link: Si isto es tu, per favor clicca super le ligamine ci infra pro + click_the_link: Si isto es tu, per favor clicca sur le ligamine sequente pro confirmar le alteration. lost_password: subject: '[OpenStreetMap] Requesta de reinitialisation del contrasigno' @@ -1824,9 +1824,9 @@ ia: english_link: le original in anglese native: title: A proposito de iste pagina - html: Tu vide nunc le version in anglese del pagina de copyright. Tu pote - retornar al %{native_link} de iste pagina o tu pote cessar de leger super - copyright e %{mapping_link}. + html: Tu vide ora le version in anglese del pagina de derecto de autor. Tu + pote retornar al %{native_link} de iste pagina o tu pote cessar de leger + sur copyright e %{mapping_link}. native_link: version in interlingua mapping_link: comenciar le cartographia legal_babble: diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml index 87e735def..5772d30c8 100644 --- a/config/locales/ku-Latn.yml +++ b/config/locales/ku-Latn.yml @@ -45,7 +45,7 @@ ku-Latn: activerecord: errors: messages: - invalid_email_address: wekî navnîşaneke e-peyamê ya derbasdar nayê xuyan + invalid_email_address: ne weke navnîşaneke e-peyamê ya derbasdar e email_address_not_routable: nikare were alîkirin models: acl: Lîsteya kontrola têketinan @@ -55,7 +55,7 @@ ku-Latn: diary_comment: Şîroveya rojane diary_entry: Nivîsa Rojane friend: Heval - issue: Pirsgirêk + issue: Problem language: Ziman message: Peyam node: Nuqte @@ -87,8 +87,8 @@ ku-Latn: client_application: name: Nav (Hewce ye) url: URLya Sepana Sereke (Hewce ye) - callback_url: URLya paşve lêgerînê - support_url: URLya piştgirîkirinê + callback_url: Lînka paşve lêgerînê + support_url: Lînka piştgirîkirinê allow_read_prefs: tercîhên wan ên bikarhêneriyê bixwîne allow_write_prefs: tercîhên wan ên bikarhêneriyê biguherîne allow_write_diary: rojnivîsk, şîroveyan çêke û ji xwe re hevalan hevalan çêke diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index 4da0a32bc..aed74ffe2 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -1317,7 +1317,7 @@ pt-PT: level3: Fronteira de região level4: Fronteira estadual level5: Fronteira distrital - level6: Fronteira municipal + level6: Limite distrital level7: Limite de município level8: Limite de freguesia level9: Limite de localidade diff --git a/config/locales/scn.yml b/config/locales/scn.yml index 5160dbc32..f295fd796 100644 --- a/config/locales/scn.yml +++ b/config/locales/scn.yml @@ -22,7 +22,7 @@ scn: create: Manna client_application: create: Riggistra - update: Cancia + update: Agghiorna redaction: create: Crea l'occultamentu update: Sarva occultamentu @@ -93,22 +93,23 @@ scn: description: Discrizzioni gpx_file: 'Carricari lu file GPX:' visibility: 'Visibbilità:' - tagstring: 'Etichetti:' + tagstring: Etichetti message: sender: Mittenti title: Oggettu body: Corpu recipient: Distinatariu redaction: + title: Tìtulu description: Discrizzioni user: email: Posta elittrònica - new_email: 'Nnirizzu di posta elittrònica novu:' + new_email: Nnirizzu di posta elittrònica novu active: Attivu display_name: Nomu ammustratu description: Discrizzioni - home_lat: 'Latitùdini:' - home_lon: 'Luncitùdini:' + home_lat: Latitùdini + home_lon: Luncitùdini languages: Lingui pass_crypt: Palora d'òrdini help: @@ -126,17 +127,25 @@ scn: remote: name: Telecumannu description: Telecumannu (JOSM o Merkaartor) + auth: + providers: + none: Nuddu + openid: OpenID + google: Google + facebook: Facebook + github: GitHub + wikipedia: Wikipedia api: notes: comment: - opened_at_html: Criatu %{when} fa - opened_at_by_html: Criatu %{when} fa di %{user} - commented_at_html: Aggiurnatu %{when} fa - commented_at_by_html: Aggiurnatu %{when} fa di %{user} - closed_at_html: Arrisurvuta %{when} fa - closed_at_by_html: Arrisurvuta %{when} fa di %{user} - reopened_at_html: Rigraputa %{when} fa - reopened_at_by_html: Rigraputa %{when} fa di %{user} + opened_at_html: Criatu %{when} + opened_at_by_html: Criatu %{when} di %{user} + commented_at_html: Aggiurnatu %{when} + commented_at_by_html: Aggiurnatu %{when} di %{user} + closed_at_html: Arrisurvuta %{when} + closed_at_by_html: Arrisurvuta %{when} di %{user} + reopened_at_html: Rigraputa %{when} + reopened_at_by_html: Rigraputa %{when} di %{user} rss: title: Noti d'OpenStreetMap description_area: N’elencu dî noti signalati, cummintati o arrisurvuti ntâ @@ -152,12 +161,12 @@ scn: browse: created: Criatu closed: Chiudutu - created_html: Criatu %{time} fa - closed_html: Chiudutu %{time} fa - created_by_html: Criatu %{time} fa di %{user} - deleted_by_html: Cancillatu %{time} fa di %{user} - edited_by_html: Canciatu %{time} fa di %{user} - closed_by_html: Chiudutu %{time} fa di %{user} + created_html: Criatu %{time} + closed_html: Chiudutu %{time} + created_by_html: Criatu %{time} di %{user} + deleted_by_html: Cancillatu %{time} di %{user} + edited_by_html: Canciatu %{time} di %{user} + closed_by_html: Chiudutu %{time} di %{user} version: Virsioni in_changeset: Gruppu di canciamenti anonymous: anònimu @@ -514,6 +523,7 @@ scn: viaduct: Viaduttu "yes": Ponti building: + house: Casa "yes": Edificiu craft: brewery: Birrificiu @@ -660,6 +670,7 @@ scn: "yes": Ricrìu man_made: lighthouse: Faru + pier: Molu pipeline: Cunnuttu tower: Turri works: Fàbbrica diff --git a/config/locales/tl.yml b/config/locales/tl.yml index 6ddfe758e..c9aafdab3 100644 --- a/config/locales/tl.yml +++ b/config/locales/tl.yml @@ -115,8 +115,8 @@ tl: active: Masigla display_name: Ipakita ang Pangalan description: Paglalarawan - home_lat: 'Latitud:' - home_lon: 'Longhitud:' + home_lat: Latitud + home_lon: Longhitud languages: Mga wika pass_crypt: Password help: @@ -1825,7 +1825,7 @@ tl: title: '%{block_on} hinadlangan ni %{block_by}' heading_html: '%{block_on} hinadlangan ni %{block_by}' created: Nilikha - status: Kalagayan + status: 'Kalagayan:' show: Ipakita edit: Baguhin revoke: Bawiin! diff --git a/lib/id.rb b/lib/id.rb index 4e6cf3b7c..87c4a194e 100644 --- a/lib/id.rb +++ b/lib/id.rb @@ -1,3 +1,3 @@ module ID - LOCALES = Locale.list(Rails.root.join("vendor/assets/iD/iD/locales").entries.map { |p| p.basename.to_s[/(.*).json/] && Regexp.last_match(1) }.compact) + LOCALES = Locale.list(Rails.root.join("vendor/assets/iD/iD/locales").entries.filter_map { |p| p.basename.to_s[/(.*).json/] && Regexp.last_match(1) }) end diff --git a/yarn.lock b/yarn.lock index ad6775903..666763944 100644 --- a/yarn.lock +++ b/yarn.lock @@ -23,15 +23,15 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@eslint/eslintrc@^0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14" - integrity sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ== +"@eslint/eslintrc@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179" + integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg== dependencies: ajv "^6.12.4" debug "^4.1.1" espree "^7.3.0" - globals "^12.1.0" + globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" @@ -270,12 +270,12 @@ eslint-visitor-keys@^2.0.0: integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== eslint@^7.3.1: - version "7.27.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.27.0.tgz#665a1506d8f95655c9274d84bd78f7166b07e9c7" - integrity sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA== + version "7.28.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820" + integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.1" + "@eslint/eslintrc" "^0.4.2" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" @@ -292,7 +292,7 @@ eslint@^7.3.1: fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" + glob-parent "^5.1.2" globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" @@ -421,10 +421,10 @@ get-intrinsic@^1.0.2: has "^1.0.3" has-symbols "^1.0.1" -glob-parent@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" - integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== +glob-parent@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" @@ -440,17 +440,10 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== - dependencies: - type-fest "^0.8.1" - -globals@^13.6.0: - version "13.6.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.6.0.tgz#d77138e53738567bb96a3916ff6f6b487af20ef7" - integrity sha512-YFKCX0SiPg7l5oKYCJ2zZGxcXprVXHcSnVuvzrT3oSENQonVLqM5pf9fN5dLGZGyCjhw8TN8Btwe/jKnZ0pjvQ== +globals@^13.6.0, globals@^13.9.0: + version "13.9.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" + integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== dependencies: type-fest "^0.20.2" @@ -823,11 +816,6 @@ type-fest@^0.20.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - uri-js@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"